From 57d3ad99c9836ba8d3a2158cb19a8d8e7ec9c763 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 17 Apr 2024 09:58:10 +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

---
 .gitignore                                  |  1 +
 SGGL/FineUIPro.Web/Web.config               |  2 +-
 SGGL/FineUIPro.Web/common/Menu_CQMS.xml     |  2 +-
 SGGL/FineUIPro.Web/common/Menu_Personal.xml |  3 +++
 SGGL/FineUIPro.Web/common/Menu_TestRun.xml  | 17 ++++++++++-------
 SGGL/FineUIPro.Web/common/Menu_Transfer.xml | 18 ++++++++++++++++++
 SGGL/FineUIPro.Web/common/Menu_ZHGL.xml     |  4 ++++
 7 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31c821ec..8fdd554d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /SGGL/FineUIPro.Web/FileUpload/Solution/2024-02
 /SGGL/FineUIPro.Web/FileUpload/Solution/2024-03
 /SGGL/FineUIPro.Web/FileUpload/TestRun/TestRunMonthSummary/2024-03
+/SGGL/FineUIPro.Web/FileUpload/TestRun/TestRunMonthSummary/2024-04
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index eafda425..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/;"/>
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index e1f50392..1ebd1ff1 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -42,7 +42,7 @@
 <TreeNode id="267064F1-88F7-4468-998A-49A1A2F25BB8" Text="季度工程项目质量信息表" NavigateUrl="CQMS/ManageReport/QuarterlyProjectQuality.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="A54EC449-5F77-4068-83B9-AA305B721A0B" Text="质量检查" NavigateUrl=""><TreeNode id="B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306" Text="质量巡检" NavigateUrl="CQMS/Check/CheckList.aspx"></TreeNode>
-<TreeNode id="E6703F32-4E42-4D03-84B3-5EC0E8E48E0F" Text="质量共检" NavigateUrl="CQMS/Check/JointCheck.aspx"></TreeNode>
+<TreeNode id="E6703F32-4E42-4D03-84B3-5EC0E8E48E0F" Text="质量专项检查" NavigateUrl="CQMS/Check/JointCheck.aspx"></TreeNode>
 <TreeNode id="D3B1433E-00DE-432B-A30A-0EFB513480A8" Text="问题统计" NavigateUrl="CQMS/Check/JointCheckStatistics.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="BBBF69F1-9520-4E0A-B0C0-9F4D3FBF4C10" Text="施工方案管理" NavigateUrl=""><TreeNode id="91C4BFDB-0A51-4992-99CC-EB4EC185593D" Text="施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml
index 2854ffd9..a9d07855 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml
@@ -6,4 +6,7 @@
 <TreeNode id="C6EF06E5-9019-4583-8122-EA94FCC545C6" Text="员工总结" NavigateUrl=""></TreeNode>
 <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="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 72096856..68f5e44c 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>
@@ -97,8 +99,8 @@
 <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="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="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>
@@ -119,7 +121,8 @@
 <TreeNode id="EC4B11B4-AF9B-44E9-8CD4-364A5633CB76" Text="性能考核报告" NavigateUrl="TestRun/DriverReport/PropertyReport.aspx"></TreeNode>
 <TreeNode id="0D5C3347-0484-4455-AD32-D558BCFF0D0B" Text="开车完工报告" NavigateUrl="TestRun/DriverReport/DriverRunComplete.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="ECDC614F-6239-44D2-9523-6A25D42C6A45" Text="项目开车总结" NavigateUrl=""><TreeNode id="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="专项总结" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></TreeNode>
+<TreeNode id="ECDC614F-6239-44D2-9523-6A25D42C6A45" Text="项目开车总结" NavigateUrl=""><TreeNode id="9B32C4BF-62E9-4561-8632-97AC0F581701" Text="月技术总结" NavigateUrl="TestRun/DriverSummary/MonthSummary.aspx"></TreeNode>
+<TreeNode id="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="专项总结" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></TreeNode>
 <TreeNode id="9EBA628D-E725-4A0B-B765-171F405D0821" Text="完工后个人总结" NavigateUrl="TestRun/DriverSummary/PersonalSummary.aspx"></TreeNode>
 <TreeNode id="AA88BD56-E0B4-4B9C-9238-3F48EA59C50A" Text="开车完工报告" NavigateUrl="TestRun/DriverSummary/CompleteSummary.aspx"></TreeNode>
 </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 ed44c8fe..69859890 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -83,4 +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>
+<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>
 </Tree>
\ No newline at end of file