xhouse/CheryFianlAssemblyLineNew
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#260316 增加大屏图片；解决CSV解析文件占用问题；修复 自定义表格控件会超出区域的问题;

Browse Source
This commit is contained in:
zhengxuan.zhang
2026-03-16 14:35:02 +08:00
parent 94d6b65547
commit 0354dc622e
16 changed files with 44692 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Analysis/CarDataDisplayForm/EHV/FEHVLeftCarData.cs
+4 -4
View File
@@ -40,10 +40,10 @@ namespace NSAnalysis
// 设置窗体位置和大小
this.StartPosition = FormStartPosition.Manual;
this.Left = secondScreen.WorkingArea.Left;
this.Top = secondScreen.WorkingArea.Top;
this.Width = secondScreen.WorkingArea.Width;
this.Height = secondScreen.WorkingArea.Height;
this.Left = secondScreen.Bounds.Left;
this.Top = secondScreen.Bounds.Top;
this.Width = secondScreen.Bounds.Width;
this.Height = secondScreen.Bounds.Height;
this.Show();
}
catch { }
Analysis/CarDataDisplayForm/EHV/FEHVLeftCarData.designer.cs
Generated
+15 -13
View File
@@ -29,6 +29,7 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FEHVLeftCarData));
this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar();
this.label2 = new System.Windows.Forms.Label();
this.labTitle = new System.Windows.Forms.Label();
@@ -153,7 +154,7 @@
this.L19.labGText = "G";
this.L19.labGVal = "3.7";
this.L19.labTitleText = "L-19";
this.L19.Location = new System.Drawing.Point(1150, 730);
this.L19.Location = new System.Drawing.Point(1677, 798);
this.L19.Name = "L19";
this.L19.Size = new System.Drawing.Size(220, 145);
this.L19.TabIndex = 38;
@@ -173,7 +174,7 @@
this.L03.labGText = "G";
this.L03.labGVal = "3.9";
this.L03.labTitleText = "L-03";
this.L03.Location = new System.Drawing.Point(649, 455);
this.L03.Location = new System.Drawing.Point(472, 105);
this.L03.Name = "L03";
this.L03.Size = new System.Drawing.Size(220, 145);
this.L03.TabIndex = 40;
@@ -193,7 +194,7 @@
this.L06.labGText = "G";
this.L06.labGVal = "3.4";
this.L06.labTitleText = "L-06";
this.L06.Location = new System.Drawing.Point(917, 455);
this.L06.Location = new System.Drawing.Point(775, 105);
this.L06.Name = "L06";
this.L06.Size = new System.Drawing.Size(220, 145);
this.L06.TabIndex = 42;
@@ -213,7 +214,7 @@
this.L02.labGText = "G";
this.L02.labGVal = "4.4";
this.L02.labTitleText = "L-02";
this.L02.Location = new System.Drawing.Point(374, 455);
this.L02.Location = new System.Drawing.Point(162, 105);
this.L02.Name = "L02";
this.L02.Size = new System.Drawing.Size(220, 145);
this.L02.TabIndex = 44;
@@ -233,7 +234,7 @@
this.L13.labGText = "G";
this.L13.labGVal = "4.3";
this.L13.labTitleText = "L-13";
this.L13.Location = new System.Drawing.Point(1187, 455);
this.L13.Location = new System.Drawing.Point(1045, 105);
this.L13.Name = "L13";
this.L13.Size = new System.Drawing.Size(220, 145);
this.L13.TabIndex = 45;
@@ -253,7 +254,7 @@
this.L01.labGText = "G";
this.L01.labGVal = "4.1";
this.L01.labTitleText = "L-01";
this.L01.Location = new System.Drawing.Point(98, 455);
this.L01.Location = new System.Drawing.Point(3, 399);
this.L01.Name = "L01";
this.L01.Size = new System.Drawing.Size(220, 145);
this.L01.TabIndex = 46;
@@ -273,7 +274,7 @@
this.L07.labGText = "G";
this.L07.labGVal = "3.0mm";
this.L07.labTitleText = "L-07";
this.L07.Location = new System.Drawing.Point(361, 730);
this.L07.Location = new System.Drawing.Point(360, 798);
this.L07.Name = "L07";
this.L07.Size = new System.Drawing.Size(220, 145);
this.L07.TabIndex = 49;
@@ -293,7 +294,7 @@
this.L1.labGText = "G";
this.L1.labGVal = "6.1";
this.L1.labTitleText = "L-11";
this.L1.Location = new System.Drawing.Point(1426, 730);
this.L1.Location = new System.Drawing.Point(1695, 522);
this.L1.Name = "L1";
this.L1.Size = new System.Drawing.Size(220, 145);
this.L1.TabIndex = 50;
@@ -313,7 +314,7 @@
this.L15.labGText = "G";
this.L15.labGVal = "2.8mm";
this.L15.labTitleText = "L-15";
this.L15.Location = new System.Drawing.Point(1461, 455);
this.L15.Location = new System.Drawing.Point(1353, 105);
this.L15.Name = "L15";
this.L15.Size = new System.Drawing.Size(220, 145);
this.L15.TabIndex = 56;
@@ -333,7 +334,7 @@
this.L18.labGText = "G";
this.L18.labGVal = "2.7";
this.L18.labTitleText = "L-18";
this.L18.Location = new System.Drawing.Point(1677, 730);
this.L18.Location = new System.Drawing.Point(1677, 310);
this.L18.Name = "L18";
this.L18.Size = new System.Drawing.Size(220, 145);
this.L18.TabIndex = 58;
@@ -353,7 +354,7 @@
this.L17.labGText = "G";
this.L17.labGVal = "2.7mm";
this.L17.labTitleText = "L-17";
this.L17.Location = new System.Drawing.Point(1699, 455);
this.L17.Location = new System.Drawing.Point(1677, 105);
this.L17.Name = "L17";
this.L17.Size = new System.Drawing.Size(220, 145);
this.L17.TabIndex = 59;
@@ -373,7 +374,7 @@
this.L16.labGText = "G";
this.L16.labGVal = "6.0";
this.L16.labTitleText = "L-16";
this.L16.Location = new System.Drawing.Point(880, 730);
this.L16.Location = new System.Drawing.Point(1105, 798);
this.L16.Name = "L16";
this.L16.Size = new System.Drawing.Size(220, 145);
this.L16.TabIndex = 60;
@@ -393,7 +394,7 @@
this.L14.labGText = "G";
this.L14.labGVal = "3.2mm";
this.L14.labTitleText = "L-14";
this.L14.Location = new System.Drawing.Point(613, 730);
this.L14.Location = new System.Drawing.Point(735, 798);
this.L14.Name = "L14";
this.L14.Size = new System.Drawing.Size(220, 145);
this.L14.TabIndex = 61;
@@ -432,6 +433,7 @@
//
this.pbLeftCar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.pbLeftCar.Image = ((System.Drawing.Image)(resources.GetObject("pbLeftCar.Image")));
this.pbLeftCar.Location = new System.Drawing.Point(3, 40);
this.pbLeftCar.Name = "pbLeftCar";
this.pbLeftCar.Size = new System.Drawing.Size(1916, 925);
Analysis/CarDataDisplayForm/EHV/FEHVLeftCarData.resx
+21809
View File
File diff suppressed because it is too large Load Diff
Analysis/CarDataDisplayForm/EHV/FEHVRightCarData.cs
+4 -4
View File
@@ -40,10 +40,10 @@ namespace NSAnalysis
// 设置窗体位置和大小
this.StartPosition = FormStartPosition.Manual;
this.Left = secondScreen.WorkingArea.Left;
this.Top = secondScreen.WorkingArea.Top;
this.Width = secondScreen.WorkingArea.Width;
this.Height = secondScreen.WorkingArea.Height;
this.Left = secondScreen.Bounds.Left;
this.Top = secondScreen.Bounds.Top;
this.Width = secondScreen.Bounds.Width;
this.Height = secondScreen.Bounds.Height;
this.Show();
}
catch { }
Analysis/CarDataDisplayForm/EHV/FEHVRightCarData.designer.cs
Generated
+14 -13
View File
@@ -155,7 +155,7 @@
this.R14.labGText = "G";
this.R14.labGVal = "3.6";
this.R14.labTitleText = "R-14";
this.R14.Location = new System.Drawing.Point(347, 283);
this.R14.Location = new System.Drawing.Point(1013, 804);
this.R14.Name = "R14";
this.R14.Size = new System.Drawing.Size(220, 145);
this.R14.TabIndex = 34;
@@ -175,7 +175,7 @@
this.R15.labGText = "G";
this.R15.labGVal = "4.2";
this.R15.labTitleText = "R-15";
this.R15.Location = new System.Drawing.Point(309, 499);
this.R15.Location = new System.Drawing.Point(351, 81);
this.R15.Name = "R15";
this.R15.Size = new System.Drawing.Size(220, 145);
this.R15.TabIndex = 35;
@@ -195,7 +195,7 @@
this.R17.labGText = "G";
this.R17.labGVal = "2.5mm";
this.R17.labTitleText = "R-17";
this.R17.Location = new System.Drawing.Point(1633, 321);
this.R17.Location = new System.Drawing.Point(12, 81);
this.R17.Name = "R17";
this.R17.Size = new System.Drawing.Size(220, 145);
this.R17.TabIndex = 37;
@@ -215,7 +215,7 @@
this.R18.labGText = "G";
this.R18.labGVal = "3.8";
this.R18.labTitleText = "R-18";
this.R18.Location = new System.Drawing.Point(1373, 305);
this.R18.Location = new System.Drawing.Point(12, 310);
this.R18.Name = "R18";
this.R18.Size = new System.Drawing.Size(220, 145);
this.R18.TabIndex = 38;
@@ -235,7 +235,7 @@
this.R11.labGText = "G";
this.R11.labGVal = "2.9";
this.R11.labTitleText = "R-11";
this.R11.Location = new System.Drawing.Point(1133, 321);
this.R11.Location = new System.Drawing.Point(12, 528);
this.R11.Name = "R11";
this.R11.Size = new System.Drawing.Size(220, 145);
this.R11.TabIndex = 42;
@@ -255,7 +255,7 @@
this.R16.labGText = "G";
this.R16.labGVal = "2.8mm";
this.R16.labTitleText = "R-16";
this.R16.Location = new System.Drawing.Point(617, 292);
this.R16.Location = new System.Drawing.Point(575, 816);
this.R16.Name = "R16";
this.R16.Size = new System.Drawing.Size(220, 145);
this.R16.TabIndex = 44;
@@ -275,7 +275,7 @@
this.R07.labGText = "G";
this.R07.labGVal = "3.5mm";
this.R07.labTitleText = "R-07";
this.R07.Location = new System.Drawing.Point(76, 305);
this.R07.Location = new System.Drawing.Point(1321, 804);
this.R07.Name = "R07";
this.R07.Size = new System.Drawing.Size(220, 145);
this.R07.TabIndex = 46;
@@ -295,7 +295,7 @@
this.R19.labGText = "G";
this.R19.labGVal = "3.5mm";
this.R19.labTitleText = "R-19";
this.R19.Location = new System.Drawing.Point(867, 305);
this.R19.Location = new System.Drawing.Point(160, 789);
this.R19.Name = "R19";
this.R19.Size = new System.Drawing.Size(220, 145);
this.R19.TabIndex = 48;
@@ -315,7 +315,7 @@
this.R02.labGText = "G";
this.R02.labGVal = "4.0mm";
this.R02.labTitleText = "R-02";
this.R02.Location = new System.Drawing.Point(1382, 499);
this.R02.Location = new System.Drawing.Point(1577, 81);
this.R02.Name = "R02";
this.R02.Size = new System.Drawing.Size(220, 145);
this.R02.TabIndex = 49;
@@ -335,7 +335,7 @@
this.R13.labGText = "G";
this.R13.labGVal = "3.8";
this.R13.labTitleText = "R-13";
this.R13.Location = new System.Drawing.Point(595, 499);
this.R13.Location = new System.Drawing.Point(678, 81);
this.R13.Name = "R13";
this.R13.Size = new System.Drawing.Size(220, 145);
this.R13.TabIndex = 54;
@@ -355,7 +355,7 @@
this.R01.labGText = "G";
this.R01.labGVal = "3.7mm";
this.R01.labTitleText = "R-01";
this.R01.Location = new System.Drawing.Point(1645, 499);
this.R01.Location = new System.Drawing.Point(1698, 331);
this.R01.Name = "R01";
this.R01.Size = new System.Drawing.Size(220, 145);
this.R01.TabIndex = 55;
@@ -375,7 +375,7 @@
this.R03.labGText = "G";
this.R03.labGVal = "3.2mm";
this.R03.labTitleText = "R-03";
this.R03.Location = new System.Drawing.Point(1120, 499);
this.R03.Location = new System.Drawing.Point(1259, 81);
this.R03.Name = "R03";
this.R03.Size = new System.Drawing.Size(220, 145);
this.R03.TabIndex = 56;
@@ -395,7 +395,7 @@
this.R06.labGText = "G";
this.R06.labGVal = "3.6mm";
this.R06.labTitleText = "R-06";
this.R06.Location = new System.Drawing.Point(867, 499);
this.R06.Location = new System.Drawing.Point(966, 81);
this.R06.Name = "R06";
this.R06.Size = new System.Drawing.Size(220, 145);
this.R06.TabIndex = 57;
@@ -434,6 +434,7 @@
//
this.pbRightCar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.pbRightCar.Image = ((System.Drawing.Image)(resources.GetObject("pbRightCar.Image")));
this.pbRightCar.Location = new System.Drawing.Point(2, 40);
this.pbRightCar.Name = "pbRightCar";
this.pbRightCar.Size = new System.Drawing.Size(1916, 923);
Analysis/CarDataDisplayForm/EHV/FEHVRightCarData.resx
+22307
View File
File diff suppressed because it is too large Load Diff
Analysis/CarDataDisplayForm/FEH3LeftCarData.cs
+4 -4
View File
@@ -40,10 +40,10 @@ namespace NSAnalysis
// 设置窗体位置和大小
this.StartPosition = FormStartPosition.Manual;
this.Left = secondScreen.WorkingArea.Left;
this.Top = secondScreen.WorkingArea.Top;
this.Width = secondScreen.WorkingArea.Width;
this.Height = secondScreen.WorkingArea.Height;
this.Left = secondScreen.Bounds.Left;
this.Top = secondScreen.Bounds.Top;
this.Width = secondScreen.Bounds.Width;
this.Height = secondScreen.Bounds.Height;
this.Show();
}
catch { }
Analysis/CarDataDisplayForm/FEH3RightCarData.cs
+4 -4
View File
@@ -40,10 +40,10 @@ namespace NSAnalysis
// 设置窗体位置和大小
this.StartPosition = FormStartPosition.Manual;
this.Left = secondScreen.WorkingArea.Left;
this.Top = secondScreen.WorkingArea.Top;
this.Width = secondScreen.WorkingArea.Width;
this.Height = secondScreen.WorkingArea.Height;
this.Left = secondScreen.Bounds.Left;
this.Top = secondScreen.Bounds.Top;
this.Width = secondScreen.Bounds.Width;
this.Height = secondScreen.Bounds.Height;
this.Show();
}
catch { }
Analysis/CarDataDisplayForm/FEHYLeftCarData.cs
+4 -4
View File
@@ -40,10 +40,10 @@ namespace NSAnalysis
// 设置窗体位置和大小
this.StartPosition = FormStartPosition.Manual;
this.Left = secondScreen.WorkingArea.Left;
this.Top = secondScreen.WorkingArea.Top;
this.Width = secondScreen.WorkingArea.Width;
this.Height = secondScreen.WorkingArea.Height;
this.Left = secondScreen.Bounds.Left;
this.Top = secondScreen.Bounds.Top;
this.Width = secondScreen.Bounds.Width;
this.Height = secondScreen.Bounds.Height;
this.Show();
}
catch { }
Analysis/CarDataDisplayForm/FEHYRightCarData.cs
+4 -4
View File
@@ -40,10 +40,10 @@ namespace NSAnalysis
// 设置窗体位置和大小
this.StartPosition = FormStartPosition.Manual;
this.Left = secondScreen.WorkingArea.Left;
this.Top = secondScreen.WorkingArea.Top;
this.Width = secondScreen.WorkingArea.Width;
this.Height = secondScreen.WorkingArea.Height;
this.Left = secondScreen.Bounds.Left;
this.Top = secondScreen.Bounds.Top;
this.Width = secondScreen.Bounds.Width;
this.Height = secondScreen.Bounds.Height;
this.Show();
}
catch { }
Analysis/CenterControl.cs
+39 -9
View File
@@ -53,7 +53,8 @@ namespace NSAnalysis
/// 2026.03.16
/// --------------------------------------------------------------
/// 1、新增EHV车型的大屏显示，解析，与报告生成
///
/// 2、增加公差的批量导入功能 √
/// 3、修复 自定义表格控件会超出区域的问题 WorkingArea → Bounds
///
///
/// </summary>
@@ -170,6 +171,13 @@ namespace NSAnalysis
fREH3 = new FEH3RightCarData(this);
fLEHV = new FEHVLeftCarData(this);
fREHV = new FEHVRightCarData(this);
// 触发所有大屏窗体的 Load 事件，确保后台刷新线程启动，再隐藏
fLEHV.Show(); fLEHV.Hide();
fREHV.Show(); fREHV.Hide();
fLEH3.Show(); fLEH3.Hide();
fREH3.Show(); fREH3.Hide();
fLEHY.Show(); fLEHY.Hide();
fREHY.Show(); fREHY.Hide();
MyBase.rleMessage = rleMessage;
rdtpStartTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
rdtpEndTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
@@ -494,7 +502,16 @@ namespace NSAnalysis
dtCSVContent.Clear();
string strCSVName = fi.FullName;
File.Copy(fi.FullName, ConfigDfn.strFileFolder + "\\NextSenseCSVBackup\\" + fi.Name, true);
try
{
File.Copy(fi.FullName, ConfigDfn.strFileFolder + "\\NextSenseCSVBackup\\" + fi.Name, true);
}
catch (IOException ioEx)
{
MyBase.TraceWriteLine("EH3 CSV文件被占用，跳过本次解析，等待下次轮询：" + fi.Name + " | " + ioEx.Message);
Thread.Sleep(500);
continue;
}
MyBase.TraceWriteLine("Copy " + fi.FullName + " TO " + ConfigDfn.strFileFolder + "\\NextSenseCSVBackup\\" + fi.Name + " Done. 备份完成");
Invoke((MethodInvoker)(() =>
{
@@ -937,7 +954,16 @@ namespace NSAnalysis
dtCSVContent.Clear();
string strCSVName = fi.FullName;
File.Copy(fi.FullName, ConfigDfn.strFileFolder + "\\NextSenseCSVBackup\\" + fi.Name, true);
try
{
File.Copy(fi.FullName, ConfigDfn.strFileFolder + "\\NextSenseCSVBackup\\" + fi.Name, true);
}
catch (IOException ioEx)
{
MyBase.TraceWriteLine("EHY CSV文件被占用，跳过本次解析，等待下次轮询：" + fi.Name + " | " + ioEx.Message);
Thread.Sleep(500);
continue;
}
MyBase.TraceWriteLine("Copy " + fi.FullName + " TO " + ConfigDfn.strFileFolder + "\\NextSenseCSVBackup\\" + fi.Name + " Done. 备份完成");
Invoke((MethodInvoker)(() =>
{
@@ -1379,7 +1405,16 @@ namespace NSAnalysis
dtCSVContent.Clear();
string strCSVName = fi.FullName;
File.Copy(fi.FullName, ConfigDfn.strFileFolder + "\\NextSenseCSVBackup\\" + fi.Name, true);
try
{
File.Copy(fi.FullName, ConfigDfn.strFileFolder + "\\NextSenseCSVBackup\\" + fi.Name, true);
}
catch (IOException ioEx)
{
MyBase.TraceWriteLine("EHV CSV文件被占用，跳过本次解析，等待下次轮询：" + fi.Name + " | " + ioEx.Message);
Thread.Sleep(500);
continue;
}
MyBase.TraceWriteLine("Copy " + fi.FullName + " TO " + ConfigDfn.strFileFolder + "\\NextSenseCSVBackup\\" + fi.Name + " Done. 备份完成");
Invoke((MethodInvoker)(() =>
{
@@ -1682,11 +1717,6 @@ namespace NSAnalysis
#endregion 界面显示功能
}));
//// 将EHV VIN写入station7，触发大屏刷新（在Invoke块外执行，避免嵌套死锁）
//string strEHVCarID = strCarID + "_EHV";
//tmdal.updateMaintenceInfo(strEHVCarID, 7);
//MyBase.TraceWriteLine("EHV解析完成，已将VIN=" + strEHVCarID + " 写入MaintenceInfo station7，触发大屏刷新。");
//ShowCarMeasureDataByCarType(3);
if (ConfigDfn.iCreateReportFlag == 1)
{
Analysis/Resources/EHVL.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

Analysis/Resources/EHVR.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

Analysis/bin/x64/Debug/Debug.txt
+484 -83
View File
File diff suppressed because one or more lines are too long
Analysis/bin/x64/Debug/NSAnalysis.exe
BIN
View File
Binary file not shown.
Analysis/bin/x64/Debug/NSAnalysis.pdb
BIN
View File
Binary file not shown.