Merge branch 'master' of http://192.168.1.12:3000/maixinrong/measure

Dprs/CSL/Measure_Cloud.cfg

@@ -35,7 +35,7 @@
 -N"D:\Work\DelphiTemp"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
--D_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
+-D_mCloud;_mEncrypt1;_Test;_mLoginNoPW
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

Dprs/CSL/Measure_Cloud.dof

@@ -96,7 +96,7 @@ PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP;ZjGridD7;DPanel;ExTree;JimComboBoxs;JimTab;PrintComRep;XPMenu_tom;ZjGridFereD7;ZjCommon;SmartDataSet;ZjGridActns
-Conditionals=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
+Conditionals=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
 DebugSourceDirs=
 UsePackages=0
 [Parameters]
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1118
+Build=1119
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1118
+FileVersion=3.1.3.1119
 InternalName=
 LegalCopyright=
 LegalTrademarks=
@@ -135,9 +135,9 @@ ProductName=
 ProductVersion=1.0.0.0
 [HistoryLists\hlConditionals]
 Count=5
-Item0=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
-Item1=_mCloud1;_mEncrypt1;_Test;_mLoginNoPW1
-Item2=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
+Item0=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
+Item1=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
+Item2=_mCloud1;_mEncrypt1;_Test;_mLoginNoPW1
 Item3=_mCloud;_mEncrypt1;_Test
 Item4=_mCloud;_mEncrypt;_Test
 [HistoryLists\hlUnitAliases]

Dprs/CSL/Measure_Cloud.dpr

@@ -5,6 +5,7 @@ uses
   ShareMem,
   Forms,
   Controls,
+  HttpApp,
   MainFrm in '..\..\Forms\MainFrm.pas' {MainForm},
   ProjectManagerFme in '..\..\Frames\ProjectManagerFme.pas' {ProjectManagerFrame: TFrame},
   UtilMethods in '..\..\Units\UtilMethods.pas',
@@ -253,6 +254,9 @@ begin
 
       {$IFDEF _mLoginNoPW}
       sName := PHPWeb.GetNameFromURLProtocol(ParamStr(1));
+      if sName[1] = '%' then
+        sName := UTF8Decode(HttpDecode(sName));
+
       if sName = '' then         // 表示手工运行的
       begin
         Application.MessageBox('请从 项目管理信息平台 打开软件。', '系统提示', MB_OK + MB_ICONINFORMATION);