diff --git a/CreateModel2017.bat b/CreateModel2017.bat
index c918b4e..1717f72 100644
--- a/CreateModel2017.bat
+++ b/CreateModel2017.bat
@@ -27,7 +27,7 @@ REM --------------
 @echo.
 @call "%VS150%"
 
-SqlMetal /views  /server:47.104.102.122,14333:SGGLDB_HBAZ /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:. /database:SGGLDB_HBAZ /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_V2025-05-06-001-gaofei.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_V2025-05-06-001-gaofei.sql
new file mode 100644
index 0000000..c825756
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_V2025-05-06-001-gaofei.sql
@@ -0,0 +1,57 @@
+
+ALTER VIEW [dbo].[View_QuantityManagement_WorkTeamStatistics]
+AS
+/********工程量整体及分类汇总表********/
+
+select distinct C.ProjectId+','+(case when a.DrawingNo is not null then a.WorkSection else b.WorkSection end)+','+ProjectContent as Id, C.ProjectId,case when a.DrawingNo is not null then a.WorkSection else b.WorkSection end as WorkSection,ba.State,
+							  ProjectContent,Unit,
+							  case when a.DrawingNo is not null then ca.ProfessionalName else cb.ProfessionalName end as Major
+                              from QuantityManagement_DayInput C 
+							  left join QuantityManagement_Base ba on ba.BaseId=C.BaseId
+                              left join QuantityManagement_Drawing a on a.DrawingId=ba.DrawingId
+							  left join Base_CNProfessional ca on ca.CNProfessionalId=a.Major
+                              left join QuantityManagement_Change b on b.ChangeId=ba.DrawingId
+							  left join Base_CNProfessional cb on cb.CNProfessionalId=b.Major
+union 
+select C.ProjectId+','+(case when a.DrawingNo is not null then a.WorkSection else b.WorkSection end)+','+ProjectContent as Id,C.ProjectId,case when a.DrawingNo is not null then a.WorkSection else b.WorkSection end as WorkSection,C.State,
+							  ProjectContent,Unit,
+							  case when a.DrawingNo is not null then ca.ProfessionalName else cb.ProfessionalName end as Major
+                              from QuantityManagement_Base C 
+                              left join QuantityManagement_Drawing a on a.DrawingId=C.DrawingId
+							  left join Base_CNProfessional ca on ca.CNProfessionalId=a.Major
+                              left join QuantityManagement_Change b on b.ChangeId=C.DrawingId
+							  left join Base_CNProfessional cb on cb.CNProfessionalId=b.Major
+
+
+
+
+GO
+
+
+
+ALTER VIEW [dbo].[View_QuantityManagement_ProjectContentStatistics]
+AS
+/********工程量整体及分类汇总表********/
+
+select distinct C.ProjectId+','+ProjectContent as Id, C.ProjectId,ba.State,
+							  ProjectContent,Unit,case when a.DrawingNo is not null then ca.ProfessionalName else cb.ProfessionalName end as Major
+                              from QuantityManagement_DayInput C 
+							  left join QuantityManagement_Base ba on ba.BaseId=C.BaseId
+                              left join QuantityManagement_Drawing a on a.DrawingId=ba.DrawingId
+							  left join Base_CNProfessional ca on ca.CNProfessionalId=a.Major
+                              left join QuantityManagement_Change b on b.ChangeId=ba.DrawingId
+							  left join Base_CNProfessional cb on cb.CNProfessionalId=b.Major
+union 
+select C.ProjectId+','+ProjectContent as Id,C.ProjectId,C.State,
+							  ProjectContent,Unit,case when a.DrawingNo is not null then ca.ProfessionalName else cb.ProfessionalName end as Major
+                              from QuantityManagement_Base C 
+                              left join QuantityManagement_Drawing a on a.DrawingId=C.DrawingId
+							  left join Base_CNProfessional ca on ca.CNProfessionalId=a.Major
+                              left join QuantityManagement_Change b on b.ChangeId=C.DrawingId
+							  left join Base_CNProfessional cb on cb.CNProfessionalId=b.Major
+
+
+
+GO
+
+
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 7c6a246..e134970 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BLL</RootNamespace>
     <AssemblyName>BLL</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
diff --git a/SGGL/BLL/CQMS/Check/CheckControlService.cs b/SGGL/BLL/CQMS/Check/CheckControlService.cs
index b220266..d4f243b 100644
--- a/SGGL/BLL/CQMS/Check/CheckControlService.cs
+++ b/SGGL/BLL/CQMS/Check/CheckControlService.cs
@@ -48,7 +48,7 @@ namespace BLL
         {
             using (var db = new Model.SGGLDB(Funs.ConnString))
             {
-                object x = db.Check_CheckControl.Select(x => new {
+                object a = db.Check_CheckControl.Select(x => new {
                     CheckControlCode = x.CheckControlCode,
                     ProjectId = x.ProjectId,
                     ProjectName = db.Base_Project.FirstOrDefault(p => p.ProjectId == x.ProjectId).ProjectName,
@@ -77,7 +77,7 @@ namespace BLL
                     QuestionTypeName = db.Base_QualityQuestionType.FirstOrDefault(e => e.QualityQuestionTypeId == x.QuestionType).QualityQuestionType,
                 }).FirstOrDefault(e => e.CheckControlCode == CheckControlCode);
 
-                return x;
+                return a;
             }
 
         }
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs
index 05c5f9b..b9a3789 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs
@@ -13,13 +13,13 @@ namespace Resources {
     
     
     /// <summary>
-    ///   涓�涓己绫诲瀷鐨勮祫婧愮被锛岀敤浜庢煡鎵炬湰鍦板寲鐨勫瓧绗︿覆绛夈��
+    ///   寮虹被鍨嬭祫婧愮被锛岀敤浜庢煡鎵炬湰鍦板寲瀛楃涓茬瓑銆�
     /// </summary>
     // 姝ょ被鏄敱 StronglyTypedResourceBuilder
     // 绫婚�氳繃绫讳技浜� ResGen 鎴� Visual Studio 鐨勫伐鍏疯嚜鍔ㄧ敓鎴愮殑銆�
-    // 鑻ヨ娣诲姞鎴栫Щ闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen
+    // 鑻ヨ娣诲姞鎴栧垹闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen
     // (浠� /str 浣滀负鍛戒护閫夐」)锛屾垨閲嶆柊鐢熸垚 Visual Studio 椤圭洰銆�
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "17.0.0.0")]
+    [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 {
@@ -33,7 +33,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   杩斿洖姝ょ被浣跨敤鐨勭紦瀛樼殑 ResourceManager 瀹炰緥銆�
+        ///   杩斿洖姝ょ被浣跨敤鐨勭紦瀛� ResourceManager 瀹炰緥銆�
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   閲嶅啓褰撳墠绾跨▼鐨� CurrentUICulture 灞炴�э紝瀵�
-        ///   浣跨敤姝ゅ己绫诲瀷璧勬簮绫荤殑鎵�鏈夎祫婧愭煡鎵炬墽琛岄噸鍐欍��
+        ///   瑕嗙洊褰撳墠绾跨▼鐨� CurrentUICulture 灞炴��
+        ///   浣跨敤姝ゅ己绫诲瀷鐨勮祫婧愮被鐨勮祫婧愭煡鎵俱��
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 澶ф暟鎹腑蹇� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 澶ф暟鎹腑蹇� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string BigDataCenter {
             get {
@@ -70,7 +70,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 璇佷功棰勮 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 璇佷功棰勮 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string CertificateWarning {
             get {
@@ -79,7 +79,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 涓浗 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 涓浗 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string China {
             get {
@@ -88,7 +88,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 涓枃 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 涓枃 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Chinese {
             get {
@@ -97,7 +97,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍦熷缓鍩虹浜ゅ畨 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍦熷缓鍩虹浜ゅ畨 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string CivilInfrastructure {
             get {
@@ -106,7 +106,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 宸插畬鎴� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 宸插畬鎴� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string completed {
             get {
@@ -115,7 +115,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍙傚缓浜烘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍙傚缓浜烘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ConPersonCount {
             get {
@@ -124,7 +124,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鏂藉伐鍗曚綅 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鏂藉伐鍗曚綅 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ConstructionUnit {
             get {
@@ -133,7 +133,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍚堝悓鍒版湡鏃堕棿 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍚堝悓鍒版湡鏃堕棿 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ContractExpirationTime {
             get {
@@ -142,7 +142,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 褰撳墠鐜板満浜烘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 褰撳墠鐜板満浜烘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string CurrentPersonnel {
             get {
@@ -151,7 +151,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 闅愭偅鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 闅愭偅鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string DangersCount {
             get {
@@ -160,7 +160,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍛樺伐绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍛樺伐绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string EmployeeManage {
             get {
@@ -169,7 +169,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鑻辨枃 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鑻辨枃 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string English {
             get {
@@ -178,7 +178,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鐜板満鍔ㄦ�� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鐜板満鍔ㄦ�� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string FieldDynamics {
             get {
@@ -187,7 +187,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 棣栧彴璁惧鍒拌揣 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 棣栧彴璁惧鍒拌揣 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string FirstEquipmentArrived {
             get {
@@ -196,7 +196,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鐒婃帴涓�娆″悎鏍肩巼 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鐒婃帴涓�娆″悎鏍肩巼 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string FistPassRateWelding {
             get {
@@ -205,7 +205,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍏ㄥ睆 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍏ㄥ睆 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string FullScreen {
             get {
@@ -214,7 +214,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鎬绘壙鍖呭晢鏂藉伐璁″垝 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鎬绘壙鍖呭晢鏂藉伐璁″垝 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string GeneralConPlan {
             get {
@@ -223,7 +223,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 涓�鑸闄� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 涓�鑸闄� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string GeneralRisk {
             get {
@@ -232,7 +232,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 杈冨ぇ椋庨櫓 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 杈冨ぇ椋庨櫓 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string GreaterRisk {
             get {
@@ -241,7 +241,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鎬婚儴妫�鏌� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鎬婚儴妫�鏌� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string HeadquartersInspection {
             get {
@@ -250,7 +250,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 棣栭〉 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 棣栭〉 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string HomePage {
             get {
@@ -259,7 +259,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 瀹夊叏绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 瀹夊叏绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string HSEManage {
             get {
@@ -268,7 +268,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 婀垮害 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 婀垮害 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string humidness {
             get {
@@ -277,7 +277,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 缁煎悎绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 缁煎悎绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string IntegratedManage {
             get {
@@ -286,7 +286,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍦ㄦ柦鍗卞ぇ宸ョ▼鏁� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍦ㄦ柦鍗卞ぇ宸ョ▼鏁� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string LargeRisk {
             get {
@@ -295,7 +295,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 绾� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 绾� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Level {
             get {
@@ -304,7 +304,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鐜板満瑙嗛 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鐜板満瑙嗛 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string LiveVideo {
             get {
@@ -313,7 +313,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鐜板満鐩稿唽 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鐜板満鐩稿唽 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Live_photo_album {
             get {
@@ -322,7 +322,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 浣庨闄� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 浣庨闄� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string LowRisk {
             get {
@@ -331,7 +331,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 閲嶅ぇ椋庨櫓 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 閲嶅ぇ椋庨櫓 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string MajorRisk {
             get {
@@ -340,7 +340,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 绠＄悊浜哄憳鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 绠＄悊浜哄憳鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string managersCount {
             get {
@@ -349,7 +349,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鏈�澶у寲 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鏈�澶у寲 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string maximize {
             get {
@@ -358,7 +358,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鏈烘绔ｅ伐 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鏈烘绔ｅ伐 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string MechanicalCompletion {
             get {
@@ -367,7 +367,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鏈烘棰勮 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鏈烘棰勮 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string MechanicalWarning {
             get {
@@ -376,7 +376,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 娑堟伅 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 娑堟伅 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string message {
             get {
@@ -385,7 +385,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鏇村 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鏇村 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string more {
             get {
@@ -394,7 +394,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鎮ㄦ病鏈夋妯″潡鎿嶄綔鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉冿紒 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鎮ㄦ病鏈夋妯″潡鎿嶄綔鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉冿紒 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string NoAuthorize {
             get {
@@ -403,7 +403,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍣煶 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍣煶 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string noise {
             get {
@@ -412,7 +412,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鎮ㄦ病鏈夋潈闄愯繘鍏ラ」鐩鐞嗘ā鍧楋紒 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鎮ㄦ病鏈夋潈闄愯繘鍏ラ」鐩鐞嗘ā鍧楋紒 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string NoPermission {
             get {
@@ -421,7 +421,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 閫氱煡绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 閫氱煡绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string NoticeManage {
             get {
@@ -430,7 +430,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鐜板満鑰冨嫟 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鐜板満鑰冨嫟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string OnSiteAttendance {
             get {
@@ -439,7 +439,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍦ㄦ柊鏍囩椤典腑鎵撳紑 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍦ㄦ柊鏍囩椤典腑鎵撳紑 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string OpensNewTab {
             get {
@@ -448,7 +448,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍚堟牸鐜� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍚堟牸鐜� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string PassRate {
             get {
@@ -457,7 +457,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 妗╁熀鏂藉伐 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 妗╁熀鏂藉伐 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Pilefoundationconstruction {
             get {
@@ -466,7 +466,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 绠￠亾瀹夎寮�濮� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 绠￠亾瀹夎寮�濮� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string PipeInstallationStarts {
             get {
@@ -475,7 +475,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍙樼數鎵�鍙楃數 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍙樼數鎵�鍙楃數 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string PowerReceived {
             get {
@@ -484,7 +484,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 闂鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 闂鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProblemTotal {
             get {
@@ -493,7 +493,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 椤圭洰鍦板潃 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 椤圭洰鍦板潃 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectAddress {
             get {
@@ -502,7 +502,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 椤圭洰娓呭崟 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 椤圭洰娓呭崟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectList {
             get {
@@ -511,7 +511,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 椤圭洰鍚嶇О 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 椤圭洰鍚嶇О 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectName {
             get {
@@ -520,7 +520,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 椤圭洰杩涘害璁″垝 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 椤圭洰杩涘害璁″垝 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectSchedule {
             get {
@@ -529,7 +529,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 椤圭洰缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 椤圭洰缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectStatistics {
             get {
@@ -538,7 +538,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍦ㄥ缓椤圭洰 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍦ㄥ缓椤圭洰 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectUnderConstruction {
             get {
@@ -547,7 +547,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 璐ㄩ噺绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 璐ㄩ噺绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string QualityManage {
             get {
@@ -556,7 +556,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 璐ㄩ噺缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 璐ㄩ噺缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string QualityStatistics {
             get {
@@ -565,7 +565,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 璐ㄩ噺棰勮 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 璐ㄩ噺棰勮 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string QualityWarning {
             get {
@@ -574,7 +574,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 璐ㄩ噺闂缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 璐ㄩ噺闂缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Quality_problem_statistics {
             get {
@@ -583,7 +583,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 璧勮川棰勮 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 璧勮川棰勮 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Quawarning {
             get {
@@ -592,7 +592,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 閫�鍑� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 閫�鍑� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string quit {
             get {
@@ -601,7 +601,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 瀹炴椂瑙嗛 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 瀹炴椂瑙嗛 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RealTimeVideo {
             get {
@@ -610,7 +610,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鏁存敼鐜� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鏁存敼鐜� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RectificationRate {
             get {
@@ -619,7 +619,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍒锋柊 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍒锋柊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Refresh {
             get {
@@ -628,7 +628,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍒锋柊鏈〉 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍒锋柊鏈〉 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RefreshPage {
             get {
@@ -637,7 +637,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 璺濈宸ュ墿浣� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 璺濈宸ュ墿浣� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RemainingTimeCompletion {
             get {
@@ -646,7 +646,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 椋庨櫓绠℃帶 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 椋庨櫓绠℃帶 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RiskControl {
             get {
@@ -655,7 +655,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 瀹夊叏浜哄伐鏃� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 瀹夊叏浜哄伐鏃� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SafeLaborHours {
             get {
@@ -664,7 +664,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 瀹夊叏闂缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 瀹夊叏闂缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SafeProStat {
             get {
@@ -673,7 +673,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 绱瀹夊叏浜哄伐鏃� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 绱瀹夊叏浜哄伐鏃� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SafetyLaborHours {
             get {
@@ -682,7 +682,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 瀹夊叏缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 瀹夊叏缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SafetyStatistics {
             get {
@@ -691,7 +691,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 宸ョ▼绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 宸ョ▼绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ScheduleManage {
             get {
@@ -700,7 +700,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 閫夋嫨璇█ 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 閫夋嫨璇█ 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SelectLanguage {
             get {
@@ -709,7 +709,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍔冲姟鏁版嵁 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍔冲姟鏁版嵁 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ServiceData {
             get {
@@ -718,7 +718,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 璁剧疆 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 璁剧疆 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Settings {
             get {
@@ -727,7 +727,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 娉ㄩ攢 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 娉ㄩ攢 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SignOUT {
             get {
@@ -736,7 +736,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 寮�宸ユ椂闂� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 寮�宸ユ椂闂� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Start_time {
             get {
@@ -745,7 +745,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍒嗗寘绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍒嗗寘绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SubManagement {
             get {
@@ -754,7 +754,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鐩戠悊鍗曚綅 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鐩戠悊鍗曚綅 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SupervisionUnit {
             get {
@@ -763,7 +763,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍒囨崲棣栭〉 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍒囨崲棣栭〉 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SwitchHomePage {
             get {
@@ -772,7 +772,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 绯荤粺鑿滃崟 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 绯荤粺鑿滃崟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SystemMenu {
             get {
@@ -781,7 +781,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鏅烘収鏂藉伐绠＄悊淇℃伅绯荤粺 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鏅烘収鏂藉伐绠＄悊淇℃伅绯荤粺 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SystemName {
             get {
@@ -790,7 +790,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 娓╁害 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 娓╁害 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string temperature {
             get {
@@ -799,7 +799,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 绔ｅ伐鏃堕棿 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 绔ｅ伐鏃堕棿 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string TimeCompletion {
             get {
@@ -808,7 +808,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 寰呭姙浜嬮」 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 寰呭姙浜嬮」 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string TodoList {
             get {
@@ -817,7 +817,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鍚堝悓鎬诲伐鏈� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鍚堝悓鎬诲伐鏈� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string TotalContractDuration {
             get {
@@ -826,7 +826,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鏈畬鎴� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鏈畬鎴� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string uncompleted {
             get {
@@ -835,7 +835,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鐢ㄦ埛 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鐢ㄦ埛 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string user {
             get {
@@ -844,7 +844,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 瑙嗛鐩戞帶 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 瑙嗛鐩戞帶 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string VideoSurveillance {
             get {
@@ -853,7 +853,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 鐒婃帴绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 鐒婃帴绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string WeldingManage {
             get {
@@ -862,7 +862,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 椋庨�� 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 椋庨�� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string WindSpeed {
             get {
@@ -871,7 +871,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 浣滀笟浜哄憳鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///  鏌ユ壘绫讳技 浣滀笟浜哄憳鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string WorkPersonnel {
             get {
diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx
index 9518b16..a681e4a 100644
--- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx
@@ -22,7 +22,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpProject" runat="server" Label="椤圭洰" Width="300px" LabelWidth="60px" EmptyText="璇烽�夋嫨椤圭洰"
+                                <f:DropDownList ID="drpProject" runat="server" Label="椤圭洰" Width="300px" LabelWidth="60px" EmptyText="璇烽�夋嫨椤圭洰" AutoPostBack="true" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
                                 EnableEdit="true">
                             </f:DropDownList>
                                 <f:DropDownList ID="drpWorkSection" runat="server" LabelWidth="120px" Required="true" Label="宸ユ" LabelAlign="Right" EnableEdit="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx.cs
index cbe4dbe..f223ebb 100644
--- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx.cs
@@ -110,6 +110,7 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
         {
             if (!IsPostBack)
             {
+                ProjectService.InitAllProjectDropDownList(this.drpProject, false);
                 string projectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["ProjectId"]))
                 {
@@ -146,7 +147,6 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
                 {
                     this.drpWorkTeam.SelectedValue = Request.Params["WorkTeam"];
                 }
-                ProjectService.InitAllProjectDropDownList(this.drpProject, false);
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
                 {
                     this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
@@ -372,9 +372,9 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
         /// <param name="e"></param>
         protected void btnSearch_Click(object sender, EventArgs e)
         {
-            string url = "~/CQMS/QuantityManagement/DayInputStatistics.aspx?Date=" + this.txtMonths.Text.Trim() + "&WorkSection=" + this.drpWorkSection.SelectedValue 
+            string url = "~/CQMS/QuantityManagement/DayInputStatistics.aspx?Date=" + this.txtMonths.Text.Trim() + "&WorkSection=" + this.drpWorkSection.SelectedValue
                 + "&DrawingId=" + this.drpDrawingNo.SelectedValue + "&Major=" + this.drpMajor.SelectedValue + "&Part=" + this.drpPart.SelectedValue
-                + "&ProjectContent=" + this.drpProjectContent.SelectedValue+ "&WorkTeam=" + this.drpWorkTeam.SelectedValue + "&ProjectId=" + this.drpProject.SelectedValue;
+                + "&ProjectContent=" + this.drpProjectContent.SelectedValue + "&WorkTeam=" + this.drpWorkTeam.SelectedValue + "&ProjectId=" + this.drpProject.SelectedValue;
             PageContext.Redirect(url, "_self");
         }
         #endregion
@@ -703,5 +703,27 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
                 this.drpProjectContent.SelectedValue = BLL.Const._Null;
             }
         }
+
+        protected void drpProject_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string projectId = this.drpProject.SelectedValue;
+            if (!string.IsNullOrEmpty(Request.Params["ProjectId"]))
+            {
+                this.drpProject.SelectedValue = Request.Params["ProjectId"];
+                projectId = Request.Params["ProjectId"];
+            }
+            BLL.DrawingService.InitWorkSectionDropDownList(drpWorkSection, projectId, true);
+            BLL.DrawingService.InitDrawingChangeDropDownList(drpDrawingNo, projectId, true);
+            BLL.CNProfessionalService.InitCNProfessionalDownList(drpMajor, true);
+            BLL.BaseService.InitAllPartDropDownList(this.drpPart, projectId, true);
+            BLL.BaseService.InitAllProjectContentDropDownList(this.drpProjectContent, projectId, true);
+            BLL.TeamGroupService.InitTeamGroupProjectDropDownList(drpWorkTeam, projectId, true);
+            drpWorkSection.SelectedValue = BLL.Const._Null;
+            drpDrawingNo.SelectedValue = BLL.Const._Null;
+            drpMajor.SelectedValue = BLL.Const._Null;
+            drpPart.SelectedValue = BLL.Const._Null;
+            drpProjectContent.SelectedValue = BLL.Const._Null;
+            drpWorkTeam.SelectedValue = BLL.Const._Null;
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx
index 27127bd..76231d1 100644
--- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx
@@ -15,17 +15,20 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="宸ョ▼閲忓熀纭�琛�" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true" ForceFit="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="ProjectContent" 
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Major,ProjectContent" 
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="false" IsDatabasePaging="true" PageSize="10000" 
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpProject" runat="server" Label="椤圭洰" Width="300px" LabelWidth="60px" EmptyText="璇烽�夋嫨椤圭洰"
+                                <f:DropDownList ID="drpProject" runat="server" Label="椤圭洰" Width="300px" LabelWidth="60px" EmptyText="璇烽�夋嫨椤圭洰" AutoPostBack="true" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
                                 EnableEdit="true">
                             </f:DropDownList>
-                                <f:TextBox runat="server" ID="txtWorkTeam" Label="浣滀笟闃�" LabelWidth="80px" LabelAlign="Right"></f:TextBox>
+                                <f:DropDownList ID="drpMajor" runat="server" LabelWidth="140px" Required="true" Label="涓撲笟" LabelAlign="Right" EnableEdit="true">
+                                            </f:DropDownList>
+                                <f:DropDownList ID="drpProjectContent" runat="server" LabelWidth="120px" Required="true" Label="椤圭洰鍐呭" LabelAlign="Right" EnableEdit="true">
+                        </f:DropDownList>
                                 <f:DatePicker runat="server" DateFormatString="yyyy-MM" DisplayType="Month" Label="閫夋嫨鏈堜唤" ID="txtMonths" LabelAlign="right" LabelWidth="110px">
                                 </f:DatePicker>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="鏌ヨ">
@@ -44,6 +47,9 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
+                        <f:RenderField ColumnID="Major" DataField="Major" FieldType="String" HeaderText="涓撲笟" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="100px">
+                        </f:RenderField>
                         <f:RenderField ColumnID="ProjectContent" DataField="ProjectContent" FieldType="String" HeaderText="椤圭洰鍐呭" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
@@ -53,9 +59,6 @@
                         <f:RenderField ColumnID="Amount" DataField="Amount" FieldType="Float" HeaderText="鎬绘暟" TextAlign="Center"
                             HeaderTextAlign="Center" Width="100px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="WorkTeam" DataField="WorkTeam" FieldType="String" HeaderText="浣滀笟闃�" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
                         <f:RenderField ColumnID="TotalComplete" DataField="TotalComplete" FieldType="Float" HeaderText="绱瀹屾垚" TextAlign="Center"
                             HeaderTextAlign="Center" Width="100px">
                         </f:RenderField>
@@ -65,6 +68,9 @@
                         <f:RenderField ColumnID="MonthComplete" DataField="MonthComplete" FieldType="Float" HeaderText="鏈湀瀹屾垚" TextAlign="Center"
                             HeaderTextAlign="Center" Width="100px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="CompleteRate" DataField="CompleteRate" FieldType="Float" HeaderText="瀹屾垚鐧惧垎姣�" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="100px">
+                        </f:RenderField>
                     </Columns>
                     <Listeners>
                             <f:Listener Event="dataload" Handler="onGridDataLoad" />
@@ -75,7 +81,7 @@
     </form>
     <script type="text/javascript">
         function onGridDataLoad(event) {
-            this.mergeColumns(['ProjectContent','Amount','Remain'], {
+            this.mergeColumns(['Major','Amount','Remain'], {
                 depends: true
             });
         }
diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx.cs
index 3b6dc5f..580a56b 100644
--- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx.cs
@@ -24,12 +24,16 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
             {
                 this.txtMonths.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
                 ProjectService.InitAllProjectDropDownList(this.drpProject, false);
+                string projectId = string.Empty;
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
                 {
                     this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
                     this.drpProject.Enabled = false;
                     this.drpProject.Hidden = true;
+                    projectId = this.drpProject.SelectedValue;
                 }
+                BLL.CNProfessionalService.InitCNProfessionalDownList(drpMajor, true);
+                BLL.BaseService.InitAllProjectContentDropDownList(this.drpProjectContent, projectId, true);
                 GetButtonPower();
                 BindGrid();
             }
@@ -44,10 +48,15 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
                               where C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
-            if (!string.IsNullOrEmpty(this.txtWorkTeam.Text.Trim()))
+            if (this.drpMajor.SelectedValue != BLL.Const._Null)
             {
-                strSql += " AND WorkTeam like @WorkTeam";
-                listStr.Add(new SqlParameter("@WorkTeam", "%" + this.txtWorkTeam.Text.Trim() + "%"));
+                strSql += " AND Major = @Major";
+                listStr.Add(new SqlParameter("@Major", this.drpMajor.SelectedItem.Text));
+            }
+            if (this.drpProjectContent.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND ProjectContent = @ProjectContent";
+                listStr.Add(new SqlParameter("@ProjectContent", this.drpProjectContent.SelectedItem.Text));
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -98,19 +107,22 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
             {
                 string[] strs = this.Grid1.Rows[i].RowID.Split(',');
                 string projectContent = strs[1];
-                string workTeam = strs[2];
                 decimal totalAmount = 0, completedAmount = 0, totalCompletedAmount = 0, monthComplete = 0;
                 totalAmount = bases.Where(x => x.ProjectContent == projectContent).ToList().Sum(x => x.Amount ?? 0);
                 foreach (var d in days)
                 {
-                    monthComplete = dayInputs.Where(x => x.ProjectContent == projectContent && x.WorkTeam == workTeam).ToList().Sum(x => x.DayAmount ?? 0);
+                    monthComplete = dayInputs.Where(x => x.ProjectContent == projectContent).ToList().Sum(x => x.DayAmount ?? 0);
                 }
-                completedAmount = totalDayInputs.Where(x => x.ProjectContent == projectContent && x.WorkTeam == workTeam).ToList().Sum(x => x.DayAmount ?? 0);
+                completedAmount = totalDayInputs.Where(x => x.ProjectContent == projectContent).ToList().Sum(x => x.DayAmount ?? 0);
                 totalCompletedAmount = totalDayInputs.Where(x => x.ProjectContent == projectContent).ToList().Sum(x => x.DayAmount ?? 0);
-                this.Grid1.Rows[i].Values[3] = totalAmount.ToString("0.##");
+                this.Grid1.Rows[i].Values[4] = totalAmount.ToString("0.##");
                 this.Grid1.Rows[i].Values[5] = completedAmount.ToString("0.##");
                 this.Grid1.Rows[i].Values[6] = (totalAmount - totalCompletedAmount).ToString("0.##");
                 this.Grid1.Rows[i].Values[7] = monthComplete.ToString("0.##");
+                if (totalAmount > 0)
+                {
+                    this.Grid1.Rows[i].Values[8] = decimal.Round(completedAmount / totalAmount, 4) * 100;
+                }
             }
         }
         #endregion
@@ -317,6 +329,9 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
                     cell = row.CreateCell(7);
                     cell.CellStyle = cellStyle;
                     cell.SetCellValue(Grid1.Rows[i].Values[7].ToString());
+                    cell = row.CreateCell(8);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(Grid1.Rows[i].Values[8].ToString());
                 }
                 // 绗笁姝ワ細鍐欏叆鏂囦欢娴�
                 using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
@@ -346,5 +361,19 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
             }
         }
         #endregion
+
+        protected void drpProject_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string projectId = this.drpProject.SelectedValue;
+            if (!string.IsNullOrEmpty(Request.Params["ProjectId"]))
+            {
+                this.drpProject.SelectedValue = Request.Params["ProjectId"];
+                projectId = Request.Params["ProjectId"];
+            }
+            BLL.CNProfessionalService.InitCNProfessionalDownList(drpMajor, true);
+            BLL.BaseService.InitAllProjectContentDropDownList(this.drpProjectContent, projectId, true);
+            drpMajor.SelectedValue = BLL.Const._Null;
+            drpProjectContent.SelectedValue = BLL.Const._Null;
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx.designer.cs
index 9ccd172..510311b 100644
--- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/ProjectContentStatistics.aspx.designer.cs
@@ -67,13 +67,22 @@ namespace FineUIPro.Web.CQMS.QuantityManagement {
         protected global::FineUIPro.DropDownList drpProject;
         
         /// <summary>
-        /// txtWorkTeam 鎺т欢銆�
+        /// drpMajor 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtWorkTeam;
+        protected global::FineUIPro.DropDownList drpMajor;
+        
+        /// <summary>
+        /// drpProjectContent 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectContent;
         
         /// <summary>
         /// txtMonths 鎺т欢銆�
diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx
index a12cc80..4bbeb90 100644
--- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx
@@ -22,11 +22,15 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpProject" runat="server" Label="椤圭洰" Width="300px" LabelWidth="60px" EmptyText="璇烽�夋嫨椤圭洰"
+                                <f:DropDownList ID="drpProject" runat="server" Label="椤圭洰" Width="300px" LabelWidth="60px" EmptyText="璇烽�夋嫨椤圭洰" AutoPostBack="true" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
                                 EnableEdit="true">
                             </f:DropDownList>
-                                <f:TextBox runat="server" ID="txtWorkSection" Label="宸ユ" LabelWidth="60px" LabelAlign="Right"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtWorkTeam" Label="浣滀笟闃�" LabelWidth="80px" LabelAlign="Right"></f:TextBox>
+                                 <f:DropDownList ID="drpWorkSection" runat="server" LabelWidth="120px" Required="true" Label="宸ユ" LabelAlign="Right" EnableEdit="true">
+                        </f:DropDownList>
+                                <f:DropDownList ID="drpMajor" runat="server" LabelWidth="140px" Required="true" Label="涓撲笟" LabelAlign="Right" EnableEdit="true">
+                                            </f:DropDownList>
+                                <f:DropDownList ID="drpProjectContent" runat="server" LabelWidth="120px" Required="true" Label="椤圭洰鍐呭" LabelAlign="Right" EnableEdit="true">
+                        </f:DropDownList>
                                 <f:DatePicker runat="server" DateFormatString="yyyy-MM" DisplayType="Month" Label="閫夋嫨鏈堜唤" ID="txtMonths" LabelAlign="right" LabelWidth="110px">
                                 </f:DatePicker>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="鏌ヨ">
@@ -69,6 +73,9 @@
                         <f:RenderField ColumnID="MonthComplete" DataField="MonthComplete" FieldType="Float" HeaderText="鏈湀瀹屾垚" TextAlign="Center"
                             HeaderTextAlign="Center" Width="100px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="CompleteRate" DataField="CompleteRate" FieldType="Float" HeaderText="瀹屾垚鐧惧垎姣�" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="100px">
+                        </f:RenderField>
                     </Columns>
                     <Listeners>
                             <f:Listener Event="dataload" Handler="onGridDataLoad" />
diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx.cs
index c477d70..0ecd9f0 100644
--- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx.cs
@@ -24,12 +24,18 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
             {
                 this.txtMonths.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
                 ProjectService.InitAllProjectDropDownList(this.drpProject, false);
+                string projectId = string.Empty;
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
                 {
                     this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
                     this.drpProject.Enabled = false;
                     this.drpProject.Hidden = true;
+                    projectId = this.drpProject.SelectedValue;
                 }
+                BLL.DrawingService.InitWorkSectionDropDownList(drpWorkSection, projectId, true);
+                BLL.CNProfessionalService.InitCNProfessionalDownList(drpMajor, true);
+                BLL.BaseService.InitAllProjectContentDropDownList(this.drpProjectContent, projectId, true);
+
                 GetButtonPower();
                 BindGrid();
             }
@@ -44,15 +50,20 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
                               where C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
-            if (!string.IsNullOrEmpty(this.txtWorkSection.Text.Trim()))
+            if (this.drpWorkSection.SelectedValue != BLL.Const._Null)
             {
-                strSql += " AND WorkSection like @WorkSection";
-                listStr.Add(new SqlParameter("@WorkSection", "%" + this.txtWorkSection.Text.Trim() + "%"));
+                strSql += " AND WorkSection = @WorkSection";
+                listStr.Add(new SqlParameter("@WorkSection", this.drpWorkSection.SelectedItem.Text));
             }
-            if (!string.IsNullOrEmpty(this.txtWorkTeam.Text.Trim()))
+            if (this.drpMajor.SelectedValue != BLL.Const._Null)
             {
-                strSql += " AND WorkTeam like @WorkTeam";
-                listStr.Add(new SqlParameter("@WorkTeam", "%" + this.txtWorkTeam.Text.Trim() + "%"));
+                strSql += " AND Major = @Major";
+                listStr.Add(new SqlParameter("@Major", this.drpMajor.SelectedItem.Text));
+            }
+            if (this.drpProjectContent.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND ProjectContent = @ProjectContent";
+                listStr.Add(new SqlParameter("@ProjectContent", this.drpProjectContent.SelectedItem.Text));
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -84,9 +95,9 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
                 endDate1 = endDate;
             }
             var totalDayInputs = from x in Funs.DB.View_QuantityManagement_DayInput2
-                            where x.ProjectId == this.drpProject.SelectedValue && x.Date <= endDate
-                            orderby x.Date
-                            select x;
+                                 where x.ProjectId == this.drpProject.SelectedValue && x.Date <= endDate
+                                 orderby x.Date
+                                 select x;
             var dayInputs = from x in Funs.DB.View_QuantityManagement_DayInput2
                             where x.ProjectId == this.drpProject.SelectedValue && x.Date >= startDate && x.Date <= endDate
                             orderby x.Date
@@ -104,19 +115,22 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
                 string[] strs = this.Grid1.Rows[i].RowID.Split(',');
                 string workSection = strs[1];
                 string projectContent = strs[2];
-                string workTeam = strs[3];
                 decimal totalAmount = 0, completedAmount = 0, totalCompletedAmount = 0, monthComplete = 0;
                 totalAmount = bases.Where(x => x.WorkSection == workSection && x.ProjectContent == projectContent).ToList().Sum(x => x.Amount ?? 0);
                 foreach (var d in days)
                 {
-                    monthComplete = dayInputs.Where(x => x.WorkSection == workSection && x.ProjectContent == projectContent && x.WorkTeam == workTeam).ToList().Sum(x => x.DayAmount ?? 0);
+                    monthComplete = dayInputs.Where(x => x.WorkSection == workSection && x.ProjectContent == projectContent).ToList().Sum(x => x.DayAmount ?? 0);
                 }
-                completedAmount= totalDayInputs.Where(x => x.WorkSection == workSection && x.ProjectContent == projectContent && x.WorkTeam == workTeam).ToList().Sum(x => x.DayAmount ?? 0);
+                completedAmount = totalDayInputs.Where(x => x.WorkSection == workSection && x.ProjectContent == projectContent).ToList().Sum(x => x.DayAmount ?? 0);
                 totalCompletedAmount = totalDayInputs.Where(x => x.WorkSection == workSection && x.ProjectContent == projectContent).ToList().Sum(x => x.DayAmount ?? 0);
                 this.Grid1.Rows[i].Values[5] = totalAmount.ToString("0.##");
                 this.Grid1.Rows[i].Values[6] = completedAmount.ToString("0.##");
                 this.Grid1.Rows[i].Values[7] = (totalAmount - totalCompletedAmount).ToString("0.##");
                 this.Grid1.Rows[i].Values[8] = monthComplete.ToString("0.##");
+                if (totalAmount > 0)
+                {
+                    this.Grid1.Rows[i].Values[9] = decimal.Round(completedAmount / totalAmount, 4) * 100;
+                }
             }
         }
         #endregion
@@ -326,6 +340,9 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
                     cell = row.CreateCell(8);
                     cell.CellStyle = cellStyle;
                     cell.SetCellValue(Grid1.Rows[i].Values[8].ToString());
+                    cell = row.CreateCell(9);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(Grid1.Rows[i].Values[9].ToString());
                 }
                 // 绗笁姝ワ細鍐欏叆鏂囦欢娴�
                 using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
@@ -355,5 +372,21 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
             }
         }
         #endregion
+
+        protected void drpProject_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string projectId = this.drpProject.SelectedValue;
+            if (!string.IsNullOrEmpty(Request.Params["ProjectId"]))
+            {
+                this.drpProject.SelectedValue = Request.Params["ProjectId"];
+                projectId = Request.Params["ProjectId"];
+            }
+            BLL.DrawingService.InitWorkSectionDropDownList(drpWorkSection, projectId, true);
+            BLL.CNProfessionalService.InitCNProfessionalDownList(drpMajor, true);
+            BLL.BaseService.InitAllProjectContentDropDownList(this.drpProjectContent, projectId, true);
+            drpWorkSection.SelectedValue = BLL.Const._Null;
+            drpMajor.SelectedValue = BLL.Const._Null;
+            drpProjectContent.SelectedValue = BLL.Const._Null;
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx.designer.cs
index e9e0ff3..a3cd9c6 100644
--- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx.designer.cs
@@ -67,22 +67,31 @@ namespace FineUIPro.Web.CQMS.QuantityManagement {
         protected global::FineUIPro.DropDownList drpProject;
         
         /// <summary>
-        /// txtWorkSection 鎺т欢銆�
+        /// drpWorkSection 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtWorkSection;
+        protected global::FineUIPro.DropDownList drpWorkSection;
         
         /// <summary>
-        /// txtWorkTeam 鎺т欢銆�
+        /// drpMajor 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtWorkTeam;
+        protected global::FineUIPro.DropDownList drpMajor;
+        
+        /// <summary>
+        /// drpProjectContent 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectContent;
         
         /// <summary>
         /// txtMonths 鎺т欢銆�
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/鏁翠綋鍙婂垎绫绘眹鎬昏〃.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/鏁翠綋鍙婂垎绫绘眹鎬昏〃.xlsx
index 3ef6d32..ac42a2b 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataOut/鏁翠綋鍙婂垎绫绘眹鎬昏〃.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataOut/鏁翠綋鍙婂垎绫绘眹鎬昏〃.xlsx differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/椤圭洰鍐呭姹囨�昏〃.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/椤圭洰鍐呭姹囨�昏〃.xlsx
index 0317bbd..ea34001 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataOut/椤圭洰鍐呭姹囨�昏〃.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataOut/椤圭洰鍐呭姹囨�昏〃.xlsx differ
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 388425f..3b68797 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FineUIPro.Web</RootNamespace>
     <AssemblyName>FineUIPro.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <SccProjectName>
     </SccProjectName>
@@ -19738,6 +19738,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 6c3a419..2daeebe 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -485188,15 +485188,13 @@ namespace Model
 		
 		private string _Unit;
 		
-		private string _WorkTeam;
-		
-		private string _WorkTeamId;
+		private string _Major;
 		
 		public View_QuantityManagement_ProjectContentStatistics()
 		{
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(202)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(151)")]
 		public string Id
 		{
 			get
@@ -485276,34 +485274,18 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkTeam", DbType="NVarChar(50)")]
-		public string WorkTeam
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Major", DbType="NVarChar(30)")]
+		public string Major
 		{
 			get
 			{
-				return this._WorkTeam;
+				return this._Major;
 			}
 			set
 			{
-				if ((this._WorkTeam != value))
+				if ((this._Major != value))
 				{
-					this._WorkTeam = value;
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkTeamId", DbType="NVarChar(100)")]
-		public string WorkTeamId
-		{
-			get
-			{
-				return this._WorkTeamId;
-			}
-			set
-			{
-				if ((this._WorkTeamId != value))
-				{
-					this._WorkTeamId = value;
+					this._Major = value;
 				}
 			}
 		}
@@ -485325,17 +485307,13 @@ namespace Model
 		
 		private string _Unit;
 		
-		private string _WorkTeam;
-		
-		private string _WorkTeamId;
-		
 		private string _Major;
 		
 		public View_QuantityManagement_WorkTeamStatistics()
 		{
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(303)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(252)")]
 		public string Id
 		{
 			get
@@ -485431,38 +485409,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkTeam", DbType="NVarChar(50)")]
-		public string WorkTeam
-		{
-			get
-			{
-				return this._WorkTeam;
-			}
-			set
-			{
-				if ((this._WorkTeam != value))
-				{
-					this._WorkTeam = value;
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkTeamId", DbType="NVarChar(100)")]
-		public string WorkTeamId
-		{
-			get
-			{
-				return this._WorkTeamId;
-			}
-			set
-			{
-				if ((this._WorkTeamId != value))
-				{
-					this._WorkTeamId = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Major", DbType="NVarChar(30)")]
 		public string Major
 		{
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index 8391cf6..7d359c2 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Model</RootNamespace>
     <AssemblyName>Model</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
diff --git a/SGGL/SgManager.AI/SgManager.AI.csproj b/SGGL/SgManager.AI/SgManager.AI.csproj
index 04451be..e8a4b58 100644
--- a/SGGL/SgManager.AI/SgManager.AI.csproj
+++ b/SGGL/SgManager.AI/SgManager.AI.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SgManager.AI</RootNamespace>
     <AssemblyName>SgManager.AI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index 8e90bfb..5cbb94b 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebAPI</RootNamespace>
     <AssemblyName>WebAPI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />