From e9499114bca870745b49e78f563fdafa8cb19a8a Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 8 Apr 2024 09:51:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CLGL/PipelineMaterialSumList.aspx.cs      |   1 +
 SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx       |   4 +-
 SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs    |  12 +-
 .../HJGL/FL/NdtList.aspx.designer.cs          |   9 -
 SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx     |   4 +-
 SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx.cs  |  12 +-
 .../HJGL/FL/OneOKRate.aspx.designer.cs        |   9 -
 .../HJGL/FL/PressurePackageList.aspx          |   4 +-
 .../HJGL/FL/PressurePackageList.aspx.cs       |  12 +-
 .../FL/PressurePackageList.aspx.designer.cs   |   9 -
 SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx      |   4 +-
 SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs   |  12 +-
 .../HJGL/FL/Quantity.aspx.designer.cs         |   9 -
 SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx  |   4 +-
 .../HJGL/FL/TailItemList.aspx.cs              |  12 +-
 .../HJGL/FL/TailItemList.aspx.designer.cs     |   9 -
 SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx |   4 +-
 .../HJGL/FL/TotalQuantity.aspx.cs             |  12 +-
 .../HJGL/FL/TotalQuantity.aspx.designer.cs    |   9 -
 .../Personal/TestRunMonthSummary.aspx         | 193 +++++++++---------
 SGGL/FineUIPro.Web/Web.config                 |   4 +-
 SGGL/FineUIPro.Web/common/Menu_Personal.xml   |   3 +
 SGGL/FineUIPro.Web/common/Menu_TestRun.xml    |  20 +-
 SGGL/FineUIPro.Web/common/Menu_Transfer.xml   |  18 ++
 SGGL/FineUIPro.Web/common/Menu_ZHGL.xml       |   3 -
 SGGL/FineUIPro.Web/common/mainProject2.aspx   |   2 +-
 .../FineUIPro.Web/common/mainProject2.aspx.cs |   5 +-
 27 files changed, 153 insertions(+), 246 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialSumList.aspx.cs b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialSumList.aspx.cs
index 5ea4246b..585ff2c4 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialSumList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialSumList.aspx.cs
@@ -26,6 +26,7 @@ namespace FineUIPro.Web.CLGL
                     this.btnGetAll.Hidden = false;
                 }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.MCSWebService.GetCLData(null, null);
                 // 绑定表格
                 this.BindGrid();
             }
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx
index 9a684b29..43b8d718 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx
@@ -33,9 +33,7 @@
                             <Items>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>
-                                <f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
-                                </f:Button>
-                                <f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
+                                <f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
                                 </f:Button>
                                  <f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
                                 </f:Button>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs
index ba1e0129..bdcf6fe6 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs
@@ -85,17 +85,7 @@ namespace FineUIPro.Web.HJGL.FL
         /// <param name="e"></param>
         protected void btnUrlN_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
-        }
-
-        /// <summary>
-        /// 外网进入软件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnUrlW_Click(object sender, EventArgs e)
-        {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
+            PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.designer.cs
index db20ddad..54cd18f6 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.designer.cs
@@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.FL {
         /// </remarks>
         protected global::FineUIPro.Button btnUrlN;
         
-        /// <summary>
-        /// btnUrlW 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnUrlW;
-        
         /// <summary>
         /// btnGet 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx b/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx
index d6213ef2..0d37b59d 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx
@@ -33,9 +33,7 @@
                             <Items>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
-                                <f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
-                                </f:Button>
-                                <f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
+                                <f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
                                 </f:Button>
                                 <f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
                                 </f:Button>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx.cs
index f60914ce..45265c61 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx.cs
@@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
         /// <param name="e"></param>
         protected void btnUrlN_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
-        }
-
-        /// <summary>
-        /// 外网进入软件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnUrlW_Click(object sender, EventArgs e)
-        {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
+            PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx.designer.cs
index 7f7f00fd..75ca72fe 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/OneOKRate.aspx.designer.cs
@@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.FL {
         /// </remarks>
         protected global::FineUIPro.Button btnUrlN;
         
-        /// <summary>
-        /// btnUrlW 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnUrlW;
-        
         /// <summary>
         /// btnGet 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx
index 97f243c1..cf4bfaf4 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx
@@ -33,9 +33,7 @@
                             <Items>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>
-                                <f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
-                                </f:Button>
-                                <f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
+                                <f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
                                 </f:Button>
                                  <f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
                                 </f:Button>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.cs
index bc2c89a5..7efbfd95 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.cs
@@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
         /// <param name="e"></param>
         protected void btnUrlN_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
-        }
-
-        /// <summary>
-        /// 外网进入软件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnUrlW_Click(object sender, EventArgs e)
-        {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
+            PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.designer.cs
index 58647148..ab33cd91 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.designer.cs
@@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.FL {
         /// </remarks>
         protected global::FineUIPro.Button btnUrlN;
         
-        /// <summary>
-        /// btnUrlW 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnUrlW;
-        
         /// <summary>
         /// btnGet 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx
index 31a0dbcc..ca6d046a 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx
@@ -39,9 +39,7 @@
                             </f:DatePicker>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>
-                                <f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
-                                </f:Button>
-                                <f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
+                                <f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
                                 </f:Button>
                                  <f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
                                 </f:Button>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs
index f6263ace..9408c510 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs
@@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
         /// <param name="e"></param>
         protected void btnUrlN_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
-        }
-
-        /// <summary>
-        /// 外网进入软件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnUrlW_Click(object sender, EventArgs e)
-        {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
+            PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.designer.cs
index a59122fd..e587f25b 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.designer.cs
@@ -93,15 +93,6 @@ namespace FineUIPro.Web.HJGL.FL {
         /// </remarks>
         protected global::FineUIPro.Button btnUrlN;
         
-        /// <summary>
-        /// btnUrlW 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnUrlW;
-        
         /// <summary>
         /// btnGet 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx b/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx
index 868e2c1f..e57cb632 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx
@@ -33,9 +33,7 @@
                             <Items>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>
-                                <f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
-                                </f:Button>
-                                <f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
+                                <f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
                                 </f:Button>
                                  <f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
                                 </f:Button>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx.cs
index 4e1bf4f7..2e5b22d7 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx.cs
@@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
         /// <param name="e"></param>
         protected void btnUrlN_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
-        }
-
-        /// <summary>
-        /// 外网进入软件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnUrlW_Click(object sender, EventArgs e)
-        {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
+            PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx.designer.cs
index 60113576..a9cafdfd 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx.designer.cs
@@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.FL {
         /// </remarks>
         protected global::FineUIPro.Button btnUrlN;
         
-        /// <summary>
-        /// btnUrlW 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnUrlW;
-        
         /// <summary>
         /// btnGet 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx
index c4557cf7..8f0bbbd2 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx
@@ -31,9 +31,7 @@
                       <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
-                                <f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
-                                </f:Button>
-                                <f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
+                                <f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
                                 </f:Button>
                                  <f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
                                 </f:Button>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.cs
index 1d07d5eb..5e1611cf 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.cs
@@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
         /// <param name="e"></param>
         protected void btnUrlN_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
-        }
-
-        /// <summary>
-        /// 外网进入软件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnUrlW_Click(object sender, EventArgs e)
-        {
-            PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
+            PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.designer.cs
index a03d0704..be042ae5 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.designer.cs
@@ -66,15 +66,6 @@ namespace FineUIPro.Web.HJGL.FL {
         /// </remarks>
         protected global::FineUIPro.Button btnUrlN;
         
-        /// <summary>
-        /// btnUrlW 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnUrlW;
-        
         /// <summary>
         /// btnGet 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx
index c27543fa..c10c9ab7 100644
--- a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx
+++ b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx
@@ -23,14 +23,14 @@
             background: rgba(0, 0, 0, 0.5);
         }
 
-        .imgPreview img {
-            z-index: 100;
-            width: 60%;
-            position: fixed;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%,-50%);
-        }
+            .imgPreview img {
+                z-index: 100;
+                width: 60%;
+                position: fixed;
+                top: 50%;
+                left: 50%;
+                transform: translate(-50%,-50%);
+            }
         /*添加鼠标移入图片效果*/
         .img {
             cursor: url("ico/放大镜.png"), auto;
@@ -40,85 +40,86 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车月技术总结" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="TestRunMonthSummaryId" EnableColumnLines="true" DataIDField="TestRunMonthSummaryId" 
-                AllowSorting="true" SortField="RaiseDate" SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
-                        <Items>      
-                            <f:TextBox runat="server" Label="姓名" ID="txtUserName" EmptyText="输入查询条件" 
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="50px"></f:TextBox>                       
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>                     
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="true" OnClick="btnNew_Click" runat="server"
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车月技术总结" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="TestRunMonthSummaryId" EnableColumnLines="true" DataIDField="TestRunMonthSummaryId"
+                    AllowSorting="true" SortField="RaiseDate" SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                                <f:TextBox runat="server" Label="姓名" ID="txtUserName" EmptyText="输入查询条件"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="50px">
+                                </f:TextBox>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="true" OnClick="btnNew_Click" runat="server"
                                     Hidden="true">
                                 </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
-                    <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" 
-                          FieldType="String" HeaderText="填报人" HeaderTextAlign="Center" TextAlign="Center">                      
-                    </f:RenderField>
-                    <f:RenderField Width="130px" ColumnID="RaiseDate" DataField="RaiseDate" 
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="填报日期"
-                         HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>  
-                    <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" 
-                          FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Center">                      
-                    </f:RenderField>
-                    <f:RenderField Width="110px" ColumnID="Major" DataField="Major" 
-                         FieldType="String" HeaderText="填报专业" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                     <f:RenderField Width="130px" ColumnID="ProcessName" DataField="ProcessName" 
-                         FieldType="String" HeaderText="装置" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="400px" ColumnID="ProblemDescription" DataField="ProblemDescription" 
-                         FieldType="String" HeaderText="案例描述" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField> 
-                    <f:RenderField Width="400px" ColumnID="HandleMethod" DataField="HandleMethod" 
-                         FieldType="String" HeaderText="案例分析及解决方案" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField> 
-                    <f:TemplateField ColumnID="tfImageUrl1" Width="180px" HeaderText="问题图片" HeaderTextAlign="Center"
-                                    TextAlign="Left">
-                                    <ItemTemplate>
-                                        <asp:Label ID="lbImageUrl1" runat="server"   Text='<%# ConvertImageUrlByImage(Eval("TestRunMonthSummaryId")) %>'></asp:Label>
-                                    </ItemTemplate>
-                                </f:TemplateField>
-                                <f:TemplateField ColumnID="tfImageUrl2" Width="180px" HeaderText="处理后图片" HeaderTextAlign="Center"
-                                    TextAlign="Left">
-                                    <ItemTemplate>
-                                        <asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImageUrlByImage2(Eval("TestRunMonthSummaryId")) %>'></asp:Label>
-                                    </ItemTemplate>
-                                </f:TemplateField>
-                    <f:RenderField Width="400px" ColumnID="ExperienceOrSuggestion" DataField="ExperienceOrSuggestion" 
-                         FieldType="String" HeaderText="体会或建议" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField> 
-                </Columns>
-                <Listeners>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
+                            FieldType="String" HeaderText="填报人" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="130px" ColumnID="RaiseDate" DataField="RaiseDate"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="填报日期"
+                            HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName"
+                            FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" ColumnID="Major" DataField="Major"
+                            FieldType="String" HeaderText="填报专业" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="130px" ColumnID="ProcessName" DataField="ProcessName"
+                            FieldType="String" HeaderText="装置" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="400px" ColumnID="ProblemDescription" DataField="ProblemDescription"
+                            FieldType="String" HeaderText="案例描述" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="400px" ColumnID="HandleMethod" DataField="HandleMethod"
+                            FieldType="String" HeaderText="案例分析及解决方案" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="tfImageUrl1" Width="180px" HeaderText="问题图片" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl1" runat="server" Text='<%# ConvertImageUrlByImage(Eval("TestRunMonthSummaryId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="tfImageUrl2" Width="180px" HeaderText="处理后图片" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImageUrlByImage2(Eval("TestRunMonthSummaryId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="400px" ColumnID="ExperienceOrSuggestion" DataField="ExperienceOrSuggestion"
+                            FieldType="String" HeaderText="体会或建议" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                     </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="开车月技术总结" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Self" EnableResize="false" runat="server"  IsModal="true" OnClose="Window1_Close"
-        Width="1300px" Height="600px">
-    </f:Window>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="开车月技术总结" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Self" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="1300px" Height="600px">
+        </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
                 Hidden="true" runat="server" Text="编辑" Icon="Pencil">
@@ -130,7 +131,7 @@
         </f:Menu>
     </form>
     <div class="imgPreview">
-    <img src="#" alt="" id="imgPreview" />
+        <img src="#" alt="" id="imgPreview" />
     </div>
     <script type="text/jscript">
         var menuID = '<%= Menu1.ClientID %>';
@@ -147,22 +148,24 @@
                 var src = $(this).attr('src');
                 console.log(src);
                 $('.imgPreview img').attr('src', src);
-               
+                if (src.indexOf("/res/icon") != -1) {
+                    return;
+                }
                 $('.imgPreview').show()
             });
             $('.imgPreview').on('click', function () {
                 $('.imgPreview').hide()
             });
-           /* $wrap.find('img').hover(function (e) {
-                console.log($(this).offset())
-                var top = $(this).offset().top;
-                var left = $(this).offset().left - 200;
-                var src = $(this).attr('src')
-                console.log('src', src, top, left)
-                $('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
-            }, function () {
-                $('#imgID1').hide()
-            })*/
+            /* $wrap.find('img').hover(function (e) {
+                 console.log($(this).offset())
+                 var top = $(this).offset().top;
+                 var left = $(this).offset().left - 200;
+                 var src = $(this).attr('src')
+                 console.log('src', src, top, left)
+                 $('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
+             }, function () {
+                 $('#imgID1').hide()
+             })*/
         })
     </script>
 </body>
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 9fc55c34..963148f2 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,7 +12,7 @@
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml
index ac8364da..a20d7aa1 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml
@@ -7,4 +7,7 @@
 <TreeNode id="AAF841AA-2EE8-4FEC-B1FB-B978736C6E1F" Text="员工责任书" NavigateUrl="Personal/PersonDuty.aspx"></TreeNode>
 <TreeNode id="CB373458-30B0-4850-ABFF-B38D40A04D43" Text="员工绩效考核结果" NavigateUrl="Personal/PersonCheckInfo.aspx"></TreeNode>
 <TreeNode id="6549EF60-1DED-4912-8D2D-7B32A80A2DEC" Text="视频会议" NavigateUrl="Personal/PersonMeeting.aspx"></TreeNode>
+<TreeNode id="522EAECC-3D40-4804-A066-A43BA8F6BFC1" Text="员工出差记录" NavigateUrl="Personal/BusinessTrip.aspx"></TreeNode>
+<TreeNode id="16229932-671B-4E04-BB61-A5C7DE4CE47F" Text="员工开车绩效记录" NavigateUrl="Personal/TestRunPerformance.aspx"></TreeNode>
+<TreeNode id="F0792B77-AEE4-4834-82C2-E5B75D0B0AB7" Text="开车月技术总结" NavigateUrl="Personal/TestRunMonthSummary.aspx"></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
index ef07bfad..3967bb70 100644
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@@ -46,12 +46,12 @@
 <TreeNode id="D9D90BA4-BF34-4045-977F-DCE9D507F40F" Text="生成工作包检查表" NavigateUrl="TestRun/BeforeTestRun/SubInspectTerm.aspx"></TreeNode>
 <TreeNode id="150A6D3D-CAA2-4246-947C-6730A18BCC83" Text="检查表条件确认" NavigateUrl="TestRun/BeforeTestRun/SubWorkInspect.aspx"></TreeNode>
 <TreeNode id="B6A6EA7D-EDAB-40C8-920D-A106731D0E08" Text="检查表尾项管理" NavigateUrl="TestRun/BeforeTestRun/InspectTailTermList.aspx"></TreeNode>
-<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="检查项确认" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
-<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表流转" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
-<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="检查项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
+<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,9 +69,11 @@
 <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>
@@ -95,7 +97,15 @@
 <TreeNode id="2124CC5E-6C45-4E8E-889C-76F0652D96CE" Text="机泵巡检记录管理" NavigateUrl="TestRun/ProduceTestRun/TestRunPumpCheck.aspx"></TreeNode>
 <TreeNode id="F76B40FD-BF9A-4751-86F9-D9E11310B04D" Text="其他巡检记录管理" NavigateUrl="TestRun/ProduceTestRun/TestRunOthersCheck.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="F4827DE7-FDA6-42B6-A495-616EEFC4C8A5" Text="生产性能考核管理" NavigateUrl=""><TreeNode id="0F0E272E-3898-487E-B98D-1A5915D809A7" Text="运行报表管理" NavigateUrl="TestRun/ProduceProperty/PropertyRunReport.aspx"></TreeNode>
+<TreeNode id="F4827DE7-FDA6-42B6-A495-616EEFC4C8A5" Text="生产性能考核管理" NavigateUrl=""><TreeNode id="AC5BC922-FA5E-4141-8458-7DE89434A8E7" Text="检查表模板" NavigateUrl="TestRun/Produce/InspectTemplate.aspx"></TreeNode>
+<TreeNode id="BEAE1E66-5783-489B-A268-F46491AE1257" Text="投料试车管理" NavigateUrl="TestRun/Produce/SubInspectTerm.aspx"></TreeNode>
+<TreeNode id="D8DF6DDB-3CDD-41C0-B374-1AAE40802B68" Text="投料试车确认" NavigateUrl="TestRun/Produce/SubWorkInspect.aspx"></TreeNode>
+<TreeNode id="C2E827C4-6E04-4EB6-8E51-B43FCBD3753F" Text="检查表尾项管理" NavigateUrl="TestRun/Produce/InspectTailTermList.aspx"></TreeNode>
+<TreeNode id="AF4EEC31-73E9-4F36-BEA7-2A92468F324E" Text="尾项处理" NavigateUrl="TestRun/Produce/TailTermHandleList.aspx"></TreeNode>
+<TreeNode id="7400F47B-3F45-4142-B21F-3BECCABBB202" Text="尾项审核" NavigateUrl="TestRun/Produce/TailTermApproveList.aspx"></TreeNode>
+<TreeNode id="F2D170C3-6CA5-439D-8CC7-81E4FB906B1F" Text="检查表会签" NavigateUrl="TestRun/Produce/InspectWanderAboutList.aspx"></TreeNode>
+<TreeNode id="A7BBF5F1-F145-43D1-9227-7EC24099BBEC" Text="检查表流转全部通过" NavigateUrl="TestRun/Produce/InspectWanderAboutAllPassList.aspx"></TreeNode>
+<TreeNode id="0F0E272E-3898-487E-B98D-1A5915D809A7" Text="运行报表管理" NavigateUrl="TestRun/ProduceProperty/PropertyRunReport.aspx"></TreeNode>
 <TreeNode id="27F1A48B-D20F-4C2B-A793-E512EA7B116D" Text="运行记录管理" NavigateUrl="TestRun/ProduceProperty/PropertyRunRecord.aspx"></TreeNode>
 <TreeNode id="AB62E585-C025-47E8-82F0-E702EBCC2B20" Text="机泵巡检记录管理" NavigateUrl="TestRun/ProduceProperty/PropertyRunPumpCheck.aspx"></TreeNode>
 <TreeNode id="6960EA9F-DC75-4193-AAB6-27ACAA0CDA96" Text="其他巡检记录管理" NavigateUrl="TestRun/ProduceProperty/PropertyRunOthersCheck.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index 91d9fd84..4d3b9e97 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -1,3 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
+  <TreeNode id="48545C6A-9D10-47F4-810F-DAB0CFCD5BF9" Text="Project Set up" NavigateUrl="Transfer/ProjectSetup.aspx">
+  </TreeNode>
+<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
+<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
+<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
+<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
+<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
+<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
+<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
+<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
+<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
+<TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
+<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
+<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
+<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交统计递增表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
+<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
+<TreeNode id="BB5EC5E1-A23D-4A3F-8772-CD40757974EC" Text="Punchlist from统计递增表" NavigateUrl="Transfer/Chart/PunchlistFromChart.aspx"></TreeNode>
+</TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 3ddcd7cf..69859890 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -83,11 +83,8 @@
 </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>
-<<<<<<< HEAD
-=======
 <TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
 <TreeNode id="C1240FCB-4C72-445E-82B5-EBFAA87D0AC6" Text="开车人员月绩效报告" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx"></TreeNode>
 <TreeNode id="0C6BB051-6BD1-4E35-90CE-9376F3C2D454" Text="开车人员月技术总结" NavigateUrl="ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx"></TreeNode>
 </TreeNode>
->>>>>>> 0ae4143492852fa438a0c21d967acf7271ee604e
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx
index 3b29d221..70749b15 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx
@@ -253,7 +253,7 @@
                             class="y_image_default">设备材料</span></div> -->
                         <div class="gj1"><span class="y_image_default y_tab-action" data-type="1">赢得值曲线</span><span
                                 data-type="2">实物工程量</span></div>
-                        <div class="gj"><span style="margin-right: .125rem;">关键事项完成率</span><span><%=gjsxRate %></span></div>
+                        <div class="gj"><span style="margin-right: .125rem;">关键事项准点率</span><span><%=gjsxRate %></span></div>
                     </div>
                     <div class="y_box_main" id="jdmap" >
                         <div id='left_one' style="width: 100%; height: 100%;"></div>
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index 111078dd..4f4d6b35 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -1056,8 +1056,9 @@ namespace FineUIPro.Web.common
 
             SqlParameter[] Staticparameter = listStaticListStr.ToArray();
             DataTable statcitbDataTable = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", Staticparameter);
-            var allcount = Funs.GetNewIntOrZero(statcitbDataTable.Rows[0]["allcount"].ToString());
-            var closecount = Funs.GetNewIntOrZero(statcitbDataTable.Rows[0]["closecount"].ToString());
+            var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId select x;
+            var allcount = list.Count(x => x.State == "0") + list.Count(x => x.State != "0" && x.CompleteDate < DateTime.Now);
+            var closecount = list.Count(x => x.State == "0");
             gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount);
             gjsxRate = gjsxRate.ToString().Replace("NaN", "0") + "%";
         }