界面调整

LN
Commit 3faecd08 由 LN 编写于 2024-04-02 10:00:21 +0800
TSA-V/FrmMaintenance.Designer.cs
TSA-V/FrmMaintenance.resx
TSA-V/Properties/Resource.en-US.resx
TSA-V/Properties/Resource.zh-CN.resx
TSA-V/frmBoard/FrmAddBoard.Designer.cs
TSA-V/frmBoard/FrmAddBoard.cs
TSA-V/frmBoard/FrmBoardInfo.Designer.cs
TSA-V/frmBoard/FrmBoardInfo.resx
TSA-V/frmBoard/FrmBomUpload.Designer.cs
TSA-V/workForm/FrmTSAV.Designer.cs
TSA-V/workForm/FrmTSAV.cs
--- a/TSA-V/FrmMaintenance.Designer.cs
查看文件 @3faecd0
+++ b/TSA-V/FrmMaintenance.Designer.cs
查看文件 @3faecd0
@@ -120,7 +120,7 @@
            this.btnPosition.Name = "btnPosition";
            this.btnPosition.Size = new System.Drawing.Size(240, 70);
            this.btnPosition.TabIndex = 6;
-            this.btnPosition.Text = "电机调试";
+            this.btnPosition.Text = "电机";
            this.btnPosition.UseVisualStyleBackColor = false;
            this.btnPosition.Click += new System.EventHandler(this.btnPosition_Click);
            // 
@@ -168,7 +168,7 @@
            this.btnWidthC.Name = "btnWidthC";
            this.btnWidthC.Size = new System.Drawing.Size(240, 70);
            this.btnWidthC.TabIndex = 20;
-            this.btnWidthC.Text = "轨道调宽";
+            this.btnWidthC.Text = "轨道";
            this.btnWidthC.UseVisualStyleBackColor = false;
            this.btnWidthC.Click += new System.EventHandler(this.btnWidthC_Click);
            // 

--- a/TSA-V/FrmMaintenance.resx
查看文件 @3faecd0
+++ b/TSA-V/FrmMaintenance.resx
查看文件 @3faecd0
@@ -997,7 +997,7 @@
        RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
        lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
        f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAA9UFJREFUeF7snYd620jT
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEAAACxABrSO9dQAA9UFJREFUeF7snYd620jT
        rM/9X9v/7VpizsiZlC/hvNUNUrQs2RJJKO3U06YhhIndEwqDnv9X1u3h4eFnQMC7A8Wr233ZdPxerIQ8
        yeNV010cBs/FZbtM20XaLbL9LG03eUOAFwTHEySDZ0kSwfZnAwJ+BXrS7Q9F3W6zepXWcdGibv21l4FG
        pWW3TOpFXO3yGsO5WMdIADGi9vO4Gm/LeUwauro7DKGzWERSNKR5tiuV8qwu6q7bP1xmrQEBHw7sru32

--- a/TSA-V/Properties/Resource.en-US.resx
查看文件 @3faecd0
+++ b/TSA-V/Properties/Resource.en-US.resx
查看文件 @3faecd0
@@ -610,7 +610,7 @@
    <value>Exit</value>
  </data>
  <data name="FrmMaintenance_btnPosition_Text" xml:space="preserve">
-    <value>Motor Debug</value>
+    <value>Motor</value>
  </data>
  <data name="FrmMaintenance_btnDebug_Text" xml:space="preserve">
    <value>I/O Module</value>
@@ -1238,7 +1238,7 @@
    <value>Foot Peddler</value>
  </data>
  <data name="FrmWork_radioButton2_Text" xml:space="preserve">
-    <value>Auto </value>
+    <value>Auto： </value>
  </data>
  <data name="NotOpen" xml:space="preserve">
    <value>Temporarily isn't open.</value>
@@ -1546,12 +1546,12 @@
  <data name="WBasePointP" xml:space="preserve">
    <value>Please enter a valid reference point coordinate.</value>
  </data>
-  <data name="FrmAddBoard_label7_Text" xml:space="preserve">
+  <!--<data name="FrmAddBoard_label7_Text" xml:space="preserve">
    <value>Left Distance</value>
  </data>
  <data name="FrmAddBoard_lblBaseImageY_Text" xml:space="preserve">
    <value>Upward Side Distance</value>
-  </data>
+  </data>-->
  <data name="FrmAddBoard_chbSort_Text" xml:space="preserve">
    <value>Component Sequence Automation</value>
  </data>
@@ -2147,10 +2147,10 @@
    <value>Motor Position</value>
  </data>
  <data name="FrmChangeWidth_Text" xml:space="preserve">
-    <value>Conveyor Control</value>
+    <value>Conveyor</value>
  </data>
  <data name="FrmMaintenance_btnWidthC_Text" xml:space="preserve">
-    <value>Conveyor Control</value>
+    <value>Conveyor</value>
  </data>
  <data name="FrmBoardSelect_chbGuoban_Text" xml:space="preserve">
    <value>Inline Mode</value>
@@ -2480,7 +2480,7 @@
    <value> Select File </value>
  </data>
  <data name="FrmAddBoard_groupBoxSelCom_Text" xml:space="preserve">
-    <value> BOM </value>
+    <value> Data </value>
  </data>
  <data name="FrmAddBoard_likSelCsvFile_Text" xml:space="preserve">
    <value> Select File </value>
@@ -2658,10 +2658,10 @@
  <data name = "CalMsg2" xml:space = "preserve"> <value> Step 2: Move the projection cursor to the lower right corner of the board </value>   </data>
  <data name = "CalMsg3" xml:space = "preserve"> <value> Step 3: Click the Start Calibration button  </value>   </data>
  <data name = "Type_None" xml:space = "preserve"> <value> None </value>   </data>
-  <data name = "FrmPointInfo_lblPolarities_Text" xml:space = "preserve"> <value> Polarity </value>   </data>
+  <data name = "FrmPointInfo_lblPolarities_Text" xml:space = "preserve"> <value> Polarity： </value>   </data>
  <data name = "FrmAddBoard_linkDataViewer_Text" xml:space = "preserve"> <value> Data Preview </value>   </data>
  <data name = "FrmAddBoard_linkBomUpload_Text" xml:space = "preserve"> <value> data sheet upload </value>   </data>
-  <data name = "FrmAddBoard_lblPolarities_Text" xml:space = "preserve"> <value> polarities </value>   </data>
+  <data name = "FrmAddBoard_lblPolarities_Text" xml:space = "preserve"> <value> Polarity： </value>   </data>
  <data name = "FrmBomUpload_Text" xml:space = "preserve"> <value> data sheet upload </value>   </data>
  <data name = "FrmBomUpload_groupBox3_Text" xml:space = "preserve"> <value> Other settings </value>   </data>
  <data name = "FrmBomUpload_chbAutoPos_Text" xml:space = "preserve"> <value>  Automatic consolidation of libraries </value>   </data>

--- a/TSA-V/Properties/Resource.zh-CN.resx
查看文件 @3faecd0
+++ b/TSA-V/Properties/Resource.zh-CN.resx
查看文件 @3faecd0
@@ -610,7 +610,7 @@
    <value>返回</value>
  </data>
  <data name="FrmMaintenance_btnPosition_Text" xml:space="preserve">
-    <value>电机调试</value>
+    <value>电机</value>
  </data>
  <data name="FrmMaintenance_btnDebug_Text" xml:space="preserve">
    <value>IO模块</value>
@@ -1222,7 +1222,7 @@
    <value>脚踏工作</value>
  </data>
  <data name="FrmWork_radioButton2_Text" xml:space="preserve">
-    <value>自动工作</value>
+    <value>自动工作：</value>
  </data>
  <data name="NotOpen" xml:space="preserve">
    <value>暂未开放</value>
@@ -1539,12 +1539,12 @@
  <data name="WBasePointP" xml:space="preserve">
    <value>请输入有效的基准点坐标</value>
  </data>
-  <data name="FrmAddBoard_label7_Text" xml:space="preserve">
+  <!--<data name="FrmAddBoard_label7_Text" xml:space="preserve">
    <value>基准点离左侧距离</value>
  </data>
  <data name="FrmAddBoard_lblBaseImageY_Text" xml:space="preserve">
    <value>基准点离上方距离：</value>
-  </data>
+  </data>-->
  <data name="FrmAddBoard_chbSort_Text" xml:space="preserve">
    <value>自动排序</value>
  </data>
@@ -1750,7 +1750,7 @@
    <value>显示点</value>
  </data>
  <data name="FrmGalvanometerTest_label5_Text" xml:space="preserve">
-    <value>点形状：</value>
+    <value>形状：</value>
  </data>
  <data name="FrmGalvanometerTest_label6_Text" xml:space="preserve">
    <value>点大小 ：</value>
@@ -1798,7 +1798,7 @@
    <value>移动测试</value>
  </data>
  <data name="FrmPositionCalibration_lbltype_Text" xml:space="preserve">
-    <value>点形状：</value>
+    <value>形状：</value>
  </data>
  <data name="FrmPositionCalibration_lblSize_Text" xml:space="preserve">
    <value>点大小 ：</value>
@@ -1840,7 +1840,7 @@
    <value>移动测试</value>
  </data>
  <data name="FrmPointInfo_lbltype_Text" xml:space="preserve">
-    <value>点形状：</value>
+    <value>形状：</value>
  </data>
  <data name="FrmPointInfo_lblSize_Text" xml:space="preserve">
    <value>点大小 ：</value>
@@ -1864,7 +1864,7 @@
    <value>移动测试</value>
  </data>
  <data name="FrmAddBoard_lbltype_Text" xml:space="preserve">
-    <value>点形状：</value>
+    <value>形状：</value>
  </data>
  <data name="FrmAddBoard_lblSize_Text" xml:space="preserve">
    <value>点大小 ：</value>
@@ -2056,7 +2056,7 @@
    <value>点大小：</value>
  </data>
  <data name="FrmDeviceConfig_lbltype_Text" xml:space="preserve">
-    <value>点形状：</value>
+    <value>形状：</value>
  </data>
  <data name="已取消更改" xml:space="preserve">
    <value>已取消更改</value>
@@ -2074,31 +2074,31 @@
    <value>请输入正确的点大小</value>
  </data>
  <data name="FrmAddBoard_lblSizeLength_Text" xml:space="preserve">
-    <value>横向大小→：</value>
+    <value>宽→：</value>
  </data>
  <data name="FrmAddBoard_lblSizeWidth_Text" xml:space="preserve">
-    <value>纵向大小↓：</value>
+    <value>高↓：</value>
  </data>
  <data name="FrmAddBoard_lblStepValue_Text" xml:space="preserve">
    <value>步进值：</value>
  </data>
  <data name="FrmPointInfo_lblSizeLength_Text" xml:space="preserve">
-    <value>横向大小→：</value>
+    <value>宽→：</value>
  </data>
  <data name="FrmPointInfo_lblSizeWidth_Text" xml:space="preserve">
-    <value>纵向大小↓：</value>
+    <value>高↓：</value>
  </data>
  <data name="FrmPointInfo_lblStepValue_Text" xml:space="preserve">
    <value>步进值：</value>
  </data>
  <data name="FrmAddBoard_lblLineWidth_Text" xml:space="preserve">
-    <value>画笔宽度：</value>
+    <value>像素：</value>
  </data>
  <data name="FrmPointInfo_lblLineWidth_Text" xml:space="preserve">
-    <value>画笔宽度：</value>
+    <value>像素：</value>
  </data>
  <data name="FrmDeviceConfig_lblLineWidth_Text" xml:space="preserve">
-    <value>画笔宽度：</value>
+    <value>像素：</value>
  </data>
  <data name="FrmIoManager_btnBottomDown_Text" xml:space="preserve">
    <value>底部气缸下降</value>
@@ -2164,10 +2164,10 @@
    <value>轨道电机位置</value>
  </data>
  <data name="FrmChangeWidth_Text" xml:space="preserve">
-    <value>轨道调宽</value>
+    <value>轨道</value>
  </data>
  <data name="FrmMaintenance_btnWidthC_Text" xml:space="preserve">
-    <value>轨道调宽</value>
+    <value>轨道</value>
  </data>
  <data name="FrmBoardSelect_chbGuoban_Text" xml:space="preserve">
    <value>流水线过板模式</value>
@@ -2344,10 +2344,10 @@
    <value> 清零位置 </value>
  </data>
  <data name="LineWidth" xml:space="preserve">
-    <value>线体宽度</value>
+    <value>流水线宽度</value>
  </data>
  <data name="WriteLineWidth" xml:space="preserve">
-    <value>请输入线体宽度</value>
+    <value>请输入流水线宽度</value>
  </data>
  <data name="FrmBoardSelect_btnChangeW_Text" xml:space="preserve">
    <value> 调宽 </value>
@@ -2359,7 +2359,7 @@
    <value> 投影文字： </value>
  </data>
  <data name="FrmBoardInfo_lblLineW_Text" xml:space="preserve">
-    <value> 线体宽度： </value>
+    <value> 流水线宽度： </value>
  </data>
  <data name="FrmBoardInfo_lbllinews_Text" xml:space="preserve">
    <value> mm </value>
@@ -2428,7 +2428,7 @@
    <value>注意事项</value>
  </data>
  <data name="FrmAddBoard_lblWidth_Text" xml:space="preserve">
-    <value> 线体宽度： </value>
+    <value> 流水线宽度： </value>
  </data>
  <data name="FrmBoardSelect_chbWorkSingleStart_Text" xml:space="preserve">
    <value> 启用工作区检测开始工作 </value>
@@ -2497,7 +2497,7 @@
    <value> 选择文件 </value>
  </data>
  <data name="FrmAddBoard_groupBoxSelCom_Text" xml:space="preserve">
-    <value> 请选择元器件库 </value>
+    <value> 数据 </value>
  </data>
  <data name="FrmAddBoard_likSelCsvFile_Text" xml:space="preserve">
    <value> 选择文件 </value>
@@ -2569,7 +2569,7 @@
    <value>操作失败，当前为过板模式</value>
  </data>
  <data name="LineCheckHigh" xml:space="preserve">
-    <value>线体检测信号亮</value>
+    <value>流水线检测信号亮</value>
  </data>
  <data name="LineNotInitOk" xml:space="preserve">
    <value>设备未初始化完成</value>
@@ -2657,17 +2657,17 @@
  <data name = "CalMsg2" xml:space = "preserve"> <value> 第二步：请将光标移动至如图示电路板右下角位置，确认后点击设置按钮 </value>   </data>
  <data name = "CalMsg3" xml:space = "preserve"> <value> 第三步：请点击开始校准按钮，自动计算投影坐标 </value>   </data>
 <data name = "Type_None" xml:space = "preserve"> <value> 无 </value>   </data> 
-<data name = "FrmPointInfo_lblPolarities_Text" xml:space = "preserve"> <value> 极性 </value>   </data>
+<data name = "FrmPointInfo_lblPolarities_Text" xml:space = "preserve"> <value> 极性： </value>   </data>
  <data name = "FrmAddBoard_linkDataViewer_Text" xml:space = "preserve"> <value> 数据预览 </value>   </data>
  <data name = "FrmAddBoard_linkBomUpload_Text" xml:space = "preserve"> <value> 数据表上传 </value>   </data>
-  <data name = "FrmAddBoard_lblPolarities_Text" xml:space = "preserve"> <value> 极性 </value>   </data>
+  <data name = "FrmAddBoard_lblPolarities_Text" xml:space = "preserve"> <value> 极性： </value>   </data>
  <data name = "FrmBomUpload_Text" xml:space = "preserve"> <value> 数据表上传 </value>   </data>
  <data name = "FrmBomUpload_groupBox3_Text" xml:space = "preserve"> <value> 其他设置 </value>   </data>
  <data name = "FrmBomUpload_chbAutoPos_Text" xml:space = "preserve"> <value> 同物料自动合并库位 </value>   </data>
  <data name = "FrmBomUpload_label3_Text" xml:space = "preserve"> <value> 元器件默认数量： </value>   </data>
  <data name = "FrmBomUpload_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value>   </data>
  <data name = "FrmBomUpload_btnUpload_Text" xml:space = "preserve"> <value> 确定上传 </value>   </data>
-  <data name = "FrmBomUpload_groupBox2_Text" xml:space = "preserve"> <value> 请选择对应关系 </value>   </data>
+  <data name = "FrmBomUpload_groupBox2_Text" xml:space = "preserve"> <value> 请选择映射关系 </value>   </data>
  <data name = "FrmBomUpload_label2_Text" xml:space = "preserve"> <value> BOM文件位号分隔符： </value>   </data>
  <data name = "FrmBomUpload_label5_Text" xml:space = "preserve"> <value> 位置文件位号： </value>   </data>
  <data name = "FrmBomUpload_label8_Text" xml:space = "preserve"> <value> X坐标： </value>   </data>
@@ -2700,7 +2700,7 @@
  <data name = "FrmDeviceConfig_chbDisBottomCylinder_Text" xml:space = "preserve"> <value> 禁用底部气缸 </value>   </data>
  <data name = "FrmAddBoard_chbShowText_Text" xml:space = "preserve"> <value> 默认设置位号为投影文字 </value>   </data>
  <data name = "FrmAddBoard_groupBox4_Text" xml:space = "preserve"> <value> 点位默认设置 </value>   </data>
-  <data name = "FrmAddBoard_label10_Text" xml:space = "preserve"> <value> 横向大小→： </value>   </data>
+  <data name = "FrmAddBoard_label10_Text" xml:space = "preserve"> <value> 宽度→： </value>   </data>
  <data name = "FrmAddBoard_rdbData_Text" xml:space = "preserve"> <value> 数据表上传 </value>   </data>
  <data name = "FrmBoardInfo_linkDis_Text" xml:space = "preserve"> <value> 批量禁用 </value>   </data>
  <data name = "FrmBoardInfo_linkEnable_Text" xml:space = "preserve"> <value> 批量启用 </value>   </data>

--- a/TSA-V/frmBoard/FrmAddBoard.Designer.cs
查看文件 @3faecd0
+++ b/TSA-V/frmBoard/FrmAddBoard.Designer.cs
查看文件 @3faecd0
--- a/TSA-V/frmBoard/FrmAddBoard.cs
查看文件 @3faecd0
+++ b/TSA-V/frmBoard/FrmAddBoard.cs
查看文件 @3faecd0
--- a/TSA-V/frmBoard/FrmBoardInfo.Designer.cs
查看文件 @3faecd0
+++ b/TSA-V/frmBoard/FrmBoardInfo.Designer.cs
查看文件 @3faecd0
@@ -51,6 +51,7 @@
            this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
            this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
            this.dataGridViewImageColumn2 = new System.Windows.Forms.DataGridViewImageColumn();
+            this.colorDialog1 = new System.Windows.Forms.ColorDialog();
            this.panel1 = new System.Windows.Forms.Panel();
            this.linkDis = new System.Windows.Forms.LinkLabel();
            this.linkEnable = new System.Windows.Forms.LinkLabel();
@@ -123,7 +124,6 @@
            this.button1 = new System.Windows.Forms.Button();
            this.btnSave = new System.Windows.Forms.Button();
            this.panel2 = new System.Windows.Forms.Panel();
-            this.colorDialog1 = new System.Windows.Forms.ColorDialog();
            this.contextMenuStrip1.SuspendLayout();
            this.contextMenuStrip2.SuspendLayout();
            this.panel1.SuspendLayout();
@@ -334,7 +334,7 @@
            this.btnCalibrate.Name = "btnCalibrate";
            this.btnCalibrate.Size = new System.Drawing.Size(120, 45);
            this.btnCalibrate.TabIndex = 294;
-            this.btnCalibrate.Text = "投影标定";
+            this.btnCalibrate.Text = "校准";
            this.btnCalibrate.UseVisualStyleBackColor = true;
            this.btnCalibrate.Click += new System.EventHandler(this.btnCalibrate_Click);
            // 

--- a/TSA-V/frmBoard/FrmBoardInfo.resx
查看文件 @3faecd0
+++ b/TSA-V/frmBoard/FrmBoardInfo.resx
查看文件 @3faecd0
@@ -156,6 +156,9 @@
        AeLDoohrNFdzAAAAAElFTkSuQmCC
 </value>
  </data>
+  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1043, 17</value>
+  </metadata>
  <metadata name="Column_pointNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -237,9 +240,6 @@
  <metadata name="Column_Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
-  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1043, 17</value>
-  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>82</value>
  </metadata>

--- a/TSA-V/frmBoard/FrmBomUpload.Designer.cs
查看文件 @3faecd0
+++ b/TSA-V/frmBoard/FrmBomUpload.Designer.cs
查看文件 @3faecd0
@@ -34,8 +34,6 @@
            this.txtXyFile = new System.Windows.Forms.TextBox();
            this.txtBomFile = new System.Windows.Forms.TextBox();
            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.txtSpilt = new System.Windows.Forms.TextBox();
            this.label5 = new System.Windows.Forms.Label();
            this.cmbTagNumber = new System.Windows.Forms.ComboBox();
            this.label8 = new System.Windows.Forms.Label();
@@ -48,6 +46,8 @@
            this.cmbPn = new System.Windows.Forms.ComboBox();
            this.label4 = new System.Windows.Forms.Label();
            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtSpilt = new System.Windows.Forms.TextBox();
            this.btnCancel = new System.Windows.Forms.Button();
            this.btnUpload = new System.Windows.Forms.Button();
            this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
@@ -141,26 +141,7 @@
            this.groupBox2.Size = new System.Drawing.Size(553, 279);
            this.groupBox2.TabIndex = 1;
            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "请选择对应关系";
+            this.groupBox2.Text = "请选择映射关系";
-            // 
-            // label2
-            // 
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(6, 76);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(242, 20);
-            this.label2.TabIndex = 321;
-            this.label2.Text = "BOM文件位号分隔符：";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // txtSpilt
-            // 
-            this.txtSpilt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtSpilt.Location = new System.Drawing.Point(254, 73);
-            this.txtSpilt.Name = "txtSpilt";
-            this.txtSpilt.Size = new System.Drawing.Size(133, 26);
-            this.txtSpilt.TabIndex = 320;
-            this.txtSpilt.Text = ",";
            // 
            // label5
            // 
@@ -282,6 +263,25 @@
            this.label1.Text = "物料编码：";
            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
+            // label2
+            // 
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(6, 76);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(242, 20);
+            this.label2.TabIndex = 321;
+            this.label2.Text = "BOM文件位号分隔符：";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // txtSpilt
+            // 
+            this.txtSpilt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtSpilt.Location = new System.Drawing.Point(254, 73);
+            this.txtSpilt.Name = "txtSpilt";
+            this.txtSpilt.Size = new System.Drawing.Size(133, 26);
+            this.txtSpilt.TabIndex = 320;
+            this.txtSpilt.Text = ",";
+            // 
            // btnCancel
            // 
            this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

--- a/TSA-V/workForm/FrmTSAV.Designer.cs
查看文件 @3faecd0
+++ b/TSA-V/workForm/FrmTSAV.Designer.cs
查看文件 @3faecd0
--- a/TSA-V/workForm/FrmTSAV.cs
查看文件 @3faecd0
+++ b/TSA-V/workForm/FrmTSAV.cs
查看文件 @3faecd0
@@ -178,7 +178,7 @@ namespace TSA_V
        {
            txtAuToTime.Visible = isShow;
            btnUpdateAutoTime.Visible = isShow;
-            label7.Visible = isShow;
+            //label7.Visible = isShow;
            label8.Visible = isShow;
        }
        private void LoadPoint()
@@ -372,11 +372,11 @@ namespace TSA_V
        {
            //bool isCy = ConfigAppSettings.GetBoolValue(Setting_Init.IsCycleDebug);
            LogUtil.info(Name + "点击：" + btnStartWorking.Text + "，自动启动循环测试模式=" + Setting_NInit.Device_IsCycleDebug);
-            btnStartWorking.Enabled = false;
+            btnStartWorking.Visible = false;
            //开始工作
            TSAVBean.StartWork(BoardManager.CurrBoard);
            WorkInfo.IsCycleDebug = Setting_NInit.Device_IsCycleDebug;
-            btnStartWorking.Enabled = true;
+            btnStartWorking.Visible = true;
        }
        private void FrmWelding_FormClosing(object sender, FormClosingEventArgs e)
@@ -395,8 +395,8 @@ namespace TSA_V
        }
        private void FormStatus()
        {
-            btnSave.Enabled = true;
+            btnSave.Visible = true;
-            btnGoHome.Enabled = true;
+            btnGoHome.Visible = true;
            if (TSAVBean.Status <= (TSAVStatus.Wait))
            {
                btnStart.Visible = true;
@@ -413,17 +413,17 @@ namespace TSA_V
                if (TSAVBean.Status.Equals(TSAVStatus.Runing) && (!TSAVBean.IsInSuddenDown))
                {
-                    btnStartWorking.Enabled = !(TSAVBean.Work.IsWorking);
+                    btnStartWorking.Visible = !(TSAVBean.Work.IsWorking);
-                    btnNextPoint.Enabled = true;
+                    btnNextPoint.Visible = true;
-                    btnPrePoint.Enabled = true;
+                    btnPrePoint.Visible = true;
                }
                else
                {
-                    btnStartWorking.Enabled = false;
+                    btnStartWorking.Visible = false;
                    if (Setting_NInit.App_IsDebug.Equals(false))
                    {
-                        btnNextPoint.Enabled = false;
+                        btnNextPoint.Visible = false;
-                        btnPrePoint.Enabled = false;
+                        btnPrePoint.Visible = false;
                    }
                }
            }
@@ -935,10 +935,11 @@ namespace TSA_V
        }
        private void ShowUpdateCount(bool isShow)
        {
+            lblCount.Visible = !isShow;
            txtCount.Visible = isShow;
            btnSave.Visible = isShow;
            btnCancel.Visible = isShow;
-            btnUpateCount.Visible = !isShow;
+            //btnUpateCount.Visible = !isShow;
        }
        private void btnSave_Click(object sender, EventArgs e)
        {
@@ -1098,6 +1099,14 @@ namespace TSA_V
        {
            FrmIoManager frmWorkIo = new FrmIoManager(true);
            frmWorkIo.ShowDialog();
-        }        
+        }
+        private void lblCount_DoubleClick(object sender, EventArgs e)
+        {
+            if (lblCount.Visible)
+            { 
+                ShowUpdateCount(true);
+            }
+        }
    }
 }