wenjy
/
ZJYJ.FD.SlnMesnac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 登录标题、图标修改

Browse Source
master
wenjy 9 months ago
parent a79dbf268a
commit 1076160e6c
7 changed files with 26 additions and 77 deletions
Show Stats Download Patch File Download Diff File

2
App.config
Unescape Escape View File

@ -17,7 +17,7 @@
<!--工控机编号-->
<add key="ipccode" value="IP-192.168.0.32" />
<!--logo文件名称-->
<add key="logofilename" value="logo.png" />
<add key="logofilename" value="logo2.png" />
<!--读取监PLC频率 单位：毫秒-->
<add key="readplcrate" value="500" />
<!--进入PLC点位配置页面的口令-->

47
LoginFrom.Designer.cs generated
Unescape Escape View File

@ -29,11 +29,6 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LoginFrom));
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@ -46,9 +41,7 @@
this.panelright = new DevExpress.XtraEditors.PanelControl();
this.ckSysMode = new DevExpress.XtraEditors.CheckEdit();
this.btnLogin = new DevExpress.XtraEditors.SimpleButton();
this.separatorControl2 = new DevExpress.XtraEditors.SeparatorControl();
this.separatorControl1 = new DevExpress.XtraEditors.SeparatorControl();
this.txtPwd = new DevExpress.XtraEditors.ButtonEdit();
this.txtUserName = new DevExpress.XtraEditors.ButtonEdit();
this.lblClose = new DevExpress.XtraEditors.LabelControl();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
@ -60,9 +53,7 @@
((System.ComponentModel.ISupportInitialize)(this.panelright)).BeginInit();
this.panelright.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ckSysMode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.separatorControl2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.separatorControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtUserName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
@ -124,7 +115,7 @@
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(341, 390);
this.labelControl2.TabIndex = 0;
this.labelControl2.Text = "Welcome\r\n电动压缩机检测系统";
this.labelControl2.Text = "Welcome\r\n富东机械信息系统";
//
// panelright
//
@ -133,9 +124,7 @@
this.panelright.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.panelright.Controls.Add(this.ckSysMode);
this.panelright.Controls.Add(this.btnLogin);
this.panelright.Controls.Add(this.separatorControl2);
this.panelright.Controls.Add(this.separatorControl1);
this.panelright.Controls.Add(this.txtPwd);
this.panelright.Controls.Add(this.txtUserName);
this.panelright.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelright.Location = new System.Drawing.Point(341, 4);
@ -180,45 +169,19 @@
this.btnLogin.Text = "登录";
this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click);
//
// separatorControl2
//
this.separatorControl2.Location = new System.Drawing.Point(51, 217);
this.separatorControl2.Margin = new System.Windows.Forms.Padding(4);
this.separatorControl2.Name = "separatorControl2";
this.separatorControl2.Padding = new System.Windows.Forms.Padding(1);
this.separatorControl2.Size = new System.Drawing.Size(251, 10);
this.separatorControl2.TabIndex = 5;
//
// separatorControl1
//
this.separatorControl1.BackColor = System.Drawing.Color.White;
this.separatorControl1.Location = new System.Drawing.Point(51, 126);
this.separatorControl1.Location = new System.Drawing.Point(51, 197);
this.separatorControl1.Margin = new System.Windows.Forms.Padding(4);
this.separatorControl1.Name = "separatorControl1";
this.separatorControl1.Padding = new System.Windows.Forms.Padding(1);
this.separatorControl1.Size = new System.Drawing.Size(251, 10);
this.separatorControl1.TabIndex = 5;
//
// txtPwd
//
this.txtPwd.Location = new System.Drawing.Point(51, 184);
this.txtPwd.Margin = new System.Windows.Forms.Padding(4);
this.txtPwd.Name = "txtPwd";
this.txtPwd.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 11F);
this.txtPwd.Properties.Appearance.Options.UseFont = true;
this.txtPwd.Properties.AutoHeight = false;
this.txtPwd.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image")));
this.txtPwd.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, true, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.txtPwd.Properties.NullValuePrompt = "请输入密码";
this.txtPwd.Properties.PasswordChar = '·';
this.txtPwd.Size = new System.Drawing.Size(251, 47);
this.txtPwd.TabIndex = 2;
//
// txtUserName
//
this.txtUserName.Location = new System.Drawing.Point(51, 88);
this.txtUserName.Location = new System.Drawing.Point(51, 159);
this.txtUserName.Margin = new System.Windows.Forms.Padding(4);
this.txtUserName.Name = "txtUserName";
this.txtUserName.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 11F);
@ -295,9 +258,7 @@
((System.ComponentModel.ISupportInitialize)(this.panelright)).EndInit();
this.panelright.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.ckSysMode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.separatorControl2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.separatorControl1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtUserName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.panelControl1.ResumeLayout(false);
@ -313,8 +274,6 @@
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.ButtonEdit txtUserName;
private DevExpress.XtraEditors.SeparatorControl separatorControl1;
private DevExpress.XtraEditors.ButtonEdit txtPwd;
private DevExpress.XtraEditors.SeparatorControl separatorControl2;
private DevExpress.XtraEditors.SimpleButton btnLogin;
private DevExpress.XtraEditors.CheckEdit ckSysMode;
private DevExpress.XtraEditors.LabelControl lblClose;

8
LoginFrom.cs
Unescape Escape View File

@ -100,12 +100,12 @@ namespace ZJ_BYD
{
stopwatch.Start();
txtUserName.Text = FaceDeviceHelper.Instance.faceLoginUserInfo.employeeNo;
txtPwd.Text = FaceDeviceHelper.Instance.faceLoginUserInfo.password;
//txtPwd.Text = FaceDeviceHelper.Instance.faceLoginUserInfo.password;
//btnLogin_Click(null, null);//触发登录事件
if (stopwatch.ElapsedMilliseconds >= 5000)
{
txtUserName.Text = "";
txtPwd.Text = "";
//txtPwd.Text = "";
FaceDeviceHelper.Instance.faceLoginUserInfo = new ViewModel.FaceLogin.FaceLoginUserInfo();
stopwatch.Reset();
}
@ -195,12 +195,12 @@ namespace ZJ_BYD
return;
}
CurrentUser.UserName = txtUserName.Text.Trim();
CurrentUser.PassWord = txtPwd.Text.Trim();
// CurrentUser.PassWord = txtPwd.Text.Trim();
CurrentUser.RealName = string.IsNullOrEmpty(FaceDeviceHelper.Instance?.faceLoginUserInfo?.name) ? CurrentUser.UserName : CurrentUser.RealName;
#region 在线模式
if (Program.SysMode)
{
if (string.IsNullOrWhiteSpace(txtUserName.Text.Trim()) || string.IsNullOrWhiteSpace(txtPwd.Text))
if (string.IsNullOrWhiteSpace(txtUserName.Text.Trim())) //|| string.IsNullOrWhiteSpace(txtPwd.Text)
{
XtraMessageBox.Show("请填写用户名和密码！", "系统提示");
return;

10
LoginFrom.resx
Unescape Escape View File

@ -126,16 +126,6 @@
vzy7oEClv4DLNcZ0qEChNYVjAyVMAAuVMAEsVCKxAoJOjGx3TWe/JLEC/lHeY1+AhUqYABYqYQJYqIQJ
YKESJoCFSpgAFiphAliohAlgoRImoNie0YECvrurDpZ0qEBtuILbXx4IQsXlaITj9Ymv9fhcaD0efzoD
wAtqKy6Pfd3qaQAAAABJRU5ErkJggg==
</value>
</data>
<data name="editorButtonImageOptions3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABYAAAAYCAYAAAD+vg1LAAAABGdBTUEAALGPC/xhBQAAARBJREFUSEvt
lT0KwkAQhbfQXkQ8iYgIgo2V4A0ESytLsfEM2ngAWytvkMpC8w+m1tpCUEFEC30jo4Swu/4kdj742CQz
75Esm12hk+/7ecdx+sByXXfFLEA3CIIst30mhDUQsANXBVtQ5/b3BEMVwZdQiIozqLJNL8MwUmheh8yv
WLJVLzTWIsaXmKZZZLtamIKOzKwDnjbb1UJTT2bWQR62q5VosGVZadu2W2gaep5Ha1YaoII9A4xNynqE
5vAwCDfGAW/vY8zQKhiHC0mArx9R8CFaSIANBcsKsfkHP/kHP/lpMJ0C0uK34Lc+U/A8WkiAGZ3EFVyc
IoU4HJFZuu9wuCmDKYizb+zBBNNQEEKIG9VX4O7UZUHJAAAAAElFTkSuQmCC
</value>
</data>
<data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

32
Main.Designer.cs generated
Unescape Escape View File

@ -37,6 +37,7 @@ namespace ZJ_BYD
this.sysLogo = new DevExpress.XtraEditors.PictureEdit();
this.lblLineName = new DevExpress.XtraEditors.LabelControl();
this.tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
this.imageSlider1 = new DevExpress.XtraEditors.Controls.ImageSlider();
this.stationpanel = new DevExpress.Utils.Layout.StackPanel();
this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
this.stackPanel2 = new DevExpress.Utils.Layout.StackPanel();
@ -52,12 +53,12 @@ namespace ZJ_BYD
this.Result = new DevExpress.XtraGrid.Columns.GridColumn();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.lbldatetime = new DevExpress.XtraEditors.LabelControl();
this.imageSlider1 = new DevExpress.XtraEditors.Controls.ImageSlider();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sysLogo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).BeginInit();
this.tablePanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.imageSlider1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.stationpanel)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
this.panelControl3.SuspendLayout();
@ -67,7 +68,6 @@ namespace ZJ_BYD
this.stackPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gridTestInfo)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imageSlider1)).BeginInit();
this.SuspendLayout();
//
// panelControl1
@ -178,6 +178,19 @@ namespace ZJ_BYD
this.tablePanel1.Size = new System.Drawing.Size(1044, 973);
this.tablePanel1.TabIndex = 5;
//
// imageSlider1
//
this.tablePanel1.SetColumn(this.imageSlider1, 1);
this.imageSlider1.CurrentImageIndex = 0;
this.imageSlider1.Dock = System.Windows.Forms.DockStyle.Fill;
this.imageSlider1.Images.Add(((System.Drawing.Image)(resources.GetObject("imageSlider1.Images"))));
this.imageSlider1.Location = new System.Drawing.Point(256, 53);
this.imageSlider1.Name = "imageSlider1";
this.tablePanel1.SetRow(this.imageSlider1, 1);
this.imageSlider1.Size = new System.Drawing.Size(785, 917);
this.imageSlider1.TabIndex = 9;
this.imageSlider1.Text = "imageSlider1";
//
// stationpanel
//
this.stationpanel.Appearance.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(9)))), ((int)(((byte)(28)))), ((int)(((byte)(77)))));
@ -484,19 +497,6 @@ namespace ZJ_BYD
this.lbldatetime.TabIndex = 4;
this.lbldatetime.Text = "2022-03-16 00:00:00";
//
// imageSlider1
//
this.tablePanel1.SetColumn(this.imageSlider1, 1);
this.imageSlider1.CurrentImageIndex = 0;
this.imageSlider1.Dock = System.Windows.Forms.DockStyle.Fill;
this.imageSlider1.Images.Add(((System.Drawing.Image)(resources.GetObject("imageSlider1.Images"))));
this.imageSlider1.Location = new System.Drawing.Point(256, 53);
this.imageSlider1.Name = "imageSlider1";
this.tablePanel1.SetRow(this.imageSlider1, 1);
this.imageSlider1.Size = new System.Drawing.Size(785, 917);
this.imageSlider1.TabIndex = 9;
this.imageSlider1.Text = "imageSlider1";
//
// Main
//
this.Appearance.BackColor = System.Drawing.Color.Transparent;
@ -520,6 +520,7 @@ namespace ZJ_BYD
((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).EndInit();
this.tablePanel1.ResumeLayout(false);
this.tablePanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.imageSlider1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.stationpanel)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl3)).EndInit();
this.panelControl3.ResumeLayout(false);
@ -529,7 +530,6 @@ namespace ZJ_BYD
this.stackPanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gridTestInfo)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.imageSlider1)).EndInit();
this.ResumeLayout(false);
}

2
StartForm.Designer.cs generated
Unescape Escape View File

@ -64,7 +64,7 @@
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(413, 69);
this.labelControl1.TabIndex = 1;
this.labelControl1.Text = "电动压缩机检测系统启动中······";
this.labelControl1.Text = "富东机械信息系统启动中······";
//
// StartForm
//

2
StartForm.resx
Unescape Escape View File

@ -124,7 +124,7 @@
<data name="$this.BackgroundImageStore" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAArUAAAGyCAYAAAD6TTxkAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAA/7JJREFUeF7s3XmD3MS5sH2+5PM+55xsJCFhCYt3Y7xgMGBsvAPe931hJ3tOMsY2
wQAADsEBuJFr7QAA/7JJREFUeF7s3XmD3MS5sH2+5PM+55xsJCFhCYt3Y7xgMGBsvAPe931hJ3tOMsY2
uwFDMHm+zbz3LXW1bklXlapK1TNj6D9+GM9IanW3VHWNRjN+6L+eXDj7f59cWPD5r6du+j15c+G/n7oj
PvH6ryfvDLgl6m3Nwn8/dWvm3GP93z/Uyj727VF+9sydoPr98/v5qk+DaJs+P19V+8XqTyY+FZ+NQvtk
0TrL7Vdrv5h6eN2XQXZZQutYtI716/V3g2ibzq/ELzbeHWet+jrfavVNpq8XfrbqC/FZlv+Wdf979d2F

Write Preview
Loading…
Cancel
Save