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

移交报表处理

This commit is contained in:
潘鸿锋 2024-02-04 10:35:09 +08:00
parent 68c7b95405
commit bfdd5b1b3b
8 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql Normal file
View File

@ -0,0 +1,13 @@
--重新导入
delete from Transfer_Piping;
delete from Transfer_StaticEquipment;
delete from Transfer_RotatingEquipment;
--修改时间完成时间
update Transfer_Instrumentation set CompleteTime=getdate();
update Transfer_Electrical set CompleteTime=getdate();
update Transfer_Civil_Structure set CompleteTime=getdate();
update Transfer_Firefighting set CompleteTime=getdate();
update Transfer_Telecom set CompleteTime=getdate();
update Transfer_Plumbing set CompleteTime=getdate();
update Transfer_HVAC set CompleteTime=getdate();

7
SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
View File

@ -415,6 +415,13 @@ namespace Web.Controls
chart1.Series[dataSourceTeam.DataPointName].Label = "#VAL{P}";//设置标签文本 (在设计期通过属性窗口编辑更直观) chart1.Series[dataSourceTeam.DataPointName].Label = "#VAL{P}";//设置标签文本 (在设计期通过属性窗口编辑更直观)
chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;//显示标签 chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;//显示标签
if (dataSourceTeam.DataPointName == "Actual Finished(%)")
{
chart1.Series[dataSourceTeam.DataPointName].Color = Color.Red;
}
else {
chart1.Series[dataSourceTeam.DataPointName].Color = Color.Blue;
}
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints) foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
{ {
chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText, dataSourcePoint.PointValue); chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText, dataSourcePoint.PointValue);

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress> <Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort /> <IISExpressSSLPort />

2
SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
View File

@ -1784,7 +1784,7 @@ namespace FineUIPro.Web.Transfer.Chart
} }
this.ChartUc.CreateChartBaifenbi(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1100, 600, false)); this.ChartUc.CreateChartBaifenbi(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1300, 600, false));
} }
#endregion #endregion
} }

2
SGGL/FineUIPro.Web/Transfer/Piping.aspx
View File

@ -63,7 +63,7 @@
HeaderTextAlign="Center" Width="120px"> HeaderTextAlign="Center" Width="120px">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center" <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
HeaderTextAlign="Center" Width="120px"> HeaderTextAlign="Center" Width="200px">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
</f:GroupField> </f:GroupField>

2
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
View File

@ -63,7 +63,7 @@
HeaderTextAlign="Center" Width="120px"> HeaderTextAlign="Center" Width="120px">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center" <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
HeaderTextAlign="Center" Width="120px"> HeaderTextAlign="Center" Width="200px">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
</f:GroupField> </f:GroupField>

2
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
View File

@ -63,7 +63,7 @@
HeaderTextAlign="Center" Width="120px"> HeaderTextAlign="Center" Width="120px">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center" <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
HeaderTextAlign="Center" Width="120px"> HeaderTextAlign="Center" Width="200px">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
</f:GroupField> </f:GroupField>

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />