lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改wbs排序

Browse Source
This commit is contained in:
高飞
2023-09-12 15:32:23 +08:00
parent a0f38c57f3
commit 1c0cdfc7e3
8 changed files with 924 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/DigData/CQMSDataCollectService.cs
+912 -166
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs
+1 -1
View File
@@ -164,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Check
}
else if (e.Node.CommandName == "WorkPackage") //展开工作包节点
{
var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x;
if (workPackages.Count() > 0) //存在子单位工程
{
foreach (var workPackage in workPackages)
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs
+1 -1
View File
@@ -166,7 +166,7 @@ namespace FineUIPro.Web.CQMS.WBS
}
else if (e.Node.CommandName == "WorkPackage") //展开工作包节点
{
var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x;
if (workPackages.Count() > 0) //存在子单位工程
{
foreach (var workPackage in workPackages)
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs
+1 -1
View File
@@ -164,7 +164,7 @@ namespace FineUIPro.Web.CQMS.WBS
}
else if (e.Node.CommandName == "WorkPackage") //展开工作包节点
{
var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x;
if (workPackages.Count() > 0) //存在子单位工程
{
foreach (var workPackage in workPackages)
SGGL/FineUIPro.Web/common/Menu_DigData.xml
+3 -3
View File
@@ -3,7 +3,7 @@
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
<TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
</TreeNode>
<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据仓库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
<TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
@@ -12,7 +12,7 @@
</TreeNode>
<TreeNode id="E7F7BC38-7357-49C0-9242-68289031F618" Text="进度数据库" NavigateUrl=""><TreeNode id="44D51E89-267D-4D72-AB6D-1F4CA4E7D19D" Text="进度数据库" NavigateUrl="DigData/JDGLDataDW.aspx"></TreeNode>
</TreeNode>
<TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""><TreeNode id="ABC4323E-2F6F-4147-AA7A-8726131D7044" Text="合同数据库" NavigateUrl="DigData/HTGLDataDW.aspx"></TreeNode>
<TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""><TreeNode id="ABC4323E-2F6F-4147-AA7A-8726131D7044" Text="合同数据库" NavigateUrl="DigData/JDGLDataDW.aspx"></TreeNode>
<TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
<TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
</TreeNode>
@@ -20,7 +20,7 @@
</TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl=""></TreeNode>
<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
</TreeNode>
</TreeNode>
SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
<TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划设置" NavigateUrl="JDGL/Check/PlanSet.aspx">
</TreeNode>
<TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
<TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_PZHGL.xml
+1
View File
@@ -13,6 +13,7 @@
<TreeNode id="87867EA8-576A-4166-AE7A-7416115DF30B" Text="工程联络单" NavigateUrl="CQMS/Check/TechnicalContactList.aspx"></TreeNode>
<TreeNode id="38F11FC6-E9F0-4ABD-BD78-BB1807EA3CE3" Text="设计变更" NavigateUrl="CQMS/Check/Design.aspx"></TreeNode>
<TreeNode id="3A9039B2-20DC-47FA-A943-E3604FBBF699" Text="施工图纸" NavigateUrl="CQMS/Check/Draw.aspx"></TreeNode>
<TreeNode id="F50EDEF0-FCDE-4B84-8D30-1F16E03FE26F" Text="施工月报" NavigateUrl="PZHGL/InformationProject/ConstructionMonthReport.aspx"></TreeNode>
<TreeNode id="25AC041E-0B27-4D7C-860B-1A06518B6673" Text="文件柜" NavigateUrl=""><TreeNode id="F274F84A-B648-4ABA-99D4-993AA6D1143A" Text="工作联系单" NavigateUrl="CQMS/Check/WorkContactFile.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+4 -21
View File
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="831FA803-E2E9-4674-9B56-44E5A5DDCB1A" Text="自动上报集团对接" NavigateUrl="">
<TreeNode id="FFD221D7-AE05-447F-8727-80058A04F401" Text="接口设置" NavigateUrl="TaskScheduling/InterFace/InterFaceSet.aspx">
<TreeNode id="D78C6E54-4240-4E82-B9B5-8ED76CF62981" Text="劳务实名制对接" NavigateUrl="">
<TreeNode id="1E451E0C-A125-4117-B8AC-14E74011B52B" Text="同步设置" NavigateUrl="ZHGL/RealName/SynchroSet.aspx">
</TreeNode>
<TreeNode id="FFD221D7-AE05-447F-8727-80058A04F402" Text="任务清单" NavigateUrl="TaskScheduling/InterFace/InterFaceTask.aspx"></TreeNode>
<TreeNode id="FFD221D7-AE05-447F-8727-80058A04F404" Text="数据调用日志" NavigateUrl="TaskScheduling/InterFace/IFLogList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D78C6E54-4240-4E82-B9B5-8ED76CF62981" Text="劳务实名制对接" NavigateUrl=""><TreeNode id="1E451E0C-A125-4117-B8AC-14E74011B52B" Text="同步设置" NavigateUrl="ZHGL/RealName/SynchroSet.aspx"></TreeNode>
<TreeNode id="C0B52610-ED93-4881-AC61-1764C243F84A" Text="基础数据" NavigateUrl="ZHGL/RealName/BasicData.aspx"></TreeNode>
<TreeNode id="F36E6C54-E39F-4032-874D-548EE090A35B" Text="同步记录" NavigateUrl="ZHGL/RealName/SynchroRecord.aspx"></TreeNode>
</TreeNode>
@@ -19,19 +15,11 @@
<TreeNode id="C619988F-307B-4A39-B518-7F45CA7326F5" Text="检查记录" NavigateUrl=""></TreeNode>
<TreeNode id="DEE90726-E00D-462B-A4BF-7E36180DD5B8" Text="项目绩效评价" NavigateUrl="OfficeCheck/ProjectEvaluation/ProjectEvaluation.aspx"></TreeNode>
</TreeNode>
<TreeNode id="ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001" Text="安全信息上报" NavigateUrl=""><TreeNode id="3156A9F0-276D-4AD4-BF84-45CF6DFC215C" Text="企业安全数据统计月报" NavigateUrl="ZHGL/Information/MillionsMonthlyReport.aspx"></TreeNode>
<TreeNode id="ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001" Text="安全信息上报" NavigateUrl=""><TreeNode id="3156A9F0-276D-4AD4-BF84-45CF6DFC215C" Text="百万工时安全统计月报" NavigateUrl="ZHGL/Information/MillionsMonthlyReport.aspx"></TreeNode>
<TreeNode id="4BC71D2E-7D94-48C1-A61A-139637825AA5" Text="职工伤亡事故原因分析报" NavigateUrl="ZHGL/Information/AccidentCauseReport.aspx"></TreeNode>
<TreeNode id="A3894BAD-3F4A-4BB4-98CF-A76C588AE53F" Text="安全生产数据季报" NavigateUrl="ZHGL/Information/SafetyQuarterlyReport.aspx"></TreeNode>
<TreeNode id="7985C759-8EB9-4B7D-AC65-00541280B46C" Text="应急演练开展情况季报" NavigateUrl="ZHGL/Information/DrillConductedQuarterlyReport.aspx"></TreeNode>
<TreeNode id="70DEB27A-D6FF-4D57-879B-0270F2967FA0" Text="应急演练工作计划半年报" NavigateUrl="ZHGL/Information/DrillPlanHalfYearReport.aspx"></TreeNode>
<TreeNode id="AAC7C263-6E25-49DC-985B-DC3FA7AAF3A1" Text="实业安全简报" NavigateUrl="ZHGL/Information/SafetyBriefing.aspx"></TreeNode>
<TreeNode id="07FEEC9D-09C1-4C19-9269-62F69532086C" Text="安全管理工作总结报告" NavigateUrl="ZHGL/Information/WorkSummaryReport.aspx"></TreeNode>
<TreeNode id="CF9C1F00-34B8-42E5-B2D1-704094169CA3" Text="季度工程项目质量信息表" NavigateUrl="ZHGL/Information/QuarterlyProjectQuality.aspx"></TreeNode>
<TreeNode id="12941594-2171-411A-8CC8-32E3BD9FCDDF" Text="质量管理工作总结报告" NavigateUrl="ZHGL/Information/QualityWorkSummaryReport.aspx"></TreeNode>
<TreeNode id="5B344750-79DD-40AA-8AA7-34B04E41FA72" Text="生态环保工作总结报告" NavigateUrl="ZHGL/Information/EPSummaryReport.aspx"></TreeNode>
<TreeNode id="7C47F078-D4C9-40D9-BEEF-E657EAFEC650" Text="建筑行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ArchitectureReport.aspx"></TreeNode>
<TreeNode id="ECDD89AC-1E16-4D82-B3BE-5D62F31B7A14" Text="化工行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ChemicalReport.aspx"></TreeNode>
<TreeNode id="7652D239-1897-4886-8DF2-B71E3B060D21" Text="中央企业节能环保产业企业基本情况和经营情况报表" NavigateUrl="ZHGL/Environmental/OperationReport.aspx"></TreeNode>
<TreeNode id="30579BFE-AB4B-49A7-A73D-B7CE902A8B69" Text="中央企业节能环保产业企业生产和服务业务情况报表" NavigateUrl="ZHGL/Environmental/EnergyReport.aspx"></TreeNode>
</TreeNode>
<TreeNode id="76E236DA-DDFC-4CE8-8CB8-02F8A27A8535" Text="专业技术方案评审" NavigateUrl=""><TreeNode id="B6A2B6EB-6B90-4953-B544-83FFF4F0EC19" Text="安全实施计划" NavigateUrl="ZHGL/Plan/ActionPlanList.aspx"></TreeNode>
<TreeNode id="B9ADD006-BA46-4191-BCD1-CCB56767C82B" Text="总包施工质量计划" NavigateUrl="ZHGL/Plan/MainPlan.aspx"></TreeNode>
@@ -90,9 +78,4 @@
</TreeNode>
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""></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 id="S89E5EC2-F725-4656-9110-5AF83C18FB6C" Text="实业数据" NavigateUrl="ZHGL/DataSync/SYHSEData_Data.aspx"></TreeNode>
</TreeNode>
</Tree>