提交代码

2025-03-14 19:20:01 +08:00 · 2025-03-14 19:20:01 +08:00 · 16af4ff9f4
parent 8f13f4d40e 20d8a06e6b
commit 16af4ff9f4
41 changed files with 5668 additions and 837 deletions
--- a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo
+++ b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo
--- a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.backup.json
+++ 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}"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
--- 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}"
            }
          ]
        }
--- a/DataBase/版本日志/SGGLDB_WH_V2025-03-13-xiaj（优化看板加载）.sql
+++ b/DataBase/版本日志/SGGLDB_WH_V2025-03-13-xiaj（优化看板加载）.sql
@ -1,11 +0,0 @@
-
-
--优化看板加载
-create index SitePerson_PersonInOutNow_ChangeTime_ProjectId_index
-on dbo.SitePerson_PersonInOutNow (ChangeTime, ProjectId)
-go
-
-
-
-
-
--- 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
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs
@ -0,0 +1,927 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   强类型资源类，用于查找本地化字符串等。
+    /// </summary>
+    // 此类是由 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() {
+        }
+        
+        /// <summary>
+        ///   返回此类使用的缓存 ResourceManager 实例。
+        /// </summary>
+        [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;
+            }
+        }
+        
+        /// <summary>
+        ///   覆盖当前线程的 CurrentUICulture 属性
+        ///   使用此强类型的资源类的资源查找。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 竣工 的本地化字符串。
+        /// </summary>
+        internal static string BeCompleted {
+            get {
+                return ResourceManager.GetString("BeCompleted", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 大数据中心 的本地化字符串。
+        /// </summary>
+        internal static string BigDataCenter {
+            get {
+                return ResourceManager.GetString("BigDataCenter", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 证书预警 的本地化字符串。
+        /// </summary>
+        internal static string CertificateWarning {
+            get {
+                return ResourceManager.GetString("CertificateWarning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 中国 的本地化字符串。
+        /// </summary>
+        internal static string China {
+            get {
+                return ResourceManager.GetString("China", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 中文 的本地化字符串。
+        /// </summary>
+        internal static string Chinese {
+            get {
+                return ResourceManager.GetString("Chinese", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 土建基础交安 的本地化字符串。
+        /// </summary>
+        internal static string CivilInfrastructure {
+            get {
+                return ResourceManager.GetString("CivilInfrastructure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 已完成 的本地化字符串。
+        /// </summary>
+        internal static string completed {
+            get {
+                return ResourceManager.GetString("completed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 参建人数 的本地化字符串。
+        /// </summary>
+        internal static string ConPersonCount {
+            get {
+                return ResourceManager.GetString("ConPersonCount", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 施工单位 的本地化字符串。
+        /// </summary>
+        internal static string ConstructionUnit {
+            get {
+                return ResourceManager.GetString("ConstructionUnit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 合同到期时间 的本地化字符串。
+        /// </summary>
+        internal static string ContractExpirationTime {
+            get {
+                return ResourceManager.GetString("ContractExpirationTime", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 当前现场人数 的本地化字符串。
+        /// </summary>
+        internal static string CurrentPersonnel {
+            get {
+                return ResourceManager.GetString("CurrentPersonnel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 隐患总数 的本地化字符串。
+        /// </summary>
+        internal static string DangersCount {
+            get {
+                return ResourceManager.GetString("DangersCount", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 员工管理 的本地化字符串。
+        /// </summary>
+        internal static string EmployeeManage {
+            get {
+                return ResourceManager.GetString("EmployeeManage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 英文 的本地化字符串。
+        /// </summary>
+        internal static string English {
+            get {
+                return ResourceManager.GetString("English", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 现场动态 的本地化字符串。
+        /// </summary>
+        internal static string FieldDynamics {
+            get {
+                return ResourceManager.GetString("FieldDynamics", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 首台设备到货 的本地化字符串。
+        /// </summary>
+        internal static string FirstEquipmentArrived {
+            get {
+                return ResourceManager.GetString("FirstEquipmentArrived", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 焊接一次合格率 的本地化字符串。
+        /// </summary>
+        internal static string FistPassRateWelding {
+            get {
+                return ResourceManager.GetString("FistPassRateWelding", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 全屏 的本地化字符串。
+        /// </summary>
+        internal static string FullScreen {
+            get {
+                return ResourceManager.GetString("FullScreen", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 总承包商施工计划 的本地化字符串。
+        /// </summary>
+        internal static string GeneralConPlan {
+            get {
+                return ResourceManager.GetString("GeneralConPlan", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 一般风险 的本地化字符串。
+        /// </summary>
+        internal static string GeneralRisk {
+            get {
+                return ResourceManager.GetString("GeneralRisk", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 较大风险 的本地化字符串。
+        /// </summary>
+        internal static string GreaterRisk {
+            get {
+                return ResourceManager.GetString("GreaterRisk", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 总部检查 的本地化字符串。
+        /// </summary>
+        internal static string HeadquartersInspection {
+            get {
+                return ResourceManager.GetString("HeadquartersInspection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 首页 的本地化字符串。
+        /// </summary>
+        internal static string HomePage {
+            get {
+                return ResourceManager.GetString("HomePage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 安全管理 的本地化字符串。
+        /// </summary>
+        internal static string HSEManage {
+            get {
+                return ResourceManager.GetString("HSEManage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 湿度 的本地化字符串。
+        /// </summary>
+        internal static string humidness {
+            get {
+                return ResourceManager.GetString("humidness", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 综合管理 的本地化字符串。
+        /// </summary>
+        internal static string IntegratedManage {
+            get {
+                return ResourceManager.GetString("IntegratedManage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 在施危大工程数 的本地化字符串。
+        /// </summary>
+        internal static string LargeRisk {
+            get {
+                return ResourceManager.GetString("LargeRisk", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 级 的本地化字符串。
+        /// </summary>
+        internal static string Level {
+            get {
+                return ResourceManager.GetString("Level", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 现场视频 的本地化字符串。
+        /// </summary>
+        internal static string LiveVideo {
+            get {
+                return ResourceManager.GetString("LiveVideo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 现场相册 的本地化字符串。
+        /// </summary>
+        internal static string Live_photo_album {
+            get {
+                return ResourceManager.GetString("Live_photo_album", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 低风险 的本地化字符串。
+        /// </summary>
+        internal static string LowRisk {
+            get {
+                return ResourceManager.GetString("LowRisk", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 重大风险 的本地化字符串。
+        /// </summary>
+        internal static string MajorRisk {
+            get {
+                return ResourceManager.GetString("MajorRisk", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 管理人员总数 的本地化字符串。
+        /// </summary>
+        internal static string managersCount {
+            get {
+                return ResourceManager.GetString("managersCount", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 材料管理 的本地化字符串。
+        /// </summary>
+        internal static string MaterialManagement {
+            get {
+                return ResourceManager.GetString("MaterialManagement", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 最大化 的本地化字符串。
+        /// </summary>
+        internal static string maximize {
+            get {
+                return ResourceManager.GetString("maximize", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 机械竣工 的本地化字符串。
+        /// </summary>
+        internal static string MechanicalCompletion {
+            get {
+                return ResourceManager.GetString("MechanicalCompletion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 机械预警 的本地化字符串。
+        /// </summary>
+        internal static string MechanicalWarning {
+            get {
+                return ResourceManager.GetString("MechanicalWarning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 消息 的本地化字符串。
+        /// </summary>
+        internal static string message {
+            get {
+                return ResourceManager.GetString("message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 更多 的本地化字符串。
+        /// </summary>
+        internal static string more {
+            get {
+                return ResourceManager.GetString("more", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 您没有此模块操作权限，请联系管理员授权！ 的本地化字符串。
+        /// </summary>
+        internal static string NoAuthorize {
+            get {
+                return ResourceManager.GetString("NoAuthorize", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 噪音 的本地化字符串。
+        /// </summary>
+        internal static string noise {
+            get {
+                return ResourceManager.GetString("noise", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 您没有权限进入项目管理模块！ 的本地化字符串。
+        /// </summary>
+        internal static string NoPermission {
+            get {
+                return ResourceManager.GetString("NoPermission", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 通知管理 的本地化字符串。
+        /// </summary>
+        internal static string NoticeManage {
+            get {
+                return ResourceManager.GetString("NoticeManage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 现场考勤 的本地化字符串。
+        /// </summary>
+        internal static string OnSiteAttendance {
+            get {
+                return ResourceManager.GetString("OnSiteAttendance", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 在新标签页中打开 的本地化字符串。
+        /// </summary>
+        internal static string OpensNewTab {
+            get {
+                return ResourceManager.GetString("OpensNewTab", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 合格率 的本地化字符串。
+        /// </summary>
+        internal static string PassRate {
+            get {
+                return ResourceManager.GetString("PassRate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 桩基施工 的本地化字符串。
+        /// </summary>
+        internal static string Pilefoundationconstruction {
+            get {
+                return ResourceManager.GetString("Pilefoundationconstruction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 管道安装开始 的本地化字符串。
+        /// </summary>
+        internal static string PipeInstallationStarts {
+            get {
+                return ResourceManager.GetString("PipeInstallationStarts", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 变电所受电 的本地化字符串。
+        /// </summary>
+        internal static string PowerReceived {
+            get {
+                return ResourceManager.GetString("PowerReceived", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 问题总数 的本地化字符串。
+        /// </summary>
+        internal static string ProblemTotal {
+            get {
+                return ResourceManager.GetString("ProblemTotal", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 项目地址 的本地化字符串。
+        /// </summary>
+        internal static string ProjectAddress {
+            get {
+                return ResourceManager.GetString("ProjectAddress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 项目清单 的本地化字符串。
+        /// </summary>
+        internal static string ProjectList {
+            get {
+                return ResourceManager.GetString("ProjectList", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 项目名称 的本地化字符串。
+        /// </summary>
+        internal static string ProjectName {
+            get {
+                return ResourceManager.GetString("ProjectName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 项目进度计划 的本地化字符串。
+        /// </summary>
+        internal static string ProjectSchedule {
+            get {
+                return ResourceManager.GetString("ProjectSchedule", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 项目统计 的本地化字符串。
+        /// </summary>
+        internal static string ProjectStatistics {
+            get {
+                return ResourceManager.GetString("ProjectStatistics", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 在建项目 的本地化字符串。
+        /// </summary>
+        internal static string ProjectUnderConstruction {
+            get {
+                return ResourceManager.GetString("ProjectUnderConstruction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 质量管理 的本地化字符串。
+        /// </summary>
+        internal static string QualityManage {
+            get {
+                return ResourceManager.GetString("QualityManage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 质量统计 的本地化字符串。
+        /// </summary>
+        internal static string QualityStatistics {
+            get {
+                return ResourceManager.GetString("QualityStatistics", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 质量预警 的本地化字符串。
+        /// </summary>
+        internal static string QualityWarning {
+            get {
+                return ResourceManager.GetString("QualityWarning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 质量问题统计 的本地化字符串。
+        /// </summary>
+        internal static string Quality_problem_statistics {
+            get {
+                return ResourceManager.GetString("Quality_problem_statistics", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 资质预警 的本地化字符串。
+        /// </summary>
+        internal static string Quawarning {
+            get {
+                return ResourceManager.GetString("Quawarning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 退出 的本地化字符串。
+        /// </summary>
+        internal static string quit {
+            get {
+                return ResourceManager.GetString("quit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 实时视频 的本地化字符串。
+        /// </summary>
+        internal static string RealTimeVideo {
+            get {
+                return ResourceManager.GetString("RealTimeVideo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 整改率 的本地化字符串。
+        /// </summary>
+        internal static string RectificationRate {
+            get {
+                return ResourceManager.GetString("RectificationRate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 刷新 的本地化字符串。
+        /// </summary>
+        internal static string Refresh {
+            get {
+                return ResourceManager.GetString("Refresh", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 刷新本页 的本地化字符串。
+        /// </summary>
+        internal static string RefreshPage {
+            get {
+                return ResourceManager.GetString("RefreshPage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 距竣工剩余 的本地化字符串。
+        /// </summary>
+        internal static string RemainingTimeCompletion {
+            get {
+                return ResourceManager.GetString("RemainingTimeCompletion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 风险管控 的本地化字符串。
+        /// </summary>
+        internal static string RiskControl {
+            get {
+                return ResourceManager.GetString("RiskControl", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 安全人工时 的本地化字符串。
+        /// </summary>
+        internal static string SafeLaborHours {
+            get {
+                return ResourceManager.GetString("SafeLaborHours", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 安全问题统计 的本地化字符串。
+        /// </summary>
+        internal static string SafeProStat {
+            get {
+                return ResourceManager.GetString("SafeProStat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 累计安全人工时 的本地化字符串。
+        /// </summary>
+        internal static string SafetyLaborHours {
+            get {
+                return ResourceManager.GetString("SafetyLaborHours", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 安全统计 的本地化字符串。
+        /// </summary>
+        internal static string SafetyStatistics {
+            get {
+                return ResourceManager.GetString("SafetyStatistics", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 进度管理 的本地化字符串。
+        /// </summary>
+        internal static string ScheduleManage {
+            get {
+                return ResourceManager.GetString("ScheduleManage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 选择语言 的本地化字符串。
+        /// </summary>
+        internal static string SelectLanguage {
+            get {
+                return ResourceManager.GetString("SelectLanguage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 劳务数据 的本地化字符串。
+        /// </summary>
+        internal static string ServiceData {
+            get {
+                return ResourceManager.GetString("ServiceData", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 设置 的本地化字符串。
+        /// </summary>
+        internal static string Settings {
+            get {
+                return ResourceManager.GetString("Settings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 停工 的本地化字符串。
+        /// </summary>
+        internal static string ShutDown {
+            get {
+                return ResourceManager.GetString("ShutDown", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 注销 的本地化字符串。
+        /// </summary>
+        internal static string SignOUT {
+            get {
+                return ResourceManager.GetString("SignOUT", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 开工时间 的本地化字符串。
+        /// </summary>
+        internal static string Start_time {
+            get {
+                return ResourceManager.GetString("Start_time", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 分包管理 的本地化字符串。
+        /// </summary>
+        internal static string SubManagement {
+            get {
+                return ResourceManager.GetString("SubManagement", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 监理单位 的本地化字符串。
+        /// </summary>
+        internal static string SupervisionUnit {
+            get {
+                return ResourceManager.GetString("SupervisionUnit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 切换首页 的本地化字符串。
+        /// </summary>
+        internal static string SwitchHomePage {
+            get {
+                return ResourceManager.GetString("SwitchHomePage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 系统菜单 的本地化字符串。
+        /// </summary>
+        internal static string SystemMenu {
+            get {
+                return ResourceManager.GetString("SystemMenu", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 智慧施工管理信息系统 的本地化字符串。
+        /// </summary>
+        internal static string SystemName {
+            get {
+                return ResourceManager.GetString("SystemName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 温度 的本地化字符串。
+        /// </summary>
+        internal static string temperature {
+            get {
+                return ResourceManager.GetString("temperature", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 试车管理 的本地化字符串。
+        /// </summary>
+        internal static string TestManagement {
+            get {
+                return ResourceManager.GetString("TestManagement", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 竣工时间 的本地化字符串。
+        /// </summary>
+        internal static string TimeCompletion {
+            get {
+                return ResourceManager.GetString("TimeCompletion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 待办事项 的本地化字符串。
+        /// </summary>
+        internal static string TodoList {
+            get {
+                return ResourceManager.GetString("TodoList", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 合同总工期 的本地化字符串。
+        /// </summary>
+        internal static string TotalContractDuration {
+            get {
+                return ResourceManager.GetString("TotalContractDuration", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 未完成 的本地化字符串。
+        /// </summary>
+        internal static string uncompleted {
+            get {
+                return ResourceManager.GetString("uncompleted", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 在建 的本地化字符串。
+        /// </summary>
+        internal static string UnderConstruction {
+            get {
+                return ResourceManager.GetString("UnderConstruction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 用户 的本地化字符串。
+        /// </summary>
+        internal static string user {
+            get {
+                return ResourceManager.GetString("user", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 视频监控 的本地化字符串。
+        /// </summary>
+        internal static string VideoSurveillance {
+            get {
+                return ResourceManager.GetString("VideoSurveillance", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 焊接管理 的本地化字符串。
+        /// </summary>
+        internal static string WeldingManage {
+            get {
+                return ResourceManager.GetString("WeldingManage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 风速 的本地化字符串。
+        /// </summary>
+        internal static string WindSpeed {
+            get {
+                return ResourceManager.GetString("WindSpeed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///  查找类似 作业人员总数 的本地化字符串。
+        /// </summary>
+        internal static string WorkPersonnel {
+            get {
+                return ResourceManager.GetString("WorkPersonnel", resourceCulture);
+            }
+        }
+    }
+}
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.designer.cs
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
@ -0,0 +1,796 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Chinese" xml:space="preserve">
+    <value>Chinese</value>
+    <comment>中文</comment>
+  </data>
+  <data name="English" xml:space="preserve">
+    <value>English</value>
+    <comment>英文</comment>
+  </data>
+  <data name="FullScreen" xml:space="preserve">
+    <value>Full screen</value>
+    <comment>全屏</comment>
+  </data>
+  <data name="GeneralConPlan" xml:space="preserve">
+    <value>General contractor construction plan</value>
+    <comment>总承包商施工计划</comment>
+  </data>
+  <data name="HomePage" xml:space="preserve">
+    <value>Home page</value>
+    <comment>首页</comment>
+  </data>
+  <data name="HSEManage" xml:space="preserve">
+    <value>HSE manage</value>
+    <comment>安全管理</comment>
+  </data>
+  <data name="maximize" xml:space="preserve">
+    <value>maximize</value>
+    <comment>最大化</comment>
+  </data>
+  <data name="message" xml:space="preserve">
+    <value>message</value>
+    <comment>消息</comment>
+  </data>
+  <data name="NoAuthorize" xml:space="preserve">
+    <value>You do not have permission to operate this module, please contact the administrator to authorize</value>
+    <comment>您没有此模块操作权限，请联系管理员授权！</comment>
+  </data>
+  <data name="OnSiteAttendance" xml:space="preserve">
+    <value>On-site attendance</value>
+    <comment>现场考勤</comment>
+  </data>
+  <data name="OpensNewTab" xml:space="preserve">
+    <value>Opens in a new TAB</value>
+    <comment>在新标签页中打开</comment>
+  </data>
+  <data name="QualityManage" xml:space="preserve">
+    <value>Quality manage</value>
+    <comment>质量管理</comment>
+  </data>
+  <data name="quit" xml:space="preserve">
+    <value>quit</value>
+    <comment>退出</comment>
+  </data>
+  <data name="RefreshPage" xml:space="preserve">
+    <value>Refresh this page</value>
+    <comment>刷新本页</comment>
+  </data>
+  <data name="ScheduleManage" xml:space="preserve">
+    <value>Schedule manage</value>
+    <comment>进度管理</comment>
+  </data>
+  <data name="SelectLanguage" xml:space="preserve">
+    <value>Choice language</value>
+    <comment>选择语言</comment>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Settings</value>
+    <comment>设置</comment>
+  </data>
+  <data name="SignOUT" xml:space="preserve">
+    <value>Sign OUT</value>
+    <comment>注销</comment>
+  </data>
+  <data name="SubManagement" xml:space="preserve">
+    <value>Subcontract manage</value>
+    <comment>分包管理</comment>
+  </data>
+  <data name="SystemMenu" xml:space="preserve">
+    <value>System menu</value>
+    <comment>系统菜单</comment>
+  </data>
+  <data name="SystemName" xml:space="preserve">
+    <value>Intelligent construction management information system</value>
+    <comment>智慧施工管理信息系统</comment>
+  </data>
+  <data name="user" xml:space="preserve">
+    <value>user</value>
+    <comment>用户</comment>
+  </data>
+  <data name="VideoSurveillance" xml:space="preserve">
+    <value>Video surveillance</value>
+    <comment>视频监控</comment>
+  </data>
+  <data name="WeldingManage" xml:space="preserve">
+    <value>Welding manage</value>
+    <comment>焊接管理</comment>
+  </data>
+  <data name="BigDataCenter" xml:space="preserve">
+    <value>Big data center</value>
+    <comment>大数据中心</comment>
+  </data>
+  <data name="EmployeeManage" xml:space="preserve">
+    <value>Employee manage</value>
+    <comment>员工管理</comment>
+  </data>
+  <data name="HeadquartersInspection" xml:space="preserve">
+    <value>Headquarters inspection</value>
+    <comment>总部检查</comment>
+  </data>
+  <data name="IntegratedManage" xml:space="preserve">
+    <value>Integrated manage</value>
+    <comment>综合管理</comment>
+  </data>
+  <data name="NoPermission" xml:space="preserve">
+    <value>You do not have permission to enter the project management module</value>
+    <comment>您没有权限进入项目管理模块！</comment>
+  </data>
+  <data name="NoticeManage" xml:space="preserve">
+    <value>Notification manage</value>
+    <comment>通知管理</comment>
+  </data>
+  <data name="ProjectList" xml:space="preserve">
+    <value>Project List</value>
+    <comment>项目清单</comment>
+  </data>
+  <data name="Refresh" xml:space="preserve">
+    <value>Refresh</value>
+    <comment>刷新</comment>
+  </data>
+  <data name="SwitchHomePage" xml:space="preserve">
+    <value>Switch home page</value>
+    <comment>切换首页</comment>
+  </data>
+  <data name="CertificateWarning" xml:space="preserve">
+    <value>Certificate</value>
+    <comment>证书预警</comment>
+  </data>
+  <data name="CivilInfrastructure" xml:space="preserve">
+    <value>Civil infrastructure maintenance</value>
+    <comment>土建基础交安</comment>
+  </data>
+  <data name="completed" xml:space="preserve">
+    <value>Completed</value>
+    <comment>已完成</comment>
+  </data>
+  <data name="ConstructionUnit" xml:space="preserve">
+    <value>Construction unit</value>
+    <comment>施工单位</comment>
+  </data>
+  <data name="ContractExpirationTime" xml:space="preserve">
+    <value>Contract expiration time</value>
+    <comment>合同到期时间</comment>
+  </data>
+  <data name="CurrentPersonnel" xml:space="preserve">
+    <value>Current field personnel</value>
+    <comment>当前现场人数</comment>
+  </data>
+  <data name="DangersCount" xml:space="preserve">
+    <value>Total number of hidden dangers</value>
+    <comment>隐患总数</comment>
+  </data>
+  <data name="FirstEquipmentArrived" xml:space="preserve">
+    <value>First equipment arrived</value>
+    <comment>首台设备到货</comment>
+  </data>
+  <data name="FistPassRateWelding" xml:space="preserve">
+    <value>First pass rate of welding</value>
+    <comment>焊接一次合格率</comment>
+  </data>
+  <data name="GeneralRisk" xml:space="preserve">
+    <value>General risk</value>
+    <comment>一般风险</comment>
+  </data>
+  <data name="GreaterRisk" xml:space="preserve">
+    <value>Greater risk</value>
+    <comment>较大风险</comment>
+  </data>
+  <data name="humidness" xml:space="preserve">
+    <value>humidness</value>
+    <comment>湿度</comment>
+  </data>
+  <data name="Level" xml:space="preserve">
+    <value>Level</value>
+    <comment>级</comment>
+  </data>
+  <data name="LowRisk" xml:space="preserve">
+    <value>Low risk</value>
+    <comment>低风险</comment>
+  </data>
+  <data name="MajorRisk" xml:space="preserve">
+    <value>Major risk</value>
+    <comment>重大风险</comment>
+  </data>
+  <data name="managersCount" xml:space="preserve">
+    <value>Total number of managers</value>
+    <comment>管理人员总数</comment>
+  </data>
+  <data name="MechanicalCompletion" xml:space="preserve">
+    <value>Mechanical completion</value>
+    <comment>机械竣工</comment>
+  </data>
+  <data name="MechanicalWarning" xml:space="preserve">
+    <value>Mechanical early</value>
+    <comment>机械预警</comment>
+  </data>
+  <data name="more" xml:space="preserve">
+    <value>more</value>
+    <comment>更多</comment>
+  </data>
+  <data name="noise" xml:space="preserve">
+    <value>noise</value>
+    <comment>噪音</comment>
+  </data>
+  <data name="PassRate" xml:space="preserve">
+    <value>Pass rate</value>
+    <comment>合格率</comment>
+  </data>
+  <data name="Pilefoundationconstruction" xml:space="preserve">
+    <value>Pile foundation construction</value>
+    <comment>桩基施工</comment>
+  </data>
+  <data name="PipeInstallationStarts" xml:space="preserve">
+    <value>Pipe installation starts</value>
+    <comment>管道安装开始</comment>
+  </data>
+  <data name="PowerReceived" xml:space="preserve">
+    <value>Power received by a substation</value>
+    <comment>变电所受电</comment>
+  </data>
+  <data name="ProblemTotal" xml:space="preserve">
+    <value>Problem total</value>
+    <comment>问题总数</comment>
+  </data>
+  <data name="ProjectSchedule" xml:space="preserve">
+    <value>Project schedule</value>
+    <comment>项目进度计划</comment>
+  </data>
+  <data name="QualityStatistics" xml:space="preserve">
+    <value>Quality statistics</value>
+    <comment>质量统计</comment>
+  </data>
+  <data name="QualityWarning" xml:space="preserve">
+    <value>Quality early warning</value>
+    <comment>质量预警</comment>
+  </data>
+  <data name="Quawarning" xml:space="preserve">
+    <value>Qualification early</value>
+    <comment>资质预警</comment>
+  </data>
+  <data name="RealTimeVideo" xml:space="preserve">
+    <value>Real-time video</value>
+    <comment>实时视频</comment>
+  </data>
+  <data name="RectificationRate" xml:space="preserve">
+    <value>Rectification rate</value>
+    <comment>整改率</comment>
+  </data>
+  <data name="RemainingTimeCompletion" xml:space="preserve">
+    <value>Remaining time to completion</value>
+    <comment>距竣工剩余</comment>
+  </data>
+  <data name="RiskControl" xml:space="preserve">
+    <value>Risk management and control</value>
+    <comment>风险管控</comment>
+  </data>
+  <data name="SafeLaborHours" xml:space="preserve">
+    <value>Safe labor hours</value>
+    <comment>安全人工时</comment>
+  </data>
+  <data name="SafetyStatistics" xml:space="preserve">
+    <value>Safety statistics</value>
+    <comment>安全统计</comment>
+  </data>
+  <data name="ServiceData" xml:space="preserve">
+    <value>Service data</value>
+    <comment>劳务数据</comment>
+  </data>
+  <data name="Start_time" xml:space="preserve">
+    <value>Start time</value>
+    <comment>开工时间</comment>
+  </data>
+  <data name="SupervisionUnit" xml:space="preserve">
+    <value>Supervision unit</value>
+    <comment>监理单位</comment>
+  </data>
+  <data name="temperature" xml:space="preserve">
+    <value>temperature</value>
+    <comment>温度</comment>
+  </data>
+  <data name="TimeCompletion" xml:space="preserve">
+    <value>Time of completion</value>
+    <comment>竣工时间</comment>
+  </data>
+  <data name="TodoList" xml:space="preserve">
+    <value>To-do list</value>
+    <comment>待办事项</comment>
+  </data>
+  <data name="TotalContractDuration" xml:space="preserve">
+    <value>Total contract duration</value>
+    <comment>合同总工期</comment>
+  </data>
+  <data name="uncompleted" xml:space="preserve">
+    <value>Uncompleted</value>
+    <comment>未完成</comment>
+  </data>
+  <data name="WindSpeed" xml:space="preserve">
+    <value>Wind speed</value>
+    <comment>风速</comment>
+  </data>
+  <data name="WorkPersonnel" xml:space="preserve">
+    <value>Total number of personnel</value>
+    <comment>作业人员总数</comment>
+  </data>
+  <data name="China" xml:space="preserve">
+    <value>China</value>
+    <comment>中国</comment>
+  </data>
+  <data name="ConPersonCount" xml:space="preserve">
+    <value>Number of construction participants</value>
+    <comment>参建人数</comment>
+  </data>
+  <data name="FieldDynamics" xml:space="preserve">
+    <value>Field dynamics</value>
+    <comment>现场动态</comment>
+  </data>
+  <data name="LargeRisk" xml:space="preserve">
+    <value>Large number of projects at risk</value>
+    <comment>在施危大工程数</comment>
+  </data>
+  <data name="LiveVideo" xml:space="preserve">
+    <value>Live video</value>
+    <comment>现场视频</comment>
+  </data>
+  <data name="Live_photo_album" xml:space="preserve">
+    <value>Live photo album</value>
+    <comment>现场相册</comment>
+  </data>
+  <data name="ProjectAddress" xml:space="preserve">
+    <value>Project address</value>
+    <comment>项目地址</comment>
+  </data>
+  <data name="ProjectName" xml:space="preserve">
+    <value>Project name</value>
+    <comment>项目名称</comment>
+  </data>
+  <data name="ProjectStatistics" xml:space="preserve">
+    <value>Project statistics</value>
+    <comment>项目统计</comment>
+  </data>
+  <data name="ProjectUnderConstruction" xml:space="preserve">
+    <value>Project under construction</value>
+    <comment>在建项目</comment>
+  </data>
+  <data name="Quality_problem_statistics" xml:space="preserve">
+    <value>Quality problem statistics
+
+</value>
+    <comment>质量问题统计</comment>
+  </data>
+  <data name="SafeProStat" xml:space="preserve">
+    <value>Safety problem statistics</value>
+    <comment>安全问题统计</comment>
+  </data>
+  <data name="SafetyLaborHours" xml:space="preserve">
+    <value>Cumulative safety labor hours</value>
+    <comment>累计安全人工时</comment>
+  </data>
+  <data name="BeCompleted" xml:space="preserve">
+    <value>Be completed</value>
+    <comment>竣工</comment>
+  </data>
+  <data name="MaterialManagement" xml:space="preserve">
+    <value>Material management</value>
+    <comment>材料管理</comment>
+  </data>
+  <data name="ShutDown" xml:space="preserve">
+    <value>Shut down</value>
+    <comment>停工</comment>
+  </data>
+  <data name="TestManagement" xml:space="preserve">
+    <value>Test management</value>
+    <comment>试车管理</comment>
+  </data>
+  <data name="UnderConstruction" xml:space="preserve">
+    <value>Under construction</value>
+    <comment>在建</comment>
+  </data>
+  <data name="altitude" xml:space="preserve">
+    <value>altitude</value>
+    <comment>高处</comment>
+  </data>
+  <data name="ApprovalCompleted" xml:space="preserve">
+    <value>Approval completed</value>
+    <comment>审批完成</comment>
+  </data>
+  <data name="call" xml:space="preserve">
+    <value>call</value>
+    <comment>呼叫</comment>
+  </data>
+  <data name="ConPlanReviewBatch" xml:space="preserve">
+    <value>Construction plan review batch</value>
+    <comment>施工方案审批量</comment>
+  </data>
+  <data name="CoordinationCommunication" xml:space="preserve">
+    <value>Coordination and communication</value>
+    <comment>协调与沟通</comment>
+  </data>
+  <data name="DangerousProject" xml:space="preserve">
+    <value>Dangerous project</value>
+    <comment>危大工程</comment>
+  </data>
+  <data name="help" xml:space="preserve">
+    <value>help</value>
+    <comment>帮助</comment>
+  </data>
+  <data name="keyc" xml:space="preserve">
+    <value>Key issues and coordination communication</value>
+    <comment>关键事项与协调沟通</comment>
+  </data>
+  <data name="lifting" xml:space="preserve">
+    <value>lifting</value>
+    <comment>吊装</comment>
+  </data>
+  <data name="LoseOneSTemper" xml:space="preserve">
+    <value>Lose one's temper</value>
+    <comment>动火</comment>
+  </data>
+  <data name="NumberOfCompletions" xml:space="preserve">
+    <value>Number of completions</value>
+    <comment>完工个数</comment>
+  </data>
+  <data name="NumberOfConstructions" xml:space="preserve">
+    <value>Number of constructions</value>
+    <comment>施工个数</comment>
+  </data>
+  <data name="NumberOfTrainees" xml:space="preserve">
+    <value>Number of trainees</value>
+    <comment>培训人次数</comment>
+  </data>
+  <data name="OpinionGathering" xml:space="preserve">
+    <value>Opinion gathering</value>
+    <comment>意见收集</comment>
+  </data>
+  <data name="other" xml:space="preserve">
+    <value>other</value>
+    <comment>其他</comment>
+  </data>
+  <data name="QualityProfile" xml:space="preserve">
+    <value>Quality profile</value>
+    <comment>质量概况</comment>
+  </data>
+  <data name="QualityTraining" xml:space="preserve">
+    <value>Quality training accumulated personnel</value>
+    <comment>质量培训累计人员</comment>
+  </data>
+  <data name="RiskEarlyWarning" xml:space="preserve">
+    <value>Risk early warning</value>
+    <comment>风险预警</comment>
+  </data>
+  <data name="SuperDangerousProject" xml:space="preserve">
+    <value>Super dangerous project</value>
+    <comment>超危大工程</comment>
+  </data>
+  <data name="TransferManagement" xml:space="preserve">
+    <value>Transfer management</value>
+    <comment>移交管理</comment>
+  </data>
+  <data name="WorkPermit" xml:space="preserve">
+    <value>Work permit</value>
+    <comment>作业许可</comment>
+  </data>
+  <data name="mainProject2_title" xml:space="preserve">
+    <value>New Project Home Page</value>
+  </data>
+  <data name="mainProject2_RiskEarlyWarning" xml:space="preserve">
+    <value>Risk Early Warning</value>
+  </data>
+  <data name="mainProject2_Quawarning" xml:space="preserve">
+    <value>Quality Safety Warning</value>
+  </data>
+  <data name="mainProject2_MechanicalWarning" xml:space="preserve">
+    <value>Mechanical Warning</value>
+  </data>
+  <data name="mainProject2_DangerousProject" xml:space="preserve">
+    <value>Dangerous Project</value>
+  </data>
+  <data name="mainProject2_ApprovalCompleted" xml:space="preserve">
+    <value>Approval Completed</value>
+  </data>
+  <data name="mainProject2_NumberOfTrainees" xml:space="preserve">
+    <value>Number of Trainees</value>
+  </data>
+  <data name="mainProject2_NumberOfConstructions" xml:space="preserve">
+    <value>Number of Constructors</value>
+  </data>
+  <data name="mainProject2_NumberOfCompletions" xml:space="preserve">
+    <value>Number of Completions</value>
+  </data>
+  <data name="mainProject2_SuperDangerousProject" xml:space="preserve">
+    <value>Super Dangerous Project</value>
+  </data>
+  <data name="mainProject2_QualityProfile" xml:space="preserve">
+    <value>Quality Profile</value>
+  </data>
+  <data name="mainProject2_QualityTraining" xml:space="preserve">
+    <value>Quality Training</value>
+  </data>
+  <data name="mainProject2_ConPlanReviewBatch" xml:space="preserve">
+    <value>Construction Plan Review Batch</value>
+  </data>
+  <data name="mainProject2_WorkPermit" xml:space="preserve">
+    <value>Work Permit</value>
+  </data>
+  <data name="mainProject2_LoseOneSTemper" xml:space="preserve">
+    <value>Level One High Temperature</value>
+  </data>
+  <data name="mainProject2_altitude" xml:space="preserve">
+    <value>High Altitude</value>
+  </data>
+  <data name="mainProject2_other" xml:space="preserve">
+    <value>Other</value>
+  </data>
+  <data name="mainProject2_CumulativeSafeWorkHours" xml:space="preserve">
+    <value>Cumulative Safe Work Hours</value>
+  </data>
+  <data name="mainProject2_SafeWorkHoursThisMonth" xml:space="preserve">
+    <value>Safe Work Hours This Month</value>
+  </data>
+  <data name="mainProject2_TotalSafeTrainingPersonnel" xml:space="preserve">
+    <value>Total Safe Training Personnel</value>
+  </data>
+  <data name="mainProject2_SafeManagementPersonnel" xml:space="preserve">
+    <value>Safe Management Personnel</value>
+  </data>
+  <data name="mainProject2_NearMissIncidents" xml:space="preserve">
+    <value>Near Miss Incidents</value>
+  </data>
+  <data name="mainProject2_TotalRectificationData" xml:space="preserve">
+    <value>Total Rectification Data</value>
+  </data>
+  <data name="mainProject2_CompletedRectification" xml:space="preserve">
+    <value>Completed Rectification</value>
+  </data>
+  <data name="mainProject2_UncompletedRectification" xml:space="preserve">
+    <value>Uncompleted Rectification</value>
+  </data>
+  <data name="mainProject2_RectificationRate" xml:space="preserve">
+    <value>Rectification Rate</value>
+  </data>
+  <data name="mainProject2_ContractDuration" xml:space="preserve">
+    <value>Contract Duration</value>
+  </data>
+  <data name="mainProject2_ContractExpiryDate" xml:space="preserve">
+    <value>Contract Expiry Date</value>
+  </data>
+  <data name="mainProject2_ContractRemaining" xml:space="preserve">
+    <value>Contract Remaining</value>
+  </data>
+  <data name="mainProject2_KeyMattersTimelinessRate" xml:space="preserve">
+    <value>Key Matters Timeliness Rate</value>
+  </data>
+  <data name="mainProject2_ProgressStatistics" xml:space="preserve">
+    <value>Progress Statistics</value>
+  </data>
+  <data name="mainProject2_Workbench" xml:space="preserve">
+    <value>Workbench</value>
+  </data>
+  <data name="mainProject2_KeyMatters" xml:space="preserve">
+    <value>Key Matters</value>
+  </data>
+  <data name="mainProject2_PendingMatters" xml:space="preserve">
+    <value>Pending Matters</value>
+  </data>
+  <data name="mainProject2_PersonalProcess" xml:space="preserve">
+    <value>Personal Process</value>
+  </data>
+  <data name="mainProject2_CompletedTasks" xml:space="preserve">
+    <value>Completed Tasks</value>
+  </data>
+  <data name="mainProject2_PersonnelInformation" xml:space="preserve">
+    <value>Personnel Information</value>
+  </data>
+  <data name="mainProject2_CurrentOnsitePersonnel" xml:space="preserve">
+    <value>Current Onsite Personnel</value>
+  </data>
+  <data name="mainProject2_TotalWorkers" xml:space="preserve">
+    <value>Total Workers</value>
+  </data>
+  <data name="mainProject2_TotalManagers" xml:space="preserve">
+    <value>Total Managers</value>
+  </data>
+  <data name="mainProject2_MaterialStatistics" xml:space="preserve">
+    <value>Material Statistics</value>
+  </data>
+  <data name="mainProject2_PipeMaterials" xml:space="preserve">
+    <value>Pipe Materials</value>
+  </data>
+  <data name="mainProject2_EquipmentMaterials" xml:space="preserve">
+    <value>Equipment Materials</value>
+  </data>
+  <data name="mainProject2_MaterialCategory" xml:space="preserve">
+    <value>Material Category</value>
+  </data>
+  <data name="mainProject2_DesignQuantity" xml:space="preserve">
+    <value>Design Quantity</value>
+  </data>
+  <data name="mainProject2_PurchaseQuantity" xml:space="preserve">
+    <value>Purchase Quantity</value>
+  </data>
+  <data name="mainProject2_ArrivalQuantity" xml:space="preserve">
+    <value>Arrival Quantity</value>
+  </data>
+  <data name="mainProject2_IssueQuantity" xml:space="preserve">
+    <value>Issue Quantity</value>
+  </data>
+  <data name="mainProject2_Percentage" xml:space="preserve">
+    <value>Percentage</value>
+  </data>
+  <data name="mainProject2_WorkbenchLabel" xml:space="preserve">
+    <value>Workbench</value>
+  </data>
+  <data name="mainProject2_PersonnelLabel" xml:space="preserve">
+    <value>Personnel Information</value>
+  </data>
+  <data name="mainProject2_MaterialLabel" xml:space="preserve">
+    <value>Material Statistics</value>
+  </data>
+  <data name="mainProject2_FullScreen" xml:space="preserve">
+    <value>Full Screen</value>
+  </data>
+  <data name="mainProject2_OpenPendingTasks" xml:space="preserve">
+    <value>Open Pending Tasks</value>
+  </data>
+  <data name="ActualValue" xml:space="preserve">
+    <value>Actual value</value>
+    <comment>实际值</comment>
+  </data>
+  <data name="Cumulative_actual_value" xml:space="preserve">
+    <value>Cumulative actual value</value>
+    <comment>累计实际值</comment>
+  </data>
+  <data name="Cumulative_planned_value" xml:space="preserve">
+    <value>Cumulative planned value</value>
+    <comment>累计计划值</comment>
+  </data>
+  <data name="HaveArrived" xml:space="preserve">
+    <value>Have arrived</value>
+    <comment>已到货</comment>
+  </data>
+  <data name="MaterialReceived" xml:space="preserve">
+    <value>Material received</value>
+    <comment>已领料</comment>
+  </data>
+  <data name="OnePassRate" xml:space="preserve">
+    <value>Pass rate of one test</value>
+    <comment>一次共检合格率</comment>
+  </data>
+  <data name="OnePassRateOfWelding" xml:space="preserve">
+    <value>First pass rate of welding</value>
+    <comment>焊接一次合格率</comment>
+  </data>
+  <data name="PlannedValue" xml:space="preserve">
+    <value>Planned value</value>
+    <comment>计划值</comment>
+  </data>
+  <data name="QualityRate" xml:space="preserve">
+    <value>Quality problem rectification rate</value>
+    <comment>质量问题整改率</comment>
+  </data>
+  <data name="RectificationData" xml:space="preserve">
+    <value>Rectification data</value>
+    <comment>整改数据</comment>
+  </data>
+  <data name="total" xml:space="preserve">
+    <value>total</value>
+    <comment>总计</comment>
+  </data>
+</root>
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US1.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US1.designer.cs
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
@ -0,0 +1,666 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Chinese" xml:space="preserve">
+    <value>中文</value>
+  </data>
+  <data name="English" xml:space="preserve">
+    <value>英文</value>
+  </data>
+  <data name="FullScreen" xml:space="preserve">
+    <value>全屏</value>
+  </data>
+  <data name="GeneralConPlan" xml:space="preserve">
+    <value>总承包商施工计划</value>
+  </data>
+  <data name="HomePage" xml:space="preserve">
+    <value>首页</value>
+  </data>
+  <data name="HSEManage" xml:space="preserve">
+    <value>安全管理</value>
+  </data>
+  <data name="maximize" xml:space="preserve">
+    <value>最大化</value>
+  </data>
+  <data name="message" xml:space="preserve">
+    <value>消息</value>
+  </data>
+  <data name="NoAuthorize" xml:space="preserve">
+    <value>您没有此模块操作权限，请联系管理员授权！</value>
+  </data>
+  <data name="OnSiteAttendance" xml:space="preserve">
+    <value>现场考勤</value>
+  </data>
+  <data name="OpensNewTab" xml:space="preserve">
+    <value>在新标签页中打开</value>
+  </data>
+  <data name="QualityManage" xml:space="preserve">
+    <value>质量管理</value>
+  </data>
+  <data name="quit" xml:space="preserve">
+    <value>退出</value>
+  </data>
+  <data name="RefreshPage" xml:space="preserve">
+    <value>刷新本页</value>
+  </data>
+  <data name="ScheduleManage" xml:space="preserve">
+    <value>进度管理</value>
+  </data>
+  <data name="SelectLanguage" xml:space="preserve">
+    <value>选择语言</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>设置</value>
+  </data>
+  <data name="SignOUT" xml:space="preserve">
+    <value>注销</value>
+  </data>
+  <data name="SubManagement" xml:space="preserve">
+    <value>分包管理</value>
+  </data>
+  <data name="SystemMenu" xml:space="preserve">
+    <value>系统菜单</value>
+  </data>
+  <data name="SystemName" xml:space="preserve">
+    <value>智慧施工管理信息系统</value>
+  </data>
+  <data name="user" xml:space="preserve">
+    <value>用户</value>
+  </data>
+  <data name="VideoSurveillance" xml:space="preserve">
+    <value>视频监控</value>
+  </data>
+  <data name="WeldingManage" xml:space="preserve">
+    <value>焊接管理</value>
+  </data>
+  <data name="BigDataCenter" xml:space="preserve">
+    <value>大数据中心</value>
+  </data>
+  <data name="EmployeeManage" xml:space="preserve">
+    <value>员工管理</value>
+  </data>
+  <data name="HeadquartersInspection" xml:space="preserve">
+    <value>总部检查</value>
+  </data>
+  <data name="IntegratedManage" xml:space="preserve">
+    <value>综合管理</value>
+  </data>
+  <data name="NoPermission" xml:space="preserve">
+    <value>您没有权限进入项目管理模块！</value>
+  </data>
+  <data name="NoticeManage" xml:space="preserve">
+    <value>通知管理</value>
+  </data>
+  <data name="ProjectList" xml:space="preserve">
+    <value>项目清单</value>
+  </data>
+  <data name="Refresh" xml:space="preserve">
+    <value>刷新</value>
+  </data>
+  <data name="SwitchHomePage" xml:space="preserve">
+    <value>切换首页</value>
+  </data>
+  <data name="CertificateWarning" xml:space="preserve">
+    <value>证书预警</value>
+  </data>
+  <data name="CivilInfrastructure" xml:space="preserve">
+    <value>土建基础交安</value>
+  </data>
+  <data name="completed" xml:space="preserve">
+    <value>已完成</value>
+  </data>
+  <data name="ConstructionUnit" xml:space="preserve">
+    <value>施工单位</value>
+  </data>
+  <data name="ContractExpirationTime" xml:space="preserve">
+    <value>合同到期时间</value>
+  </data>
+  <data name="CurrentPersonnel" xml:space="preserve">
+    <value>当前现场人数</value>
+  </data>
+  <data name="DangersCount" xml:space="preserve">
+    <value>隐患总数</value>
+  </data>
+  <data name="FirstEquipmentArrived" xml:space="preserve">
+    <value>首台设备到货</value>
+  </data>
+  <data name="FistPassRateWelding" xml:space="preserve">
+    <value>焊接一次合格率</value>
+  </data>
+  <data name="GeneralRisk" xml:space="preserve">
+    <value>一般风险</value>
+  </data>
+  <data name="GreaterRisk" xml:space="preserve">
+    <value>较大风险</value>
+  </data>
+  <data name="humidness" xml:space="preserve">
+    <value>湿度</value>
+  </data>
+  <data name="Level" xml:space="preserve">
+    <value>级</value>
+  </data>
+  <data name="LowRisk" xml:space="preserve">
+    <value>低风险</value>
+  </data>
+  <data name="MajorRisk" xml:space="preserve">
+    <value>重大风险</value>
+  </data>
+  <data name="managersCount" xml:space="preserve">
+    <value>管理人员总数</value>
+  </data>
+  <data name="MechanicalCompletion" xml:space="preserve">
+    <value>机械竣工</value>
+  </data>
+  <data name="MechanicalWarning" xml:space="preserve">
+    <value>机械预警</value>
+  </data>
+  <data name="more" xml:space="preserve">
+    <value>更多</value>
+  </data>
+  <data name="noise" xml:space="preserve">
+    <value>噪音</value>
+  </data>
+  <data name="PassRate" xml:space="preserve">
+    <value>合格率</value>
+  </data>
+  <data name="Pilefoundationconstruction" xml:space="preserve">
+    <value>桩基施工</value>
+  </data>
+  <data name="PipeInstallationStarts" xml:space="preserve">
+    <value>管道安装开始</value>
+  </data>
+  <data name="PowerReceived" xml:space="preserve">
+    <value>变电所受电</value>
+  </data>
+  <data name="ProblemTotal" xml:space="preserve">
+    <value>问题总数</value>
+  </data>
+  <data name="ProjectSchedule" xml:space="preserve">
+    <value>项目进度计划</value>
+  </data>
+  <data name="QualityStatistics" xml:space="preserve">
+    <value>质量统计</value>
+  </data>
+  <data name="QualityWarning" xml:space="preserve">
+    <value>质量预警</value>
+  </data>
+  <data name="Quawarning" xml:space="preserve">
+    <value>资质预警</value>
+  </data>
+  <data name="RealTimeVideo" xml:space="preserve">
+    <value>实时视频</value>
+  </data>
+  <data name="RectificationRate" xml:space="preserve">
+    <value>整改率</value>
+  </data>
+  <data name="RemainingTimeCompletion" xml:space="preserve">
+    <value>距竣工剩余</value>
+  </data>
+  <data name="RiskControl" xml:space="preserve">
+    <value>风险管控</value>
+  </data>
+  <data name="SafeLaborHours" xml:space="preserve">
+    <value>安全人工时</value>
+  </data>
+  <data name="SafetyStatistics" xml:space="preserve">
+    <value>安全统计</value>
+  </data>
+  <data name="ServiceData" xml:space="preserve">
+    <value>劳务数据</value>
+  </data>
+  <data name="Start_time" xml:space="preserve">
+    <value>开工时间</value>
+  </data>
+  <data name="SupervisionUnit" xml:space="preserve">
+    <value>监理单位</value>
+  </data>
+  <data name="temperature" xml:space="preserve">
+    <value>温度</value>
+  </data>
+  <data name="TimeCompletion" xml:space="preserve">
+    <value>竣工时间</value>
+  </data>
+  <data name="TodoList" xml:space="preserve">
+    <value>待办事项</value>
+  </data>
+  <data name="TotalContractDuration" xml:space="preserve">
+    <value>合同总工期</value>
+  </data>
+  <data name="uncompleted" xml:space="preserve">
+    <value>未完成</value>
+  </data>
+  <data name="WindSpeed" xml:space="preserve">
+    <value>风速</value>
+  </data>
+  <data name="WorkPersonnel" xml:space="preserve">
+    <value>作业人员总数</value>
+  </data>
+  <data name="China" xml:space="preserve">
+    <value>中国</value>
+  </data>
+  <data name="ConPersonCount" xml:space="preserve">
+    <value>参建人数</value>
+  </data>
+  <data name="FieldDynamics" xml:space="preserve">
+    <value>现场动态</value>
+  </data>
+  <data name="LargeRisk" xml:space="preserve">
+    <value>在施危大工程数</value>
+  </data>
+  <data name="LiveVideo" xml:space="preserve">
+    <value>现场视频</value>
+  </data>
+  <data name="Live_photo_album" xml:space="preserve">
+    <value>现场相册</value>
+  </data>
+  <data name="ProjectAddress" xml:space="preserve">
+    <value>项目地址</value>
+  </data>
+  <data name="ProjectName" xml:space="preserve">
+    <value>项目名称</value>
+  </data>
+  <data name="ProjectStatistics" xml:space="preserve">
+    <value>项目统计</value>
+  </data>
+  <data name="ProjectUnderConstruction" xml:space="preserve">
+    <value>在建项目</value>
+  </data>
+  <data name="Quality_problem_statistics" xml:space="preserve">
+    <value>质量问题统计</value>
+  </data>
+  <data name="SafeProStat" xml:space="preserve">
+    <value>安全问题统计</value>
+  </data>
+  <data name="SafetyLaborHours" xml:space="preserve">
+    <value>累计安全人工时</value>
+  </data>
+  <data name="BeCompleted" xml:space="preserve">
+    <value>竣工</value>
+  </data>
+  <data name="MaterialManagement" xml:space="preserve">
+    <value>材料管理</value>
+  </data>
+  <data name="ShutDown" xml:space="preserve">
+    <value>停工</value>
+  </data>
+  <data name="TestManagement" xml:space="preserve">
+    <value>试车管理</value>
+  </data>
+  <data name="UnderConstruction" xml:space="preserve">
+    <value>在建</value>
+  </data>
+  <data name="altitude" xml:space="preserve">
+    <value>高处</value>
+  </data>
+  <data name="ApprovalCompleted" xml:space="preserve">
+    <value>审批完成</value>
+  </data>
+  <data name="call" xml:space="preserve">
+    <value>呼叫</value>
+  </data>
+  <data name="ConPlanReviewBatch" xml:space="preserve">
+    <value>施工方案审批量</value>
+  </data>
+  <data name="CoordinationCommunication" xml:space="preserve">
+    <value>协调与沟通</value>
+  </data>
+  <data name="DangerousProject" xml:space="preserve">
+    <value>危大工程</value>
+  </data>
+  <data name="help" xml:space="preserve">
+    <value>帮助</value>
+  </data>
+  <data name="keyc" xml:space="preserve">
+    <value>关键事项与协调沟通</value>
+  </data>
+  <data name="lifting" xml:space="preserve">
+    <value>吊装</value>
+  </data>
+  <data name="LoseOneSTemper" xml:space="preserve">
+    <value>动火</value>
+  </data>
+  <data name="NumberOfCompletions" xml:space="preserve">
+    <value>完工个数</value>
+  </data>
+  <data name="NumberOfConstructions" xml:space="preserve">
+    <value>施工个数</value>
+  </data>
+  <data name="NumberOfTrainees" xml:space="preserve">
+    <value>培训人次数</value>
+  </data>
+  <data name="OpinionGathering" xml:space="preserve">
+    <value>意见收集</value>
+  </data>
+  <data name="other" xml:space="preserve">
+    <value>其他</value>
+  </data>
+  <data name="QualityProfile" xml:space="preserve">
+    <value>质量概况</value>
+  </data>
+  <data name="QualityTraining" xml:space="preserve">
+    <value>质量培训累计人员</value>
+  </data>
+  <data name="RiskEarlyWarning" xml:space="preserve">
+    <value>风险预警</value>
+  </data>
+  <data name="SuperDangerousProject" xml:space="preserve">
+    <value>超危大工程</value>
+  </data>
+  <data name="TransferManagement" xml:space="preserve">
+    <value>移交管理</value>
+  </data>
+  <data name="WorkPermit" xml:space="preserve">
+    <value>作业许可</value>
+  </data>
+  <data name="mainProject2_title" xml:space="preserve">
+    <value>项目级首页（新）</value>
+  </data>
+  <data name="mainProject2_RiskEarlyWarning" xml:space="preserve">
+    <value>风险预警</value>
+  </data>
+  <data name="mainProject2_Quawarning" xml:space="preserve">
+    <value>质量安全预警</value>
+  </data>
+  <data name="mainProject2_MechanicalWarning" xml:space="preserve">
+    <value>机械预警</value>
+  </data>
+  <data name="mainProject2_DangerousProject" xml:space="preserve">
+    <value>危险项目</value>
+  </data>
+  <data name="mainProject2_ApprovalCompleted" xml:space="preserve">
+    <value>审批完成</value>
+  </data>
+  <data name="mainProject2_NumberOfTrainees" xml:space="preserve">
+    <value>培训人数</value>
+  </data>
+  <data name="mainProject2_NumberOfConstructions" xml:space="preserve">
+    <value>施工人数</value>
+  </data>
+  <data name="mainProject2_NumberOfCompletions" xml:space="preserve">
+    <value>完工人数</value>
+  </data>
+  <data name="mainProject2_SuperDangerousProject" xml:space="preserve">
+    <value>超危险项目</value>
+  </data>
+  <data name="mainProject2_QualityProfile" xml:space="preserve">
+    <value>质量概况</value>
+  </data>
+  <data name="mainProject2_QualityTraining" xml:space="preserve">
+    <value>质量培训</value>
+  </data>
+  <data name="mainProject2_ConPlanReviewBatch" xml:space="preserve">
+    <value>施工方案审查批次</value>
+  </data>
+  <data name="mainProject2_WorkPermit" xml:space="preserve">
+    <value>工作许可</value>
+  </data>
+  <data name="mainProject2_LoseOneSTemper" xml:space="preserve">
+    <value>一级高温</value>
+  </data>
+  <data name="mainProject2_altitude" xml:space="preserve">
+    <value>高空</value>
+  </data>
+  <data name="mainProject2_other" xml:space="preserve">
+    <value>其他</value>
+  </data>
+  <data name="mainProject2_CumulativeSafeWorkHours" xml:space="preserve">
+    <value>累计安全人工时</value>
+  </data>
+  <data name="mainProject2_SafeWorkHoursThisMonth" xml:space="preserve">
+    <value>本月安全人工时</value>
+  </data>
+  <data name="mainProject2_TotalSafeTrainingPersonnel" xml:space="preserve">
+    <value>安全培训累计人员</value>
+  </data>
+  <data name="mainProject2_SafeManagementPersonnel" xml:space="preserve">
+    <value>安全管理人员</value>
+  </data>
+  <data name="mainProject2_NearMissIncidents" xml:space="preserve">
+    <value>未遂事件</value>
+  </data>
+  <data name="mainProject2_TotalRectificationData" xml:space="preserve">
+    <value>总数</value>
+  </data>
+  <data name="mainProject2_CompletedRectification" xml:space="preserve">
+    <value>已完成</value>
+  </data>
+  <data name="mainProject2_UncompletedRectification" xml:space="preserve">
+    <value>未完成</value>
+  </data>
+  <data name="mainProject2_RectificationRate" xml:space="preserve">
+    <value>整改率</value>
+  </data>
+  <data name="mainProject2_ContractDuration" xml:space="preserve">
+    <value>合同工期</value>
+  </data>
+  <data name="mainProject2_ContractRemaining" xml:space="preserve">
+    <value>合同剩余</value>
+  </data>
+  <data name="mainProject2_KeyMattersTimelinessRate" xml:space="preserve">
+    <value>关键事项准点率</value>
+  </data>
+  <data name="mainProject2_ProgressStatistics" xml:space="preserve">
+    <value>进度统计</value>
+  </data>
+  <data name="mainProject2_Workbench" xml:space="preserve">
+    <value>工作台面</value>
+  </data>
+  <data name="mainProject2_KeyMatters" xml:space="preserve">
+    <value>关键事项</value>
+  </data>
+  <data name="mainProject2_PendingMatters" xml:space="preserve">
+    <value>待办事项</value>
+  </data>
+  <data name="mainProject2_PersonalProcess" xml:space="preserve">
+    <value>个人流程</value>
+  </data>
+  <data name="mainProject2_CompletedTasks" xml:space="preserve">
+    <value>已办任务</value>
+  </data>
+  <data name="mainProject2_PersonnelInformation" xml:space="preserve">
+    <value>人员信息</value>
+  </data>
+  <data name="mainProject2_CurrentOnsitePersonnel" xml:space="preserve">
+    <value>当前现场人数</value>
+  </data>
+  <data name="mainProject2_TotalWorkers" xml:space="preserve">
+    <value>作业人员总数</value>
+  </data>
+  <data name="mainProject2_TotalManagers" xml:space="preserve">
+    <value>管理人员总数</value>
+  </data>
+  <data name="mainProject2_MaterialStatistics" xml:space="preserve">
+    <value>材料统计</value>
+  </data>
+  <data name="mainProject2_PipeMaterials" xml:space="preserve">
+    <value>管道材料</value>
+  </data>
+  <data name="mainProject2_EquipmentMaterials" xml:space="preserve">
+    <value>设备材料</value>
+  </data>
+  <data name="mainProject2_MaterialCategory" xml:space="preserve">
+    <value>材料类别</value>
+  </data>
+  <data name="mainProject2_DesignQuantity" xml:space="preserve">
+    <value>设计量</value>
+  </data>
+  <data name="mainProject2_PurchaseQuantity" xml:space="preserve">
+    <value>采购量</value>
+  </data>
+  <data name="mainProject2_ArrivalQuantity" xml:space="preserve">
+    <value>到货量</value>
+  </data>
+  <data name="mainProject2_IssueQuantity" xml:space="preserve">
+    <value>领料量</value>
+  </data>
+  <data name="mainProject2_Percentage" xml:space="preserve">
+    <value>百分比</value>
+  </data>
+  <data name="mainProject2_WorkbenchLabel" xml:space="preserve">
+    <value>工作台面</value>
+  </data>
+  <data name="mainProject2_PersonnelLabel" xml:space="preserve">
+    <value>人员信息</value>
+  </data>
+  <data name="mainProject2_MaterialLabel" xml:space="preserve">
+    <value>材料统计</value>
+  </data>
+  <data name="mainProject2_FullScreen" xml:space="preserve">
+    <value>全屏</value>
+  </data>
+  <data name="mainProject2_OpenPendingTasks" xml:space="preserve">
+    <value>打开代办</value>
+  </data>
+  <data name="ActualValue" xml:space="preserve">
+    <value>实际值</value>
+  </data>
+  <data name="Cumulative_actual_value" xml:space="preserve">
+    <value>累计实际值</value>
+  </data>
+  <data name="Cumulative_planned_value" xml:space="preserve">
+    <value>累计计划值</value>
+  </data>
+  <data name="HaveArrived" xml:space="preserve">
+    <value>已到货</value>
+  </data>
+  <data name="mainProject2_ContractExpiryDate" xml:space="preserve">
+    <value>合同到期时间</value>
+  </data>
+  <data name="MaterialReceived" xml:space="preserve">
+    <value>已领料</value>
+  </data>
+  <data name="OnePassRate" xml:space="preserve">
+    <value>一次共检合格率</value>
+  </data>
+  <data name="OnePassRateOfWelding" xml:space="preserve">
+    <value>焊接一次合格率</value>
+  </data>
+  <data name="PlannedValue" xml:space="preserve">
+    <value>计划值</value>
+  </data>
+  <data name="QualityRate" xml:space="preserve">
+    <value>质量问题整改率</value>
+  </data>
+  <data name="RectificationData" xml:space="preserve">
+    <value>整改数据</value>
+  </data>
+  <data name="total" xml:space="preserve">
+    <value>总计</value>
+  </data>
+</root>
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.designer.cs
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
@ -0,0 +1,666 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Chinese" xml:space="preserve">
+    <value>中文</value>
+  </data>
+  <data name="English" xml:space="preserve">
+    <value>英文</value>
+  </data>
+  <data name="FullScreen" xml:space="preserve">
+    <value>全屏</value>
+  </data>
+  <data name="GeneralConPlan" xml:space="preserve">
+    <value>总承包商施工计划</value>
+  </data>
+  <data name="HomePage" xml:space="preserve">
+    <value>首页</value>
+  </data>
+  <data name="HSEManage" xml:space="preserve">
+    <value>安全管理</value>
+  </data>
+  <data name="maximize" xml:space="preserve">
+    <value>最大化</value>
+  </data>
+  <data name="message" xml:space="preserve">
+    <value>消息</value>
+  </data>
+  <data name="NoAuthorize" xml:space="preserve">
+    <value>您没有此模块操作权限，请联系管理员授权！</value>
+  </data>
+  <data name="OnSiteAttendance" xml:space="preserve">
+    <value>现场考勤</value>
+  </data>
+  <data name="OpensNewTab" xml:space="preserve">
+    <value>在新标签页中打开</value>
+  </data>
+  <data name="QualityManage" xml:space="preserve">
+    <value>质量管理</value>
+  </data>
+  <data name="quit" xml:space="preserve">
+    <value>退出</value>
+  </data>
+  <data name="RefreshPage" xml:space="preserve">
+    <value>刷新本页</value>
+  </data>
+  <data name="ScheduleManage" xml:space="preserve">
+    <value>进度管理</value>
+  </data>
+  <data name="SelectLanguage" xml:space="preserve">
+    <value>选择语言</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>设置</value>
+  </data>
+  <data name="SignOUT" xml:space="preserve">
+    <value>注销</value>
+  </data>
+  <data name="SubManagement" xml:space="preserve">
+    <value>分包管理</value>
+  </data>
+  <data name="SystemMenu" xml:space="preserve">
+    <value>系统菜单</value>
+  </data>
+  <data name="SystemName" xml:space="preserve">
+    <value>智慧施工管理信息系统</value>
+  </data>
+  <data name="user" xml:space="preserve">
+    <value>用户</value>
+  </data>
+  <data name="VideoSurveillance" xml:space="preserve">
+    <value>视频监控</value>
+  </data>
+  <data name="WeldingManage" xml:space="preserve">
+    <value>焊接管理</value>
+  </data>
+  <data name="BigDataCenter" xml:space="preserve">
+    <value>大数据中心</value>
+  </data>
+  <data name="EmployeeManage" xml:space="preserve">
+    <value>员工管理</value>
+  </data>
+  <data name="HeadquartersInspection" xml:space="preserve">
+    <value>总部检查</value>
+  </data>
+  <data name="IntegratedManage" xml:space="preserve">
+    <value>综合管理</value>
+  </data>
+  <data name="NoticeManage" xml:space="preserve">
+    <value>通知管理</value>
+  </data>
+  <data name="ProjectList" xml:space="preserve">
+    <value>项目清单</value>
+  </data>
+  <data name="Refresh" xml:space="preserve">
+    <value>刷新</value>
+  </data>
+  <data name="SwitchHomePage" xml:space="preserve">
+    <value>切换首页</value>
+  </data>
+  <data name="NoPermission" xml:space="preserve">
+    <value>您没有权限进入项目管理模块！</value>
+  </data>
+  <data name="CertificateWarning" xml:space="preserve">
+    <value>证书预警</value>
+  </data>
+  <data name="CivilInfrastructure" xml:space="preserve">
+    <value>土建基础交安</value>
+  </data>
+  <data name="completed" xml:space="preserve">
+    <value>已完成</value>
+  </data>
+  <data name="ConstructionUnit" xml:space="preserve">
+    <value>施工单位</value>
+  </data>
+  <data name="ContractExpirationTime" xml:space="preserve">
+    <value>合同到期时间</value>
+  </data>
+  <data name="CurrentPersonnel" xml:space="preserve">
+    <value>当前现场人数</value>
+  </data>
+  <data name="DangersCount" xml:space="preserve">
+    <value>隐患总数</value>
+  </data>
+  <data name="FirstEquipmentArrived" xml:space="preserve">
+    <value>首台设备到货</value>
+  </data>
+  <data name="FistPassRateWelding" xml:space="preserve">
+    <value>焊接一次合格率</value>
+  </data>
+  <data name="GeneralRisk" xml:space="preserve">
+    <value>一般风险</value>
+  </data>
+  <data name="GreaterRisk" xml:space="preserve">
+    <value>较大风险</value>
+  </data>
+  <data name="humidness" xml:space="preserve">
+    <value>湿度</value>
+  </data>
+  <data name="Level" xml:space="preserve">
+    <value>级</value>
+  </data>
+  <data name="LowRisk" xml:space="preserve">
+    <value>低风险</value>
+  </data>
+  <data name="MajorRisk" xml:space="preserve">
+    <value>重大风险</value>
+  </data>
+  <data name="managersCount" xml:space="preserve">
+    <value>管理人员总数</value>
+  </data>
+  <data name="MechanicalCompletion" xml:space="preserve">
+    <value>机械竣工</value>
+  </data>
+  <data name="MechanicalWarning" xml:space="preserve">
+    <value>机械预警</value>
+  </data>
+  <data name="more" xml:space="preserve">
+    <value>更多</value>
+  </data>
+  <data name="noise" xml:space="preserve">
+    <value>噪音</value>
+  </data>
+  <data name="PassRate" xml:space="preserve">
+    <value>合格率</value>
+  </data>
+  <data name="Pilefoundationconstruction" xml:space="preserve">
+    <value>桩基施工</value>
+  </data>
+  <data name="PipeInstallationStarts" xml:space="preserve">
+    <value>管道安装开始</value>
+  </data>
+  <data name="PowerReceived" xml:space="preserve">
+    <value>变电所受电</value>
+  </data>
+  <data name="ProblemTotal" xml:space="preserve">
+    <value>问题总数</value>
+  </data>
+  <data name="ProjectSchedule" xml:space="preserve">
+    <value>项目进度计划</value>
+  </data>
+  <data name="QualityStatistics" xml:space="preserve">
+    <value>质量统计</value>
+  </data>
+  <data name="QualityWarning" xml:space="preserve">
+    <value>质量预警</value>
+  </data>
+  <data name="Quawarning" xml:space="preserve">
+    <value>资质预警</value>
+  </data>
+  <data name="RealTimeVideo" xml:space="preserve">
+    <value>实时视频</value>
+  </data>
+  <data name="RectificationRate" xml:space="preserve">
+    <value>整改率</value>
+  </data>
+  <data name="RemainingTimeCompletion" xml:space="preserve">
+    <value>距竣工剩余</value>
+  </data>
+  <data name="RiskControl" xml:space="preserve">
+    <value>风险管控</value>
+  </data>
+  <data name="SafeLaborHours" xml:space="preserve">
+    <value>安全人工时</value>
+  </data>
+  <data name="SafetyStatistics" xml:space="preserve">
+    <value>安全统计</value>
+  </data>
+  <data name="ServiceData" xml:space="preserve">
+    <value>劳务数据</value>
+  </data>
+  <data name="Start_time" xml:space="preserve">
+    <value>开工时间</value>
+  </data>
+  <data name="SupervisionUnit" xml:space="preserve">
+    <value>监理单位</value>
+  </data>
+  <data name="temperature" xml:space="preserve">
+    <value>温度</value>
+  </data>
+  <data name="TimeCompletion" xml:space="preserve">
+    <value>竣工时间</value>
+  </data>
+  <data name="TodoList" xml:space="preserve">
+    <value>待办事项</value>
+  </data>
+  <data name="TotalContractDuration" xml:space="preserve">
+    <value>合同总工期</value>
+  </data>
+  <data name="uncompleted" xml:space="preserve">
+    <value>未完成</value>
+  </data>
+  <data name="WindSpeed" xml:space="preserve">
+    <value>风速</value>
+  </data>
+  <data name="WorkPersonnel" xml:space="preserve">
+    <value>作业人员总数</value>
+  </data>
+  <data name="China" xml:space="preserve">
+    <value>中国</value>
+  </data>
+  <data name="ConPersonCount" xml:space="preserve">
+    <value>参建人数</value>
+  </data>
+  <data name="FieldDynamics" xml:space="preserve">
+    <value>现场动态</value>
+  </data>
+  <data name="LargeRisk" xml:space="preserve">
+    <value>在施危大工程数</value>
+  </data>
+  <data name="LiveVideo" xml:space="preserve">
+    <value>现场视频</value>
+  </data>
+  <data name="Live_photo_album" xml:space="preserve">
+    <value>现场相册</value>
+  </data>
+  <data name="ProjectAddress" xml:space="preserve">
+    <value>项目地址</value>
+  </data>
+  <data name="ProjectName" xml:space="preserve">
+    <value>项目名称</value>
+  </data>
+  <data name="ProjectStatistics" xml:space="preserve">
+    <value>项目统计</value>
+  </data>
+  <data name="ProjectUnderConstruction" xml:space="preserve">
+    <value>在建项目</value>
+  </data>
+  <data name="Quality_problem_statistics" xml:space="preserve">
+    <value>质量问题统计</value>
+  </data>
+  <data name="SafeProStat" xml:space="preserve">
+    <value>安全问题统计</value>
+  </data>
+  <data name="SafetyLaborHours" xml:space="preserve">
+    <value>累计安全人工时</value>
+  </data>
+  <data name="BeCompleted" xml:space="preserve">
+    <value>竣工</value>
+  </data>
+  <data name="MaterialManagement" xml:space="preserve">
+    <value>材料管理</value>
+  </data>
+  <data name="ShutDown" xml:space="preserve">
+    <value>停工</value>
+  </data>
+  <data name="TestManagement" xml:space="preserve">
+    <value>试车管理</value>
+  </data>
+  <data name="UnderConstruction" xml:space="preserve">
+    <value>在建</value>
+  </data>
+  <data name="altitude" xml:space="preserve">
+    <value>高处</value>
+  </data>
+  <data name="ApprovalCompleted" xml:space="preserve">
+    <value>审批完成</value>
+  </data>
+  <data name="call" xml:space="preserve">
+    <value>呼叫</value>
+  </data>
+  <data name="ConPlanReviewBatch" xml:space="preserve">
+    <value>施工方案审批量</value>
+  </data>
+  <data name="CoordinationCommunication" xml:space="preserve">
+    <value>协调与沟通</value>
+  </data>
+  <data name="DangerousProject" xml:space="preserve">
+    <value>危大工程</value>
+  </data>
+  <data name="help" xml:space="preserve">
+    <value>帮助</value>
+  </data>
+  <data name="keyc" xml:space="preserve">
+    <value>关键事项与协调沟通</value>
+  </data>
+  <data name="lifting" xml:space="preserve">
+    <value>吊装</value>
+  </data>
+  <data name="LoseOneSTemper" xml:space="preserve">
+    <value>动火</value>
+  </data>
+  <data name="NumberOfCompletions" xml:space="preserve">
+    <value>完工个数</value>
+  </data>
+  <data name="NumberOfConstructions" xml:space="preserve">
+    <value>施工个数</value>
+  </data>
+  <data name="NumberOfTrainees" xml:space="preserve">
+    <value>培训人次数</value>
+  </data>
+  <data name="OpinionGathering" xml:space="preserve">
+    <value>意见收集</value>
+  </data>
+  <data name="other" xml:space="preserve">
+    <value>其他</value>
+  </data>
+  <data name="QualityProfile" xml:space="preserve">
+    <value>质量概况</value>
+  </data>
+  <data name="QualityTraining" xml:space="preserve">
+    <value>质量培训累计人员</value>
+  </data>
+  <data name="RiskEarlyWarning" xml:space="preserve">
+    <value>风险预警</value>
+  </data>
+  <data name="SuperDangerousProject" xml:space="preserve">
+    <value>超危大工程</value>
+  </data>
+  <data name="TransferManagement" xml:space="preserve">
+    <value>移交管理</value>
+  </data>
+  <data name="WorkPermit" xml:space="preserve">
+    <value>作业许可</value>
+  </data>
+  <data name="mainProject2_title" xml:space="preserve">
+    <value>项目级首页（新）</value>
+  </data>
+  <data name="mainProject2_RiskEarlyWarning" xml:space="preserve">
+    <value>风险预警</value>
+  </data>
+  <data name="mainProject2_Quawarning" xml:space="preserve">
+    <value>质量安全预警</value>
+  </data>
+  <data name="mainProject2_MechanicalWarning" xml:space="preserve">
+    <value>机械预警</value>
+  </data>
+  <data name="mainProject2_DangerousProject" xml:space="preserve">
+    <value>危险项目</value>
+  </data>
+  <data name="mainProject2_ApprovalCompleted" xml:space="preserve">
+    <value>审批完成</value>
+  </data>
+  <data name="mainProject2_NumberOfTrainees" xml:space="preserve">
+    <value>培训人数</value>
+  </data>
+  <data name="mainProject2_NumberOfConstructions" xml:space="preserve">
+    <value>施工人数</value>
+  </data>
+  <data name="mainProject2_NumberOfCompletions" xml:space="preserve">
+    <value>完工人数</value>
+  </data>
+  <data name="mainProject2_SuperDangerousProject" xml:space="preserve">
+    <value>超危险项目</value>
+  </data>
+  <data name="mainProject2_QualityProfile" xml:space="preserve">
+    <value>质量概况</value>
+  </data>
+  <data name="mainProject2_QualityTraining" xml:space="preserve">
+    <value>质量培训</value>
+  </data>
+  <data name="mainProject2_ConPlanReviewBatch" xml:space="preserve">
+    <value>施工方案审查批次</value>
+  </data>
+  <data name="mainProject2_WorkPermit" xml:space="preserve">
+    <value>工作许可</value>
+  </data>
+  <data name="mainProject2_LoseOneSTemper" xml:space="preserve">
+    <value>一级高温</value>
+  </data>
+  <data name="mainProject2_altitude" xml:space="preserve">
+    <value>高空</value>
+  </data>
+  <data name="mainProject2_other" xml:space="preserve">
+    <value>其他</value>
+  </data>
+  <data name="mainProject2_CumulativeSafeWorkHours" xml:space="preserve">
+    <value>累计安全人工时</value>
+  </data>
+  <data name="mainProject2_SafeWorkHoursThisMonth" xml:space="preserve">
+    <value>本月安全人工时</value>
+  </data>
+  <data name="mainProject2_TotalSafeTrainingPersonnel" xml:space="preserve">
+    <value>安全培训累计人员</value>
+  </data>
+  <data name="mainProject2_SafeManagementPersonnel" xml:space="preserve">
+    <value>安全管理人员</value>
+  </data>
+  <data name="mainProject2_NearMissIncidents" xml:space="preserve">
+    <value>未遂事件</value>
+  </data>
+  <data name="mainProject2_TotalRectificationData" xml:space="preserve">
+    <value>总数</value>
+  </data>
+  <data name="mainProject2_CompletedRectification" xml:space="preserve">
+    <value>已完成</value>
+  </data>
+  <data name="mainProject2_UncompletedRectification" xml:space="preserve">
+    <value>未完成</value>
+  </data>
+  <data name="mainProject2_RectificationRate" xml:space="preserve">
+    <value>整改率</value>
+  </data>
+  <data name="mainProject2_ContractDuration" xml:space="preserve">
+    <value>合同工期</value>
+  </data>
+  <data name="mainProject2_ContractExpiryDate" xml:space="preserve">
+    <value>合同到期时间</value>
+  </data>
+  <data name="mainProject2_ContractRemaining" xml:space="preserve">
+    <value>合同剩余</value>
+  </data>
+  <data name="mainProject2_KeyMattersTimelinessRate" xml:space="preserve">
+    <value>关键事项准点率</value>
+  </data>
+  <data name="mainProject2_ProgressStatistics" xml:space="preserve">
+    <value>进度统计</value>
+  </data>
+  <data name="mainProject2_Workbench" xml:space="preserve">
+    <value>工作台面</value>
+  </data>
+  <data name="mainProject2_KeyMatters" xml:space="preserve">
+    <value>关键事项</value>
+  </data>
+  <data name="mainProject2_PendingMatters" xml:space="preserve">
+    <value>待办事项</value>
+  </data>
+  <data name="mainProject2_PersonalProcess" xml:space="preserve">
+    <value>个人流程</value>
+  </data>
+  <data name="mainProject2_CompletedTasks" xml:space="preserve">
+    <value>已办任务</value>
+  </data>
+  <data name="mainProject2_PersonnelInformation" xml:space="preserve">
+    <value>人员信息</value>
+  </data>
+  <data name="mainProject2_CurrentOnsitePersonnel" xml:space="preserve">
+    <value>当前现场人数</value>
+  </data>
+  <data name="mainProject2_TotalWorkers" xml:space="preserve">
+    <value>作业人员总数</value>
+  </data>
+  <data name="mainProject2_TotalManagers" xml:space="preserve">
+    <value>管理人员总数</value>
+  </data>
+  <data name="mainProject2_MaterialStatistics" xml:space="preserve">
+    <value>材料统计</value>
+  </data>
+  <data name="mainProject2_PipeMaterials" xml:space="preserve">
+    <value>管道材料</value>
+  </data>
+  <data name="mainProject2_EquipmentMaterials" xml:space="preserve">
+    <value>设备材料</value>
+  </data>
+  <data name="mainProject2_MaterialCategory" xml:space="preserve">
+    <value>材料类别</value>
+  </data>
+  <data name="mainProject2_DesignQuantity" xml:space="preserve">
+    <value>设计量</value>
+  </data>
+  <data name="mainProject2_PurchaseQuantity" xml:space="preserve">
+    <value>采购量</value>
+  </data>
+  <data name="mainProject2_ArrivalQuantity" xml:space="preserve">
+    <value>到货量</value>
+  </data>
+  <data name="mainProject2_IssueQuantity" xml:space="preserve">
+    <value>领料量</value>
+  </data>
+  <data name="mainProject2_Percentage" xml:space="preserve">
+    <value>百分比</value>
+  </data>
+  <data name="mainProject2_WorkbenchLabel" xml:space="preserve">
+    <value>工作台面</value>
+  </data>
+  <data name="mainProject2_PersonnelLabel" xml:space="preserve">
+    <value>人员信息</value>
+  </data>
+  <data name="mainProject2_MaterialLabel" xml:space="preserve">
+    <value>材料统计</value>
+  </data>
+  <data name="mainProject2_FullScreen" xml:space="preserve">
+    <value>全屏</value>
+  </data>
+  <data name="mainProject2_OpenPendingTasks" xml:space="preserve">
+    <value>打开代办</value>
+  </data>
+  <data name="ActualValue" xml:space="preserve">
+    <value>实际值</value>
+  </data>
+  <data name="Cumulative_actual_value" xml:space="preserve">
+    <value>累计实际值</value>
+  </data>
+  <data name="Cumulative_planned_value" xml:space="preserve">
+    <value>累计计划值</value>
+  </data>
+  <data name="HaveArrived" xml:space="preserve">
+    <value>已到货</value>
+  </data>
+  <data name="MaterialReceived" xml:space="preserve">
+    <value>已领料</value>
+  </data>
+  <data name="OnePassRate" xml:space="preserve">
+    <value>一次共检合格率</value>
+  </data>
+  <data name="OnePassRateOfWelding" xml:space="preserve">
+    <value>焊接一次合格率</value>
+  </data>
+  <data name="PlannedValue" xml:space="preserve">
+    <value>计划值</value>
+  </data>
+  <data name="QualityRate" xml:space="preserve">
+    <value>质量问题整改率</value>
+  </data>
+  <data name="RectificationData" xml:space="preserve">
+    <value>整改数据</value>
+  </data>
+  <data name="total" xml:space="preserve">
+    <value>总计</value>
+  </data>
+</root>
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN1.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN1.designer.cs
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
--- 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;
--- 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";
+                    }
                }
            }
            //离场为灰色
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@ -6433,6 +6433,21 @@
    </Content>
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="App_GlobalResources\Lan.en-US1.designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Lan.en-US.resx</DependentUpon>
+    </Compile>
+    <Compile Include="App_GlobalResources\Lan.zh-CN1.designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Lan.zh-CN.resx</DependentUpon>
+    </Compile>
+    <Compile Include="App_GlobalResources\Lan1.designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Lan.resx</DependentUpon>
+    </Compile>
    <Compile Include="AttachFile\fileupload.ashx.cs">
      <DependentUpon>fileupload.ashx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@ -19677,6 +19692,23 @@
  <ItemGroup>
    <WCFMetadata Include="Service References\" />
  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_GlobalResources\Lan.en-US.resx">
+      <Generator>GlobalResourceProxyGenerator</Generator>
+      <LastGenOutput>Lan.en-US1.designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="App_GlobalResources\Lan.resx">
+      <Generator>GlobalResourceProxyGenerator</Generator>
+      <LastGenOutput>Lan1.designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="App_GlobalResources\Lan.zh-CN.resx">
+      <Generator>GlobalResourceProxyGenerator</Generator>
+      <LastGenOutput>Lan.zh-CN1.designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <ProjectExtensions>
    <VisualStudio>
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.sln
+++ 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
--- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx
@ -19,9 +19,18 @@
                    <Toolbars>
                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                            <Items>
+                                <f:RadioButtonList runat="server" ID="ckCycle" AutoPostBack="True" Hidden="true" Width="320px"
+                                    OnSelectedIndexChanged="ckCycle_SelectedIndexChanged">
+                                    <f:RadioItem Value="1" Text="按月度" Selected="True"></f:RadioItem>
+                                    <f:RadioItem Value="2" Text="按年度" ></f:RadioItem>
+                                    <f:RadioItem Value="3" Text="按项目周期" ></f:RadioItem>
+                                </f:RadioButtonList>
                                <f:DatePicker runat="server" ID="txtMonths" DateFormatString="yyyy-MM" DisplayType="Month" AutoPostBack="true" OnTextChanged="ckType_SelectedIndexChanged"
                                    Label="月份" LabelWidth="50px" Width="150px">
                                </f:DatePicker>
+                                <f:DatePicker runat="server" ID="txtYear" DateFormatString="yyyy" DisplayType="Year" AutoPostBack="true" OnTextChanged="ckType_SelectedIndexChanged"
+                                    Label="年份" LabelWidth="50px" Width="150px" Hidden="true">
+                                </f:DatePicker>
                                
                                <f:RadioButtonList runat="server" ID="ckType" AutoPostBack="True" Width="300px"
                                    OnSelectedIndexChanged="ckType_SelectedIndexChanged">
--- 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
        /// <summary>
        /// 绑定
@ -143,6 +145,38 @@ namespace FineUIPro.Web.JDGL.Check
            this.Grid1.DataBind();
        }
        #endregion
+
+        /// <summary>
+        /// 统计周期
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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();
+        }
+
+        /// <summary>
+        /// 统计汇总
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
        protected void ckType_SelectedIndexChanged(object sender, EventArgs e)
        {
            if (this.ckType.SelectedValue == "1")
--- 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
+    {
+
        /// <summary>
        /// form1 控件。
        /// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
        /// <summary>
        /// PageManager1 控件。
        /// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.PageManager PageManager1;
-        
+
        /// <summary>
        /// Panel1 控件。
        /// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel Panel1;
-        
+
        /// <summary>
        /// Grid1 控件。
        /// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Grid Grid1;
-        
+
        /// <summary>
        /// Toolbar1 控件。
        /// </summary>
@ -56,7 +58,16 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar1;
-        
+
+        /// <summary>
+        /// ckCycle 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList ckCycle;
+
        /// <summary>
        /// txtMonths 控件。
        /// </summary>
@ -65,7 +76,16 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DatePicker txtMonths;
-        
+
+        /// <summary>
+        /// txtYear 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtYear;
+
        /// <summary>
        /// ckType 控件。
        /// </summary>
@ -74,7 +94,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.RadioButtonList ckType;
-        
+
        /// <summary>
        /// btnSearch 控件。
        /// </summary>
@ -83,7 +103,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnSearch;
-        
+
        /// <summary>
        /// btnOut 控件。
        /// </summary>
@ -92,7 +112,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnOut;
-        
+
        /// <summary>
        /// lblPageIndex 控件。
        /// </summary>
@ -101,7 +121,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
        /// <summary>
        /// ToolbarSeparator1 控件。
        /// </summary>
@ -110,7 +130,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
        /// <summary>
        /// ToolbarText1 控件。
        /// </summary>
@ -119,7 +139,7 @@ namespace FineUIPro.Web.JDGL.Check {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
        /// <summary>
        /// ddlPageSize 控件。
        /// </summary>
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
@ -46,7 +46,7 @@
                                    </f:FormRow>
                                    <f:FormRow>
                                        <Items>
-                                            <f:DropDownList ID="DropQuestionTypeID" runat="server" Label="紧急程度" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
+                                            <f:DropDownList ID="DropQuestionTypeID" runat="server" Label="紧急程度" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="false" EnableMultiSelect="false">
                                            </f:DropDownList>
                                            <f:DropDownList ID="DropGJSXTypeID" runat="server" Label="事项类别" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
                                            </f:DropDownList>
@ -54,13 +54,13 @@
                                    </f:FormRow>
                                    <f:FormRow>
                                        <Items>
-                                            <f:DropDownList ID="DropUser_Acceptance" runat="server" Label="责任人" MaxLength="50" LabelWidth="110px"
+                                            <f:DropDownList ID="DropUser_Acceptance" runat="server" Label="责任人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" Required="true" ShowRedStar="true" MaxLength="50" LabelWidth="110px"
                                                EnableCheckBoxSelect="true" EnableEdit="true">
                                            </f:DropDownList>
                                            <f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" ShowRedStar="true"
                                                LabelWidth="110px">
                                            </f:DatePicker>
-                                            <f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" MaxLength="50" LabelWidth="110px"
+                                            <f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" Required="true" ShowRedStar="true" MaxLength="50" LabelWidth="110px"
                                                EnableCheckBoxSelect="true" EnableEdit="true"
                                                OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true">
                                            </f:DropDownList>
--- 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;
--- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
@ -22,6 +22,4 @@
 <TreeNode id="7EC1FBAF-BEC9-46CD-9E3B-0D0093B4E1C2" Text="仪表完成情况" NavigateUrl="JDGL/Check/MeterCompletion.aspx"></TreeNode>
 <TreeNode id="C7037A5D-D8A6-4C1C-A5B8-2083C31C0A7B" Text="全厂地下管网完成情况" NavigateUrl="JDGL/Check/UndergroundPipeCompletion.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="1FBC729D-0A8E-423C-B133-B64583BF9611" Text="进度软件（新）" NavigateUrl=""><TreeNode id="368DB90C-8A47-44F7-A69A-D2D60A6E338C" Text="费用项裁剪" NavigateUrl="JDGL/Progress/WbsManager.aspx"></TreeNode>
-</TreeNode>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
  <TreeNode id="168A94C7-E37D-4B9C-8684-51DF4F8C5134" Text="关键事项（内部）" NavigateUrl="">
-    <TreeNode id="0BEA2126-7A48-40EB-8E21-99148E91A22B" Text="我创建的" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=0">
+    <TreeNode id="4A9E60ED-24FF-4410-B3B7-2A5079615A78" Text="待我处理" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=1">
    </TreeNode>
-<TreeNode id="4A9E60ED-24FF-4410-B3B7-2A5079615A78" Text="待我处理" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=1"></TreeNode>
 <TreeNode id="BEF7850D-1BA5-45F9-BD40-E52F6D813E7C" Text="我已处理" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=2"></TreeNode>
 <TreeNode id="3C129205-F6A9-480D-B36C-E35DED5D7CEC" Text="我参与的" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=3"></TreeNode>
 </TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
@ -22,8 +22,7 @@
 <TreeNode id="179F286B-6DF8-414E-947F-82267076D4C8" Text="施工方案类型" NavigateUrl="BaseInfo/SolutionTempleteType.aspx"></TreeNode>
 <TreeNode id="2181FB42-22F2-4342-B604-96F5770FE892" Text="分部分项工程定义" NavigateUrl="BaseInfo/SpecialSchemeType.aspx"></TreeNode>
 <TreeNode id="D95CA72C-182C-4718-92A4-3F665E0FB660" Text="项目亮点类型定义" NavigateUrl="BaseInfo/PictureType.aspx"></TreeNode>
-<TreeNode id="3044D68E-5018-4B57-BFC4-FBE4BCCA8B8B" Text="紧急程度定义" NavigateUrl="BaseInfo/QuestionType.aspx"></TreeNode>
-<TreeNode id="C7E69F5F-04A8-41F9-8EA1-C41B13248421" Text="关键事项类别定义" NavigateUrl="BaseInfo/GJSXType.aspx"></TreeNode>
+<TreeNode id="3044D68E-5018-4B57-BFC4-FBE4BCCA8B8B" Text="问题类别定义" NavigateUrl="BaseInfo/QuestionType.aspx"></TreeNode>
 <TreeNode id="F0DF2F2B-7C12-4A0F-B7D4-0B00BADE1D64" Text="文档类别定义" NavigateUrl="BaseInfo/DocType.aspx"></TreeNode>
 <TreeNode id="D0850615-BF32-4CFA-84CA-EEA261676EA8" Text="移交专业设置" NavigateUrl="BaseInfo/TransferMajor.aspx"></TreeNode>
 </TreeNode>
@ -65,8 +64,6 @@
 </TreeNode>
 <TreeNode id="24A40837-0756-49B0-8B3C-EFB8A9879336" Text="合同设置" NavigateUrl=""><TreeNode id="E40C8FCE-3530-47D6-85EB-5C7E7E0A89FC" Text="施工分包方式定义" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="88E597DD-D725-4991-8253-22C2626233D0" Text="邮箱管理" NavigateUrl=""><TreeNode id="32009B4F-3802-4C2F-824B-DBAA62876E7C" Text="邮箱配置" NavigateUrl="Email_Send/Email_Pop_Edit.aspx"></TreeNode>
-</TreeNode>
 </TreeNode>
 <TreeNode id="75AA6177-8AAD-4AA4-BC4E-3883FB095A65" Text="项目设置" NavigateUrl=""><TreeNode id="B830399C-CA36-4C23-A170-21E556D052DD" Text="项目成立" NavigateUrl="ProjectData/ProjectSet.aspx"></TreeNode>
 </TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@ -49,9 +49,9 @@
 <TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="尾项处理" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
 <TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="尾项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
 <TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表会签" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
-<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
 <TreeNode id="F184E0FC-96E3-48A5-9515-21EAD37053B3" Text="现场实施" NavigateUrl="TestRun/BeforeTestRun/SiteImplementationList.aspx"></TreeNode>
 <TreeNode id="19865B64-E0AA-4D32-9712-05C14FE6288F" Text="试车记录上传" NavigateUrl="TestRun/BeforeTestRun/TestRunRecordUploadList.aspx"></TreeNode>
+<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
 <TreeNode id="FCC050F0-0F13-4CE5-BE33-623377562965" Text="三查四定尾项清单" NavigateUrl="TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx"></TreeNode>
 <TreeNode id="4822760B-395B-4979-B547-EA0D715C8A2C" Text="三查四定提出人处理" NavigateUrl="TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx"></TreeNode>
 <TreeNode id="E673FC27-74F1-479C-8DE1-950183566725" Text="三查四定责任人销项" NavigateUrl="TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx"></TreeNode>
@ -69,11 +69,9 @@
 <TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
 <TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
 <TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
-<TreeNode id="AF2B0CAD-DE15-4F15-A5EE-C8FB558D00C8" Text="检查项分组信息" NavigateUrl="TestRun/TestRunManage/TemplateItemGroup.aspx"></TreeNode>
 <TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
 <TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
 <TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
-<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
 <TreeNode id="2232ED9A-EA3C-4CB5-A53C-D96D3F5E0527" Text="尾项处理" NavigateUrl="TestRun/TestRunManage/TailTermHandleList.aspx"></TreeNode>
 <TreeNode id="9489BD6A-1A95-43BC-85C0-A65751C2C85E" Text="尾项审核" NavigateUrl="TestRun/TestRunManage/TailTermApproveList.aspx"></TreeNode>
 <TreeNode id="26F8468D-4358-4E2A-895D-8720A6F1FA89" Text="检查表会签" NavigateUrl="TestRun/TestRunManage/InspectWanderAboutList.aspx"></TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@ -3,17 +3,4 @@
  <TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
  </TreeNode>
 <TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="非工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
-<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="尾项完成统计表" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
-<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="移交统计表" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
-<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="移交统计图表" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
-<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="移交状态汇总表" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="管道" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
-<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="静设备" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
-<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="动设备" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
-<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="仪表" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
-<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="电气" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
-<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="土建/建筑/结构" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
-<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="电信" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
-<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="尾项管理" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@ -27,8 +27,8 @@
 <TreeNode id="ECDD89AC-1E16-4D82-B3BE-5D62F31B7A14" Text="化工行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ChemicalReport.aspx"></TreeNode>
 <TreeNode id="7652D239-1897-4886-8DF2-B71E3B060D21" Text="中央企业节能环保产业企业基本情况和经营情况报表" NavigateUrl="ZHGL/Environmental/OperationReport.aspx"></TreeNode>
 <TreeNode id="30579BFE-AB4B-49A7-A73D-B7CE902A8B69" Text="中央企业节能环保产业企业生产和服务业务情况报表" NavigateUrl="ZHGL/Environmental/EnergyReport.aspx"></TreeNode>
-<TreeNode id="CB76394B-BDEB-4F45-9D19-F38612DC6591" Text="中央企业安全生产治本攻坚三年行动工作台账" NavigateUrl="ZHGL/Information/ActionWorkLedger.aspx"></TreeNode>
-<TreeNode id="C48087A8-4C9F-485D-B0A4-C85E112BA705" Text="中央企业安全生产管理评价工作调度台账" NavigateUrl="ZHGL/Information/SafetyProductionEvaluation.aspx"></TreeNode>
+<TreeNode id="CB76394B-BDEB-4F45-9D19-F38612DC6591" Text="安全生产治本攻坚三年行动工作台账" NavigateUrl="ZHGL/Information/ActionWorkLedger.aspx"></TreeNode>
+<TreeNode id="C48087A8-4C9F-485D-B0A4-C85E112BA705" Text="安全生产管理评价工作调度台账" NavigateUrl="ZHGL/Information/SafetyProductionEvaluation.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="C0F4A4A5-D5D3-4952-9A90-9B27F5FA9DFA" Text="安全信息分析" NavigateUrl=""><TreeNode id="598568A0-A338-499F-888C-1B73665837F9" Text="人工时费用分析" NavigateUrl="ZHGL/Information/AnalyseWorkTimeCost.aspx"></TreeNode>
 <TreeNode id="8396C9E2-3376-4144-978A-CC6041EC6C6A" Text="安全事故分析" NavigateUrl="ZHGL/Information/AnalyseSafeAccident.aspx"></TreeNode>
@ -88,6 +88,4 @@
 </TreeNode>
 <TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
 <TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
-<TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
-</TreeNode>
 </Tree>
--- 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 中英文切换
+        /// <summary>
+        /// 语言国际化
+        /// </summary>
+        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 获取语言
+        /// <summary>
+        /// 获取语言
+        /// </summary>
+        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
    }
 }
--- a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx
@ -205,7 +205,7 @@
                    <div class="bw-b-bottom">
                        <div class="bw-b-bottom-up">
                            <div class="bw-item-content">
-                                <div id="myDiv" runat="server" style="width: 100%; height: 100%;" ></div>
+                                <div id="myDiv" runat="server" style="width: 100%; height: 100%;"></div>
                            </div>
                        </div>
                    </div>
@ -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,//开启显示
--- 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<string> listCategories = new List<string>();
                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<double> listdata = new List<double>();
                List<double> listdata2 = new List<double>();
                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);
                }
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx
@ -76,65 +76,65 @@
            <div class="side">
                <div class="site fx" style="width: 100%;">
                    <div class="label">
-                        风险预警
+                        <asp:Literal runat="server" Text="<%$ Resources:Lan,RiskEarlyWarning %>" />
                    </div>
                    <div class="main">
                        <div id="fx-map"></div>
                        <div class="fx-box">
                            <div class="yj-bars">
                                <div class="yj-bar">
-                                    <div class="lab">资质预警</div>
+                                    <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,Quawarning %>" /></div>
                                    <div class="num"><%=getEarlyWarningCounts() %></div>
                                </div>
                                <div class="yj-bar">
-                                    <div class="lab">机械预警</div>
+                                    <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,MechanicalWarning %>" /></div>
                                    <div class="num"><%=GetJxyjNum() %></div>
                                </div>
                            </div>
                            <div class="wd-box">
-                                <div class="tit">危大工程</div>
+                                <div class="tit"><asp:Literal runat="server" Text="<%$ Resources:Lan,DangerousProject %>" /></div>
                                <div class="inner">
                                    <div class="inner-box">
-                                        <div class="lab">审批完成</div>
+                                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompleted %>" /></div>
                                        <div class="num"><%=GetCompletedNum() %></div>
                                    </div>
                                    <span></span>
                                    <div class="inner-box">
-                                        <div class="lab" style="width: 1rem">培训人次数</div>
+                                        <div class="lab" style="width: 1rem"><asp:Literal runat="server" Text="<%$ Resources:Lan,NumberOfTrainees %>" /></div>
                                        <div class="num"><%=GetTrainPersonNum() %></div>
                                    </div>
                                    <span></span>
                                    <div class="inner-box">
-                                        <div class="lab">施工个数</div>
+                                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,NumberOfConstructions %>" /></div>
                                        <div class="num"><%=GetConstructionNum() %></div>
                                    </div>
                                    <span></span>
                                    <div class="inner-box">
-                                        <div class="lab">完工个数</div>
+                                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,NumberOfCompletions %>" /></div>
                                        <div class="num"><%=GetFinishedNum() %></div>
                                    </div>
                                </div>
                            </div>
                            <div class="wd-box">
-                                <div class="tit">超危大工程</div>
+                                <div class="tit"><asp:Literal runat="server" Text="<%$ Resources:Lan,SuperDangerousProject %>" /></div>
                                <div class="inner">
                                    <div class="inner-box">
-                                        <div class="lab">审批完成</div>
+                                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompleted %>" /></div>
                                        <div class="num"><%=GetSuperCompletedNum() %></div>
                                    </div>
                                    <span></span>
                                    <div class="inner-box">
-                                        <div class="lab" style="width: 1rem;">培训人次数</div>
+                                        <div class="lab" style="width: 1rem;"><asp:Literal runat="server" Text="<%$ Resources:Lan,NumberOfTrainees %>" /></div>
                                        <div class="num"><%=GetSuperTrainPersonNum() %></div>
                                    </div>
                                    <span></span>
                                    <div class="inner-box">
-                                        <div class="lab">施工个数</div>
+                                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,NumberOfConstructions %>" /></div>
                                        <div class="num"><%=GetSuperConstructionNum() %></div>
                                    </div>
                                    <span></span>
                                    <div class="inner-box">
-                                        <div class="lab">完工个数</div>
+                                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,NumberOfCompletions %>" /></div>
                                        <div class="num"><%=GetSuperFinishedNum() %></div>
                                    </div>
                                </div>
@ -145,16 +145,16 @@
                </div>
                <div class="site zl">
                    <div class="label">
-                        质量概况
+                        <asp:Literal runat="server" Text="<%$ Resources:Lan,QualityProfile %>" />
                    </div>
                    <div class="main">
                        <div class="total">
                            <div class="glry">
-                                <div class="lab">质量培训累计人员</div>
+                                <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,QualityTraining %>" /></div>
                                <div class="num" id="divCqmsPxNum" runat="server">1307</div>
                            </div>
                            <div class="glry">
-                                <div class="lab">施工方案审批量</div>
+                                <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,ConPlanReviewBatch %>" /></div>
                                <div class="num" id="div_sgfaSpl" runat="server">5217</div>
                            </div>
                        </div>
@ -167,23 +167,23 @@
                </div>
                <div class="site zy">
                    <div class="label">
-                        作业许可
+                        <asp:Literal runat="server" Text="<%$ Resources:Lan,WorkPermit %>" />
                    </div>
                    <div class="total">
                        <div class="zyp">
-                            <div class="lab">动火</div>
+                            <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,LoseOneSTemper %>" /></div>
                            <div class="num"><%=getWrokCount0() %>/<%=getALLWrokCount0() %></div>
                        </div>
                        <div class="zyp">
-                            <div class="lab">高处</div>
+                            <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,altitude %>" /></div>
                            <div class="num"><%=getWrokCount1() %>/<%=getALLWrokCount1() %></div>
                        </div>
                        <div class="zyp">
-                            <div class="lab">吊装</div>
+                            <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,altitude %>" /></div>
                            <div class="num"><%=getWrokCount2() %>/<%=getALLWrokCount2() %></div>
                        </div>
                        <div class="zyp">
-                            <div class="lab">其他</div>
+                            <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,other %>" /></div>
                            <div class="num"><%=getWrokCount3() %>/<%=getALLWrokCount3() %></div>
                        </div>
                    </div>
@ -206,54 +206,54 @@
                <div class="c-site">
                    <div class="num-box">
                        <div class="num" id="divSafeWorkTime" runat="server">1656059</div>
-                        <div class="lab">累计安全人工时</div>
+                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,SafetyLaborHours %>" /></div>
                    </div>
                    <div class="num-box">
                        <div class="num" id="divSafeWorkTimeMonth" runat="server">0</div>
-                        <div class="lab">本月安全人工时</div>
+                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_SafeWorkHoursThisMonth %>" /></div>
                    </div>
                    <div class="num-box">
                        <div class="num" id="divSafePersonNum" runat="server">1161</div>
-                        <div class="lab">安全培训累计人员</div>
+                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_TotalSafeTrainingPersonnel %>" /></div>
                    </div>
                    <div class="num-box">
                        <div class="num" id="divSafeManagePersonNum" runat="server">3</div>
-                        <div class="lab">安全管理人员</div>
+                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_SafeManagementPersonnel %>" /></div>
                    </div>
                    <div class="num-box">
                        <div class="num" runat="server" id="divWS">4564</div>
-                        <div class="lab">未遂事件</div>
+                        <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_NearMissIncidents %>" /></div>
                    </div>
                </div>
                <div class="aqyh">
                    <div class="an-boxs">
-                        <div>整改数据</div>
+                        <div><asp:Literal runat="server" Text="<%$ Resources:Lan,RectificationData %>" /></div>
                        <div>
                            <div class="dot">
                                <div class="dot-c" style="background: #4F97F9;"></div>
                            </div>
-                            <p>总数</p>
+                            <p><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_TotalRectificationData %>" /></p>
                            <p style="color: #4F97F9;" runat="server" id="div_zgsj">265</p>
                        </div>
                        <div>
                            <div class="dot">
                                <div class="dot-c" style="background: #12CDA2;"></div>
                            </div>
-                            <p>已完成</p>
+                            <p><asp:Literal runat="server" Text="<%$ Resources:Lan,completed %>" /></p>
                            <p style="color: #12CDA2;" runat="server" id="div_zgywc">265</p>
                        </div>
                        <div>
                            <div class="dot">
                                <div class="dot-c" style="background: #FF7474;"></div>
                            </div>
-                            <p>未完成</p>
+                            <p><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_UncompletedRectification %>" /></p>
                            <p style="color: #FF7474;" runat="server" id="div_zgwwc">12</p>
                        </div>
                        <div>
                            <div class="dot">
                                <div class="dot-c" style="background: #FFD130;"></div>
                            </div>
-                            <p>整改率</p>
+                            <p><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_RectificationRate %>" /></p>
                            <p style="color: #FFD130;" runat="server" id="div_zgwcl">100%</p>
                        </div>
                    </div>
@ -290,24 +290,24 @@

                    <div class="ht-boxs">
                        <div class="ht-box">
-                            <div class="label">合同工期</div>
+                            <div class="label"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_ContractDuration %>" /></div>
                            <div class="value" id="divProjectDays" runat="server">0<span>天</span></div>
                        </div>
                        <div class="ht-box">
-                            <div class="label">合同到期时间</div>
+                            <div class="label"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_ContractExpiryDate %>" /></div>
                            <div class="value" id="divEndDate" runat="server"></div>
                        </div>
                        <div class="ht-box">
-                            <div class="label">合同剩余</div>
+                            <div class="label"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_ContractRemaining %>" /></div>
                            <div class="value" id="divRemainingDays" runat="server">0<span>天</span></div>
                        </div>
                    </div>
                </div>

                <div class="site aqtj">
-                    <div class="gjl">关键事项准点率 <span><%=gjsxRate %></span></div>
+                    <div class="gjl"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_KeyMattersTimelinessRate %>" /> <span><%=gjsxRate %></span></div>
                    <div class="label">
-                        进度统计
+                        <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_ProgressStatistics %>" />
                    </div>
                    <div class="main">
                       <%-- <div id="aq-map"></div>--%>
@ -318,24 +318,24 @@
            <div class="side">
                <div class="site gz">
                    <div class="label">
-                        工作台面
+                        <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_Workbench %>" />
                    </div>
                    <div class="main">
                        <div class="total">
                            <div class="zg" style="cursor: pointer;" runat="server" onclick="showGztm(0)" id="div_Gzgjsx">
-                                <div class="lab">关键事项</div>
+                                <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_KeyMatters %>" /></div>
                                <div class="num" id="div_gjsx" runat="server">0</div>
                            </div>
                            <div class="zg" style="cursor: pointer" runat="server" onclick="showGztm(1)" id="div_Gzdbsx">
-                                <div class="lab">待办事项</div>
+                                <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_PendingMatters %>" /></div>
                                <div class="num" id="div_dbsx" runat="server">0</div>
                            </div>
                            <div class="zg" style="cursor: pointer" runat="server" onclick="showGztm(2)" id="div_Gzgrlc">
-                                <div class="lab">个人流程</div>
+                                <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_PersonalProcess %>" /></div>
                                <div class="num" id="div_grlc" runat="server">0</div>
                            </div>
                            <div class="zg">
-                                <div class="lab">已办任务</div>
+                                <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_CompletedTasks %>" /></div>
                                <div class="num" id="div_ybrw" runat="server">0</div>
                            </div>
                        </div>
@ -358,19 +358,19 @@
                </div>
                <div class="site p-ry" style="height: 3.75rem;">
                    <div class="label">
-                        人员信息
+                        <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_PersonnelInformation %>" />
                    </div>
                    <div class="total">
                        <div class="rs">
-                            <div class="lab">当前现场人数</div>
+                            <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,CurrentPersonnel %>" /></div>
                            <div class="num" id="div_xcrs" runat="server">0</div>
                        </div>
                        <div class="rs">
-                            <div class="lab">作业人员总数</div>
+                            <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_TotalWorkers %>" /></div>
                            <div class="num" runat="server" id="div_zyxcrs">0</div>
                        </div>
                        <div class="rs">
-                            <div class="lab">管理人员总数</div>
+                            <div class="lab"><asp:Literal runat="server" Text="<%$ Resources:Lan,managersCount %>" /></div>
                            <div class="num" runat="server" id="div_glxcrs">0</div>
                        </div>
                    </div>
@ -378,28 +378,28 @@
                </div>
                <div class="site cltj">
                    <div class="label">
-                        材料统计
+                        <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_MaterialLabel %>" />
                    </div>
                    <div class="main" style="padding: .1875rem .25rem;">
                        <div class="cl-tab">
-                            <div class="cl-btn cl-btn-act" id="span_gdcl" onclick="clOnclick(0)" style="cursor:pointer">管道材料</div>
-                            <div class="cl-btn" onclick="clOnclick(1)" id="span_sbcl" style="cursor:pointer">设备材料</div>
+                            <div class="cl-btn cl-btn-act" id="span_gdcl" onclick="clOnclick(0)" style="cursor:pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_MaterialLabel %>" /></div>
+                            <div class="cl-btn" onclick="clOnclick(1)" id="span_sbcl" style="cursor:pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_PipeMaterials %>" /></div>
                        </div>
                        <div class="table">
                            <div class="row" id="div_cldhHead">
-                                <div class="th-p">材料类别</div>
-                                <div class="th-p">设计量</div>
+                                <div class="th-p"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_MaterialCategory %>" /></div>
+                                <div class="th-p"><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_DesignQuantity %>" /></div>
                                <div class="th-p">
-                                    <p>采购量</p>
-                                    <p><span>采购量</span><span>百分比</span></p>
+                                    <p><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_PurchaseQuantity %>" /></p>
+                                    <p><span><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_PurchaseQuantity %>" /></span><span><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_Percentage %>" /></span></p>
                                </div>
                                <div class="th-p">
-                                    <p>到货量</p>
-                                    <p><span>已到货</span><span>百分比</span></p>
+                                    <p><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_ArrivalQuantity %>" /></p>
+                                    <p><span><asp:Literal runat="server" Text="<%$ Resources:Lan,HaveArrived %>" /></span><span><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_Percentage %>" /></span></p>
                                </div>
                                <div class="th-p">
-                                    <p>领料量</p>
-                                    <p><span>已领料</span><span>百分比</span></p>
+                                    <p><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_IssueQuantity %>" /></p>
+                                    <p><span><asp:Literal runat="server" Text="<%$ Resources:Lan,MaterialReceived %>" /></span><span><asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_Percentage %>" /></span></p>
                                </div>
                            </div>
                            <div class="t-body" id="div_cldhList">
@ -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,
--- 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
+
+
+        /// <summary>
+        /// 中英文
+        /// </summary>
+        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;
+        }
    }
 }
--- 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"%>

 <!DOCTYPE html>

--- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@ -236,6 +236,13 @@
                        <div class="header">
                            <div class="nav-left">
                                <div class="nav-btn t-btns p-t-btns">
+                                    <div class="c_lang">
+                                        <f:DropDownList runat="server" ID="drpSelectLan" AutoPostBack="true" EmptyText="<%$ Resources:Lan,SelectLanguage %>"
+                                            CssClass="icontopaction themes" Width="80px" OnSelectedIndexChanged="drpSelectLan_SelectedIndexChanged">
+                                            <f:ListItem Text="<%$ Resources:Lan,Chinese %>" Value="zh-CN" />
+                                            <f:ListItem Text="<%$ Resources:Lan,English %>" Value="en-US" />
+                                        </f:DropDownList>
+                                    </div>
                                    <div class="projectSelect">

                                        <f:DropDownList runat="server" Width="250px" ID="drpProject" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
@ -248,12 +255,14 @@
                                    <div class="t-btn" onclick="ProjectJGClick();" style="cursor: pointer">竣工</div>
                                </div>
                                <div class="nav-btn n-btns-l">
-                                    <div class="n-btn-l p-n-btn-l" onclick="CQMSClick();" style="cursor: pointer">质量管理</div>
-                                    <div class="n-btn-l p-n-btn-l" onclick="HSSEClick();" style="cursor: pointer">安全管理</div>
-                                    <div class="n-btn-l p-n-btn-l" onclick="JDGLClick();" style="cursor: pointer">进度管理</div>
-                                    <div class="n-btn-l p-n-btn-l" onclick="HJGLClick();" style="cursor: pointer">焊接管理</div>
-                                    <div class="n-btn-l p-n-btn-l" onclick="CLGLClick();" style="cursor: pointer">材料管理</div>
-                                    <div class="n-btn-l p-n-btn-l" onclick="TestRunClick();" style="cursor: pointer">试车管理</div>
+                                    <div class="n-btn-l p-n-btn-l" onclick="CQMSClick();" style="cursor: pointer">
+                                        <asp:Literal runat="server" Text="<%$ Resources:Lan,QualityManage %>" /></div>
+                                    <div class="n-btn-l p-n-btn-l" onclick="HSSEClick();" style="cursor: pointer">
+                                        <asp:Literal runat="server" Text="<%$ Resources:Lan,HSEManage %>" /></div>
+                                    <div class="n-btn-l p-n-btn-l" onclick="JDGLClick();" style="cursor: pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,ScheduleManage %>" /></div>
+                                    <div class="n-btn-l p-n-btn-l" onclick="HJGLClick();" style="cursor: pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,WeldingManage %>" /></div>
+                                    <div class="n-btn-l p-n-btn-l" onclick="CLGLClick();" style="cursor: pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,MaterialManagement %>" /></div>
+                                    <div class="n-btn-l p-n-btn-l" onclick="TestRunClick();" style="cursor: pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,TestManagement %>" /></div>
                                </div>
                            </div>
                            <div class="nav-center">
@ -265,12 +274,12 @@
                            <div class="nav-right">
                                <div class="btns t-btns t-btn-r">
                                    <div class=" t-btn1 iconfont icon-phone" onclick="CallFunction()" style="cursor: pointer">
-                                        <span>呼叫<f:Button runat="server" CssClass="bgbtntop" IconFont="_Phone" OnClick="btnPhoneClick" ToolTip="呼叫" Hidden="true"
+                                        <span><asp:Literal runat="server" Text="<%$ Resources:Lan,call %>" /><f:Button runat="server" CssClass="bgbtntop" IconFont="_Phone" OnClick="btnPhoneClick" ToolTip="<%$ Resources:Lan,call %>" Hidden="true"
                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCall" OnClientClick="parent.removeActiveTab();">
                                        </f:Button>
                                        </span>
                                    </div>
-                                    
+
                                    <div class="t-btn1 iconfont icon-phone" onclick="ToDo()" style="cursor: pointer">
                                        <span>待办<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnTodo_OnClick" ToolTip="待办" Hidden="true"
                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnTodo" OnClientClick="parent.removeActiveTab();">
@ -280,8 +289,8 @@
                                        <%--<span id="notification-badge" class="notification-badge" >2</span>--%>
                                        <span id="notification-badge" class="  notification-badge" style="display: none;">0</span>
                                    </div>
-                                    <div class=" t-btn1 iconfont icon-yonghu" onclick="PersonalFunction()" style="cursor: pointer">
-                                        <span>个人<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" ToolTip="我的" Hidden="true"
+                                    <div class="t-btn1 iconfont icon-yonghu" onclick="PersonalFunction()" style="cursor: pointer">
+                                        <span><f:Label ID="lblName" runat="server" Hidden="true"></f:Label>个人<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" ToolTip="我的" Hidden="true"
                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
                                        </f:Button>
                                        </span>
@ -293,13 +302,13 @@
                                        </span>
                                    </div>
                                    <div class="t-btn1 iconfont icon-bangzhu" onclick="HelpFunction()" style="cursor: pointer">
-                                        <span>帮助<f:Button runat="server" CssClass="bgbtntop" IconFont="Eye" OnClick="btnHelp_Click" ToolTip="帮助" Hidden="true"
+                                        <span><asp:Literal runat="server" Text="<%$ Resources:Lan,help %>" /><f:Button runat="server" CssClass="bgbtntop" IconFont="Eye" OnClick="btnHelp_Click" ToolTip="<%$ Resources:Lan,help %>" Hidden="true"
                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHelp" OnClientClick="parent.removeActiveTab();">
                                        </f:Button>
                                        </span>
                                    </div>
                                    <div class="t-btn1 iconfont icon-tuichu" onclick="SignOutFunction()" style="cursor: pointer">
-                                        <span>退出<f:Button runat="server" CssClass="bgbtntop" Text="退出" ToolTip="退出" IconFont="PowerOff" Hidden="true"
+                                        <span><asp:Literal runat="server" Text="<%$ Resources:Lan,quit %>" /><f:Button runat="server" CssClass="bgbtntop" Text="<%$ Resources:Lan,quit %>" ToolTip="<%$ Resources:Lan,quit %>" IconFont="PowerOff" Hidden="true"
                                            EnablePostBack="false" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button18">
                                            <Listeners>
                                                <f:Listener Event="click" Handler="onToolSignOutClick" />
@ -310,12 +319,12 @@
                                    <div class="t-btn1 iconfont icon-quanping_o ab" style="cursor: pointer"><span>全屏</span></div>
                                </div>
                                <div class="nav-btn n-btns-r">
-                                    <div class="n-btn-r c-n-btn-r" onclick="TransferClick();" style="cursor: pointer">移交管理</div>
-                                    <div class="n-btn-r c-n-btn-r" onclick="PGJSXClick();" style="cursor: pointer; width: 2.225rem; height: .305rem; line-height: .35rem;">关键事项与协调沟通</div>
-                                    <div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor: pointer">视频监控</div>
-                                    <div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor: pointer">现场考勤</div>
-                                    <div class="n-btn-r c-n-btn-r" onclick="OpinionClick();" style="cursor: pointer">意见收集</div>
-                                    <div class="n-btn-r c-n-btn-r" onclick="DocClick();" style="cursor: pointer; display: none">协调与沟通</div>
+                                    <div class="n-btn-r c-n-btn-r" onclick="TransferClick();" style="cursor: pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,TransferManagement %>" /></div>
+                                    <div class="n-btn-r c-n-btn-r" onclick="PGJSXClick();" style="cursor: pointer; width: 2.225rem; height: .305rem; line-height: .35rem;"><asp:Literal runat="server" Text="<%$ Resources:Lan,keyc %>" /></div>
+                                    <div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor: pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,VideoSurveillance %>" /></div>
+                                    <div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor: pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,OnSiteAttendance %>" /></div>
+                                    <div class="n-btn-r c-n-btn-r" onclick="OpinionClick();" style="cursor: pointer"><asp:Literal runat="server" Text="<%$ Resources:Lan,OpinionGathering %>" /></div>
+                                    <div class="n-btn-r c-n-btn-r" onclick="DocClick();" style="cursor: pointer; display: none"><asp:Literal runat="server" Text="<%$ Resources:Lan,CoordinationCommunication %>" /></div>
                                </div>
                            </div>
                        </div>
@ -441,7 +450,7 @@
            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
            Height="500px">
        </f:Window>
-        
+
        <f:Window ID="Window1" Title="呼叫" Hidden="true" EnableIFrame="true" EnableMaximize="true"
            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
            Height="700px">
--- a/SGGL/FineUIPro.Web/indexProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs
@ -33,6 +33,7 @@ namespace FineUIPro.Web
            ////////////////////////////////////////////////////////////////
            string themeStr = Request.QueryString["theme"];
            string menuStr = Request.QueryString["menu"];
+            string https = ConfigurationManager.AppSettings["Https"];
            if (!String.IsNullOrEmpty(themeStr) || !String.IsNullOrEmpty(menuStr))
            {
                if (!String.IsNullOrEmpty(themeStr))
@ -50,6 +51,10 @@ namespace FineUIPro.Web
                    {
                        Expires = DateTime.Now.AddYears(1)
                    };
+                    if (https == "true")
+                    {
+                        cookie.Secure = true;
+                    }
                    Response.Cookies.Add(cookie);
                }

@ -312,6 +317,7 @@ namespace FineUIPro.Web
                    this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
                }
                this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
+                this.lblName.Text = BLL.UserService.GetUserNameByUserId(this.CurrUser.UserId);
                this.MenuSwitchMethod(Request.Params["menuType"]);
                this.InitMenuStyleButton();
                this.InitMenuModeButton();
@ -341,8 +347,17 @@ namespace FineUIPro.Web
 						this.hfMonitorPW.Text = Funs.EncryptionPassword(sysSet17.SetValue);
 					}
 				}
-				//GetWeather();
-			}
+                //GetWeather();
+
+                if (Request.Cookies["SelectLan"] != null)
+                {
+                    HttpCookie lanCookie = Request.Cookies["SelectLan"];
+                    if (lanCookie["lan"] != null)
+                    {
+                        drpSelectLan.SelectedValue = lanCookie["lan"];
+                    }
+                }
+            }
        }

        private void GetWeather()
@ -901,5 +916,19 @@ namespace FineUIPro.Web
        {
            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Work/ToDoList.aspx")));
        }
+
+        protected void drpSelectLan_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string https = ConfigurationManager.AppSettings["Https"];
+            HttpCookie lanCookie = Request.Cookies["SelectLan"];
+            lanCookie["lan"] = drpSelectLan.SelectedValue;
+            lanCookie.Expires = DateTime.Now.AddDays(1);
+            if (https == "true")
+            {
+                lanCookie.Secure = true;
+            }
+            Response.Cookies.Add(lanCookie);
+            Response.Redirect(Request.UrlReferrer.ToString());//刷新当前页面
+        }
    }
 }
--- a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web
-{
-
-
-    public partial class indexProject
-    {
-
+namespace FineUIPro.Web {
+    
+    
+    public partial class indexProject {
+        
        /// <summary>
        /// form1 控件。
        /// </summary>
@ -22,7 +20,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
        /// <summary>
        /// PageManager1 控件。
        /// </summary>
@ -31,7 +29,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.PageManager PageManager1;
-
+        
        /// <summary>
        /// Panel1 控件。
        /// </summary>
@ -40,7 +38,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel Panel1;
-
+        
        /// <summary>
        /// topPanel 控件。
        /// </summary>
@ -49,7 +47,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ContentPanel topPanel;
-
+        
        /// <summary>
        /// ContentPanel1 控件。
        /// </summary>
@ -58,7 +56,16 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ContentPanel ContentPanel1;
-
+        
+        /// <summary>
+        /// drpSelectLan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpSelectLan;
+        
        /// <summary>
        /// drpProject 控件。
        /// </summary>
@ -67,7 +74,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList drpProject;
-
+        
        /// <summary>
        /// Button21 控件。
        /// </summary>
@ -76,7 +83,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button Button21;
-
+        
        /// <summary>
        /// btnCall 控件。
        /// </summary>
@ -85,7 +92,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnCall;
-
+        
        /// <summary>
        /// btnTodo 控件。
        /// </summary>
@ -94,7 +101,16 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnTodo;
-
+        
+        /// <summary>
+        /// lblName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblName;
+        
        /// <summary>
        /// btnPersonal 控件。
        /// </summary>
@ -103,7 +119,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnPersonal;
-
+        
        /// <summary>
        /// btnProjectSet 控件。
        /// </summary>
@ -112,7 +128,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnProjectSet;
-
+        
        /// <summary>
        /// btnHelp 控件。
        /// </summary>
@ -121,7 +137,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnHelp;
-
+        
        /// <summary>
        /// Button18 控件。
        /// </summary>
@ -130,7 +146,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button Button18;
-
+        
        /// <summary>
        /// leftPanel 控件。
        /// </summary>
@ -139,7 +155,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel leftPanel;
-
+        
        /// <summary>
        /// leftPanelToolCollapse 控件。
        /// </summary>
@ -148,7 +164,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Tool leftPanelToolCollapse;
-
+        
        /// <summary>
        /// leftPanelToolGear 控件。
        /// </summary>
@ -157,7 +173,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Tool leftPanelToolGear;
-
+        
        /// <summary>
        /// btnExpandAll 控件。
        /// </summary>
@ -166,7 +182,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnExpandAll;
-
+        
        /// <summary>
        /// btnCollapseAll 控件。
        /// </summary>
@ -175,7 +191,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnCollapseAll;
-
+        
        /// <summary>
        /// MenuMode 控件。
        /// </summary>
@ -184,7 +200,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton MenuMode;
-
+        
        /// <summary>
        /// MenuModeNormal 控件。
        /// </summary>
@ -193,7 +209,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuCheckBox MenuModeNormal;
-
+        
        /// <summary>
        /// MenuModeCompact 控件。
        /// </summary>
@ -202,7 +218,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuCheckBox MenuModeCompact;
-
+        
        /// <summary>
        /// MenuModeLarge 控件。
        /// </summary>
@ -211,7 +227,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuCheckBox MenuModeLarge;
-
+        
        /// <summary>
        /// MenuStyle 控件。
        /// </summary>
@ -220,7 +236,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton MenuStyle;
-
+        
        /// <summary>
        /// MenuStyleTree 控件。
        /// </summary>
@ -229,7 +245,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuCheckBox MenuStyleTree;
-
+        
        /// <summary>
        /// MenuStyleMiniModeTree 控件。
        /// </summary>
@ -238,7 +254,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuCheckBox MenuStyleMiniModeTree;
-
+        
        /// <summary>
        /// MenuStylePlainTree 控件。
        /// </summary>
@ -247,7 +263,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuCheckBox MenuStylePlainTree;
-
+        
        /// <summary>
        /// MenuLang 控件。
        /// </summary>
@ -256,7 +272,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton MenuLang;
-
+        
        /// <summary>
        /// MenuLangZHCN 控件。
        /// </summary>
@ -265,7 +281,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuCheckBox MenuLangZHCN;
-
+        
        /// <summary>
        /// mainTabStrip 控件。
        /// </summary>
@ -274,7 +290,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TabStrip mainTabStrip;
-
+        
        /// <summary>
        /// Tab1 控件。
        /// </summary>
@ -283,7 +299,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Tab Tab1;
-
+        
        /// <summary>
        /// toolRefresh 控件。
        /// </summary>
@ -292,7 +308,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Tool toolRefresh;
-
+        
        /// <summary>
        /// toolNewWindow 控件。
        /// </summary>
@ -301,7 +317,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Tool toolNewWindow;
-
+        
        /// <summary>
        /// toolMaximize 控件。
        /// </summary>
@ -310,7 +326,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Tool toolMaximize;
-
+        
        /// <summary>
        /// toolSignOut 控件。
        /// </summary>
@ -319,7 +335,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Tool toolSignOut;
-
+        
        /// <summary>
        /// windowCustomQuery 控件。
        /// </summary>
@ -328,7 +344,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Window windowCustomQuery;
-
+        
        /// <summary>
        /// WindowAtt 控件。
        /// </summary>
@ -337,7 +353,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Window WindowAtt;
-
+        
        /// <summary>
        /// Window1 控件。
        /// </summary>
@ -346,7 +362,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Window Window1;
-
+        
        /// <summary>
        /// Window2 控件。
        /// </summary>
@ -355,7 +371,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Window Window2;
-
+        
        /// <summary>
        /// XmlDataSource1 控件。
        /// </summary>
@ -364,7 +380,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.XmlDataSource XmlDataSource1;
-
+        
        /// <summary>
        /// ProjectZJ 控件。
        /// </summary>
@ -373,7 +389,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button ProjectZJ;
-
+        
        /// <summary>
        /// ProjectTG 控件。
        /// </summary>
@ -382,7 +398,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button ProjectTG;
-
+        
        /// <summary>
        /// ProjectJG 控件。
        /// </summary>
@ -391,7 +407,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button ProjectJG;
-
+        
        /// <summary>
        /// btnCQMS 控件。
        /// </summary>
@ -400,7 +416,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnCQMS;
-
+        
        /// <summary>
        /// btnHSSE 控件。
        /// </summary>
@ -409,7 +425,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnHSSE;
-
+        
        /// <summary>
        /// btnJDGL 控件。
        /// </summary>
@ -418,7 +434,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnJDGL;
-
+        
        /// <summary>
        /// btnHJGL 控件。
        /// </summary>
@ -427,7 +443,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnHJGL;
-
+        
        /// <summary>
        /// btnCLGL 控件。
        /// </summary>
@ -436,7 +452,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnCLGL;
-
+        
        /// <summary>
        /// btnTestRun 控件。
        /// </summary>
@ -445,7 +461,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnTestRun;
-
+        
        /// <summary>
        /// btnTransfer 控件。
        /// </summary>
@ -454,7 +470,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnTransfer;
-
+        
        /// <summary>
        /// btnPGJSX 控件。
        /// </summary>
@ -463,7 +479,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnPGJSX;
-
+        
        /// <summary>
        /// btnDigitalSite 控件。
        /// </summary>
@ -472,7 +488,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnDigitalSite;
-
+        
        /// <summary>
        /// btnPDigData 控件。
        /// </summary>
@ -481,7 +497,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnPDigData;
-
+        
        /// <summary>
        /// btnOpinion 控件。
        /// </summary>
@ -490,7 +506,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnOpinion;
-
+        
        /// <summary>
        /// btnDoc 控件。
        /// </summary>
@ -499,7 +515,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnDoc;
-
+        
        /// <summary>
        /// SimpleForm1 控件。
        /// </summary>
@ -508,7 +524,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.SimpleForm SimpleForm1;
-
+        
        /// <summary>
        /// hfProjectCode 控件。
        /// </summary>
@ -517,7 +533,7 @@ namespace FineUIPro.Web
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.HiddenField hfProjectCode;
-
+        
        /// <summary>
        /// hfMonitorPW 控件。
        /// </summary>
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@ -6,7 +6,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi</_PublishTargetUrl>
-    <History>True|2025-03-13T07:31:10.3223071Z||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
+    <History>True|2025-03-13T08:44:25.3220313Z||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
    <LastFailureDetails />
  </PropertyGroup>
  <ItemGroup>
@ -86,22 +86,22 @@
      <publishTime>10/28/2024 14:02:50</publishTime>
    </File>
    <File Include="bin/App_global.asax.compiled">
-      <publishTime>03/13/2025 15:31:08</publishTime>
+      <publishTime>03/13/2025 16:44:23</publishTime>
    </File>
    <File Include="bin/App_global.asax.dll">
-      <publishTime>03/13/2025 15:31:08</publishTime>
+      <publishTime>03/13/2025 16:44:23</publishTime>
    </File>
    <File Include="bin/Aspose.Words.dll">
      <publishTime>12/06/2024 20:13:58</publishTime>
    </File>
    <File Include="bin/BLL.dll">
-      <publishTime>03/13/2025 15:30:45</publishTime>
+      <publishTime>03/13/2025 16:44:14</publishTime>
    </File>
    <File Include="bin/BLL.dll.config">
      <publishTime>12/26/2024 09:46:52</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
-      <publishTime>03/13/2025 15:30:45</publishTime>
+      <publishTime>03/13/2025 16:44:14</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
@ -389,13 +389,13 @@
      <publishTime>02/09/2013 00:42:28</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
-      <publishTime>03/13/2025 15:30:49</publishTime>
+      <publishTime>03/13/2025 16:44:14</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
-      <publishTime>03/13/2025 15:30:49</publishTime>
+      <publishTime>03/13/2025 16:44:14</publishTime>
    </File>
    <File Include="bin/WebAPI.xml">
-      <publishTime>03/13/2025 15:30:49</publishTime>
+      <publishTime>03/13/2025 16:44:14</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
      <publishTime>10/28/2024 14:02:50</publishTime>
    </File>
    <File Include="PrecompiledApp.config">
-      <publishTime>03/13/2025 15:30:51</publishTime>
+      <publishTime>03/13/2025 16:44:15</publishTime>
    </File>
    <File Include="Scripts/bootstrap.js">
      <publishTime>10/28/2024 14:02:50</publishTime>
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />