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

修改移交

Browse Source
This commit is contained in:
潘鸿锋
2024-07-29 14:45:01 +08:00
parent 36e43ba0ab
commit 1eb9661726
15 changed files with 90 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+12 -12
View File
@@ -56,50 +56,50 @@
<f:GroupField HeaderText="Civil Structure" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField Width="200px" TextAlign="Center" ColumnID="Civil_Structure" DataField="Civil_Structure" HeaderText="Structure/Civil/Architecture" />
<f:BoundField minWidth="200px" TextAlign="Center" ColumnID="Civil_Structure" DataField="Civil_Structure" HeaderText="Structure/Civil/Architecture" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
<Columns>
<f:RenderField ColumnID="Foundation" DataField="Foundation" FieldType="String" HeaderText="Foundation" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="Mainstructure" DataField="Mainstructure" FieldType="String" HeaderText="Main structure<br/> acceptance" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Buildingdecoration" DataField="Buildingdecoration" FieldType="String" HeaderText="Building<br/> decoration" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Equipment" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="Instrument" DataField="Instrument" FieldType="String" HeaderText="Instrument" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="Electrical" DataField="Electrical" FieldType="String" HeaderText="Electrical" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="FireFighting" DataField="FireFighting" FieldType="String" HeaderText="Fire<br/> Fighting" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="HVAC" DataField="HVAC" FieldType="String" HeaderText="HVAC" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="100px">
</f:RenderField>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/Electrical.aspx
+8 -8
View File
@@ -57,34 +57,34 @@
<f:GroupField HeaderText="ELECTRICAL" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField Width="200px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
<f:BoundField minWidth="140px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="System" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/> &Inspection Reocrd" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="150px">
</f:RenderField>
<f:RenderField ColumnID="Communicationtest" DataField="Communicationtest" FieldType="String" HeaderText="Communication<br/> test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="CableLaying" DataField="CableLaying" FieldType="String" HeaderText="Cable Laying and<br/> Insulation Test<br/> Record" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="LoopTest" DataField="LoopTest" FieldType="String" HeaderText="Loop Test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
+7 -7
View File
@@ -57,30 +57,30 @@
<f:GroupField HeaderText="FF" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField Width="200px" TextAlign="Center" ColumnID="Firefighting" DataField="Firefighting" HeaderText="Firefighting" />
<f:BoundField minWidth="140px" TextAlign="Center" ColumnID="Firefighting" DataField="Firefighting" HeaderText="Firefighting" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField minWidth="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField minWidth="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField minWidth="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="Debugging" DataField="Debugging" FieldType="String" HeaderText="Debugging" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="Acceptancecheck" DataField="Acceptancecheck" FieldType="String" HeaderText="Acceptance check" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+9 -9
View File
@@ -57,38 +57,38 @@
<f:GroupField HeaderText="INSTRUMENTATION" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField Width="200px" TextAlign="Center" ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" />
<f:BoundField minWidth="160px" TextAlign="Center" ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="System" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField ColumnID="InstallationCalibration" DataField="InstallationCalibration" FieldType="String" HeaderText="Installation<br/> &Calibration " TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="PipingPressuretest" DataField="PipingPressuretest" FieldType="String" HeaderText="Piping Pressure test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="150px">
</f:RenderField>
<f:RenderField ColumnID="PipingLeak" DataField="PipingLeak" FieldType="String" HeaderText="Piping Leak/<br/>Vacuum Test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="PipingBlowing" DataField="PipingBlowing" FieldType="String" HeaderText="Piping Blowing" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Looptest" DataField="Looptest" FieldType="String" HeaderText="Loop test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
+1 -1
View File
@@ -81,7 +81,7 @@
<f:RenderField ColumnID="PlanFinishofTestingDate" DataField="PlanFinishofTestingDate" FieldType="Date" Renderer="Date"
RendererArgument="yyyy-MM-dd"
HeaderText="Plan Finish of Testing Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="180px">
HeaderText="Plan Finish of Testing Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="200px">
</f:RenderField>
<f:RenderField ColumnID="Status" DataField="Status"
SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs
+1 -1
View File
@@ -116,7 +116,7 @@ namespace FineUIPro.Web.Transfer
oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
oleDBConnString += "Data Source=";
oleDBConnString += fileName;
oleDBConnString += ";Extended Properties=Excel 8.0;";
oleDBConnString += ";Extended Properties='Excel 8.0;IMEX=1; 8.0;HDR=1;'";
OleDbConnection oleDBConn = null;
OleDbDataAdapter oleAdMaster = null;
DataTable m_tableName = new DataTable();
SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
+7 -7
View File
@@ -49,30 +49,30 @@
<f:GroupField HeaderText="Plumbing" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField Width="200px" TextAlign="Center" ColumnID="Plumbing" DataField="Plumbing" HeaderText="Plumbing" />
<f:BoundField minWidth="120px" TextAlign="Center" ColumnID="Plumbing" DataField="Plumbing" HeaderText="Plumbing" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField ColumnID="Ndt" DataField="Ndt" FieldType="String" HeaderText="NDT" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="100px">
</f:RenderField>
<f:RenderField ColumnID="Flushing" DataField="Flushing" FieldType="String" HeaderText="Flushing" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="RunningTest" DataField="RunningTest" FieldType="String" HeaderText="Running Test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+8 -8
View File
@@ -57,36 +57,36 @@
</ItemTemplate>
</f:TemplateField>--%>
<f:RenderField ColumnID="RotatingEquipment" DataField="RotatingEquipment" FieldType="String" HeaderText="Tag. No" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="160px">
</f:RenderField>
<f:RenderField ColumnID="Alignment" DataField="Alignment" FieldType="String" HeaderText="Alignment" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Motorsoloruntest" DataField="Motorsoloruntest" FieldType="String" HeaderText="Motor solorun test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" Width="140px">
</f:RenderField>
<f:RenderField ColumnID="Standalonetest" DataField="Standalonetest" FieldType="String" HeaderText="Standalone test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="200px">
</f:RenderField>
</Columns>
<Listeners>
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+7 -7
View File
@@ -59,35 +59,35 @@
<f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Tag No" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" Width="140px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
HeaderTextAlign="Center" Width="140px">
</f:RenderField>
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
HeaderTextAlign="Center" Width="140px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Internal inspection " TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
<f:RenderField ColumnID="InternalsPacking" DataField="InternalsPacking" FieldType="String" HeaderText="Internals/Packing<br/> installation " TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
<f:RenderField ColumnID="BOXupRecord" DataField="BOXupRecord" FieldType="String" HeaderText="BOX-up Record" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/Telecom.aspx
+8 -8
View File
@@ -56,34 +56,34 @@
<f:GroupField HeaderText="Telecom" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField Width="200px" TextAlign="Center" ColumnID="Telecom" DataField="Telecom" HeaderText="Telecom" />
<f:BoundField minWidth="120px" TextAlign="Center" ColumnID="Telecom" DataField="Telecom" HeaderText="Telecom" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/> &Inspection Reocrd" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="160px">
</f:RenderField>
<f:RenderField ColumnID="Communication" DataField="Communication" FieldType="String" HeaderText="Communication<br/> test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="160px">
</f:RenderField>
<f:RenderField ColumnID="CableLaying" DataField="CableLaying" FieldType="String" HeaderText="Cable Laying and<br/> Insulation Test<br/> Record" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="160px">
</f:RenderField>
<f:RenderField ColumnID="FunctionTest" DataField="FunctionTest" FieldType="String" HeaderText="Function Test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
HeaderTextAlign="Center" minWidth="160px">
</f:RenderField>
</Columns>
</f:GroupField>