lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2024-07-10 09:51:09 +08:00
parent 3852f86332
commit 5da904933b
6 changed files with 362 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19048,7 +19048,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<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">

2
SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx
View File

@ -41,7 +41,7 @@
<f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:LinkButtonField ID="lk" ColumnID="export" Hidden="true" HeaderText="导出" Width="60px" Icon="ArrowUp" TextAlign="Center" HeaderTextAlign="Center" CommandName="export" EnableAjax="false" />
<f:LinkButtonField ID="lk" ColumnID="export" HeaderText="导出" Width="60px" Icon="ArrowUp" TextAlign="Center" HeaderTextAlign="Center" CommandName="export" EnableAjax="false" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

362
SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx.cs
View File

@ -883,7 +883,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
cell = row.CreateCell(34);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
sheet.AddMergedRegion(new CellRangeAddress(i-1, i, 34, 34));
sheet.AddMergedRegion(new CellRangeAddress(i - 1, i, 34, 34));
cell = row.CreateCell(35);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
@ -900,17 +900,365 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
sheet.AddMergedRegion(new CellRangeAddress(i - 1, i, 38, 38));
i++;
string projectName = string.Empty;
string lastProjectName = string.Empty;
int b = 1;
foreach (var item in monthList)
{
bool isForeign = false;
string isForeignStr = "否";
row = sheet.CreateRow(i);
cell = row.CreateCell(0);
cell.CellStyle = cellStyle;
cell.SetCellValue(b.ToString());
cell = row.CreateCell(1);
cell.CellStyle = cellStyle;
var project = projects.FirstOrDefault(x => x.ProjectId == item.ProjectId);
if (project != null)
{
projectName = project.ProjectName;
if (lastProjectName != projectName)
{
lastProjectName = projectName;
}
else
{
projectName = string.Empty;
}
if (project.IsForeign == true)
{
isForeign = true;
isForeignStr = "是";
}
}
else
{
if (lastProjectName != projectName)
{
lastProjectName = projectName;
}
else
{
projectName = string.Empty;
}
projectName = "本部";
}
cell.SetCellValue(projectName);
cell = row.CreateCell(2);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.JobContent);
cell = row.CreateCell(3);
cell.CellStyle = cellStyle;
cell.SetCellValue(isForeignStr);
if (item.Type == "部门基础工作")
{
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "公司培训")
{
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "项目投标")
{
cell = row.CreateCell(9);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(10);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(9);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(10);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "开车策划")
{
cell = row.CreateCell(11);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(12);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(11);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(12);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "开车培训")
{
cell = row.CreateCell(13);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(14);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(15);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(13);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(14);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(15);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "合同管理")
{
cell = row.CreateCell(16);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(17);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(16);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(17);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "预试车")
{
cell = row.CreateCell(18);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(19);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(20);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(18);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(19);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(20);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "试车")
{
cell = row.CreateCell(21);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(22);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(21);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(22);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "试运行及考核")
{
cell = row.CreateCell(23);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(24);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(25);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(23);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(24);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(25);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "开车收尾")
{
cell = row.CreateCell(26);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(27);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(28);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(26);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(27);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(28);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "项目协调")
{
cell = row.CreateCell(29);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(30);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(29);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(30);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "其他")
{
cell = row.CreateCell(31);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(32);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(33);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(31);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(32);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(33);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
double sDays = 0, sDays1 = 0, sDays3 = 0;
if (isForeign) //境外项目
{
if (item.Code1 != 1 && item.Code1 != 2 && item.Code1 != 12)
{
sDays = (item.Days ?? 0) * 1.2;
}
else
{
sDays = item.Days ?? 0;
}
}
else
{
sDays = item.Days ?? 0;
}
if (item.Code1 == 1)
{
sDays1 = item.Days ?? 0;
}
else
{
sDays1 = 0;
}
if (item.Code1 == 3)
{
sDays3 = item.Days ?? 0;
}
else
{
sDays3 = 0;
}
cell = row.CreateCell(34);
cell.CellStyle = cellStyle;
cell.SetCellValue(sDays.ToString());
cell = row.CreateCell(35);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(36);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(37);
cell.CellStyle = cellStyle;
cell.SetCellValue(sDays1);
cell = row.CreateCell(38);
cell.CellStyle = cellStyle;
cell.SetCellValue(sDays3);
b++;
i++;
}
i++;
}

1
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
View File

@ -91,7 +91,6 @@
</TreeNode>
<TreeNode id="20ECB69E-28C4-4FAC-941A-15F446AEB634" Text="HSE费用" NavigateUrl=""><TreeNode id="C6CF3A5C-546B-483A-B742-A77F2E152523" Text="合同HSE费用额登记" NavigateUrl="HSSE/CostGoods/FeeRegistration.aspx"></TreeNode>
<TreeNode id="6FBF4B7D-21D2-4013-9465-12AC093109D4" Text="HSE措施费使用计划" NavigateUrl="HSSE/CostGoods/MeasuresPlan.aspx"></TreeNode>
<TreeNode id="E7B8059B-304B-47C6-90C8-D88E4A3EC506" Text="分包商HSE费用投入登记" NavigateUrl="HSSE/CostGoods/SubPayRegistration.aspx"></TreeNode>
<TreeNode id="9EFF1A0F-87AA-43E7-83B0-79EEAAC8848E" Text="HSE费用投入登记" NavigateUrl="HSSE/CostGoods/PayRegistrationNew.aspx"></TreeNode>
<TreeNode id="19C1370F-92C0-4E31-87B4-8BADA74113E4" Text="合同HSE费用及支付台账" NavigateUrl="HSSE/CostGoods/CostLedgerNew.aspx"></TreeNode>
</TreeNode>

3
SGGL/FineUIPro.Web/common/Menu_Personal.xml
View File

@ -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>

2
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
View File

@ -84,5 +84,7 @@
<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>