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

Dprs/CSL/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1076
+Build=1077
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1076
+FileVersion=3.1.3.1077
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure

Forms/IPFrm.dfm

@@ -1,6 +1,6 @@
 object IPForm: TIPForm
-  Left = 1104
-  Top = 329
+  Left = 1030
+  Top = 363
   ActiveControl = edtIP
   AutoSize = True
   BorderStyle = bsDialog
@@ -14,6 +14,7 @@ object IPForm: TIPForm
   Font.Name = #24494#36719#38597#40657
   Font.Style = []
   OldCreateOrder = False
+  Position = poScreenCenter
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 19

Forms/LoginFrm.dfm

@@ -31220,7 +31220,7 @@ object LoginFrm: TLoginFrm
   end
   object lblForgetPW: TCslLabel
     Left = 782
-    Top = 245
+    Top = 249
     Width = 58
     Height = 19
     Cursor = crHandPoint
@@ -31312,6 +31312,21 @@ object LoginFrm: TLoginFrm
     ShowHint = True
     OnMouseDown = shpPWMouseDown
   end
+  object lblHint: TLabel
+    Left = 648
+    Top = 177
+    Width = 24
+    Height = 17
+    Caption = #25552#31034
+    Color = clWindow
+    Font.Charset = DEFAULT_CHARSET
+    Font.Color = clRed
+    Font.Height = -12
+    Font.Name = #24494#36719#38597#40657
+    Font.Style = []
+    ParentColor = False
+    ParentFont = False
+  end
   object edtPW: TEdit
     Left = 705
     Top = 137
@@ -31333,7 +31348,7 @@ object LoginFrm: TLoginFrm
   end
   object btnLogin: TCslButton
     Left = 645
-    Top = 185
+    Top = 196
     Width = 320
     Height = 48
     Cursor = crHandPoint
@@ -35740,15 +35755,15 @@ object LoginFrm: TLoginFrm
   end
   object pnlLocalServer: TPanel
     Left = 615
-    Top = 176
+    Top = 195
     Width = 380
-    Height = 158
+    Height = 139
     BevelOuter = bvNone
     Color = clWhite
     TabOrder = 4
     object lblLocalHelp: TCslLabel
       Left = 104
-      Top = 104
+      Top = 90
       Width = 52
       Height = 19
       Cursor = crHandPoint
@@ -35766,7 +35781,7 @@ object LoginFrm: TLoginFrm
     end
     object lblLocalServer: TCslLabel
       Left = 38
-      Top = 104
+      Top = 90
       Width = 52
       Height = 19
       Cursor = crHandPoint
@@ -35784,7 +35799,7 @@ object LoginFrm: TLoginFrm
     end
     object btnLocalLogin: TCslButton
       Left = 30
-      Top = 15
+      Top = 1
       Width = 320
       Height = 48
       Cursor = crHandPoint
@@ -40131,8 +40146,10 @@ object LoginFrm: TLoginFrm
     Width = 254
     Height = 29
     ParentFont = False
+    ParentShowHint = False
     PopupMenu = pmLogin
     Properties.Alignment.Vert = taVCenter
+    ShowHint = False
     Style.BorderStyle = ebsNone
     Style.Font.Charset = DEFAULT_CHARSET
     Style.Font.Color = clWindowText
@@ -40141,6 +40158,7 @@ object LoginFrm: TLoginFrm
     Style.Font.Style = []
     Style.Shadow = False
     Style.ButtonStyle = btsHotFlat
+    Style.ButtonTransparency = ebtHideUnselected
     StyleFocused.BorderStyle = ebsNone
     StyleHot.BorderStyle = ebsNone
     TabOrder = 5

Forms/LoginFrm.pas

@@ -40,6 +40,7 @@ type
     cbUser: TcxComboBox;
     pmLogin: TPopupMenu;
     nClearAccount: TMenuItem;
+    lblHint: TLabel;
     procedure edtPWKeyDown(Sender: TObject; var Key: Word;
       Shift: TShiftState);
     procedure FormCreate(Sender: TObject);
@@ -106,6 +107,8 @@ procedure TLoginFrm.FormCreate(Sender: TObject);
 var SL: TStringList;
   ini: TIniFile;
 begin
+  lblHint.Caption := '';
+
   SetClassLong(Handle, GCL_STYLE, GetClassLong(Handle, GCL_STYLE) or CS_DROPSHADOW);
 
   Set8087CW(Default8087CW or $0004);
@@ -161,6 +164,25 @@ end;
 procedure TLoginFrm.btnLoginClick(Sender: TObject);
 var sInfo, sURL, sCheckCode, sMD5PW: string;
 begin
+  lblHint.Caption := '';
+  lblHint.Update;
+
+  if Trim(cbUser.Text) = '' then
+  begin
+    lblHint.Caption := '请您输入账号后再登录';
+    lblHint.Update;
+    cbUser.SetFocus;
+    Exit;
+  end;
+
+  if Trim(edtPW.Text) = '' then
+  begin
+    lblHint.Caption := '请您输入密码后再登录';
+    lblHint.Update;
+    edtPW.SetFocus;
+    Exit;
+  end;
+
   case PHPWeb.Login(cbUser.Text, edtPW.Text, sInfo, sCheckCode) of
     ltCon:
     begin
@@ -172,7 +194,8 @@ begin
 
     ltLoginFail:
     begin
-      Application.MessageBox(PChar(sInfo), '操作提醒', MB_OK + MB_ICONWARNING);
+      lblHint.Caption := sInfo;
+      lblHint.Update;
       edtPW.SetFocus;
       edtPW.SelectAll;
       ModalResult := mrNone;
@@ -218,7 +241,7 @@ begin
 
     ltDisCon:
     begin
-      Application.MessageBox('当前网络状态较差，无法连接云端，请重新尝试！', '操作提醒', MB_OK + MB_ICONWARNING);
+      Application.MessageBox('网络错误，请稍后重试！', '操作提醒', MB_OK + MB_ICONWARNING);
       ModalResult := mrNone;
     end;
   end;