#013 新增备份;解析或提取有效内容失败时,移动到源\error文件夹,避免影响后续服务;3、修复查询结果错误

This commit is contained in:
HM-CN\zhengxuan.zhang
2025-08-28 21:51:13 +08:00
parent 8533d5109f
commit d4a658d641
20 changed files with 890 additions and 784 deletions
+8 -8
View File
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<appSettings>
<add key="TelerikWinFormsThemeName" value="Fluent"/>
<add key="ClientSettingsProvider.ServiceUri" value=""/>
<add key="TelerikWinFormsThemeName" value="Fluent" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>
@@ -12,9 +12,9 @@ using Telerik.WinControls.UI;
namespace NSAnalysis
{
public partial class AboutSoftwareInfo : Telerik.WinControls.UI.ShapedForm
public partial class AboutSoftware : Telerik.WinControls.UI.ShapedForm
{
public AboutSoftwareInfo()
public AboutSoftware()
{
InitializeComponent();
}
@@ -1,6 +1,6 @@
namespace NSAnalysis
{
partial class AboutSoftwareInfo
partial class AboutSoftware
{
/// <summary>
/// Required designer variable.
@@ -28,7 +28,7 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutSoftwareInfo));
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutSoftware));
this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar();
this.label2 = new System.Windows.Forms.Label();
this.labTitle = new System.Windows.Forms.Label();
+2 -3
View File
@@ -1,5 +1,4 @@
using BaseFunction;
using System;
using System;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
@@ -53,7 +52,7 @@ namespace NSAnalysis
private void rtbnSaveSetup_Click(object sender, EventArgs e) //保存
{
//获取控件状态
ConfigDfn.iEnableSort = cbFileSorter.Checked ;
ConfigDfn.iEnableSort = cbFileSorter.Checked;
ConfigDfn.iAnalysisCSVFlag = cbAnalysisCSV.Checked ? 1 : 0;
ConfigDfn.strReportPath = rtbReportPath.Text.Trim();
+80 -52
View File
@@ -6,7 +6,6 @@ using System.Collections.Generic;
using System.Data;
using System.Globalization;
using System.IO;
using System.Net.NetworkInformation;
using System.Text;
namespace NSAnalysis
@@ -43,6 +42,12 @@ namespace NSAnalysis
public void ProcessFiles()
{
var tasks = GetTaskRecords();
// 增加空检查
if (tasks == null || tasks.Rows.Count == 0)
{
Trace("没有找到任何任务记录,处理终止。");
return;
}
foreach (DataRow task in tasks.Rows)
{
string modelName = task["modelsName"].ToString();
@@ -52,7 +57,7 @@ namespace NSAnalysis
string targetDir = task["targetFile"].ToString();
// 打印信息
Trace($"Processing Task - Source: {sourceDir}, Target: {targetDir}, ModelCode: {modelCode} Position: {position}");
Trace($"[ProcessFiles] 正在执行分发任务 - 源路径: {sourceDir}, 目标路径: {targetDir}, 匹配字符: {modelCode} 位置:{position}");
if (Directory.Exists(sourceDir))
{
ProcessDirectory(sourceDir, targetDir, modelCode, modelName, position);
@@ -60,29 +65,6 @@ namespace NSAnalysis
else
{
Trace($"[ProcessFiles] 源文件地址不存在或错误: {sourceDir}");
////记录到数据库
//try
//{
// //插入分发详情
// CjlrTaskReleaseDetailModel detailModel = new CjlrTaskReleaseDetailModel
// {
// ModelsName = modelName, // 这里可以根据需要填写车型名称
// ModelsCode = modelCode,
// Position = position, // 这里可以根据需要填写位置
// SourceFile = "",
// TargetFile = "",
// TaskFileName = "",
// TaskStatus = 2, // 假设1表示已处理, 2表示未处理
// TaskDetail = $"源文件地址不存在或错误: {sourceDir}",
// CreateDate = DateTime.Now
// };
// _dal.InsertTaskDetail(detailModel);
//}
//catch (Exception ex)
//{
// Trace($"[ProcessFiles] 记录错误到数据库失败: {ex.Message}");
//}
}
}
}
@@ -127,11 +109,14 @@ namespace NSAnalysis
// 解析入库
AnalysisNxsCSV(file);
// 如果未启用分发功能,直接返回
if (!ConfigDfn.iEnableSort)
{
return;
}
// 分发逻辑
#region
if (MatchCsvValue(file, matchStr, readRowIndex, readColIndex))
{
string destFile = Path.Combine(targetDir, Path.GetFileName(file));
@@ -188,6 +173,8 @@ namespace NSAnalysis
Trace($"记录错误到数据库失败: {ex.Message}");
}
}
#endregion
}
}
@@ -217,7 +204,7 @@ namespace NSAnalysis
if (colIndex < 0 || colIndex >= columns.Length)
return false;
return columns[colIndex].Trim().Equals(targetValue);
return columns[colIndex].Trim().Contains(targetValue); //改为包含
}
catch (Exception ex)
{
@@ -306,6 +293,26 @@ namespace NSAnalysis
return;
}
// 解析数据之前,备份原始数据,如果已存在备份文件,则覆盖, 备份到 程序根目录\Backup 文件夹
try
{
string backupDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Backup");
if (!Directory.Exists(backupDir))
{
Directory.CreateDirectory(backupDir);
}
string backupFilePath = Path.Combine(backupDir, Path.GetFileName(filePath));
File.Copy(filePath, backupFilePath, true); // 如果存在则覆盖
MyBase.TraceWriteLine("已备份文件到: " + backupFilePath);
}
catch (Exception ex)
{
MyBase.TraceWriteLine("备份文件时发生错误:" + ex.Message);
// 继续处理,不返回
}
try
{
using (var reader = new StreamReader(filePath))
@@ -326,8 +333,8 @@ namespace NSAnalysis
continue; // 跳过空行或注释行
}
// 跳过前两行(如果有标题行或其他非数据行)
if (values.Length < 22)
// 跳过前两行(如果有标题行或其他非数据行),理论应该有19列
if (values.Length < 19)
{
MyBase.TraceWriteLine("CSV行数据不完整,跳过该行:" + line);
continue; // 跳过不完整的行
@@ -358,13 +365,10 @@ namespace NSAnalysis
ToleranceName0 = values[12],
ToleranceLower0 = values[13],
ToleranceUpper0 = values[14],
ToleranceName1 = values[15],
ToleranceLower1 = values[16],
ToleranceUpper1 = values[17],
NominalValue = values[18],
MeasureDate = DateTime.ParseExact(values[19], "yyyyMMdd", CultureInfo.InvariantCulture),
MeasureTime = TimeSpan.ParseExact(values[20], "hhmmss", CultureInfo.InvariantCulture),
SequenceNum = int.Parse(values[21])
NominalValue = values[15],
MeasureDate = DateTime.ParseExact(values[16], "yyyyMMdd", CultureInfo.InvariantCulture),
MeasureTime = TimeSpan.ParseExact(values[17], "hhmmss", CultureInfo.InvariantCulture),
SequenceNum = int.Parse(values[18])
};
records.Add(record);
@@ -374,6 +378,20 @@ namespace NSAnalysis
catch (Exception ex)
{
MyBase.TraceWriteLine("导入CSV文件时发生错误:" + ex.Message);
// 将错误信息通过事件传递出去
emitProcessStep($"---> 2、导入CSV文件时发生错误: {ex.Message}");
// 1、解析出错的,移动到 源路径文件夹\Error 文件夹
string errorDir = Path.Combine(Path.GetDirectoryName(filePath), "Error");
if (!Directory.Exists(errorDir))
{
Directory.CreateDirectory(errorDir);
}
string errorFilePath = Path.Combine(errorDir, Path.GetFileName(filePath));
File.Move(filePath, errorFilePath);
// 记录到日志
MyBase.TraceWriteLine("已将文件移动到错误文件夹: " + errorFilePath);
return;
}
@@ -384,6 +402,8 @@ namespace NSAnalysis
{
var firstRecord = records[0];
ConfigDfn.strMeasureTime = firstRecord.MeasureDate.ToString("yyyy-MM-dd") + " " + firstRecord.MeasureTime.ToString(@"hh\:mm\:ss");
// 记录时间
MyBase.TraceWriteLine("测量时间:" + ConfigDfn.strMeasureTime);
// 获取车号
MyBase.TraceWriteLine("--------------------------------------------------------");
@@ -406,8 +426,15 @@ namespace NSAnalysis
{
// 使用下划线分隔 GroupName,提取最后一部分作为位置
var parts2 = firstRecord.GroupName.Split('_');
ConfigDfn.strEquipPosition = parts2.Length > 1 ? parts2[parts2.Length - 1] : firstRecord.GroupName; // 如果没有下划线,直接使用原值
if (parts2.Length > 1 && !string.IsNullOrEmpty(parts2[1]))
{
// 提取下划线后第一个字符
ConfigDfn.strEquipPosition = parts2[1].Substring(0, 1);
}
else
{
ConfigDfn.strEquipPosition = firstRecord.GroupName; // 如果没有下划线,直接使用原值
}
}
// 打印提取后位置
@@ -415,21 +442,24 @@ namespace NSAnalysis
MyBase.TraceWriteLine("测量时间:" + ConfigDfn.strMeasureTime);
emitProcessStep($"---> 1、解析到, 车号:{ConfigDfn.strEquipNo} 车型:{ConfigDfn.strCarModel} 位置:{ConfigDfn.strEquipPosition} 测量时间:{ConfigDfn.strMeasureTime}");
emitProcessStep($"---> 1、解析到, 车号: {ConfigDfn.strEquipNo} 车型: {ConfigDfn.strCarModel} 位置: {ConfigDfn.strEquipPosition} 测量时间: {ConfigDfn.strMeasureTime}");
}
else
{
MyBase.TraceWriteLine("没有找到有效的测量记录,无法设置测量时间。");
MyBase.TraceWriteLine("没有找到有效的测量记录,无法设置测量时间。CSV文件导入到数据库失败!");
//将错误信息
emitProcessStep($"---> 2、没有找到有效的测量记录,无法设置测量时间。CSV文件导入到数据库失败!");
// 将文件移动到 未导入文件夹,如果不存在则新建该文件夹
//string strNotImportPath = ConfigDfn.strFileFolder + "\\NextSenseCSVNotImport\\";
//if (!Directory.Exists(strNotImportPath))
//{
// Directory.CreateDirectory(strNotImportPath);
//}
//string destFilePath = Path.Combine(strNotImportPath, Path.GetFileName(filePath));
//File.Move(filePath, destFilePath);
//MyBase.TraceWriteLine("将文件移动到未导入文件夹,路径为:" + destFilePath);
// 2、解析未出错(有可能整个文件被跳过),但没有有效数据的,移动到 源路径文件夹\Error 文件夹
string errorDir = Path.Combine(Path.GetDirectoryName(filePath), "Error");
if (!Directory.Exists(errorDir))
{
Directory.CreateDirectory(errorDir);
}
string errorFilePath = Path.Combine(errorDir, Path.GetFileName(filePath));
File.Move(filePath, errorFilePath);
// 记录到日志
MyBase.TraceWriteLine("已将文件移动到错误文件夹: " + errorFilePath);
return;
}
@@ -440,11 +470,9 @@ namespace NSAnalysis
_dal.InsertOrUpdateCJLRMeaData(record);
}
MyBase.TraceWriteLine("CSV文件导入到数据库成功!");
// 记录处理文件到数据库
_dal.InsertProcessedFile(filePath);
MyBase.TraceWriteLine("CSV文件导入到数据库成功!");
emitProcessStep($"---> 2、CSV文件导入到数据库成功");
#region
+22 -42
View File
@@ -97,7 +97,7 @@ namespace NSAnalysis.DAL
}
// 从CJLR_MeaData 中查询 总测量项 Good测量项 NoGood测量项 Reject测量项 FPY
public DataTable SelectMeasureResultByCarID(string strCarID,string strGroupName)
public DataTable SelectMeasureResultByCarID(string strCarID, string strGroupName)
{
string strSql = @"
SELECT
@@ -125,9 +125,6 @@ NULLIF(
{
new SqlParameter("@CarID", strCarID),
new SqlParameter("@GroupName", strGroupName)
};
DataTable dt = SQLHelper.ExecuteQuery(strSql, parameters, CommandType.Text);
@@ -161,14 +158,12 @@ NULLIF(
SqlParameter[] parameters = new SqlParameter[]
{
new SqlParameter("@CarID", strCarID)
};
DataTable dt = SQLHelper.ExecuteQuery(strSql, parameters, CommandType.Text);
return dt;
}
// 每个测量点的上下限和偏差分析(包含合并的测量时间)
public DataTable SelectMeasureDataByCarID(string strCarID)
{
@@ -179,8 +174,8 @@ NULLIF(
NominalValue,
--
NominalValue + ToleranceLower1 AS LowerLimit,
NominalValue + ToleranceUpper1 AS UpperLimit,
ToleranceLower0 AS LowerLimit,
ToleranceUpper0 AS UpperLimit,
Classification,
--
CAST(MeasureDate AS DATETIME) + CAST(MeasureTime AS DATETIME) AS MeasureDateTime
@@ -201,16 +196,16 @@ NULLIF(
public DataTable SelectTMeasureDataByCarIDAndTime(string strCarID, string strStartTime, string strEndTime)
{
StringBuilder strSql = new StringBuilder(@"
SELECT
ProductNum,
PointName,
Model,
DimensionName,
DimensionValue,
NominalValue,
NominalValue + ToleranceLower1 AS LowerLimit,
NominalValue + ToleranceUpper1 AS UpperLimit,
Classification,
SELECT
ProductNum,
Model,
PointName,
DimensionName,
NominalValue,
ToleranceLower0 AS LowerLimit,
ToleranceUpper0 AS UpperLimit,
DimensionValue,
Classification,
CAST(MeasureDate AS DATETIME) + CAST(MeasureTime AS DATETIME) AS MeasureDateTime
FROM CJLR.dbo.CJLR_MeaData
WHERE 1=1
@@ -269,7 +264,6 @@ ProductNum,
return SQLHelper.ExecuteQuery(sql, paras, CommandType.Text);
}
#endregion
#region Insert Function
@@ -293,7 +287,7 @@ ProductNum,
new SqlParameter("@sourceFile", model.SourceFile ?? (object)DBNull.Value),
new SqlParameter("@targetFile", model.TargetFile ?? (object)DBNull.Value),
new SqlParameter("@status", model.Status ?? (object)DBNull.Value),
new SqlParameter("@create_date", model.CreateDate == default ?
new SqlParameter("@create_date", model.CreateDate == DateTime.MinValue ?
DateTime.Parse("2024-01-31 14:37:00"): model.CreateDate),
new SqlParameter("@is_delete", model.IsDelete),
new SqlParameter("@readType", model.ReadType)
@@ -323,7 +317,7 @@ ProductNum,
new SqlParameter("@taskFileName", model.TaskFileName ?? (object)DBNull.Value),
new SqlParameter("@taskStatus", model.TaskStatus),
new SqlParameter("@taskDetail", model.TaskDetail ?? (object)DBNull.Value),
new SqlParameter("@createDate", model.CreateDate == default ? DateTime.Now : model.CreateDate)
new SqlParameter("@createDate", model.CreateDate == DateTime.MinValue ? DateTime.Now : model.CreateDate)
};
object result = SQLHelper.ExecuteNonQuery(strSql, parameters, CommandType.Text);
@@ -389,8 +383,8 @@ ProductNum,
new SqlParameter("@ToleranceLower1", record.ToleranceLower1),
new SqlParameter("@ToleranceUpper1", record.ToleranceUpper1),
new SqlParameter("@MeasPointNominal", record.NominalValue),
new SqlParameter("@Date", record.MeasureDate == default ? DateTime.Now : record.MeasureDate),
new SqlParameter("@Time", record.MeasureTime == default ? DateTime.Now.TimeOfDay : record.MeasureTime),
new SqlParameter("@Date", record.MeasureDate == DateTime.MinValue ? DateTime.Now : record.MeasureDate),
new SqlParameter("@Time", record.MeasureTime == TimeSpan.Zero ? DateTime.Now.TimeOfDay : record.MeasureTime),
new SqlParameter("@SeqNr", record.SequenceNum),
new SqlParameter("@CreatedAt", DateTime.Now )
};
@@ -436,9 +430,6 @@ ProductNum,
ToleranceName0 = @ToleranceName0,
ToleranceLower0 = @ToleranceLower0,
ToleranceUpper0 = @ToleranceUpper0,
ToleranceName1 = @ToleranceName1,
ToleranceLower1 = @ToleranceLower1,
ToleranceUpper1 = @ToleranceUpper1,
NominalValue = @MeasPointNominal,
SequenceNum = @SeqNr,
CreatedAt = @CreatedAt
@@ -457,9 +448,6 @@ ProductNum,
new SqlParameter("@ToleranceName0", record.ToleranceName0 ?? (object)DBNull.Value),
new SqlParameter("@ToleranceLower0", record.ToleranceLower0),
new SqlParameter("@ToleranceUpper0", record.ToleranceUpper0),
new SqlParameter("@ToleranceName1", record.ToleranceName1 ?? (object)DBNull.Value),
new SqlParameter("@ToleranceLower1", record.ToleranceLower1),
new SqlParameter("@ToleranceUpper1", record.ToleranceUpper1),
new SqlParameter("@MeasPointNominal", record.NominalValue),
new SqlParameter("@SeqNr", record.SequenceNum),
new SqlParameter("@CreatedAt", DateTime.Now),
@@ -475,14 +463,12 @@ ProductNum,
PointName, GroupName, ProductNum, Model, Station, Method,
Standard, DimensionName, DimensionValue, DimensionUnit,
IsManual, Classification, ToleranceName0,
ToleranceLower0, ToleranceUpper0, ToleranceName1,
ToleranceLower1, ToleranceUpper1, NominalValue, MeasureDate, MeasureTime, SequenceNum,CreatedAt
ToleranceLower0, ToleranceUpper0, NominalValue, MeasureDate, MeasureTime, SequenceNum,CreatedAt
) VALUES (
@MeasPointName, @MeasGroupName, @ProdNum, @Model, @Station, @MeasMethod,
@TestStandard, @DimensionName, @DimensionValue, @DimensionUnit,
@DimensionManualOverride, @DimensionClassification, @ToleranceName0,
@ToleranceLower0, @ToleranceUpper0, @ToleranceName1,
@ToleranceLower1, @ToleranceUpper1, @MeasPointNominal, @Date, @Time, @SeqNr,@CreatedAt
@ToleranceLower0, @ToleranceUpper0,@MeasPointNominal, @Date, @Time, @SeqNr,@CreatedAt
)";
SqlParameter[] insertParas = new SqlParameter[]
{
@@ -501,12 +487,9 @@ ProductNum,
new SqlParameter("@ToleranceName0", record.ToleranceName0 ?? (object)DBNull.Value),
new SqlParameter("@ToleranceLower0", record.ToleranceLower0),
new SqlParameter("@ToleranceUpper0", record.ToleranceUpper0),
new SqlParameter("@ToleranceName1", record.ToleranceName1 ?? (object)DBNull.Value),
new SqlParameter("@ToleranceLower1", record.ToleranceLower1),
new SqlParameter("@ToleranceUpper1", record.ToleranceUpper1),
new SqlParameter("@MeasPointNominal", record.NominalValue),
new SqlParameter("@Date", record.MeasureDate == default ? DateTime.Now : record.MeasureDate),
new SqlParameter("@Time", record.MeasureTime == default ? DateTime.Now.TimeOfDay : record.MeasureTime),
new SqlParameter("@Date", record.MeasureDate == DateTime.MinValue ? DateTime.Now : record.MeasureDate),
new SqlParameter("@Time", record.MeasureTime == TimeSpan.Zero ? DateTime.Now.TimeOfDay : record.MeasureTime),
new SqlParameter("@SeqNr", record.SequenceNum),
new SqlParameter("@CreatedAt", DateTime.Now)
};
@@ -592,11 +575,8 @@ ProductNum,
#endregion
#region
// 判断文件是否已处理
public bool IsFileProcessed(string fileName)
{
+1 -1
View File
@@ -158,7 +158,7 @@ namespace NSAnalysis
FileIni.WriteString(strConfigFile, strSection, "SoftwareHelpDocument", strHelpDocumentName);
FileIni.WriteString(strConfigFile, strSection, "CNCPictureName", Path.GetFileName(strImagePath));
FileIni.WriteBool(strConfigFile, strSection, "Language", bLanguage);
FileIni.WriteBool(strConfigFile, strSection, "RememberMe", bRememberMe );
FileIni.WriteBool(strConfigFile, strSection, "RememberMe", bRememberMe);
FileIni.WriteString(strConfigFile, strSection, "Password", strPwd);
FileIni.WriteBool(strConfigFile, strSection, "EnableSort", iEnableSort);
FileIni.WriteInt(strConfigFile, strSection, "AnalysisCSVFlag", iAnalysisCSVFlag);
+307 -286
View File
@@ -1,8 +1,5 @@
using BaseFunction;
using NSAnalysis.DAL;
using NSAnalysis.Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -16,6 +13,34 @@ using Telerik.WinControls.UI;
namespace NSAnalysis
{
/// <summary>
///
///
///
/// 2025.08.28
/// ----------------------------------------------
/// 1、当解析文件时,增加备份到根目录
/// 2、解析失败或提取有效内容失败,移动到源文件夹的Error文件夹
/// 3、修复查询结果,显示错误问题
///
///
///
///
///
///
///
///
///
///
///
///
///
///
///
///
///
/// </summary>
public partial class FormMain : Telerik.WinControls.UI.ShapedForm
{
private Timer fileSortTimer = new Timer(); // 定时器,用于定时分发任务
@@ -83,16 +108,6 @@ namespace NSAnalysis
rdtpStartTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
rdtpEndTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
// 定时处理任务
fileSortTimer.Interval = 10000; // 每60秒检查一次分发任务
fileSortTimer.Tick += FileSortTimer_Tick;
fileSortTimer.Start();
// 订阅处理中事件
fileSorter.OnFileParsed += FileSorter_OnFileParsed;
fileSorter.OnProcessStep += FileSorter_OnProcessStep;
//绑定按钮
lpcSoftwareSetup.labPicture.Click += new EventHandler(lpcSoftwareSetup_Click);
lpcSoftwareSetup.labText.Click += new EventHandler(lpcSoftwareSetup_Click);
@@ -140,6 +155,39 @@ namespace NSAnalysis
}
}
private void FormMain_FormClosed(object sender, FormClosedEventArgs e)
{
MyBase.TraceWriteLine("-------------海克斯康面隙分析软件程序关闭---------------------");
LogDebugDfn.strEndTime = DateTime.Now.ToString("yyyy.MM.dd HH-mm-ss");
string CopyFileName = ConfigDfn.strFileFolder + "\\DebugFiles\\" + "Debug(" + LogDebugDfn.strStartTime + " To " + LogDebugDfn.strEndTime + ")" + ".txt";
if (File.Exists(LogDebugDfn.strDebugFile))
File.Copy(LogDebugDfn.strDebugFile, CopyFileName);
System.Environment.Exit(0);
}
private void FormMain_Resize(object sender, EventArgs e)
{
ScaleControls(this);
}
private void FormMain_Shown(object sender, EventArgs e)
{
// 定时处理任务
fileSortTimer.Interval = 15000; // 每60秒检查一次分发任务
fileSortTimer.Tick += FileSortTimer_Tick;
fileSortTimer.Start();
// 订阅处理中事件
fileSorter.OnFileParsed += FileSorter_OnFileParsed;
fileSorter.OnProcessStep += FileSorter_OnProcessStep;
//记录到日志
MyBase.TraceWriteLine("-------------海克斯康面隙分析软件程序启动---------------------");
}
#endregion
#region
private void ClearLabel()
{
@@ -231,53 +279,6 @@ namespace NSAnalysis
#endregion
}
private void FormMain_FormClosing(object sender, FormClosingEventArgs e)
{
if (DialogResult.Yes == MessageBox.Show("警告:您确定要退出该软件系统吗?", "警告", MessageBoxButtons.YesNo, MessageBoxIcon.Warning))
{
}
else
{
e.Cancel = true;
}
}
private void FormMain_FormClosed(object sender, FormClosedEventArgs e)
{
MyBase.TraceWriteLine("-------------海克斯康面隙分析软件程序关闭---------------------");
LogDebugDfn.strEndTime = DateTime.Now.ToString("yyyy.MM.dd HH-mm-ss");
string CopyFileName = ConfigDfn.strFileFolder + "\\DebugFiles\\" + "Debug(" + LogDebugDfn.strStartTime + " To " + LogDebugDfn.strEndTime + ")" + ".txt";
if (File.Exists(LogDebugDfn.strDebugFile))
File.Copy(LogDebugDfn.strDebugFile, CopyFileName);
System.Environment.Exit(0);
}
#endregion
private void tmSystem_Tick(object sender, EventArgs e)
{
rleTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
if (ConfigDfn.iAnalysisCSVFlag == 1)
rleReadCSVStatus.ForeColor = bReadCSVFlag ? Color.Green : Color.White;
bReadCSVFlag = !bReadCSVFlag;
}
private void FileSortTimer_Tick(object sender, EventArgs e) //分发定时器
{
// 后台运行,避免阻塞UI
Task.Run(() =>
{
try
{
fileSorter.ProcessFiles();
}
catch (Exception ex)
{
MyBase.TraceWriteLine($"分发任务异常: {ex.Message}");
}
});
}
private void DisplayMeasureData(string strCarID) // 其中 string strCarID 是车身ID_L 或 车身ID_R
{
try
@@ -478,189 +479,44 @@ namespace NSAnalysis
}
}
#region
#region datagridview分页功能
private void LoadPage()
private void StoreControlRatios(Control container)
{
if (currentPage < 1) currentPage = 1;
if (currentPage > pageCount) currentPage = pageCount;
int beginRecord; //开始指针
int endRecord; //结束指针
DataTable dtTemp;
dtTemp = PageTable.Clone();//Clone方法只会复制DataTable的结构(列定义),而不会复制数据行的引用。
beginRecord = pageSize * (currentPage - 1);
if (currentPage == 1) beginRecord = 0;
endRecord = pageSize * currentPage;
if (currentPage == pageCount) endRecord = recordCount;
for (int i = beginRecord; i < endRecord; i++)
foreach (Control ctrl in container.Controls)
{
// 使用ImportRow方法将源PageTable的行导入到目标dtTemp
dtTemp.ImportRow(PageTable.Rows[i]);
}
// 存储位置比例
originalRatios.Add(ctrl,
new PointF((float)ctrl.Left / container.Width,
(float)ctrl.Top / container.Height));
dgvSelectMeasureData.Rows.Clear();
// 存储尺寸比例
originalSizes.Add(ctrl,
new SizeF((float)ctrl.Width / container.Width,
(float)ctrl.Height / container.Height));
for (int i = 0; i < dtTemp.Rows.Count; i++)
{
dgvSelectMeasureData.Rows.Add(new object[] { dtTemp.Rows[i][0], dtTemp.Rows[i][1], dtTemp.Rows[i][2], dtTemp.Rows[i][3], dtTemp.Rows[i][4], dtTemp.Rows[i][5], dtTemp.Rows[i][6], dtTemp.Rows[i][7], dtTemp.Rows[i][8] });
}
SetdgvRowBgColor(dgvSelectMeasureData);
for (int i = 0; i < dgvSelectMeasureData.Rows.Count; i++)
{
string strResult = dgvSelectMeasureData.Rows[i].Cells["MeasureItemResult"].Value.ToString();
if (strResult.ToLower().Contains("ng"))
{
//dgvSelectMeasureData.Rows[i].Cells["MeasureItemResult"].Style.ForeColor = Color.Orange;
dgvSelectMeasureData.Rows[i].DefaultCellStyle.BackColor = Color.Orange;
}
if (strResult.ToLower().Contains("rej"))
{
dgvSelectMeasureData.Rows[i].Cells["MeasureItemResult"].Style.ForeColor = Color.Red;
}
}
labCurrentPage.Text = "当前页:" + currentPage.ToString(); //当前页
labSumPages.Text = "共 " + pageCount.ToString() + " 页";//总页数
labSumRecorders.Text = "总共 " + recordCount.ToString() + " 条记录";//总记录数
}
private void rbtnFirtstPage_Click(object sender, EventArgs e)
{
if (currentPage == 1)
{ return; }
currentPage = 1;
LoadPage();
}
private void rbtnPrevPage_Click(object sender, EventArgs e)
{
if (currentPage == 1)
{ return; }
currentPage--;
LoadPage();
}
private void rbtnNextPage_Click(object sender, EventArgs e)
{
if (currentPage == pageCount)
{ return; }
currentPage++;
LoadPage();
}
private void rbtnLastPage_Click(object sender, EventArgs e)
{
if (currentPage == pageCount)
{ return; }
currentPage = pageCount;
LoadPage();
}
private void rddlPageRecorderCount_SelectedIndexChanged(object sender, Telerik.WinControls.UI.Data.PositionChangedEventArgs e)
{
pageSize = int.Parse(rddlPageRecorderCount.Text.Trim());
//PageSorter();
}
#endregion datagridview分页功能
private void rbtnSearchMeaserData_Click(object sender, EventArgs e)
{
dgvFPYResult.Visible = false;
chartFPYLine.Visible = false;
rbtnExportCSVReport.Visible = false;
string strStartTime = rdtpStartTime.Value.ToString("yyyy-MM-dd") + " 00:00:00";
string strEndTime = rdtpEndTime.Value.ToString("yyyy-MM-dd") + " 23:59:59";
string strCarID = rtbPartID.Text.Trim();
PageTable.Clear();
PageTable = tmdal.SelectTMeasureDataByCarIDAndTime(strCarID, strStartTime, strEndTime);
if (PageTable.Rows.Count > 0)
{
recordCount = PageTable.Rows.Count; //记录总行数
pageCount = (recordCount / pageSize);
if ((recordCount % pageSize) > 0)
{
pageCount++;
}
//默认第一页
currentPage = 1;
LoadPage();//调用加载数据的方法
dgvSelectMeasureData.Visible = true;
rbtnExportCSVReport.Visible = true;
pnlPage.Visible = true;
labSearchResult.Visible = false;
pnlPage.Visible = true;
}
else
{
dgvSelectMeasureData.Visible = false;
labSearchResult.Visible = true;
rbtnExportCSVReport.Visible = false;
pnlPage.Visible = false;
// 递归处理容器控件
if (ctrl.HasChildren) StoreControlRatios(ctrl);
}
}
private void rbtSelectFPY_Click(object sender, EventArgs e)
private void ScaleControls(Control container)
{
dgvSelectMeasureData.Visible = false;
rbtnExportCSVReport.Visible = false;
pnlPage.Visible = false;
string strStartTime = rdtpStartTime.Value.ToString("yyyy-MM-dd") + " 00:00:00";
string strEndTime = rdtpEndTime.Value.ToString("yyyy-MM-dd") + " 23:59:59";
string strCarID = rtbPartID.Text.Trim();
DataTable dtFPY = new DataTable();
dtFPY = tmdal.SelectTMeasureResultByTime(strCarID, strStartTime, strEndTime);
if (dtFPY.Rows.Count > 0)
foreach (var item in originalRatios)
{
dgvFPYResult.Visible = true;
labSearchResult.Visible = false;
rbtnExportCSVReport.Visible = true;
chartFPYLine.Visible = true;
dgvFPYResult.DataSource = dtFPY;
SetdgvRowBgColor(dgvFPYResult);
for (int i = 0; i < dgvFPYResult.Rows.Count; i++)
if (!container.Controls.Contains(item.Key)) continue;
// 调整位置
item.Key.Left = (int)(container.Width * item.Value.X);
item.Key.Top = (int)(container.Height * item.Value.Y);
// 调整大小
if (originalSizes.TryGetValue(item.Key, out SizeF sizeRatio))
{
if (dgvFPYResult.Rows[i].Cells["SMResult"].Value.ToString().ToLower().Contains("不合格"))
{
dgvFPYResult.Rows[i].Cells["SMResult"].Style.ForeColor = Color.Red;
}
item.Key.Width = (int)(container.Width * sizeRatio.Width);
item.Key.Height = (int)(container.Height * sizeRatio.Height);
}
#region 线
//合格率折线图
string[] strXDate = new string[dtFPY.Rows.Count];
double[] dFPYResult = new double[dtFPY.Rows.Count];
for (int i = 0; i < dtFPY.Rows.Count; i++)
{
strXDate[i] = dtFPY.Rows[i]["CarID"].ToString();
}
for (int i = 0; i < dtFPY.Rows.Count; i++)
{
double dResult = double.Parse(dtFPY.Rows[i]["FPY"].ToString());
dFPYResult[i] = dResult * 100.00;
}
chartFPYLine.ChartAreas[0].AxisX.LabelStyle.Angle = -50; //X轴标签倾斜角度设置
chartFPYLine.ChartAreas[0].AxisY.LabelStyle.Format = "{0:F2}" + "%"; //设置Y轴值的格式化 带%
chartFPYLine.Series[0].Label = "#VAL%"; //设置显示Y的值
chartFPYLine.Series[0].LabelForeColor = Color.White;
chartFPYLine.Series[0].ToolTip = "车身编号 : #VALX \r\n合格率 : #VAL%"; //鼠标移动到对应点显示数值
chartFPYLine.Series[0].Points.DataBindXY(strXDate, dFPYResult);
#endregion 线
}
else
{
dgvFPYResult.Visible = false;
labSearchResult.Visible = true;
rbtnExportCSVReport.Visible = false;
chartFPYLine.Visible = false;
// 递归处理容器控件
if (item.Key.HasChildren) ScaleControls(item.Key);
}
}
@@ -722,7 +578,220 @@ namespace NSAnalysis
File.WriteAllText(filePath, sb.ToString());
}
private void rbtnExportCSVReport_Click(object sender, EventArgs e)
#endregion
#region datagridview分页功能
private void LoadPage()
{
if (currentPage < 1) currentPage = 1;
if (currentPage > pageCount) currentPage = pageCount;
int beginRecord; //开始指针
int endRecord; //结束指针
DataTable dtTemp;
dtTemp = PageTable.Clone();//Clone方法只会复制DataTable的结构(列定义),而不会复制数据行的引用。
beginRecord = pageSize * (currentPage - 1);
if (currentPage == 1) beginRecord = 0;
endRecord = pageSize * currentPage;
if (currentPage == pageCount) endRecord = recordCount;
for (int i = beginRecord; i < endRecord; i++)
{
// 使用ImportRow方法将源PageTable的行导入到目标dtTemp
dtTemp.ImportRow(PageTable.Rows[i]);
}
dgvSelectMeasureData.Rows.Clear();
for (int i = 0; i < dtTemp.Rows.Count; i++)
{
dgvSelectMeasureData.Rows.Add(new object[] { dtTemp.Rows[i][0], dtTemp.Rows[i][1], dtTemp.Rows[i][2], dtTemp.Rows[i][3], dtTemp.Rows[i][4], dtTemp.Rows[i][5], dtTemp.Rows[i][6], dtTemp.Rows[i][7], dtTemp.Rows[i][8], dtTemp.Rows[i][9] });
}
SetdgvRowBgColor(dgvSelectMeasureData);
for (int i = 0; i < dgvSelectMeasureData.Rows.Count; i++)
{
string strResult = dgvSelectMeasureData.Rows[i].Cells["MeasureItemResult"].Value.ToString();
if (strResult.ToLower().Contains("ng"))
{
//dgvSelectMeasureData.Rows[i].Cells["MeasureItemResult"].Style.ForeColor = Color.Orange;
dgvSelectMeasureData.Rows[i].DefaultCellStyle.BackColor = Color.Orange;
}
if (strResult.ToLower().Contains("rej"))
{
dgvSelectMeasureData.Rows[i].Cells["MeasureItemResult"].Style.ForeColor = Color.Red;
}
}
labCurrentPage.Text = "当前页:" + currentPage.ToString(); //当前页
labSumPages.Text = "共 " + pageCount.ToString() + " 页";//总页数
labSumRecorders.Text = "总共 " + recordCount.ToString() + " 条记录";//总记录数
}
private void rbtnFirtstPage_Click(object sender, EventArgs e) //首页
{
if (currentPage == 1)
{ return; }
currentPage = 1;
LoadPage();
}
private void rbtnPrevPage_Click(object sender, EventArgs e) //上一页
{
if (currentPage == 1)
{ return; }
currentPage--;
LoadPage();
}
private void rbtnNextPage_Click(object sender, EventArgs e) //下一页
{
if (currentPage == pageCount)
{ return; }
currentPage++;
LoadPage();
}
private void rbtnLastPage_Click(object sender, EventArgs e) //尾页
{
if (currentPage == pageCount)
{ return; }
currentPage = pageCount;
LoadPage();
}
private void rddlPageRecorderCount_SelectedIndexChanged(object sender, Telerik.WinControls.UI.Data.PositionChangedEventArgs e)
{
pageSize = int.Parse(rddlPageRecorderCount.Text.Trim());
//PageSorter();
}
#endregion datagridview分页功能
private void tmSystem_Tick(object sender, EventArgs e)
{
rleTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
if (ConfigDfn.iAnalysisCSVFlag == 1)
rleReadCSVStatus.ForeColor = bReadCSVFlag ? Color.Green : Color.White;
bReadCSVFlag = !bReadCSVFlag;
}
private void FileSortTimer_Tick(object sender, EventArgs e) //分发定时器
{
// 后台运行,避免阻塞UI
Task.Run(() =>
{
try
{
fileSorter.ProcessFiles();
}
catch (Exception ex)
{
MyBase.TraceWriteLine($"分发任务异常: {ex.Message}");
}
});
}
#region
private void rbtnSearchMeaserData_Click(object sender, EventArgs e) //查询测量数据
{
dgvFPYResult.Visible = false;
chartFPYLine.Visible = false;
rbtnExportCSVReport.Visible = false;
string strStartTime = rdtpStartTime.Value.ToString("yyyy-MM-dd") + " 00:00:00";
string strEndTime = rdtpEndTime.Value.ToString("yyyy-MM-dd") + " 23:59:59";
string strCarID = rtbPartID.Text.Trim();
PageTable.Clear();
PageTable = tmdal.SelectTMeasureDataByCarIDAndTime(strCarID, strStartTime, strEndTime);
if (PageTable.Rows.Count > 0)
{
recordCount = PageTable.Rows.Count; //记录总行数
pageCount = (recordCount / pageSize);
if ((recordCount % pageSize) > 0)
{
pageCount++;
}
//默认第一页
currentPage = 1;
LoadPage();//调用加载数据的方法
dgvSelectMeasureData.Visible = true;
rbtnExportCSVReport.Visible = true;
pnlPage.Visible = true;
labSearchResult.Visible = false;
pnlPage.Visible = true;
}
else
{
dgvSelectMeasureData.Visible = false;
labSearchResult.Visible = true;
rbtnExportCSVReport.Visible = false;
pnlPage.Visible = false;
}
}
private void rbtSelectFPY_Click(object sender, EventArgs e) //查询合格率
{
dgvSelectMeasureData.Visible = false;
rbtnExportCSVReport.Visible = false;
pnlPage.Visible = false;
string strStartTime = rdtpStartTime.Value.ToString("yyyy-MM-dd") + " 00:00:00";
string strEndTime = rdtpEndTime.Value.ToString("yyyy-MM-dd") + " 23:59:59";
string strCarID = rtbPartID.Text.Trim();
DataTable dtFPY = new DataTable();
dtFPY = tmdal.SelectTMeasureResultByTime(strCarID, strStartTime, strEndTime);
if (dtFPY.Rows.Count > 0)
{
dgvFPYResult.Visible = true;
labSearchResult.Visible = false;
rbtnExportCSVReport.Visible = true;
chartFPYLine.Visible = true;
dgvFPYResult.DataSource = dtFPY;
SetdgvRowBgColor(dgvFPYResult);
for (int i = 0; i < dgvFPYResult.Rows.Count; i++)
{
if (dgvFPYResult.Rows[i].Cells["SMResult"].Value.ToString().ToLower().Contains("不合格"))
{
dgvFPYResult.Rows[i].Cells["SMResult"].Style.ForeColor = Color.Red;
}
}
#region 线
//合格率折线图
string[] strXDate = new string[dtFPY.Rows.Count];
double[] dFPYResult = new double[dtFPY.Rows.Count];
for (int i = 0; i < dtFPY.Rows.Count; i++)
{
strXDate[i] = dtFPY.Rows[i]["CarID"].ToString();
}
for (int i = 0; i < dtFPY.Rows.Count; i++)
{
double dResult = double.Parse(dtFPY.Rows[i]["FPY"].ToString());
dFPYResult[i] = dResult * 100.00;
}
chartFPYLine.ChartAreas[0].AxisX.LabelStyle.Angle = -50; //X轴标签倾斜角度设置
chartFPYLine.ChartAreas[0].AxisY.LabelStyle.Format = "{0:F2}" + "%"; //设置Y轴值的格式化 带%
chartFPYLine.Series[0].Label = "#VAL%"; //设置显示Y的值
chartFPYLine.Series[0].LabelForeColor = Color.White;
chartFPYLine.Series[0].ToolTip = "车身编号 : #VALX \r\n合格率 : #VAL%"; //鼠标移动到对应点显示数值
chartFPYLine.Series[0].Points.DataBindXY(strXDate, dFPYResult);
#endregion 线
}
else
{
dgvFPYResult.Visible = false;
labSearchResult.Visible = true;
rbtnExportCSVReport.Visible = false;
chartFPYLine.Visible = false;
}
}
private void rbtnExportCSVReport_Click(object sender, EventArgs e) //导出CSV报表
{
string strCSVExportPath = "";
string strExportTime = DateTime.Now.ToString("yyyyMMddHHmmssfff");
@@ -782,7 +851,7 @@ namespace NSAnalysis
e.Row.HeaderCell.Value = string.Format("{0}", e.Row.Index + 1);
}
private void lpcSoftwareSetup_Click(object sender, EventArgs e)
private void lpcSoftwareSetup_Click(object sender, EventArgs e) //软件设置
{
//string strInputPwd = MyBase.InputBox("密码", "请输入密码 : ", "", "确定", "取消");
//if (strInputPwd.Contains("-999.999"))
@@ -800,7 +869,7 @@ namespace NSAnalysis
//}
}
private void lpcToleranceSetup_Click(object sender, EventArgs e)
private void lpcToleranceSetup_Click(object sender, EventArgs e) //分发设置
{
//string strInputPwd = MyBase.InputBox("密码", "请输入密码 : ", "", "确定", "取消");
//if (strInputPwd.Contains("-999.999"))
@@ -818,66 +887,18 @@ namespace NSAnalysis
//}
}
private void lpcAboutSoftware_Click(object sender, EventArgs e)
private void lpcAboutSoftware_Click(object sender, EventArgs e) //关于软件
{
AboutSoftwareInfo asi = new AboutSoftwareInfo();
AboutSoftware asi = new AboutSoftware();
asi.ShowDialog();
}
private void lpcShowLog_Click(object sender, EventArgs e)
private void lpcShowLog_Click(object sender, EventArgs e) //查看日志
{
System.Diagnostics.Process.Start("notepad.exe", LogDebugDfn.strDebugFile);
}
#endregion
private void StoreControlRatios(Control container)
{
foreach (Control ctrl in container.Controls)
{
// 存储位置比例
originalRatios.Add(ctrl,
new PointF((float)ctrl.Left / container.Width,
(float)ctrl.Top / container.Height));
// 存储尺寸比例
originalSizes.Add(ctrl,
new SizeF((float)ctrl.Width / container.Width,
(float)ctrl.Height / container.Height));
// 递归处理容器控件
if (ctrl.HasChildren) StoreControlRatios(ctrl);
}
}
private void ScaleControls(Control container)
{
foreach (var item in originalRatios)
{
if (!container.Controls.Contains(item.Key)) continue;
// 调整位置
item.Key.Left = (int)(container.Width * item.Value.X);
item.Key.Top = (int)(container.Height * item.Value.Y);
// 调整大小
if (originalSizes.TryGetValue(item.Key, out SizeF sizeRatio))
{
item.Key.Width = (int)(container.Width * sizeRatio.Width);
item.Key.Height = (int)(container.Height * sizeRatio.Height);
}
// 递归处理容器控件
if (item.Key.HasChildren) ScaleControls(item.Key);
}
}
private void FormMain_Resize(object sender, EventArgs e)
{
ScaleControls(this);
}
#endregion
}
public class AnalysisResult
+290 -270
View File
@@ -32,22 +32,22 @@ namespace NSAnalysis
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
Telerik.WinControls.UI.RadListDataItem radListDataItem1 = new Telerik.WinControls.UI.RadListDataItem();
Telerik.WinControls.UI.RadListDataItem radListDataItem2 = new Telerik.WinControls.UI.RadListDataItem();
Telerik.WinControls.UI.RadListDataItem radListDataItem3 = new Telerik.WinControls.UI.RadListDataItem();
Telerik.WinControls.UI.RadListDataItem radListDataItem4 = new Telerik.WinControls.UI.RadListDataItem();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
Telerik.WinControls.UI.RadListDataItem radListDataItem5 = new Telerik.WinControls.UI.RadListDataItem();
Telerik.WinControls.UI.RadListDataItem radListDataItem6 = new Telerik.WinControls.UI.RadListDataItem();
Telerik.WinControls.UI.RadListDataItem radListDataItem7 = new Telerik.WinControls.UI.RadListDataItem();
Telerik.WinControls.UI.RadListDataItem radListDataItem8 = new Telerik.WinControls.UI.RadListDataItem();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Title title2 = new System.Windows.Forms.DataVisualization.Charting.Title();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar();
this.label2 = new System.Windows.Forms.Label();
this.labTitle = new System.Windows.Forms.Label();
@@ -105,23 +105,14 @@ namespace NSAnalysis
this.rbtnExportCSVReport = new Telerik.WinControls.UI.RadButton();
this.rtbPartID = new Telerik.WinControls.UI.RadTextBox();
this.rbtSelectFPY = new Telerik.WinControls.UI.RadButton();
this.chartFPYLine = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.rdtpStartTime = new Telerik.WinControls.UI.RadDateTimePicker();
this.rdtpEndTime = new Telerik.WinControls.UI.RadDateTimePicker();
this.rbtnSearchMeaserData = new Telerik.WinControls.UI.RadButton();
this.radLabel15 = new Telerik.WinControls.UI.RadLabel();
this.radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.radLabel11 = new Telerik.WinControls.UI.RadLabel();
this.chartFPYLine = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.dgvSelectMeasureData = new System.Windows.Forms.DataGridView();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.MeasureItemResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dgvFPYResult = new System.Windows.Forms.DataGridView();
this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -137,6 +128,16 @@ namespace NSAnalysis
this.lpcSoftwareSetup = new UserControlClass.LabPictureControl();
this.lpcAboutSoftware = new UserControlClass.LabPictureControl();
this.tmSystem = new System.Windows.Forms.Timer(this.components);
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Model = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.MeasureItemResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).BeginInit();
this.radTitleBar1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radStatusStrip1)).BeginInit();
@@ -159,13 +160,13 @@ namespace NSAnalysis
((System.ComponentModel.ISupportInitialize)(this.rbtnExportCSVReport)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rtbPartID)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rbtSelectFPY)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.chartFPYLine)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rdtpStartTime)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rdtpEndTime)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rbtnSearchMeaserData)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.chartFPYLine)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dgvSelectMeasureData)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dgvFPYResult)).BeginInit();
this.rpvpSetup.SuspendLayout();
@@ -245,7 +246,7 @@ namespace NSAnalysis
this.commandBarSeparator3,
this.rleMessageText,
this.rleMessage});
this.radStatusStrip1.Location = new System.Drawing.Point(1, 1002);
this.radStatusStrip1.Location = new System.Drawing.Point(9, 817);
this.radStatusStrip1.Name = "radStatusStrip1";
this.radStatusStrip1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0);
this.radStatusStrip1.Size = new System.Drawing.Size(1535, 26);
@@ -334,7 +335,7 @@ namespace NSAnalysis
this.RPV.Location = new System.Drawing.Point(1, 38);
this.RPV.Name = "RPV";
this.RPV.SelectedPage = this.rpvpAnalysis;
this.RPV.Size = new System.Drawing.Size(1543, 958);
this.RPV.Size = new System.Drawing.Size(1543, 770);
this.RPV.TabIndex = 127;
this.RPV.ViewMode = Telerik.WinControls.UI.PageViewMode.NavigationView;
((Telerik.WinControls.UI.RadPageViewNavigationViewElement)(this.RPV.GetChildAt(0))).DisplayMode = Telerik.WinControls.UI.NavigationViewDisplayModes.Compact;
@@ -463,7 +464,7 @@ namespace NSAnalysis
this.rpvpAnalysis.ItemSize = new System.Drawing.SizeF(46F, 46F);
this.rpvpAnalysis.Location = new System.Drawing.Point(49, 35);
this.rpvpAnalysis.Name = "rpvpAnalysis";
this.rpvpAnalysis.Size = new System.Drawing.Size(1493, 922);
this.rpvpAnalysis.Size = new System.Drawing.Size(1493, 734);
this.rpvpAnalysis.Text = " 分析主界面";
//
// groupBox4
@@ -483,9 +484,9 @@ namespace NSAnalysis
this.groupBox4.Controls.Add(this.label8);
this.groupBox4.Controls.Add(this.label12);
this.groupBox4.ForeColor = System.Drawing.Color.White;
this.groupBox4.Location = new System.Drawing.Point(991, 255);
this.groupBox4.Location = new System.Drawing.Point(1038, 167);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(495, 311);
this.groupBox4.Size = new System.Drawing.Size(448, 311);
this.groupBox4.TabIndex = 199;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "解析概览";
@@ -647,9 +648,9 @@ namespace NSAnalysis
// panel2
//
this.panel2.Controls.Add(this.dgvMeasureContent);
this.panel2.Location = new System.Drawing.Point(3, 255);
this.panel2.Location = new System.Drawing.Point(3, 167);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(968, 664);
this.panel2.Size = new System.Drawing.Size(1019, 561);
this.panel2.TabIndex = 216;
//
// dgvMeasureContent
@@ -659,14 +660,14 @@ namespace NSAnalysis
this.dgvMeasureContent.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
this.dgvMeasureContent.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgvMeasureContent.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvMeasureContent.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle10.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvMeasureContent.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
this.dgvMeasureContent.ColumnHeadersHeight = 38;
this.dgvMeasureContent.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.PointName,
@@ -684,23 +685,23 @@ namespace NSAnalysis
this.dgvMeasureContent.Name = "dgvMeasureContent";
this.dgvMeasureContent.ReadOnly = true;
this.dgvMeasureContent.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle2.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvMeasureContent.RowHeadersDefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle11.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvMeasureContent.RowHeadersDefaultCellStyle = dataGridViewCellStyle11;
this.dgvMeasureContent.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle3.Font = new System.Drawing.Font("Segoe UI", 10F);
dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
this.dgvMeasureContent.RowsDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle12.Font = new System.Drawing.Font("Segoe UI", 10F);
dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
this.dgvMeasureContent.RowsDefaultCellStyle = dataGridViewCellStyle12;
this.dgvMeasureContent.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Segoe UI", 10F);
this.dgvMeasureContent.RowTemplate.Height = 38;
this.dgvMeasureContent.Size = new System.Drawing.Size(968, 664);
this.dgvMeasureContent.Size = new System.Drawing.Size(1019, 561);
this.dgvMeasureContent.TabIndex = 198;
//
// PointName
@@ -728,7 +729,6 @@ namespace NSAnalysis
this.NormalVal.Name = "NormalVal";
this.NormalVal.ReadOnly = true;
this.NormalVal.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.NormalVal.Visible = false;
//
// LowerTolVal
//
@@ -776,7 +776,7 @@ namespace NSAnalysis
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1493, 241);
this.panel1.Size = new System.Drawing.Size(1493, 161);
this.panel1.TabIndex = 215;
//
// lbCSVFiles
@@ -791,7 +791,7 @@ namespace NSAnalysis
this.lbCSVFiles.ItemHeight = 19;
this.lbCSVFiles.Location = new System.Drawing.Point(3, 4);
this.lbCSVFiles.Name = "lbCSVFiles";
this.lbCSVFiles.Size = new System.Drawing.Size(1483, 230);
this.lbCSVFiles.Size = new System.Drawing.Size(1483, 154);
this.lbCSVFiles.TabIndex = 198;
//
// rpvpSearch
@@ -799,14 +799,13 @@ namespace NSAnalysis
this.rpvpSearch.Controls.Add(this.pnlPage);
this.rpvpSearch.Controls.Add(this.labSearchResult);
this.rpvpSearch.Controls.Add(this.radGroupBox1);
this.rpvpSearch.Controls.Add(this.chartFPYLine);
this.rpvpSearch.Controls.Add(this.dgvSelectMeasureData);
this.rpvpSearch.Controls.Add(this.dgvFPYResult);
this.rpvpSearch.Image = ((System.Drawing.Image)(resources.GetObject("rpvpSearch.Image")));
this.rpvpSearch.ItemSize = new System.Drawing.SizeF(46F, 46F);
this.rpvpSearch.Location = new System.Drawing.Point(49, 35);
this.rpvpSearch.Name = "rpvpSearch";
this.rpvpSearch.Size = new System.Drawing.Size(1493, 922);
this.rpvpSearch.Size = new System.Drawing.Size(1493, 734);
this.rpvpSearch.Text = " 查询界面";
//
// pnlPage
@@ -820,7 +819,7 @@ namespace NSAnalysis
this.pnlPage.Controls.Add(this.labSumRecorders);
this.pnlPage.Controls.Add(this.labSumPages);
this.pnlPage.Controls.Add(this.labCurrentPage);
this.pnlPage.Location = new System.Drawing.Point(1, 881);
this.pnlPage.Location = new System.Drawing.Point(3, 689);
this.pnlPage.Name = "pnlPage";
this.pnlPage.Size = new System.Drawing.Size(1159, 42);
this.pnlPage.TabIndex = 177;
@@ -832,14 +831,14 @@ namespace NSAnalysis
this.rddlPageRecorderCount.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
this.rddlPageRecorderCount.Font = new System.Drawing.Font("Segoe UI", 12F);
this.rddlPageRecorderCount.ForeColor = System.Drawing.Color.White;
radListDataItem1.Text = "20";
radListDataItem2.Text = "50";
radListDataItem3.Text = "100";
radListDataItem4.Text = "200";
this.rddlPageRecorderCount.Items.Add(radListDataItem1);
this.rddlPageRecorderCount.Items.Add(radListDataItem2);
this.rddlPageRecorderCount.Items.Add(radListDataItem3);
this.rddlPageRecorderCount.Items.Add(radListDataItem4);
radListDataItem5.Text = "20";
radListDataItem6.Text = "50";
radListDataItem7.Text = "100";
radListDataItem8.Text = "200";
this.rddlPageRecorderCount.Items.Add(radListDataItem5);
this.rddlPageRecorderCount.Items.Add(radListDataItem6);
this.rddlPageRecorderCount.Items.Add(radListDataItem7);
this.rddlPageRecorderCount.Items.Add(radListDataItem8);
this.rddlPageRecorderCount.Location = new System.Drawing.Point(718, 9);
this.rddlPageRecorderCount.Name = "rddlPageRecorderCount";
//
@@ -1058,7 +1057,7 @@ namespace NSAnalysis
this.labSearchResult.BackColor = System.Drawing.Color.Transparent;
this.labSearchResult.Font = new System.Drawing.Font("Segoe UI", 12F);
this.labSearchResult.ForeColor = System.Drawing.Color.Red;
this.labSearchResult.Location = new System.Drawing.Point(273, 459);
this.labSearchResult.Location = new System.Drawing.Point(273, 365);
this.labSearchResult.Name = "labSearchResult";
this.labSearchResult.Size = new System.Drawing.Size(452, 21);
this.labSearchResult.TabIndex = 176;
@@ -1074,6 +1073,7 @@ namespace NSAnalysis
this.radGroupBox1.Controls.Add(this.rbtnExportCSVReport);
this.radGroupBox1.Controls.Add(this.rtbPartID);
this.radGroupBox1.Controls.Add(this.rbtSelectFPY);
this.radGroupBox1.Controls.Add(this.chartFPYLine);
this.radGroupBox1.Controls.Add(this.rdtpStartTime);
this.radGroupBox1.Controls.Add(this.rdtpEndTime);
this.radGroupBox1.Controls.Add(this.rbtnSearchMeaserData);
@@ -1085,7 +1085,7 @@ namespace NSAnalysis
this.radGroupBox1.HeaderText = "查询条件";
this.radGroupBox1.Location = new System.Drawing.Point(3, 3);
this.radGroupBox1.Name = "radGroupBox1";
this.radGroupBox1.Size = new System.Drawing.Size(1520, 86);
this.radGroupBox1.Size = new System.Drawing.Size(1491, 108);
this.radGroupBox1.TabIndex = 20;
this.radGroupBox1.Text = "查询条件";
((Telerik.WinControls.UI.RadGroupBoxElement)(this.radGroupBox1.GetChildAt(0))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(158)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
@@ -1109,7 +1109,7 @@ namespace NSAnalysis
this.rbtnExportCSVReport.Font = new System.Drawing.Font("Segoe UI", 12F);
this.rbtnExportCSVReport.ForeColor = System.Drawing.Color.White;
this.rbtnExportCSVReport.Image = global::NSAnalysis.Properties.Resources.export;
this.rbtnExportCSVReport.Location = new System.Drawing.Point(1120, 29);
this.rbtnExportCSVReport.Location = new System.Drawing.Point(1105, 29);
this.rbtnExportCSVReport.Name = "rbtnExportCSVReport";
this.rbtnExportCSVReport.Size = new System.Drawing.Size(144, 40);
this.rbtnExportCSVReport.TabIndex = 8;
@@ -1131,7 +1131,7 @@ namespace NSAnalysis
this.rtbPartID.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
this.rtbPartID.Font = new System.Drawing.Font("Segoe UI", 12F);
this.rtbPartID.ForeColor = System.Drawing.Color.White;
this.rtbPartID.Location = new System.Drawing.Point(106, 37);
this.rtbPartID.Location = new System.Drawing.Point(91, 36);
this.rtbPartID.MaxLength = 50;
this.rtbPartID.Name = "rtbPartID";
this.rtbPartID.Size = new System.Drawing.Size(192, 27);
@@ -1146,7 +1146,7 @@ namespace NSAnalysis
this.rbtSelectFPY.Font = new System.Drawing.Font("Segoe UI", 12F);
this.rbtSelectFPY.ForeColor = System.Drawing.Color.White;
this.rbtSelectFPY.Image = global::NSAnalysis.Properties.Resources.search16;
this.rbtSelectFPY.Location = new System.Drawing.Point(1278, 29);
this.rbtSelectFPY.Location = new System.Drawing.Point(1263, 29);
this.rbtSelectFPY.Name = "rbtSelectFPY";
this.rbtSelectFPY.Size = new System.Drawing.Size(146, 40);
this.rbtSelectFPY.TabIndex = 8;
@@ -1163,15 +1163,66 @@ namespace NSAnalysis
((Telerik.WinControls.Primitives.BorderPrimitive)(this.rbtSelectFPY.GetChildAt(0).GetChildAt(2))).InnerColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(48)))));
((Telerik.WinControls.Primitives.BorderPrimitive)(this.rbtSelectFPY.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
//
// chartFPYLine
//
this.chartFPYLine.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.chartFPYLine.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
chartArea2.AxisX.LabelStyle.ForeColor = System.Drawing.Color.White;
chartArea2.AxisX.LineColor = System.Drawing.Color.White;
chartArea2.AxisX.MajorGrid.LineColor = System.Drawing.Color.White;
chartArea2.AxisX.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.NotSet;
chartArea2.AxisX.MajorTickMark.LineColor = System.Drawing.Color.White;
chartArea2.AxisX.MinorGrid.LineColor = System.Drawing.Color.White;
chartArea2.AxisX.MinorTickMark.LineColor = System.Drawing.Color.White;
chartArea2.AxisX.TitleForeColor = System.Drawing.Color.White;
chartArea2.AxisY.LabelStyle.ForeColor = System.Drawing.Color.White;
chartArea2.AxisY.LineColor = System.Drawing.Color.White;
chartArea2.AxisY.MajorGrid.LineColor = System.Drawing.Color.White;
chartArea2.AxisY.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
chartArea2.AxisY.MajorTickMark.LineColor = System.Drawing.Color.White;
chartArea2.AxisY.MinorGrid.LineColor = System.Drawing.Color.White;
chartArea2.AxisY.MinorTickMark.LineColor = System.Drawing.Color.White;
chartArea2.AxisY.TitleForeColor = System.Drawing.Color.White;
chartArea2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
chartArea2.Name = "ChartArea1";
this.chartFPYLine.ChartAreas.Add(chartArea2);
this.chartFPYLine.Location = new System.Drawing.Point(1434, 29);
this.chartFPYLine.Name = "chartFPYLine";
series2.BorderWidth = 3;
series2.ChartArea = "ChartArea1";
series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line;
series2.Color = System.Drawing.Color.Lime;
series2.MarkerSize = 9;
series2.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle;
series2.Name = "Series1";
this.chartFPYLine.Series.Add(series2);
this.chartFPYLine.Size = new System.Drawing.Size(49, 48);
this.chartFPYLine.TabIndex = 77;
this.chartFPYLine.Text = "chartFPY";
title2.Font = new System.Drawing.Font("微软雅黑", 12F);
title2.ForeColor = System.Drawing.Color.White;
title2.Name = "Title1";
title2.Text = "合格率";
this.chartFPYLine.Titles.Add(title2);
this.chartFPYLine.Visible = false;
//
// rdtpStartTime
//
this.rdtpStartTime.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.rdtpStartTime.AutoSize = false;
this.rdtpStartTime.Font = new System.Drawing.Font("Segoe UI", 12F);
this.rdtpStartTime.ForeColor = System.Drawing.Color.White;
this.rdtpStartTime.Location = new System.Drawing.Point(446, 37);
this.rdtpStartTime.Location = new System.Drawing.Point(431, 34);
this.rdtpStartTime.MinDate = new System.DateTime(2020, 1, 1, 0, 0, 0, 0);
this.rdtpStartTime.MinimumSize = new System.Drawing.Size(140, 27);
this.rdtpStartTime.Name = "rdtpStartTime";
this.rdtpStartTime.Size = new System.Drawing.Size(140, 27);
//
//
//
this.rdtpStartTime.RootElement.MinSize = new System.Drawing.Size(140, 27);
this.rdtpStartTime.Size = new System.Drawing.Size(140, 30);
this.rdtpStartTime.TabIndex = 39;
this.rdtpStartTime.TabStop = false;
this.rdtpStartTime.Text = "2020年5月1日";
@@ -1245,13 +1296,19 @@ namespace NSAnalysis
// rdtpEndTime
//
this.rdtpEndTime.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.rdtpEndTime.AutoSize = false;
this.rdtpEndTime.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
this.rdtpEndTime.Font = new System.Drawing.Font("Segoe UI", 12F);
this.rdtpEndTime.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
this.rdtpEndTime.Location = new System.Drawing.Point(716, 38);
this.rdtpEndTime.Location = new System.Drawing.Point(701, 34);
this.rdtpEndTime.MinDate = new System.DateTime(2023, 6, 1, 0, 0, 0, 0);
this.rdtpEndTime.MinimumSize = new System.Drawing.Size(140, 27);
this.rdtpEndTime.Name = "rdtpEndTime";
this.rdtpEndTime.Size = new System.Drawing.Size(140, 27);
//
//
//
this.rdtpEndTime.RootElement.MinSize = new System.Drawing.Size(140, 27);
this.rdtpEndTime.Size = new System.Drawing.Size(140, 30);
this.rdtpEndTime.TabIndex = 38;
this.rdtpEndTime.TabStop = false;
this.rdtpEndTime.Text = "2023年6月1日";
@@ -1329,7 +1386,7 @@ namespace NSAnalysis
this.rbtnSearchMeaserData.Font = new System.Drawing.Font("Segoe UI", 12F);
this.rbtnSearchMeaserData.ForeColor = System.Drawing.Color.White;
this.rbtnSearchMeaserData.Image = global::NSAnalysis.Properties.Resources.search16;
this.rbtnSearchMeaserData.Location = new System.Drawing.Point(967, 29);
this.rbtnSearchMeaserData.Location = new System.Drawing.Point(952, 29);
this.rbtnSearchMeaserData.Name = "rbtnSearchMeaserData";
this.rbtnSearchMeaserData.Size = new System.Drawing.Size(139, 40);
this.rbtnSearchMeaserData.TabIndex = 7;
@@ -1350,7 +1407,7 @@ namespace NSAnalysis
this.radLabel15.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.radLabel15.Font = new System.Drawing.Font("Segoe UI", 12F);
this.radLabel15.ForeColor = System.Drawing.Color.White;
this.radLabel15.Location = new System.Drawing.Point(620, 39);
this.radLabel15.Location = new System.Drawing.Point(605, 37);
this.radLabel15.Name = "radLabel15";
this.radLabel15.Size = new System.Drawing.Size(94, 25);
this.radLabel15.TabIndex = 36;
@@ -1361,7 +1418,7 @@ namespace NSAnalysis
this.radLabel1.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.radLabel1.Font = new System.Drawing.Font("Segoe UI", 12F);
this.radLabel1.ForeColor = System.Drawing.Color.White;
this.radLabel1.Location = new System.Drawing.Point(350, 38);
this.radLabel1.Location = new System.Drawing.Point(335, 37);
this.radLabel1.Name = "radLabel1";
this.radLabel1.Size = new System.Drawing.Size(94, 25);
this.radLabel1.TabIndex = 34;
@@ -1372,57 +1429,12 @@ namespace NSAnalysis
this.radLabel11.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.radLabel11.Font = new System.Drawing.Font("Segoe UI", 12F);
this.radLabel11.ForeColor = System.Drawing.Color.White;
this.radLabel11.Location = new System.Drawing.Point(15, 38);
this.radLabel11.Location = new System.Drawing.Point(0, 37);
this.radLabel11.Name = "radLabel11";
this.radLabel11.Size = new System.Drawing.Size(94, 25);
this.radLabel11.TabIndex = 28;
this.radLabel11.Text = "车身编号:";
//
// chartFPYLine
//
this.chartFPYLine.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.chartFPYLine.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
chartArea1.AxisX.LabelStyle.ForeColor = System.Drawing.Color.White;
chartArea1.AxisX.LineColor = System.Drawing.Color.White;
chartArea1.AxisX.MajorGrid.LineColor = System.Drawing.Color.White;
chartArea1.AxisX.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.NotSet;
chartArea1.AxisX.MajorTickMark.LineColor = System.Drawing.Color.White;
chartArea1.AxisX.MinorGrid.LineColor = System.Drawing.Color.White;
chartArea1.AxisX.MinorTickMark.LineColor = System.Drawing.Color.White;
chartArea1.AxisX.TitleForeColor = System.Drawing.Color.White;
chartArea1.AxisY.LabelStyle.ForeColor = System.Drawing.Color.White;
chartArea1.AxisY.LineColor = System.Drawing.Color.White;
chartArea1.AxisY.MajorGrid.LineColor = System.Drawing.Color.White;
chartArea1.AxisY.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
chartArea1.AxisY.MajorTickMark.LineColor = System.Drawing.Color.White;
chartArea1.AxisY.MinorGrid.LineColor = System.Drawing.Color.White;
chartArea1.AxisY.MinorTickMark.LineColor = System.Drawing.Color.White;
chartArea1.AxisY.TitleForeColor = System.Drawing.Color.White;
chartArea1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
chartArea1.Name = "ChartArea1";
this.chartFPYLine.ChartAreas.Add(chartArea1);
this.chartFPYLine.Location = new System.Drawing.Point(1166, 95);
this.chartFPYLine.Name = "chartFPYLine";
series1.BorderWidth = 3;
series1.ChartArea = "ChartArea1";
series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line;
series1.Color = System.Drawing.Color.Lime;
series1.MarkerSize = 9;
series1.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle;
series1.Name = "Series1";
this.chartFPYLine.Series.Add(series1);
this.chartFPYLine.Size = new System.Drawing.Size(327, 219);
this.chartFPYLine.TabIndex = 77;
this.chartFPYLine.Text = "chartFPY";
title1.Font = new System.Drawing.Font("微软雅黑", 12F);
title1.ForeColor = System.Drawing.Color.White;
title1.Name = "Title1";
title1.Text = "合格率";
this.chartFPYLine.Titles.Add(title1);
this.chartFPYLine.Visible = false;
//
// dgvSelectMeasureData
//
this.dgvSelectMeasureData.AllowUserToAddRows = false;
@@ -1433,123 +1445,51 @@ namespace NSAnalysis
this.dgvSelectMeasureData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
this.dgvSelectMeasureData.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgvSelectMeasureData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvSelectMeasureData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle13.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvSelectMeasureData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
this.dgvSelectMeasureData.ColumnHeadersHeight = 37;
this.dgvSelectMeasureData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column2,
this.Model,
this.dataGridViewTextBoxColumn1,
this.dataGridViewTextBoxColumn2,
this.dataGridViewTextBoxColumn3,
this.dataGridViewTextBoxColumn4,
this.dataGridViewTextBoxColumn5,
this.dataGridViewTextBoxColumn6,
this.dataGridViewTextBoxColumn7,
this.MeasureItemResult});
this.MeasureItemResult,
this.dataGridViewTextBoxColumn7});
this.dgvSelectMeasureData.EnableHeadersVisualStyles = false;
this.dgvSelectMeasureData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(181)))), ((int)(((byte)(200)))));
this.dgvSelectMeasureData.Location = new System.Drawing.Point(3, 95);
this.dgvSelectMeasureData.Location = new System.Drawing.Point(3, 117);
this.dgvSelectMeasureData.Name = "dgvSelectMeasureData";
this.dgvSelectMeasureData.ReadOnly = true;
this.dgvSelectMeasureData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvSelectMeasureData.RowHeadersDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle14.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvSelectMeasureData.RowHeadersDefaultCellStyle = dataGridViewCellStyle14;
this.dgvSelectMeasureData.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 10F);
dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
this.dgvSelectMeasureData.RowsDefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 10F);
dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
this.dgvSelectMeasureData.RowsDefaultCellStyle = dataGridViewCellStyle15;
this.dgvSelectMeasureData.RowTemplate.Height = 37;
this.dgvSelectMeasureData.Size = new System.Drawing.Size(1157, 776);
this.dgvSelectMeasureData.Size = new System.Drawing.Size(1483, 566);
this.dgvSelectMeasureData.TabIndex = 174;
this.dgvSelectMeasureData.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvSelectMeasureData_RowStateChanged);
//
// Column2
//
this.Column2.DataPropertyName = "ProductNum";
this.Column2.HeaderText = "车身编号";
this.Column2.Name = "Column2";
this.Column2.ReadOnly = true;
this.Column2.Width = 170;
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "PointName";
this.dataGridViewTextBoxColumn1.HeaderText = "测量点名称";
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.ReadOnly = true;
this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewTextBoxColumn2
//
this.dataGridViewTextBoxColumn2.DataPropertyName = "DimensionName";
this.dataGridViewTextBoxColumn2.HeaderText = "尺寸名";
this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
this.dataGridViewTextBoxColumn2.ReadOnly = true;
this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.dataGridViewTextBoxColumn2.Width = 80;
//
// dataGridViewTextBoxColumn3
//
this.dataGridViewTextBoxColumn3.DataPropertyName = "NominalValue";
this.dataGridViewTextBoxColumn3.HeaderText = "理论值";
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
this.dataGridViewTextBoxColumn3.ReadOnly = true;
this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewTextBoxColumn4
//
this.dataGridViewTextBoxColumn4.DataPropertyName = "LowerLimit";
this.dataGridViewTextBoxColumn4.HeaderText = "下公差";
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
this.dataGridViewTextBoxColumn4.ReadOnly = true;
this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "UpperLimit";
this.dataGridViewTextBoxColumn5.HeaderText = "上公差";
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.ReadOnly = true;
this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewTextBoxColumn6
//
this.dataGridViewTextBoxColumn6.DataPropertyName = "DimensionValue";
this.dataGridViewTextBoxColumn6.HeaderText = "实测值";
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
this.dataGridViewTextBoxColumn6.ReadOnly = true;
this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewTextBoxColumn7
//
this.dataGridViewTextBoxColumn7.DataPropertyName = "MeasureDateTime";
this.dataGridViewTextBoxColumn7.HeaderText = "测量时间";
this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
this.dataGridViewTextBoxColumn7.ReadOnly = true;
this.dataGridViewTextBoxColumn7.Width = 190;
//
// MeasureItemResult
//
this.MeasureItemResult.DataPropertyName = "Classification";
this.MeasureItemResult.HeaderText = "结果";
this.MeasureItemResult.Name = "MeasureItemResult";
this.MeasureItemResult.ReadOnly = true;
this.MeasureItemResult.Width = 50;
//
// dgvFPYResult
//
this.dgvFPYResult.AllowUserToAddRows = false;
@@ -1560,14 +1500,14 @@ namespace NSAnalysis
this.dgvFPYResult.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
this.dgvFPYResult.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgvFPYResult.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvFPYResult.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle16.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvFPYResult.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16;
this.dgvFPYResult.ColumnHeadersHeight = 37;
this.dgvFPYResult.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dataGridViewTextBoxColumn9,
@@ -1580,27 +1520,27 @@ namespace NSAnalysis
this.SMResult});
this.dgvFPYResult.EnableHeadersVisualStyles = false;
this.dgvFPYResult.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(181)))), ((int)(((byte)(200)))));
this.dgvFPYResult.Location = new System.Drawing.Point(3, 95);
this.dgvFPYResult.Location = new System.Drawing.Point(3, 117);
this.dgvFPYResult.Name = "dgvFPYResult";
this.dgvFPYResult.ReadOnly = true;
this.dgvFPYResult.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvFPYResult.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle17.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvFPYResult.RowHeadersDefaultCellStyle = dataGridViewCellStyle17;
this.dgvFPYResult.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10F);
dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
this.dgvFPYResult.RowsDefaultCellStyle = dataGridViewCellStyle9;
dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 10F);
dataGridViewCellStyle18.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
this.dgvFPYResult.RowsDefaultCellStyle = dataGridViewCellStyle18;
this.dgvFPYResult.RowTemplate.Height = 37;
this.dgvFPYResult.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvFPYResult.Size = new System.Drawing.Size(1141, 748);
this.dgvFPYResult.Size = new System.Drawing.Size(1487, 566);
this.dgvFPYResult.TabIndex = 175;
this.dgvFPYResult.Visible = false;
this.dgvFPYResult.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvFPYResult_RowStateChanged);
@@ -1681,7 +1621,7 @@ namespace NSAnalysis
this.rpvpSetup.ItemSize = new System.Drawing.SizeF(46F, 46F);
this.rpvpSetup.Location = new System.Drawing.Point(49, 35);
this.rpvpSetup.Name = "rpvpSetup";
this.rpvpSetup.Size = new System.Drawing.Size(1493, 922);
this.rpvpSetup.Size = new System.Drawing.Size(1493, 734);
this.rpvpSetup.Text = " 软件设置";
//
// lpcToleranceSetup
@@ -1749,6 +1689,85 @@ namespace NSAnalysis
this.tmSystem.Interval = 1000;
this.tmSystem.Tick += new System.EventHandler(this.tmSystem_Tick);
//
// Column2
//
this.Column2.DataPropertyName = "ProductNum";
this.Column2.HeaderText = "车身编号";
this.Column2.Name = "Column2";
this.Column2.ReadOnly = true;
this.Column2.Width = 170;
//
// Model
//
this.Model.DataPropertyName = "Model";
this.Model.HeaderText = "车型";
this.Model.Name = "Model";
this.Model.ReadOnly = true;
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "PointName";
this.dataGridViewTextBoxColumn1.HeaderText = "测量点名称";
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.ReadOnly = true;
this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewTextBoxColumn2
//
this.dataGridViewTextBoxColumn2.DataPropertyName = "DimensionName";
this.dataGridViewTextBoxColumn2.HeaderText = "尺寸名";
this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
this.dataGridViewTextBoxColumn2.ReadOnly = true;
this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.dataGridViewTextBoxColumn2.Width = 80;
//
// dataGridViewTextBoxColumn3
//
this.dataGridViewTextBoxColumn3.DataPropertyName = "NominalValue";
this.dataGridViewTextBoxColumn3.HeaderText = "理论值";
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
this.dataGridViewTextBoxColumn3.ReadOnly = true;
this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewTextBoxColumn4
//
this.dataGridViewTextBoxColumn4.DataPropertyName = "LowerLimit";
this.dataGridViewTextBoxColumn4.HeaderText = "下公差";
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
this.dataGridViewTextBoxColumn4.ReadOnly = true;
this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "UpperLimit";
this.dataGridViewTextBoxColumn5.HeaderText = "上公差";
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.ReadOnly = true;
this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// dataGridViewTextBoxColumn6
//
this.dataGridViewTextBoxColumn6.DataPropertyName = "DimensionValue";
this.dataGridViewTextBoxColumn6.HeaderText = "实测值";
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
this.dataGridViewTextBoxColumn6.ReadOnly = true;
this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// MeasureItemResult
//
this.MeasureItemResult.DataPropertyName = "Classification";
this.MeasureItemResult.HeaderText = "结果";
this.MeasureItemResult.Name = "MeasureItemResult";
this.MeasureItemResult.ReadOnly = true;
//
// dataGridViewTextBoxColumn7
//
this.dataGridViewTextBoxColumn7.DataPropertyName = "MeasureDateTime";
this.dataGridViewTextBoxColumn7.HeaderText = "测量时间";
this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
this.dataGridViewTextBoxColumn7.ReadOnly = true;
this.dataGridViewTextBoxColumn7.Width = 190;
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
@@ -1756,7 +1775,7 @@ namespace NSAnalysis
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
this.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
this.BorderWidth = 0;
this.ClientSize = new System.Drawing.Size(1548, 1039);
this.ClientSize = new System.Drawing.Size(1548, 864);
this.Controls.Add(this.RPV);
this.Controls.Add(this.radStatusStrip1);
this.Controls.Add(this.radTitleBar1);
@@ -1766,9 +1785,9 @@ namespace NSAnalysis
this.Name = "FormMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "海克斯康间隙面差分析系统";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormMain_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormMain_FormClosed);
this.Load += new System.EventHandler(this.FormMain_Load);
this.Shown += new System.EventHandler(this.FormMain_Shown);
this.Resize += new System.EventHandler(this.FormMain_Resize);
((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit();
this.radTitleBar1.ResumeLayout(false);
@@ -1797,13 +1816,13 @@ namespace NSAnalysis
((System.ComponentModel.ISupportInitialize)(this.rbtnExportCSVReport)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rtbPartID)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rbtSelectFPY)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.chartFPYLine)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rdtpStartTime)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rdtpEndTime)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rbtnSearchMeaserData)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radLabel11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.chartFPYLine)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dgvSelectMeasureData)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dgvFPYResult)).EndInit();
this.rpvpSetup.ResumeLayout(false);
@@ -1877,23 +1896,6 @@ namespace NSAnalysis
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel2;
public System.Windows.Forms.DataGridView dgvMeasureContent;
private System.Windows.Forms.DataGridViewTextBoxColumn PointName;
private System.Windows.Forms.DataGridViewTextBoxColumn DimensionName;
private System.Windows.Forms.DataGridViewTextBoxColumn NormalVal;
private System.Windows.Forms.DataGridViewTextBoxColumn LowerTolVal;
private System.Windows.Forms.DataGridViewTextBoxColumn UpperTolVal;
private System.Windows.Forms.DataGridViewTextBoxColumn MeasureValue;
private System.Windows.Forms.DataGridViewTextBoxColumn MeasureDateTime;
private System.Windows.Forms.DataGridViewTextBoxColumn Classification;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
private System.Windows.Forms.DataGridViewTextBoxColumn MeasureItemResult;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
@@ -1903,5 +1905,23 @@ namespace NSAnalysis
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn16;
private System.Windows.Forms.DataGridViewTextBoxColumn SMResult;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.DataGridViewTextBoxColumn PointName;
private System.Windows.Forms.DataGridViewTextBoxColumn DimensionName;
private System.Windows.Forms.DataGridViewTextBoxColumn NormalVal;
private System.Windows.Forms.DataGridViewTextBoxColumn LowerTolVal;
private System.Windows.Forms.DataGridViewTextBoxColumn UpperTolVal;
private System.Windows.Forms.DataGridViewTextBoxColumn MeasureValue;
private System.Windows.Forms.DataGridViewTextBoxColumn MeasureDateTime;
private System.Windows.Forms.DataGridViewTextBoxColumn Classification;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
private System.Windows.Forms.DataGridViewTextBoxColumn Model;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
private System.Windows.Forms.DataGridViewTextBoxColumn MeasureItemResult;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
}
}
+92 -82
View File
@@ -152,30 +152,6 @@
qEc4R0mJ+26dgwn6qipE706fjsJ1VnvEI8VA/PC3/lOjX79/AdonQT85iOsDAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="PointName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="DimensionName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="NormalVal.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="LowerTolVal.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="UpperTolVal.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MeasureValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MeasureDateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Classification.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="rpvpAnalysis.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAYCAYAAADtaU2/AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -193,64 +169,6 @@
C+7S06WW9WaY1WoePIOs8V9ihlmt/EPm3xP/SXja/A/0NoOspvkJxD7h7QqkS00AAAAASUVORK5CYII=
</value>
</data>
<data name="resource.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAAUAAAAECAYAAABGM/VAAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAACFJREFUGFdjEHXq/o+OGf4DAbIACDCAAEwCLgADCAEGBgDP4STWpID5ywAAAABJ
RU5ErkJggg==
</value>
</data>
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MeasureItemResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SMResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="rpvpSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -293,6 +211,98 @@
ez4z8zeeNDGa23P9IwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="PointName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="DimensionName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="NormalVal.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="LowerTolVal.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="UpperTolVal.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MeasureValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MeasureDateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Classification.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="resource.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAAUAAAAECAYAAABGM/VAAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAACFJREFUGFdjEHXq/o+OGf4DAbIACDCAAEwCLgADCAEGBgDP4STWpID5ywAAAABJ
RU5ErkJggg==
</value>
</data>
<data name="resource.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAAUAAAAECAYAAABGM/VAAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAACFJREFUGFdjEHXq/o+OGf4DAbIACDCAAEwCLgADCAEGBgDP4STWpID5ywAAAABJ
RU5ErkJggg==
</value>
</data>
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Model.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MeasureItemResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SMResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="tmSystem.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+5 -5
View File
@@ -111,11 +111,11 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CjlrForm\AboutSoftwareInfo.cs">
<Compile Include="CjlrForm\AboutSoftware.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CjlrForm\AboutSoftwareInfo.designer.cs">
<DependentUpon>AboutSoftwareInfo.cs</DependentUpon>
<Compile Include="CjlrForm\AboutSoftware.designer.cs">
<DependentUpon>AboutSoftware.cs</DependentUpon>
</Compile>
<Compile Include="BaseUnit\Base.cs" />
<Compile Include="CjlrForm\FileSorter.cs" />
@@ -170,8 +170,8 @@
<Compile Include="BaseUnit\ZSFDEMO.designer.cs">
<DependentUpon>ZSFDEMO.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="CjlrForm\AboutSoftwareInfo.resx">
<DependentUpon>AboutSoftwareInfo.cs</DependentUpon>
<EmbeddedResource Include="CjlrForm\AboutSoftware.resx">
<DependentUpon>AboutSoftware.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FormMain.resx">
<DependentUpon>FormMain.cs</DependentUpon>
+1 -5
View File
@@ -82,12 +82,9 @@ namespace NSAnalysis
#endregion Log文件
//FileSorter fileSorter = new FileSorter();
//fileSorter.test();
if (gAuthorizationMode == 1)
{
MyBase.TraceWriteLine("Log in using the CLMS authorization.");
@@ -153,8 +150,7 @@ namespace NSAnalysis
Licence.GetRegisterInfo();
Licence.Encryption_DLL();
}
}
}
}
public class Licence
+2 -2
View File
@@ -25,8 +25,8 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers by using the '*'
// as shown below: [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2025.03.03.1")]
[assembly: AssemblyFileVersion("2025.03.03.1")]
[assembly: AssemblyVersion("2025.08.28.1")]
[assembly: AssemblyFileVersion("2025.08.28.1")]
//奇瑞总装软件
//2024.09.27.1 该版本增加读取编码器数值功能
//2024.10.08.1 该版本修改了EHY和EH3的测点图片 以及增加了上传IOT时,在1.5倍公差内,都是OK的结果,传给IOT
+66 -14
View File
@@ -1,14 +1,66 @@
2025-01-27 20:10:51.697----软件Program Main函数开始执行--
2025-01-27 20:10:51.699--加载配置文件——>开始
2025-01-27 20:10:51.712--数据库连接 SqlServerName127.0.0.1
2025-01-27 20:10:51.712--数据库连接 SqlUserNamesa
2025-01-27 20:10:51.713--数据库连接 SqlPasswordHexagon123
2025-01-27 20:10:51.714--数据库连接 SqlDbNameCJLR
2025-01-27 20:10:51.714--加载配置文件——>完成
2025-01-27 20:10:51.716--Log in using the CLMS authorization.
2025-01-27 20:10:55.778--数据库连接 SqlServerName127.0.0.1
2025-01-27 20:10:55.780--数据库连接 SqlUserNamesa
2025-01-27 20:10:55.781--数据库连接 SqlPasswordHexagon123
2025-01-27 20:10:55.782--数据库连接 SqlDbNameCJLR
2025-01-27 20:10:55.783--数据库连接字符串:Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123;
2025-01-27 20:10:59.421---------------海克斯康面隙分析软件程序关闭---------------------
2025-08-28 21:40:46.762----软件Program Main函数开始执行--
2025-08-28 21:40:46.763--加载配置文件——>开始
2025-08-28 21:40:46.778--数据库连接 SqlServerName127.0.0.1
2025-08-28 21:40:46.779--数据库连接 SqlUserNamesa
2025-08-28 21:40:46.779--数据库连接 SqlPasswordHexagon123
2025-08-28 21:40:46.780--数据库连接 SqlDbNameCJLR
2025-08-28 21:40:46.780--加载配置文件——>完成
2025-08-28 21:40:46.781--Log in using the original authorization mode.
2025-08-28 21:40:47.993--软件授权成功
2025-08-28 21:40:49.060--数据库连接 SqlServerName127.0.0.1
2025-08-28 21:40:49.061--数据库连接 SqlUserNamesa
2025-08-28 21:40:49.062--数据库连接 SqlPasswordHexagon123
2025-08-28 21:40:49.063--数据库连接 SqlDbNameCJLR
2025-08-28 21:40:49.063--数据库连接字符串:Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123;
2025-08-28 21:40:49.503---------------海克斯康面隙分析软件程序启动---------------------
2025-08-28 21:41:04.522--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
2025-08-28 21:41:04.524--匹配文件特征符: E0Y_R
2025-08-28 21:41:04.526--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
2025-08-28 21:41:04.526--匹配文件特征符: E0Y_L
2025-08-28 21:41:19.496--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
2025-08-28 21:41:19.497--匹配文件特征符: E0Y_R
2025-08-28 21:41:19.497--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
2025-08-28 21:41:19.498--匹配文件特征符: E0Y_L
2025-08-28 21:41:19.499--正在处理文件 : D:\CJLR\DATA\Input\LLL\SX541625.csv
2025-08-28 21:41:19.508--已备份文件到: D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\bin\x64\Debug\Backup\SX541625.csv
2025-08-28 21:41:22.758--测量时间:2025-08-28 11:38:37
2025-08-28 21:41:22.758----------------------------------------------------------
2025-08-28 21:41:22.759--车号:SX541625
2025-08-28 21:41:22.760--车型:E0Y
2025-08-28 21:41:22.761--组名:E0Y_L20250828
2025-08-28 21:41:22.762--位置:L
2025-08-28 21:41:22.762--测量时间:2025-08-28 11:38:37
2025-08-28 21:41:22.790--CSV文件导入到数据库成功!
2025-08-28 21:41:22.796--将总结果插入数据库完毕。
2025-08-28 21:41:22.803----------------------------------------------------------
2025-08-28 21:41:22.804--触发事件,车号: SX541625 位置: L
2025-08-28 21:41:24.534--双侧测量结果已完成,开始生成客户报告。
2025-08-28 21:41:24.552--客户报告已生成: D:\QMLTest\SX541625_20250828214124.csv
2025-08-28 21:41:24.664--[MatchCsvValue] 检查文件: D:\CJLR\DATA\Input\LLL\SX541625.csv, 行索引: 2, 列索引: 1, 目标值: E0Y_L
2025-08-28 21:41:24.667--目标文件已存在,已重命名为备份文件: D:\CJLR\DATA\Output\X540R\SX541625.csv.bak_20250828_214124
2025-08-28 21:41:24.669--移动完成,: D:\CJLR\DATA\Input\LLL\SX541625.csv -> D:\CJLR\DATA\Output\X540R\SX541625.csv
2025-08-28 21:41:34.500--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
2025-08-28 21:41:34.501--匹配文件特征符: E0Y_R
2025-08-28 21:41:34.502--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
2025-08-28 21:41:34.503--匹配文件特征符: E0Y_L
2025-08-28 21:41:49.511--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
2025-08-28 21:41:49.513--匹配文件特征符: E0Y_R
2025-08-28 21:41:49.515--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
2025-08-28 21:41:49.516--匹配文件特征符: E0Y_L
2025-08-28 21:42:04.504--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
2025-08-28 21:42:04.505--匹配文件特征符: E0Y_R
2025-08-28 21:42:04.506--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
2025-08-28 21:42:04.507--匹配文件特征符: E0Y_L
2025-08-28 21:42:19.500--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
2025-08-28 21:42:19.502--匹配文件特征符: E0Y_R
2025-08-28 21:42:19.504--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
2025-08-28 21:42:19.505--匹配文件特征符: E0Y_L
2025-08-28 21:42:34.497--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
2025-08-28 21:42:34.498--匹配文件特征符: E0Y_R
2025-08-28 21:42:34.499--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
2025-08-28 21:42:34.500--匹配文件特征符: E0Y_L
2025-08-28 21:42:49.503--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
2025-08-28 21:42:49.504--匹配文件特征符: E0Y_R
2025-08-28 21:42:49.505--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
2025-08-28 21:42:49.506--匹配文件特征符: E0Y_L
2025-08-28 21:42:51.464---------------海克斯康面隙分析软件程序关闭---------------------
@@ -8,7 +8,7 @@ Language =1
RememberMe=1
;1:CLMS授权
AuthorizationMode=1
AuthorizationMode=0
CLMSModeID=4
;权限密码
Binary file not shown.
+8 -8
View File
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<appSettings>
<add key="TelerikWinFormsThemeName" value="Fluent"/>
<add key="ClientSettingsProvider.ServiceUri" value=""/>
<add key="TelerikWinFormsThemeName" value="Fluent" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>
Binary file not shown.
+1 -1
View File
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.12.35707.178
VisualStudioVersion = 17.12.35707.178 d17.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NXSAnalysis", "Analysis\NXSAnalysis.csproj", "{7C83975D-A071-48E0-8A12-DAFD20525B66}"
EndProject