Просмотр исходного кода

Merge branch 'SiChuanJiaoTou' of http://192.168.1.12:3000/maixinrong/measure into SiChuanJiaoTou

MaiXinRong 10 лет назад
Родитель
Сommit
2f3475849c

+ 9 - 22
Dprs/Pro/Measure.dof

@@ -112,10 +112,10 @@ RootDir=D:\Program Files\Borland\Delphi7\Bin\
 [Version Info]
 IncludeVerInfo=1
 AutoIncBuild=1
-MajorVer=3
-MinorVer=1
-Release=6
-Build=1036
+MajorVer=1
+MinorVer=0
+Release=1
+Build=2
 Debug=0
 PreRelease=0
 Special=0
@@ -126,26 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-FileVersion=3.1.6.1036
+FileVersion=1.0.1.2
 InternalName=
-LegalCopyright=版权所有(C)珠海纵横创新软件有限公司2003-2016
-LegalTrademarks=Measure
+LegalCopyright=
+LegalTrademarks=
 OriginalFilename=
-ProductName=纵横公路工程结算决算一体化软件
-ProductVersion=3.1.6.1
+ProductName=
+ProductVersion=1.0.0.0
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=1
-Item0=_mEncrypt;
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=1
-Item0=..\..\Dcus
-[HistoryLists\hlOutputDirectorry]
-Count=2
-Item0=D:\SmartCostExe\Measure
-Item1=E:\资料\软件安装文件\纵横结算决算计量一体化软件(专业版)

+ 2 - 1
Dprs/Pro/Measure.dpr

@@ -204,7 +204,8 @@ uses
   OtherMeasureFme in '..\..\Frames\OtherMeasureFme.pas' {OtherMeasureFrame: TFrame},
   ProjGatherSelectFme in '..\..\ProjGather\ProjGatherSelectFme.pas' {ProjGatherSelectFrame: TFrame},
   rpgZoneGatherControl in '..\..\Report\ProjGather\Zone\rpgZoneGatherControl.pas',
-  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm};
+  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm},
+  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame};
 
 {$R *.res}
 

BIN
Dprs/Pro/Measure.res


+ 5 - 5
Dprs/Pro/Measure_Cloud.dof

@@ -112,10 +112,10 @@ RootDir=D:\Program Files\Borland\Delphi7\Bin\
 [Version Info]
 IncludeVerInfo=1
 AutoIncBuild=1
-MajorVer=3
-MinorVer=1
-Release=6
-Build=1036
+MajorVer=1
+MinorVer=0
+Release=1
+Build=2
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.6.1036
+FileVersion=1.0.1.2
 InternalName=
 LegalCopyright=版权所有(C)珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure

+ 2 - 1
Dprs/Pro/Measure_Cloud.dpr

@@ -210,7 +210,8 @@ uses
   OtherMeasureFme in '..\..\Frames\OtherMeasureFme.pas' {OtherMeasureFrame: TFrame},
   ProjGatherSelectFme in '..\..\ProjGather\ProjGatherSelectFme.pas' {ProjGatherSelectFrame: TFrame},
   rpgZoneGatherControl in '..\..\Report\ProjGather\Zone\rpgZoneGatherControl.pas',
-  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm};
+  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm},
+  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame};
 
 {$R *.res}
 

BIN
Dprs/Pro/Measure_Cloud.res