zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

汇总

Browse Source
This commit is contained in:
李超
2023-01-02 09:22:58 +08:00
parent 81de6657b5
commit 8ef4bc1502
13 changed files with 554 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+1
View File
@@ -24,6 +24,7 @@
<TreeNode id="9ac06df6-b91a-42bb-9a51-5cd59d8733a9" Text="特种设备管理" NavigateUrl="CQMS/Comprehensive/SpecialEquipment.aspx"></TreeNode>
<TreeNode id="49b87812-c07d-4b0e-9909-960e5cd822c7" Text="压力管道管理" NavigateUrl="CQMS/Comprehensive/PressurePipe.aspx"></TreeNode>
<TreeNode id="1da8fd71-f653-4764-bbfd-65e43f0220e5" Text="质量事故处理记录" NavigateUrl="CQMS/Comprehensive/QualityAccident.aspx"></TreeNode>
<TreeNode id="B2086D3A-2384-487E-AFFB-6FACDD09B621" Text="质量数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx"></TreeNode>
</TreeNode>
<TreeNode id="149f1f1c-a925-412b-970e-e9b79d54e03f" Text="过程控制" NavigateUrl=""><TreeNode id="4781f467-35bf-4cf2-aaa4-7960a175eb61" Text="共检通知单" NavigateUrl="CQMS/ProcessControl/InspectionNotice.aspx"></TreeNode>
<TreeNode id="e728cc1a-fd65-4f1a-8f22-2b72e62f78ee" Text="控制点检查检测" NavigateUrl="CQMS/ProcessControl/InspectionManagement.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+1
View File
@@ -64,6 +64,7 @@
<TreeNode id="96B84AEF-B463-41D9-AB28-3009EBDAD327" Text="储罐/管道每日焊接量统计表" NavigateUrl="HJGL/WeldingReport/OneDayReport.aspx"></TreeNode>
<TreeNode id="60354A52-AD39-4538-A60E-C2B492F52B7A" Text="管道焊接周报" NavigateUrl="HJGL/WeldingReport/OneWeekReport.aspx"></TreeNode>
<TreeNode id="60354A52-AD39-4538-A60E-C2B492F52B7B" Text="管道焊接月报" NavigateUrl="HJGL/WeldingReport/OneMonthReport.aspx"></TreeNode>
<TreeNode id="6035E549-66FF-4B6D-989B-BE99C9EF5EB7" Text="焊接数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx"></TreeNode>
</TreeNode>
<TreeNode id="74DDDB95-9BCA-46FD-BF1F-5C2BDAFF7B4A" Text="通用导入" NavigateUrl=""><TreeNode id="51BFF0C3-C2C9-4EF4-BA97-A27F4F51B336" Text="管线焊口导入" NavigateUrl="HJGL/DataIn/DataInTable.aspx"></TreeNode>
</TreeNode>
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+1
View File
@@ -137,5 +137,6 @@
<TreeNode id="05C6C2AF-3B0B-4BF0-A8CE-1FC15DAC3C54" Text="项目文件夹" NavigateUrl="HSSE/InformationProject/ProjectFolder.aspx"></TreeNode>
<TreeNode id="C69B7409-BE1E-4754-AC90-57B56EEE198B" Text="文件柜A（检查类）" NavigateUrl="HSSE/InformationProject/FileCabinetA.aspx"></TreeNode>
</TreeNode>
<TreeNode id="C483220C-0FEE-4E45-9B78-BBBA857EFFB3" Text="安全数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+5
View File
@@ -20,6 +20,7 @@
</TreeNode>
<TreeNode id="70E51ABF-81C8-49CB-89AC-CF0542A201D6" Text="HSSE管理工作报告" NavigateUrl=""><TreeNode id="D67D1C85-3798-47A9-A0DB-B4DB47FF2E7D" Text="报表上报情况" NavigateUrl="ZHGL/ManagementReport/ReportRemind.aspx"></TreeNode>
<TreeNode id="0D7755D3-EC87-4E1A-9CF9-9F04174692DA" Text="HSSE管理月报" NavigateUrl="ZHGL/ManagementReport/HSSEMonthReport.aspx"></TreeNode>
<TreeNode id="3C009AA9-B44F-4000-BC77-BF02C4E83785" Text="HSSE管理月报(项目汇总)" NavigateUrl="ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx"></TreeNode>
<TreeNode id="120528A7-536C-4A79-BD55-2C6D2960D292" Text="考试记录" NavigateUrl="ZHGL/ManagementReport/TestRecord.aspx"></TreeNode>
<TreeNode id="A20ADEA9-BAC3-41C2-973E-81C82E6AB7F1" Text="日常巡检" NavigateUrl="ZHGL/ManagementReport/CheckDaily.aspx"></TreeNode>
<TreeNode id="226C32BA-E4F8-4206-82B5-E35E465B3F70" Text="专项检查" NavigateUrl="ZHGL/ManagementReport/CheckSpecial.aspx"></TreeNode>
@@ -57,4 +58,8 @@
<TreeNode id="F36E6C54-E39F-4032-874D-548EE090A35B" Text="同步记录" NavigateUrl="ZHGL/RealName/SynchroRecord.aspx"></TreeNode>
<TreeNode id="214A1AE1-816E-4DDA-8E6E-04EB35F02A12" Text="现场人员" NavigateUrl="ZHGL/RealName/OnPost.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+11 -7
View File
@@ -68,14 +68,18 @@ namespace FineUIPro.Web.common
private void getPersonWorkTime()
{
this.divSafeWorkTime.InnerHtml = "0000000000";
var getMax = Funs.DB.SeDin_MonthReport.Where(x => x.ProjectId == this.ProjectId).OrderByDescending(x=>x.ReporMonth).FirstOrDefault();
if (getMax != null)
var ProjectTotal = (from x in Funs.DB.HSSE_MonthReportItem
join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
where y.ProjectId == this.ProjectId && "安全生产人工时数" == x.ReportItem
select x.ProjectTotal).Sum();
if (ProjectTotal.HasValue)
{
var getItem = Funs.DB.SeDin_MonthReport2.FirstOrDefault(x => x.MonthReportId == getMax.MonthReportId);
if (getItem != null && getItem.ProjectWorkTime.HasValue)
{
this.divSafeWorkTime.InnerHtml = getItem.ProjectWorkTime.Value.ToString("0000000000");
}
this.divSafeWorkTime.InnerHtml = ProjectTotal.Value.ToString("0000000000"); ;
}
else
{
this.divSafeWorkTime.InnerHtml = "0000000000";
}
///整改单