Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ccc06486 由 LN
选项

增加用户管理功能

1 个父辈 b2a955fa
全部展开
内嵌 并排
正在显示 30 个修改的文件 包含 488 行增加 和 128 行删除
Common/Setting_Init.cs
......@@ -131,7 +131,7 @@ namespace TSA_V.Common
/// </summary>
public static string AOIFileConfig = "AOIFileConfig";
public static string Config_Pwd = "Config_Pwd";
//public static string Config_Pwd = "Config_Pwd";
public static string DefaultPointSize = "DefaultPointSize";
public static string DefaultPointType = "DefaultPointType";
......
DeviceLibrary/DeviceLibrary.csproj
......@@ -125,6 +125,9 @@
<None Include="config\database.db3">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\user.sqlite3">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\defaultBoard0.jpg" />
<None Include="config\元器件信息模板.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......
DeviceLibrary/SQLite.cs
......@@ -43,18 +43,18 @@ namespace DAL
}
}
public bool QueryUserName(string username, string password)
{
bool succeed = false;
string sql = "SELECT * FROM Account WHERE Username='" + username + "' AND Password='" + password + "'";
bool rtn = Select(sql, out string[][] data);
if (rtn)
{
if (data.Length > 0)
succeed = true;
}
return succeed;
}
//public bool QueryUserName(string username, string password)
//{
// bool succeed = false;
// string sql = "SELECT * FROM Account WHERE Username='" + username + "' AND Password='" + password + "'";
// bool rtn = Select(sql, out string[][] data);
// if (rtn)
// {
// if (data.Length > 0)
// succeed = true;
// }
// return succeed;
//}
public bool QueryHistory(string barCode, string dateTimeFront, string dateTimeBack, out string[][] data)
{
......
DeviceLibrary/config/user.sqlite3 0 → 100644
此文件类型无法预览
TSA-V/FormManager.cs
......@@ -12,8 +12,8 @@ namespace TSA_V
public class FormManager
{
public static Color buttonColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
private static string skinFileName = Application.StartupPath + @"\Skins\OneBlue.ssk";
......@@ -35,14 +35,14 @@ namespace TSA_V
return skinFileName;
}
}
private static int index = -1;
public static void DefaultSkin()
{
index = -1;
}
public static void NextSkin()
{
index++;
......@@ -51,9 +51,9 @@ namespace TSA_V
index = 0;
}
}
public static List<string> SkinsList = new List<string>();
private static List<string> GetSkinList()
{
List<string> returnList = new System.Collections.Generic.List<string>();
......@@ -67,5 +67,14 @@ namespace TSA_V
}
return returnList;
}
public static Lazy<Asa.UserManagement> userManager = new Lazy<Asa.UserManagement>(() => {
Asa.UserManagement user = new Asa.UserManagement("log");
user.DatabasePath = Application.StartupPath + @"\config\user.sqlite3";
return user;
});
public static Asa.Users UserInfo = null;
}
}
TSA-V/FrmLogin.cs
......@@ -23,20 +23,35 @@ namespace TSA_V
private void BtnLogin_Click(object sender, EventArgs e)
{
if (DeviceLibrary.DB.db.IsCon)
{
DeviceLibrary.DB.userName = TxtUsername.Text;
bool rtn = DeviceLibrary.DB.db.QueryUserName(DeviceLibrary.DB.userName, TxtPassword.Text);
if (rtn)
DialogResult = DialogResult.OK;
else
MessageBox.Show("用户名或密码错误", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
FormManager.UserInfo = new Asa.Users();
FormManager.UserInfo.Name = TxtUsername.Text.Trim();
FormManager.UserInfo.Password = TxtPassword.Text.Trim();
FormManager.userManager.Value.Connect();
if (FormManager.userManager.Value.UserLogin(ref FormManager.UserInfo))
{
DialogResult = DialogResult.OK;
}
else
{
MessageBox.Show("数据库未连接");
string msg = ResourceCulture.GetString("用户名或密码错误");
MessageBox.Show(msg, "", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
////if (DeviceLibrary.DB.db.IsCon)
//{
// DeviceLibrary.DB.userName = TxtUsername.Text;
// bool rtn = DeviceLibrary.DB.db.QueryUserName(DeviceLibrary.DB.userName, TxtPassword.Text);
// if (rtn)
// DialogResult = DialogResult.OK;
// else
// MessageBox.Show("用户名或密码错误", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
//}
//else
//{
// MessageBox.Show("数据库未连接");
//}
}
private void BtnExit_Click(object sender, EventArgs e)
......
TSA-V/FrmMaintenance.Designer.cs
......@@ -46,7 +46,7 @@
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.ForeColor = System.Drawing.Color.White;
this.button1.Location = new System.Drawing.Point(99, 99);
this.button1.Location = new System.Drawing.Point(221, 206);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(118, 103);
this.button1.TabIndex = 13;
......@@ -61,13 +61,12 @@
this.btnDeviceSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDeviceSelect.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDeviceSelect.ForeColor = System.Drawing.Color.White;
this.btnDeviceSelect.Location = new System.Drawing.Point(111, 12);
this.btnDeviceSelect.Location = new System.Drawing.Point(99, 206);
this.btnDeviceSelect.Name = "btnDeviceSelect";
this.btnDeviceSelect.Size = new System.Drawing.Size(158, 103);
this.btnDeviceSelect.Size = new System.Drawing.Size(118, 103);
this.btnDeviceSelect.TabIndex = 12;
this.btnDeviceSelect.Text = "设备选择";
this.btnDeviceSelect.Text = "用户管理";
this.btnDeviceSelect.UseVisualStyleBackColor = false;
this.btnDeviceSelect.Visible = false;
this.btnDeviceSelect.Click += new System.EventHandler(this.btnDeviceSelect_Click);
//
// btnLanguage
......@@ -77,9 +76,9 @@
this.btnLanguage.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLanguage.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLanguage.ForeColor = System.Drawing.Color.White;
this.btnLanguage.Location = new System.Drawing.Point(99, 208);
this.btnLanguage.Location = new System.Drawing.Point(99, 98);
this.btnLanguage.Name = "btnLanguage";
this.btnLanguage.Size = new System.Drawing.Size(158, 103);
this.btnLanguage.Size = new System.Drawing.Size(118, 103);
this.btnLanguage.TabIndex = 11;
this.btnLanguage.Text = "语言";
this.btnLanguage.UseVisualStyleBackColor = false;
......@@ -92,9 +91,9 @@
this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnExit.ForeColor = System.Drawing.Color.White;
this.btnExit.Location = new System.Drawing.Point(426, 209);
this.btnExit.Location = new System.Drawing.Point(465, 206);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(158, 103);
this.btnExit.Size = new System.Drawing.Size(118, 103);
this.btnExit.TabIndex = 10;
this.btnExit.Text = "返回";
this.btnExit.UseVisualStyleBackColor = false;
......@@ -107,7 +106,7 @@
this.btnPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPosition.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPosition.ForeColor = System.Drawing.Color.White;
this.btnPosition.Location = new System.Drawing.Point(465, 100);
this.btnPosition.Location = new System.Drawing.Point(465, 98);
this.btnPosition.Name = "btnPosition";
this.btnPosition.Size = new System.Drawing.Size(118, 103);
this.btnPosition.TabIndex = 6;
......@@ -122,7 +121,7 @@
this.btnDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDebug.ForeColor = System.Drawing.Color.White;
this.btnDebug.Location = new System.Drawing.Point(221, 100);
this.btnDebug.Location = new System.Drawing.Point(221, 98);
this.btnDebug.Name = "btnDebug";
this.btnDebug.Size = new System.Drawing.Size(118, 103);
this.btnDebug.TabIndex = 5;
......@@ -137,9 +136,9 @@
this.btnPwdUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPwdUpdate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPwdUpdate.ForeColor = System.Drawing.Color.White;
this.btnPwdUpdate.Location = new System.Drawing.Point(263, 209);
this.btnPwdUpdate.Location = new System.Drawing.Point(343, 206);
this.btnPwdUpdate.Name = "btnPwdUpdate";
this.btnPwdUpdate.Size = new System.Drawing.Size(158, 103);
this.btnPwdUpdate.Size = new System.Drawing.Size(118, 103);
this.btnPwdUpdate.TabIndex = 19;
this.btnPwdUpdate.Text = "密码修改";
this.btnPwdUpdate.UseVisualStyleBackColor = false;
......@@ -152,7 +151,7 @@
this.btnWidthC.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWidthC.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWidthC.ForeColor = System.Drawing.Color.White;
this.btnWidthC.Location = new System.Drawing.Point(343, 99);
this.btnWidthC.Location = new System.Drawing.Point(343, 98);
this.btnWidthC.Name = "btnWidthC";
this.btnWidthC.Size = new System.Drawing.Size(118, 103);
this.btnWidthC.TabIndex = 20;
......
TSA-V/FrmMaintenance.cs
using System;
using Asa;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
......@@ -8,7 +9,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using TSA_V.Common;
using TSA_V.DeviceLibrary;
using TSA_V.DeviceLibrary;
namespace TSA_V
{
......@@ -66,6 +67,31 @@ namespace TSA_V
private void FrmMaintenance_Load(object sender, EventArgs e)
{
LanguageProcess();
if (FormManager.UserInfo.Limit.Equals(UserLimit.Admin)) {
btnDeviceSelect.Visible = true;
btnLanguage.Visible = true;
}
else if(FormManager.UserInfo.Limit.Equals(UserLimit.Debug))
{
button1.Visible = true;
btnDebug.Visible = true;
btnWidthC.Visible = true;
btnPosition.Visible = true;
btnDeviceSelect.Visible = false ;
btnLanguage.Visible = false ;
}
else
{
button1.Visible = false;
btnDebug.Visible = false;
btnWidthC.Visible = false;
btnPosition.Visible = false;
btnDeviceSelect.Visible = false;
btnLanguage.Visible = false;
}
}
private void btnDeviceSelect_Click(object sender, EventArgs e)
{
......@@ -73,6 +99,36 @@ namespace TSA_V
//this.Visible = false;
//frmLanguage.ShowDialog();
//this.Visible = true;
SetUserMLanager();
this.Visible = false;
FormManager.userManager.Value.ManageForm(this);
this.Visible = true;
}
private void SetUserMLanager()
{
Asa.Language.AddFail = ResourceCulture.GetString("添加用户失败");
Asa.Language.Exit = ResourceCulture.GetString("退出");
Asa.Language.AddUpdateDel = new string[] {
ResourceCulture.GetString("增加") ,
ResourceCulture.GetString("修改") ,
ResourceCulture.GetString("删除") };
Asa.Language.UserPwdLimit = new string[] {
ResourceCulture.GetString("用户名") ,
ResourceCulture.GetString("密码") ,
ResourceCulture.GetString("权限") };
Asa.Language.ManageTitle = ResourceCulture.GetString("用户管理");
Asa.Language.DelConfirm = ResourceCulture.GetString("确认删除用户");
Asa.Language.DelSucceed = ResourceCulture.GetString("删除用户成功");
Asa.Language.DelFail = ResourceCulture.GetString("删除用户失败");
Asa.Language.UpdateConfirm = ResourceCulture.GetString("确定修改用户信息");
Asa.Language.UpdateSucceed = ResourceCulture.GetString("修改用户成功");
Asa.Language.UpdateFail = ResourceCulture.GetString("修改用户失败");
Asa.Language.AddSucceed = ResourceCulture.GetString("添加用户成功");
Asa.Language.AddFail = ResourceCulture.GetString("添加用户失败");
Asa.Language.UserPwdWrong = ResourceCulture.GetString("用户名或密码错误");
}
private void button1_Click(object sender, EventArgs e)
......
TSA-V/FrmMenu.Designer.cs
......@@ -36,6 +36,7 @@ namespace TSA_V
this.btnExit = new System.Windows.Forms.Button();
this.btnWork = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
this.btnHistory = new System.Windows.Forms.Button();
this.LblUserName = new System.Windows.Forms.Label();
this.btnScreenTest = new System.Windows.Forms.Button();
this.lblWaitTime = new System.Windows.Forms.Label();
......@@ -45,7 +46,6 @@ namespace TSA_V
this.btnMaintenance = new System.Windows.Forms.Button();
this.btnCom = new System.Windows.Forms.Button();
this.btnProduct = new System.Windows.Forms.Button();
this.btnHistory = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
......@@ -114,6 +114,22 @@ namespace TSA_V
this.panel1.Size = new System.Drawing.Size(861, 453);
this.panel1.TabIndex = 14;
//
// btnHistory
//
this.btnHistory.BackColor = System.Drawing.Color.Transparent;
this.btnHistory.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnHistory.BackgroundImage")));
this.btnHistory.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.btnHistory.FlatAppearance.BorderSize = 0;
this.btnHistory.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHistory.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHistory.ForeColor = System.Drawing.Color.White;
this.btnHistory.Location = new System.Drawing.Point(412, 195);
this.btnHistory.Name = "btnHistory";
this.btnHistory.Size = new System.Drawing.Size(222, 81);
this.btnHistory.TabIndex = 20;
this.btnHistory.UseVisualStyleBackColor = false;
this.btnHistory.Click += new System.EventHandler(this.BtnHistory_Click);
//
// LblUserName
//
this.LblUserName.AutoSize = true;
......@@ -204,7 +220,7 @@ namespace TSA_V
this.btnMaintenance.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMaintenance.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMaintenance.ForeColor = System.Drawing.Color.White;
this.btnMaintenance.Location = new System.Drawing.Point(527, 285);
this.btnMaintenance.Location = new System.Drawing.Point(414, 287);
this.btnMaintenance.Name = "btnMaintenance";
this.btnMaintenance.Size = new System.Drawing.Size(107, 81);
this.btnMaintenance.TabIndex = 8;
......@@ -220,7 +236,7 @@ namespace TSA_V
this.btnCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCom.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCom.ForeColor = System.Drawing.Color.White;
this.btnCom.Location = new System.Drawing.Point(412, 285);
this.btnCom.Location = new System.Drawing.Point(527, 287);
this.btnCom.Name = "btnCom";
this.btnCom.Size = new System.Drawing.Size(107, 81);
this.btnCom.TabIndex = 5;
......@@ -243,22 +259,6 @@ namespace TSA_V
this.btnProduct.UseVisualStyleBackColor = false;
this.btnProduct.Click += new System.EventHandler(this.btnProduct_Click);
//
// btnHistory
//
this.btnHistory.BackColor = System.Drawing.Color.Transparent;
this.btnHistory.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnHistory.BackgroundImage")));
this.btnHistory.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.btnHistory.FlatAppearance.BorderSize = 0;
this.btnHistory.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHistory.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHistory.ForeColor = System.Drawing.Color.White;
this.btnHistory.Location = new System.Drawing.Point(412, 195);
this.btnHistory.Name = "btnHistory";
this.btnHistory.Size = new System.Drawing.Size(222, 81);
this.btnHistory.TabIndex = 20;
this.btnHistory.UseVisualStyleBackColor = false;
this.btnHistory.Click += new System.EventHandler(this.BtnHistory_Click);
//
// FrmMenu
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -299,7 +299,7 @@ namespace TSA_V
private System.Windows.Forms.Label lblWaitTime;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Button btnScreenTest;
private System.Windows.Forms.Label LblUserName;
private System.Windows.Forms.Button btnHistory;
private System.Windows.Forms.Label LblUserName;
}
}
\ No newline at end of file
TSA-V/FrmMenu.cs
......@@ -15,6 +15,7 @@ using TSA_V.LoadCSVLibrary;
using System.IO;
using AccAOI;
using System.Speech.Synthesis;
using Asa;
namespace TSA_V
{
......@@ -30,10 +31,29 @@ namespace TSA_V
ResourceCulture.SetCurrentCulture(str);
frmMain = this;
CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
InitializeComponent();
this.MaximizeBox = false;
this.MinimizeBox = false;
this.btnCom.Visible = true ;
this.MinimizeBox = false;
this.btnCom.Visible = true;
if (FormManager.UserInfo.Limit.Equals(UserLimit.Admin) || FormManager.UserInfo.Limit.Equals(UserLimit.Debug))
{
btnProduct.Visible = true;
btnCom.Visible = true;
}
else
{
btnProduct.Visible = false;
btnCom.Visible = true;
}
//if (FormManager.UserInfo.Limit.Equals(UserLimit.Admin))
//{
// btnMaintenance.Visible = true;
//}
//else
//{
// btnMaintenance.Visible = false ;
//}
}
public static void Speak(string text)
{
......@@ -60,27 +80,31 @@ namespace TSA_V
fw.ShowDialog();
this.Visible = true;
}
private void btnProduct_Click(object sender, EventArgs e)
{
FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("点击 元器件信息，没有正确输入密码");
return;
}
this.Visible = false; ;
isClick = true;
FrmBoardList.instance.Show();
FrmBoardList.instance .LoadCom();
//FrmPwd fw = new FrmPwd(10);
//DialogResult result = fw.ShowDialog();
//if (!result.Equals(DialogResult.OK))
//{
// LogUtil.info("点击 元器件信息，没有正确输入密码");
// return;
//}
this.Visible = false; ;
isClick = true;
FrmBoardList.instance.Show();
FrmBoardList.instance.LoadCom();
}
private bool useLed = false;
private System.Timers.Timer timer = new System.Timers.Timer();
private void FrmMenu_Load(object sender, EventArgs e)
{
LblUserName.Text = DB.userName;
DB.userName = FormManager.UserInfo.Name;
LblUserName.Text = FormManager.UserInfo.Name + "/" + FormManager.UserInfo.Limit;
GetVersion(true);
Task.Factory.StartNew(delegate
{
......@@ -225,13 +249,13 @@ namespace TSA_V
private void btnCom_Click(object sender, EventArgs e)
{
FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("点击 元器件信息，没有正确输入密码");
return;
}
//FrmPwd fw = new FrmPwd(10);
//DialogResult result = fw.ShowDialog();
//if (!result.Equals(DialogResult.OK))
//{
// LogUtil.info("点击 元器件信息，没有正确输入密码");
// return;
//}
isClick = true;
FrmComponentList.instance.Show();
this.Visible = false;
......@@ -268,13 +292,13 @@ namespace TSA_V
private void btnMaintenance_Click(object sender, EventArgs e)
{
FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("点击 元器件信息，没有正确输入密码");
return;
}
//FrmPwd fw = new FrmPwd(10);
//DialogResult result = fw.ShowDialog();
//if (!result.Equals(DialogResult.OK))
//{
// LogUtil.info("点击 元器件信息，没有正确输入密码");
// return;
//}
isClick = true;
FrmMaintenance.instance.Show();
this.Visible = false;
......
TSA-V/Properties/Resource.en-US.resx
......@@ -1190,7 +1190,7 @@
<value>DAC MODULE DEBUG</value>
</data>
<data name="FrmMaintenance_btnDeviceSelect_Text" xml:space="preserve">
<value>DEVICE SELECTION</value>
<value>USER MANAGMENT </value>
</data>
<data name="FrmMaintenance_btnLed_Text" xml:space="preserve">
<value>LED MODULE DEBUG</value>
......@@ -2267,6 +2267,25 @@
<value>point no</value>
</data>
<data name="名称" xml:space="preserve">
<value>point name</value>
</data>
<value>point name</value>
</data>
<data name="用户名或密码错误" xml:space="preserve">
<value>Incorrect user name or password</value>
</data>
<data name = "添加用户失败" xml:space = "preserve"> <value> Failed to add user </value> </data>
<data name = "退出" xml:space = "preserve"> <value> exit </value> </data>
<data name = "增加" xml:space = "preserve"> <value> add </value> </data>
<data name = "修改" xml:space = "preserve"> <value> modify </value> </data>
<data name = "删除" xml:space = "preserve"> <value> delete </value> </data>
<data name = "用户名" xml:space = "preserve"> <value> username </value> </data>
<data name = "密码" xml:space = "preserve"> <value> password </value> </data>
<data name = "权限" xml:space = "preserve"> <value> Permission </value> </data>
<data name = "用户管理" xml:space = "preserve"> <value> user management </value> </data>
<data name = "确认删除用户" xml:space = "preserve"> <value> Confirm to delete user </value> </data>
<data name = "用户删除成功" xml:space = "preserve"> <value> User deleted successfully </value> </data>
<data name = "用户删除失败" xml:space = "preserve"> <value> Failed to delete user </value> </data>
<data name = "确定修改用户信息" xml:space = "preserve"> <value> Confirm to modify user information </value> </data>
<data name = "用户修改成功" xml:space = "preserve"> <value> Modify user successfully </value> </data>
<data name = "用户修改失败" xml:space = "preserve"> <value> Failed to modify user </value> </data>
<data name = "添加用户成功" xml:space = "preserve"> <value> Added user successfully </value> </data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
......@@ -1174,7 +1174,7 @@
<value>DAC模块调试</value>
</data>
<data name="FrmMaintenance_btnDeviceSelect_Text" xml:space="preserve">
<value>设备选择</value>
<value>用户管理</value>
</data>
<data name="FrmMaintenance_btnLed_Text" xml:space="preserve">
<value>LED模块调试</value>
......@@ -2250,38 +2250,56 @@
<data name="FrmHistorySearch_Text" xml:space="preserve">
<value>历史记录</value>
</data>
<data name="ID" xml:space="preserve">
<value>ID</value>
</data>
<data name="程序名称" xml:space="preserve">
<data name="程序名称" xml:space="preserve">
<value>程序名称</value>
</data>
<data name="程序类型" xml:space="preserve">
<value>程序类型</value>
</data>
<data name="条码" xml:space="preserve">
<data name="条码" xml:space="preserve">
<value>条码</value>
</data>
<data name="宽度" xml:space="preserve">
<value>宽度 ↑</value>
</data>
<data name="长度" xml:space="preserve">
<data name="长度" xml:space="preserve">
<value>长度→</value>
</data>
<data name="结果" xml:space="preserve">
<value>结果</value>
</data>
<data name="用户" xml:space="preserve">
<data name="用户" xml:space="preserve">
<value>用户</value>
</data>
<data name="时间" xml:space="preserve">
<value>时间</value>
</data>
<data name="编号" xml:space="preserve">
<data name="编号" xml:space="preserve">
<value>编号</value>
</data>
<data name="名称" xml:space="preserve">
<value>名称</value>
<value>名称</value>
</data>
<data name="用户名或密码错误" xml:space="preserve">
<value>用户名或密码错误</value>
</data>
<data name = "添加用户失败" xml:space = "preserve"> <value> 添加用户失败 </value> </data>
<data name = "退出" xml:space = "preserve"> <value> 退出 </value> </data>
<data name = "增加" xml:space = "preserve"> <value> 增加 </value> </data>
<data name = "修改" xml:space = "preserve"> <value> 修改 </value> </data>
<data name = "删除" xml:space = "preserve"> <value> 删除 </value> </data>
<data name = "用户名" xml:space = "preserve"> <value> 用户名 </value> </data>
<data name = "密码" xml:space = "preserve"> <value> 密码 </value> </data>
<data name = "权限" xml:space = "preserve"> <value> 权限 </value> </data>
<data name = "用户管理" xml:space = "preserve"> <value> 用户管理 </value> </data>
<data name = "确认删除用户" xml:space = "preserve"> <value> 确认删除用户 </value> </data>
<data name = "删除用户成功" xml:space = "preserve"> <value> 删除用户成功 </value> </data>
<data name = "删除用户失败" xml:space = "preserve"> <value> 删除用户失败 </value> </data>
<data name = "确定修改用户信息" xml:space = "preserve"> <value> 确定修改用户信息 </value> </data>
<data name = "修改用户成功" xml:space = "preserve"> <value> 修改用户成功 </value> </data>
<data name = "修改用户失败" xml:space = "preserve"> <value> 修改用户失败 </value> </data>
<data name = "添加用户成功" xml:space = "preserve"> <value> 添加用户成功 </value> </data>
</root>
\ No newline at end of file
TSA-V/ResourceCulture.cs
......@@ -110,13 +110,18 @@ namespace TSA_V
}
public static void LogDefaultMap()
{
LogUtil.info("开始打印缺少的文字配置" + defaultMap.Count);
//LogUtil.info("开始打印缺少的文字配置" + defaultMap.Count);
StringBuilder builder = new StringBuilder();
builder.Append("开始打印缺少的文字配置" + defaultMap.Count+"\r\n");
foreach (string key in defaultMap.Keys)
{
string value = defaultMap[key];
LogUtil.info(" 缺少文字配置[" + key + "] 默认值[" + value + "]");
}
LogUtil.info("结束打印缺少的文字配置");
builder.Append($"<data name = {key} xml:space = \"preserve\"> <value> { value} </value> </data> \r\n");
//LogUtil.info(" 缺少文字配置[" + key + "] 默认值[" + value + "]");
}
builder.Append("结束打印缺少的文字配置");
LogUtil.info(builder.ToString());
}
private static string spiltStr = "_";
private static string Text = "Text";
......
TSA-V/Smart-Workstation.csproj
......@@ -69,6 +69,9 @@
<Reference Include="Asa.Theme">
<HintPath>..\dll\Asa.Theme.dll</HintPath>
</Reference>
<Reference Include="Asa.UserManagement">
<HintPath>..\dll\user\Asa.UserManagement.dll</HintPath>
</Reference>
<Reference Include="CodeLibrary">
<HintPath>..\dll\CodeLibrary.dll</HintPath>
</Reference>
......@@ -114,12 +117,6 @@
<Compile Include="DataCalculate.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="deviceDebug\FrmPwd.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="deviceDebug\FrmPwd.Designer.cs">
<DependentUpon>FrmPwd.cs</DependentUpon>
</Compile>
<Compile Include="deviceDebug\FrmUpdatePwd.cs">
<SubType>Form</SubType>
</Compile>
......@@ -306,9 +303,6 @@
<Compile Include="FrmDeviceConfig.Designer.cs">
<DependentUpon>FrmDeviceConfig.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="deviceDebug\FrmPwd.resx">
<DependentUpon>FrmPwd.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="deviceDebug\FrmUpdatePwd.resx">
<DependentUpon>FrmUpdatePwd.cs</DependentUpon>
</EmbeddedResource>
......
TSA-V/deviceDebug/FrmUpdatePwd.cs
......@@ -26,14 +26,14 @@ namespace TSA_V
private void btnNext_Click(object sender, EventArgs e)
{
string pwd = txtPwd.Text;
string configPwd = ConfigAppSettings.GetValue(Setting_Init.Config_Pwd);
if (configPwd.Equals(""))
{
configPwd = "123456";
ConfigAppSettings.SaveValue(Setting_Init.Config_Pwd,configPwd);
}
if (pwd.Equals(configPwd))
string pwd = txtPwd.Text.Trim();
//string configPwd = ConfigAppSettings.GetValue(Setting_Init.Config_Pwd);
//if (configPwd.Equals(""))
//{
// configPwd = "123456";
// ConfigAppSettings.SaveValue(Setting_Init.Config_Pwd,configPwd);
//}
if (pwd.Equals(FormManager.UserInfo.Password))
{
string newPwd = FormUtil.getValue(txtNPwd);
......@@ -47,7 +47,8 @@ namespace TSA_V
}
ConfigAppSettings.SaveValue(Setting_Init.Config_Pwd, newPwd);
//ConfigAppSettings.SaveValue(Setting_Init.Config_Pwd, newPwd);
FormManager.userManager.Value.UserUpdatePassword(FormManager.UserInfo.Name, newPwd);
MessageBox.Show(ResourceCulture.GetString("修改密码成功", "修改密码成功"));
this.DialogResult = DialogResult.OK;
......
TSA-V/user/FrmUserM.cs 0 → 100644
此文件的差异被折叠， 点击展开。
dll/log4net.dll
此文件类型无法预览
dll/user/Asa.UserManagement.dll 0 → 100644
此文件类型无法预览
dll/user/Asa.UserManagement.pdb 0 → 100644
此文件类型无法预览
dll/user/Asa.UserManagement.xml 0 → 100644
<?xml version="1.0"?>
<doc>
<assembly>
<name>Asa.UserManagement</name>
</assembly>
<members>
<member name="F:Asa.FrmLogin.components">
<summary>
Required designer variable.
</summary>
</member>
<member name="M:Asa.FrmLogin.Dispose(System.Boolean)">
<summary>
Clean up any resources being used.
</summary>
<param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
</member>
<member name="M:Asa.FrmLogin.InitializeComponent">
<summary>
Required method for Designer support - do not modify
the contents of this method with the code editor.
</summary>
</member>
<member name="F:Asa.FrmManage.components">
<summary>
Required designer variable.
</summary>
</member>
<member name="M:Asa.FrmManage.Dispose(System.Boolean)">
<summary>
Clean up any resources being used.
</summary>
<param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
</member>
<member name="M:Asa.FrmManage.InitializeComponent">
<summary>
Required method for Designer support - do not modify
the contents of this method with the code editor.
</summary>
</member>
<member name="T:Asa.Language">
<summary>
语言
</summary>
</member>
<member name="P:Asa.Language.UserPwdWrong">
<summary>
用户名或密码错误（提示框）
</summary>
</member>
<member name="P:Asa.Language.AddFail">
<summary>
账号添加失败（提示框）
</summary>
</member>
<member name="P:Asa.Language.AddSucceed">
<summary>
账号添加成功（提示框）
</summary>
</member>
<member name="P:Asa.Language.UpdateFail">
<summary>
账号修改失败（提示框）
</summary>
</member>
<member name="P:Asa.Language.UpdateSucceed">
<summary>
账号修改成功（提示框）
</summary>
</member>
<member name="P:Asa.Language.UpdateConfirm">
<summary>
账号修改确认（提示框）
</summary>
</member>
<member name="P:Asa.Language.DelFail">
<summary>
账号删除失败（提示框）
</summary>
</member>
<member name="P:Asa.Language.DelSucceed">
<summary>
账号删除成功（提示框）
</summary>
</member>
<member name="P:Asa.Language.DelConfirm">
<summary>
账号删除确认（提示框）
</summary>
</member>
<member name="P:Asa.Language.LoginTitle">
<summary>
登录框（标题）
</summary>
</member>
<member name="P:Asa.Language.ManageTitle">
<summary>
账号管理（标题）
</summary>
</member>
<member name="P:Asa.Language.UserPwdLimit">
<summary>
用户名密码权限（界面）
</summary>
</member>
<member name="P:Asa.Language.LoginCancel">
<summary>
登录取消（界面）
</summary>
</member>
<member name="P:Asa.Language.AddUpdateDel">
<summary>
添加修改删除（界面）
</summary>
</member>
<member name="P:Asa.Language.Exit">
<summary>
退出（界面）
</summary>
</member>
<member name="T:Asa.UserManagement">
<summary>
用户账户管理
</summary>
</member>
<member name="M:Asa.UserManagement.#ctor(System.String)">
<summary>
用户账户管理
</summary>
<param name="logName">日志名称</param>
</member>
<member name="P:Asa.UserManagement.Icon">
<summary>
窗口图标
</summary>
</member>
<member name="P:Asa.UserManagement.DatabasePath">
<summary>
SQLite数据库路径
</summary>
</member>
<member name="M:Asa.UserManagement.Connect">
<summary>
数据库连接
</summary>
<returns></returns>
</member>
<member name="M:Asa.UserManagement.Close">
<summary>
数据库关闭
</summary>
</member>
<member name="M:Asa.UserManagement.UserLogin(Asa.Users@)">
<summary>
用户登录
</summary>
<param name="user"></param>
<returns></returns>
</member>
<member name="M:Asa.UserManagement.UserInsert(Asa.Users)">
<summary>
用户添加
</summary>
<param name="user"></param>
<returns></returns>
</member>
<member name="M:Asa.UserManagement.UserUpdatePassword(System.String,System.String)">
<summary>
用户更新密码
</summary>
<param name="userName"></param>
<param name="newPassword"></param>
<returns></returns>
</member>
<member name="M:Asa.UserManagement.UserUpdateLimit(System.String,Asa.UserLimit)">
<summary>
用户更新权限
</summary>
<param name="userName"></param>
<param name="newLimit"></param>
<returns></returns>
</member>
<member name="M:Asa.UserManagement.UserDelete(System.String)">
<summary>
用户删除
</summary>
<param name="userName"></param>
<returns></returns>
</member>
<member name="M:Asa.UserManagement.LoginForm(Asa.Users@)">
<summary>
登录窗口
</summary>
<param name="user"></param>
<returns></returns>
</member>
<member name="M:Asa.UserManagement.LoginForm(System.Windows.Forms.Form,Asa.Users@)">
<summary>
登录窗口
</summary>
<param name="parent"></param>
<param name="user"></param>
<returns></returns>
</member>
<member name="M:Asa.UserManagement.ManageForm(System.Windows.Forms.Form)">
<summary>
账户管理窗口
</summary>
<param name="parent"></param>
</member>
<member name="M:Asa.UserManagement.ManageForm">
<summary>
账户管理窗口
</summary>
</member>
</members>
</doc>
dll/user/System.Data.SQLite.dll 0 → 100644
此文件类型无法预览
dll/user/System.Data.SQLite.xml 0 → 100644
此文件的差异太大，无法显示。
dll/user/database.sqlite3 0 → 100644
此文件类型无法预览
dll/user/log4net.dll 0 → 100644
此文件类型无法预览
dll/user/log4net.xml 0 → 100644
此文件的差异太大，无法显示。
dll/user/x64/SQLite.Interop.dll 0 → 100644
此文件类型无法预览
dll/user/x86/SQLite.Interop.dll 0 → 100644
此文件类型无法预览
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!