Skip to content

李娜 / Line-Smart-Workstation

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

界面修改。增加中英文处理

1 个父辈 1ad53a19
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 218 行增加 和 1 行删除
TSA-V/FrmHistorySearch.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace TSA_V
{
public partial class FrmHistorySearch : FrmBase
{
public FrmHistorySearch()
{
InitializeComponent();
}
private void frmHistorySearch_Load(object sender, EventArgs e)
{
DtpTimeFront.Value = DateTime.Now.AddHours(-8);
DtpTimeBack.Value = DateTime.Now;
LoadColName();
}
private void LoadColName()
{
col_ID.HeaderText = ResourceCulture.GetString("ID");
col_ProName.HeaderText = ResourceCulture.GetString("程序名称");
col_ProType.HeaderText = ResourceCulture.GetString("程序类型");
col_BarCode.HeaderText = ResourceCulture.GetString("条码");
col_BoardWidth.HeaderText = ResourceCulture.GetString("宽度");
col_BoardLength.HeaderText = ResourceCulture.GetString("长度");
col_AoiResult.HeaderText = ResourceCulture.GetString("结果");
col_UserName.HeaderText = ResourceCulture.GetString("用户");
col_CreateDate.HeaderText = ResourceCulture.GetString("时间");
pcol_CreateDate.HeaderText = ResourceCulture.GetString("时间");
pcol_ID.HeaderText = ResourceCulture.GetString("ID");
pcol_PartNum.HeaderText = ResourceCulture.GetString("编号");
pcol_PointName.HeaderText = ResourceCulture.GetString("名称");
}
private void BtnQuery_Click(object sender, EventArgs e)
{
string timeFront = null, timeBack = null;
if (DtpTimeFront.Checked) timeFront = string.Format("{0:yyyy-MM-dd HH:mm:ss}", DtpTimeFront.Value);
if (DtpTimeBack.Checked) timeBack = string.Format("{0:yyyy-MM-dd HH:mm:ss}", DtpTimeBack.Value);
bool rtn = DeviceLibrary.DB.db.QueryHistory(TxtCode.Text, timeFront, timeBack, out string[][] data);
if (rtn)
{
DgvOperateInfo.Rows.Clear();
if (data.Length == 0)
MessageBox.Show("没有找到记录");
else
for (int i = 0; i < data.Length; i++)
DgvOperateInfo.Rows.Add(data[i]);
}
else
{
MessageBox.Show("查询出错", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
private void DgvOperateInfo_CellClick(object sender, DataGridViewCellEventArgs e)
{
if (DgvOperateInfo.CurrentCell == null) return;
string id = DgvOperateInfo.Rows[DgvOperateInfo.CurrentCell.RowIndex].Cells[0].Value.ToString();
bool rtn = DeviceLibrary.DB.db.QueryPointInfo(id, out string[][] data);
if (rtn)
{
DgvPointInfo.Rows.Clear();
if (data.Length == 0)
MessageBox.Show("没有找到记录");
else
for (int i = 0; i < data.Length; i++)
DgvPointInfo.Rows.Add(data[i]);
}
else
{
MessageBox.Show("查询出错", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
private void btnExit_Click(object sender, EventArgs e)
{
this.Close();
}
}
}
TSA-V/FrmLogin.cs
...@@ -7,6 +7,7 @@ using System.Linq; ...@@ -7,6 +7,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using TSA_V.Common;
namespace TSA_V namespace TSA_V
{ {
...@@ -15,6 +16,9 @@ namespace TSA_V ...@@ -15,6 +16,9 @@ namespace TSA_V
public FrmLogin() public FrmLogin()
{ {
InitializeComponent(); InitializeComponent();
string str = ConfigAppSettings.GetValue(Setting_Init.Default_Language);
LogUtil.info("默认语言：" + str);
ResourceCulture.SetCurrentCulture(str);
} }
private void BtnLogin_Click(object sender, EventArgs e) private void BtnLogin_Click(object sender, EventArgs e)
......
TSA-V/FrmMenu.cs
...@@ -344,8 +344,10 @@ namespace TSA_V ...@@ -344,8 +344,10 @@ namespace TSA_V
private void BtnHistory_Click(object sender, EventArgs e) private void BtnHistory_Click(object sender, EventArgs e)
{ {
FrmHistory frm = new FrmHistory(); FrmHistorySearch frm = new FrmHistorySearch();
frm.ShowDialog(); frm.ShowDialog();
//FrmHistory frm = new FrmHistory();
//frm.ShowDialog();
} }
} }
} }
TSA-V/Properties/Resource.en-US.resx
...@@ -2215,4 +2215,58 @@ ...@@ -2215,4 +2215,58 @@
<data name="FrmLogin_Text" xml:space="preserve"> <data name="FrmLogin_Text" xml:space="preserve">
<value>Login</value> <value>Login</value>
</data> </data>
<data name="FrmHistorySearch_btnExit_Text" xml:space="preserve">
<value>Exit</value>
</data>
<data name="FrmHistorySearch_BtnQuery_Text" xml:space="preserve">
<value>Search</value>
</data>
<data name="FrmHistorySearch_groupBox1_Text" xml:space="preserve">
<value>History query</value>
</data>
<data name="FrmHistorySearch_label1_Text" xml:space="preserve">
<value>Code</value>
</data>
<data name="FrmHistorySearch_label2_Text" xml:space="preserve">
<value>start time</value>
</data>
<data name="FrmHistorySearch_label3_Text" xml:space="preserve">
<value>end time</value>
</data>
<data name="FrmHistorySearch_Text" xml:space="preserve">
<value>HISTORY</value>
</data>
<data name="ID" xml:space="preserve">
<value>ID</value>
</data>
<data name="程序名称" xml:space="preserve">
<value>program name </value>
</data>
<data name="程序类型" xml:space="preserve">
<value>program type</value>
</data>
<data name="条码" xml:space="preserve">
<value>barcode</value>
</data>
<data name="宽度" xml:space="preserve">
<value>width ↑</value>
</data>
<data name="长度" xml:space="preserve">
<value>length→</value>
</data>
<data name="结果" xml:space="preserve">
<value>result</value>
</data>
<data name="用户" xml:space="preserve">
<value>username</value>
</data>
<data name="时间" xml:space="preserve">
<value>creat time</value>
</data>
<data name="编号" xml:space="preserve">
<value>point no</value>
</data>
<data name="名称" xml:space="preserve">
<value>point name</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -2229,4 +2229,59 @@ ...@@ -2229,4 +2229,59 @@
<data name="FrmLogin_Text" xml:space="preserve"> <data name="FrmLogin_Text" xml:space="preserve">
<value>登录</value> <value>登录</value>
</data> </data>
<data name="FrmHistorySearch_btnExit_Text" xml:space="preserve">
<value>退出</value>
</data>
<data name="FrmHistorySearch_BtnQuery_Text" xml:space="preserve">
<value>查询</value>
</data>
<data name="FrmHistorySearch_groupBox1_Text" xml:space="preserve">
<value>历史记录查询</value>
</data>
<data name="FrmHistorySearch_label1_Text" xml:space="preserve">
<value>条码</value>
</data>
<data name="FrmHistorySearch_label2_Text" xml:space="preserve">
<value>开始时间</value>
</data>
<data name="FrmHistorySearch_label3_Text" xml:space="preserve">
<value>结束时间</value>
</data>
<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">
<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> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Smart-Workstation.csproj
...@@ -163,6 +163,12 @@ ...@@ -163,6 +163,12 @@
<Compile Include="FrmHistory.Designer.cs"> <Compile Include="FrmHistory.Designer.cs">
<DependentUpon>FrmHistory.cs</DependentUpon> <DependentUpon>FrmHistory.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmHistorySearch.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmHistorySearch.Designer.cs">
<DependentUpon>FrmHistorySearch.cs</DependentUpon>
</Compile>
<Compile Include="FrmLogin.cs"> <Compile Include="FrmLogin.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -324,6 +330,9 @@ ...@@ -324,6 +330,9 @@
<EmbeddedResource Include="FrmHistory.resx"> <EmbeddedResource Include="FrmHistory.resx">
<DependentUpon>FrmHistory.cs</DependentUpon> <DependentUpon>FrmHistory.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmHistorySearch.resx">
<DependentUpon>FrmHistorySearch.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmLogin.resx"> <EmbeddedResource Include="FrmLogin.resx">
<DependentUpon>FrmLogin.cs</DependentUpon> <DependentUpon>FrmLogin.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!