# 250827 修复 数据系统有，但IOt没有，定位到 极差计算因为NXS inv , 客户要求这种情况为空值， 进而iot构造时，double解析出错 导致的问题，从而没有进行后续上传动作
This commit is contained in:
HM-CN\zhengxuan.zhang
File diff suppressed because one or more lines are too long
@@ -366,6 +366,10 @@
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
|
||||
+163
-75
@@ -28,6 +28,8 @@ using System.Net;
|
||||
using System.Xml.Linq;
|
||||
using System.IO.Ports;
|
||||
using System.Drawing.Printing;
|
||||
using System.Drawing.Text;
|
||||
using NSAnalysis;
|
||||
|
||||
namespace NSAnalysis
|
||||
{
|
||||
@@ -239,7 +241,11 @@ namespace NSAnalysis
|
||||
|
||||
InitTableColumns();
|
||||
strSaveReprotPath = ConfigDfn.strReportPath + @"\";
|
||||
}
|
||||
|
||||
|
||||
testIotUpload();
|
||||
|
||||
}
|
||||
|
||||
private void InitTableColumns()
|
||||
{
|
||||
@@ -372,17 +378,7 @@ namespace NSAnalysis
|
||||
lpcShowLog.labText.Click += new EventHandler(lpcShowLog_Click);
|
||||
}
|
||||
|
||||
private void CenterControl_FormClosing(object sender, FormClosingEventArgs e)
|
||||
{
|
||||
if (DialogResult.Yes == MessageBox.Show("警告：您确定要退出该软件系统吗？", "警告", MessageBoxButtons.YesNo, MessageBoxIcon.Warning))
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
e.Cancel = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void CenterControl_FormClosed(object sender, FormClosedEventArgs e)
|
||||
{
|
||||
@@ -1366,71 +1362,71 @@ namespace NSAnalysis
|
||||
|
||||
if (ConfigDfn.iStartIOTFlag == 1)
|
||||
{
|
||||
bool bVINMeasuedFlag = tmdal.CheckVINExistInDB(strCarID);
|
||||
if (bVINMeasuedFlag)
|
||||
{
|
||||
MyBase.TraceWriteLine("VIN:" + strCarID + " 该VIN码已经在数据库中存在了，说明已经测量过了，不再进行IOT数据上传操作。");
|
||||
}
|
||||
else
|
||||
{
|
||||
#region IOT上传功能
|
||||
|
||||
if (dtAllRangeDate.Rows.Count > 0)
|
||||
{
|
||||
foreach (DataRow row in dtAllRangeDate.Rows)
|
||||
{
|
||||
bool bVINMeasuedFlag = tmdal.CheckVINExistInDB(strCarID);
|
||||
if (bVINMeasuedFlag)
|
||||
{
|
||||
MyBase.TraceWriteLine("VIN:" + strCarID + " 该VIN码已经在数据库中存在了，说明已经测量过了，不再进行IOT数据上传操作。");
|
||||
}
|
||||
else
|
||||
{
|
||||
// 上传 IOT功能
|
||||
if (dtAllRangeDate.Rows.Count > 0)
|
||||
{
|
||||
foreach (DataRow row in dtAllRangeDate.Rows)
|
||||
{
|
||||
|
||||
CheryIOTData cIOTData = new CheryIOTData();
|
||||
cIOTData.vin = strCarID;
|
||||
cIOTData.gfNo = "G";
|
||||
cIOTData.pointNumber = row.ItemArray[2].ToString();
|
||||
cIOTData.actualValue = row.ItemArray[3].ToString();
|
||||
cIOTData.controlLine = row.ItemArray[4].ToString();
|
||||
cIOTData.measurementResult = row.ItemArray[5].ToString();
|
||||
if (cIOTData.measurementResult.ToUpper().Contains("NG"))
|
||||
{
|
||||
if (!cIOTData.actualValue.ToLower().Contains("inv"))
|
||||
{
|
||||
dLowerValue = double.Parse(row.ItemArray[4].ToString().Substring(0, 3));
|
||||
dUpperValue = double.Parse(row.ItemArray[4].ToString().Substring(4, 3));
|
||||
dStrictTLower = CalculateStrictLowerTolerance(dLowerValue, dUpperValue);
|
||||
dStrictTUpper = CalculateStrictUpperTolerance(dLowerValue, dUpperValue);
|
||||
double dValue = double.Parse(row.ItemArray[3].ToString());
|
||||
if (dValue > dStrictTLower && dValue < dStrictTUpper)
|
||||
{
|
||||
cIOTData.measurementResult = "OK";
|
||||
}
|
||||
}
|
||||
}
|
||||
ListPostIOTData.Add(cIOTData);
|
||||
}
|
||||
}
|
||||
string strGapList = JsonHelper.ObjectToJson(ListPostIOTData);
|
||||
string strCaliResult = "OK";
|
||||
if (labResult.Text == "合格")
|
||||
{
|
||||
strCaliResult = "OK";
|
||||
}
|
||||
else
|
||||
{
|
||||
strCaliResult = "NG";
|
||||
}
|
||||
string strPostData = "{\"serno\":\"" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + "\",\"requestData\":[{\"vin\":\"" + strCarID + "\",\"model\":\"EHY\",\"equipmentNo\":\"" + ConfigDfn.strEquipNo + "\",\"equipmentName\":\"" + ConfigDfn.strEquipName + "\",\"calibrationResult\":\"" + strCaliResult + "\",\"detectionTime\":\"" + ConfigDfn.strMeasureTime + "\",\"targetRate\":\"" + strTargetRate + "\",\"rate\":\"" + labResultPercent.Text + "\",\"GapList\":" + strGapList + "}]}";
|
||||
MyBase.TraceWriteLine("Update To IOT Data Content: " + strPostData);
|
||||
string strPostResult = PostJsonToIOT(ConfigDfn.strIOTAddress, strPostData, 10000);
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT完成，结果返回为：" + strPostResult);
|
||||
if (strPostResult.Contains("成功"))
|
||||
{
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT成功 ^_^");
|
||||
}
|
||||
else
|
||||
{
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT失败！");
|
||||
}
|
||||
CheryIOTData cIOTData = new CheryIOTData();
|
||||
cIOTData.vin = strCarID;
|
||||
cIOTData.gfNo = "G";
|
||||
cIOTData.pointNumber = row.ItemArray[2].ToString();
|
||||
cIOTData.actualValue = row.ItemArray[3].ToString();
|
||||
cIOTData.controlLine = row.ItemArray[4].ToString();
|
||||
cIOTData.measurementResult = row.ItemArray[5].ToString();
|
||||
if (cIOTData.measurementResult.ToUpper().Contains("NG"))
|
||||
{
|
||||
if (!cIOTData.actualValue.ToLower().Contains("inv"))
|
||||
{
|
||||
dLowerValue = double.Parse(row.ItemArray[4].ToString().Substring(0, 3));
|
||||
dUpperValue = double.Parse(row.ItemArray[4].ToString().Substring(4, 3));
|
||||
dStrictTLower = CalculateStrictLowerTolerance(dLowerValue, dUpperValue);
|
||||
dStrictTUpper = CalculateStrictUpperTolerance(dLowerValue, dUpperValue);
|
||||
double dValue = double.Parse(row.ItemArray[3].ToString());
|
||||
if (dValue > dStrictTLower && dValue < dStrictTUpper)
|
||||
{
|
||||
cIOTData.measurementResult = "OK";
|
||||
}
|
||||
}
|
||||
}
|
||||
ListPostIOTData.Add(cIOTData);
|
||||
}
|
||||
}
|
||||
string strGapList = JsonHelper.ObjectToJson(ListPostIOTData);
|
||||
string strCaliResult = "OK";
|
||||
if (labResult.Text == "合格")
|
||||
{
|
||||
strCaliResult = "OK";
|
||||
}
|
||||
else
|
||||
{
|
||||
strCaliResult = "NG";
|
||||
}
|
||||
string strPostData = "{\"serno\":\"" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + "\",\"requestData\":[{\"vin\":\"" + strCarID + "\",\"model\":\"EHY\",\"equipmentNo\":\"" + ConfigDfn.strEquipNo + "\",\"equipmentName\":\"" + ConfigDfn.strEquipName + "\",\"calibrationResult\":\"" + strCaliResult + "\",\"detectionTime\":\"" + ConfigDfn.strMeasureTime + "\",\"targetRate\":\"" + strTargetRate + "\",\"rate\":\"" + labResultPercent.Text + "\",\"GapList\":" + strGapList + "}]}";
|
||||
MyBase.TraceWriteLine("Update To IOT Data Content: " + strPostData);
|
||||
string strPostResult = PostJsonToIOT(ConfigDfn.strIOTAddress, strPostData, 10000);
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT完成，结果返回为：" + strPostResult);
|
||||
if (strPostResult.Contains("成功"))
|
||||
{
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT成功 ^_^");
|
||||
}
|
||||
else
|
||||
{
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT失败！");
|
||||
}
|
||||
|
||||
#endregion IOT上传功能
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT功能未启用！");
|
||||
@@ -1451,6 +1447,95 @@ namespace NSAnalysis
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void testIotUpload()
|
||||
{
|
||||
|
||||
// 修复极差 计算问题
|
||||
//LNNBBDEC7SDF49695
|
||||
//string strVIN = "LNNBBDEC5SDF49694";
|
||||
// string strCarType = "EHY";
|
||||
//CalculateRange(strVIN, strCarType);
|
||||
|
||||
|
||||
//修复IOt上传问题
|
||||
string strCarID = "LNNBDDEF4SDF49707";
|
||||
DataTable dtAllRangeDate = tmdal.SelectRangeDatabyCarID(strCarID);
|
||||
string strTargetRate = "97.00%";
|
||||
UploadIOTData(strCarID, dtAllRangeDate, strTargetRate);
|
||||
|
||||
}
|
||||
|
||||
private void UploadIOTData(string strCarID, DataTable dtAllRangeDate, string strTargetRate)
|
||||
{
|
||||
double dStrictTLower = 0;
|
||||
double dStrictTUpper = 0;
|
||||
double dLowerValue = 0;
|
||||
double dUpperValue = 0;
|
||||
bool bVINMeasuedFlag = tmdal.CheckVINExistInDB(strCarID);
|
||||
if (bVINMeasuedFlag)
|
||||
{
|
||||
MyBase.TraceWriteLine("VIN:" + strCarID + " 该VIN码已经在数据库中存在了，说明已经测量过了，不再进行IOT数据上传操作。");
|
||||
}
|
||||
else
|
||||
{
|
||||
// 上传 IOT功能
|
||||
if (dtAllRangeDate.Rows.Count > 0)
|
||||
{
|
||||
foreach (DataRow row in dtAllRangeDate.Rows)
|
||||
{
|
||||
|
||||
CheryIOTData cIOTData = new CheryIOTData();
|
||||
cIOTData.vin = strCarID;
|
||||
cIOTData.gfNo = "G";
|
||||
cIOTData.pointNumber = row.ItemArray[2].ToString();
|
||||
cIOTData.actualValue = row.ItemArray[3].ToString();
|
||||
cIOTData.controlLine = row.ItemArray[4].ToString();
|
||||
cIOTData.measurementResult = row.ItemArray[5].ToString();
|
||||
if (cIOTData.measurementResult.ToUpper().Contains("NG"))
|
||||
{
|
||||
if (!string.IsNullOrEmpty(cIOTData.actualValue) && !cIOTData.actualValue.ToLower().Contains("inv")) // 2025.08.27 修复NG数据实际值为空时，上传IOT报错问题
|
||||
{
|
||||
dLowerValue = double.Parse(row.ItemArray[4].ToString().Substring(0, 3));
|
||||
dUpperValue = double.Parse(row.ItemArray[4].ToString().Substring(4, 3));
|
||||
dStrictTLower = CalculateStrictLowerTolerance(dLowerValue, dUpperValue);
|
||||
dStrictTUpper = CalculateStrictUpperTolerance(dLowerValue, dUpperValue);
|
||||
double dValue = double.Parse(row.ItemArray[3].ToString());
|
||||
if (dValue > dStrictTLower && dValue < dStrictTUpper)
|
||||
{
|
||||
cIOTData.measurementResult = "OK";
|
||||
}
|
||||
}
|
||||
}
|
||||
ListPostIOTData.Add(cIOTData);
|
||||
}
|
||||
}
|
||||
string strGapList = JsonHelper.ObjectToJson(ListPostIOTData);
|
||||
string strCaliResult = "OK";
|
||||
if (labResult.Text == "合格")
|
||||
{
|
||||
strCaliResult = "OK";
|
||||
}
|
||||
else
|
||||
{
|
||||
strCaliResult = "NG";
|
||||
}
|
||||
string strPostData = "{\"serno\":\"" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + "\",\"requestData\":[{\"vin\":\"" + strCarID + "\",\"model\":\"EHY\",\"equipmentNo\":\"" + ConfigDfn.strEquipNo + "\",\"equipmentName\":\"" + ConfigDfn.strEquipName + "\",\"calibrationResult\":\"" + strCaliResult + "\",\"detectionTime\":\"" + ConfigDfn.strMeasureTime + "\",\"targetRate\":\"" + strTargetRate + "\",\"rate\":\"" + labResultPercent.Text + "\",\"GapList\":" + strGapList + "}]}";
|
||||
MyBase.TraceWriteLine("Update To IOT Data Content: " + strPostData);
|
||||
string strPostResult = PostJsonToIOT(ConfigDfn.strIOTAddress, strPostData, 10000);
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT完成，结果返回为：" + strPostResult);
|
||||
if (strPostResult.Contains("成功"))
|
||||
{
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT成功 ^_^");
|
||||
}
|
||||
else
|
||||
{
|
||||
MyBase.TraceWriteLine("EHY数据上传IOT失败！");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
private void CalculateRange(string strVIN, string strCarType)
|
||||
{
|
||||
MyBase.TraceWriteLine(strVIN + " " + strCarType + "开始计算极差：============");
|
||||
@@ -1472,7 +1557,8 @@ namespace NSAnalysis
|
||||
for (int j = 0; j < strArrRangePoint.Length; j++)
|
||||
{
|
||||
string strMeasureValue = tmdal.SelectOneMeasureValueByCondition(strVIN, strArrRangePoint[j].Substring(0, 4));
|
||||
if (strMeasureValue.ToLower().Contains("inv"))
|
||||
|
||||
if (string.IsNullOrEmpty(strMeasureValue) || strMeasureValue.ToLower().Contains("inv"))
|
||||
{
|
||||
strRangeValue = "";
|
||||
strRangeResult = "NG";
|
||||
@@ -1492,7 +1578,9 @@ namespace NSAnalysis
|
||||
iCalcCount++;
|
||||
}
|
||||
}
|
||||
if (iCalcCount == strArrRangePoint.Length)
|
||||
|
||||
//iCalcCount 的作用就是确保只有全部测点都有效时才计算极差，否则提前退出。
|
||||
if (iCalcCount == strArrRangePoint.Length)
|
||||
{
|
||||
double dMax = dMeasureData.Max();
|
||||
double dMin = dMeasureData.Min();
|
||||
|
||||
Generated
+183
-184
@@ -30,31 +30,31 @@
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CenterControl));
|
||||
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();
|
||||
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
|
||||
System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
|
||||
System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
|
||||
System.Windows.Forms.DataVisualization.Charting.Title title4 = new System.Windows.Forms.DataVisualization.Charting.Title();
|
||||
Telerik.WinControls.UI.RadListDataItem radListDataItem7 = new Telerik.WinControls.UI.RadListDataItem();
|
||||
Telerik.WinControls.UI.RadListDataItem radListDataItem8 = new Telerik.WinControls.UI.RadListDataItem();
|
||||
Telerik.WinControls.UI.RadListDataItem radListDataItem9 = new Telerik.WinControls.UI.RadListDataItem();
|
||||
Telerik.WinControls.UI.RadListDataItem radListDataItem10 = new Telerik.WinControls.UI.RadListDataItem();
|
||||
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea5 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
|
||||
System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series();
|
||||
System.Windows.Forms.DataVisualization.Charting.Title title5 = 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();
|
||||
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea6 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
|
||||
System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
|
||||
System.Windows.Forms.DataVisualization.Charting.Title title6 = new System.Windows.Forms.DataVisualization.Charting.Title();
|
||||
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();
|
||||
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
|
||||
System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
|
||||
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();
|
||||
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 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 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.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
|
||||
System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
|
||||
System.Windows.Forms.DataVisualization.Charting.Title title3 = new System.Windows.Forms.DataVisualization.Charting.Title();
|
||||
Telerik.WinControls.UI.RadListDataItem radListDataItem5 = new Telerik.WinControls.UI.RadListDataItem();
|
||||
Telerik.WinControls.UI.RadListDataItem radListDataItem6 = new Telerik.WinControls.UI.RadListDataItem();
|
||||
this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.labTitle = new System.Windows.Forms.Label();
|
||||
@@ -582,7 +582,7 @@
|
||||
this.RPV.ItemSizeMode = ((Telerik.WinControls.UI.PageViewItemSizeMode)((Telerik.WinControls.UI.PageViewItemSizeMode.EqualWidth | Telerik.WinControls.UI.PageViewItemSizeMode.EqualHeight)));
|
||||
this.RPV.Location = new System.Drawing.Point(1, 42);
|
||||
this.RPV.Name = "RPV";
|
||||
this.RPV.SelectedPage = this.rpvpAnalysis;
|
||||
this.RPV.SelectedPage = this.rpvpSetup;
|
||||
this.RPV.Size = new System.Drawing.Size(1918, 1008);
|
||||
this.RPV.TabIndex = 127;
|
||||
this.RPV.ViewMode = Telerik.WinControls.UI.PageViewMode.NavigationView;
|
||||
@@ -665,7 +665,7 @@
|
||||
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161)))));
|
||||
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161)))));
|
||||
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).HorizontalLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).Text = " 分析主界面";
|
||||
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).Text = " 软件设置";
|
||||
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).FocusBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161)))));
|
||||
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.White;
|
||||
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
|
||||
@@ -769,14 +769,14 @@
|
||||
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;
|
||||
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;
|
||||
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;
|
||||
this.dgvMeasureContent.ColumnHeadersHeight = 38;
|
||||
this.dgvMeasureContent.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.DimensionID,
|
||||
@@ -793,20 +793,20 @@
|
||||
this.dgvMeasureContent.Name = "dgvMeasureContent";
|
||||
this.dgvMeasureContent.ReadOnly = true;
|
||||
this.dgvMeasureContent.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
|
||||
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;
|
||||
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;
|
||||
this.dgvMeasureContent.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
|
||||
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;
|
||||
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;
|
||||
this.dgvMeasureContent.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Segoe UI", 10F);
|
||||
this.dgvMeasureContent.RowTemplate.Height = 38;
|
||||
this.dgvMeasureContent.Size = new System.Drawing.Size(1082, 846);
|
||||
@@ -1126,18 +1126,18 @@
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chartResultPie.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
chartArea4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
chartArea4.Name = "ChartArea1";
|
||||
this.chartResultPie.ChartAreas.Add(chartArea4);
|
||||
legend2.Alignment = System.Drawing.StringAlignment.Center;
|
||||
legend2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
legend2.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Bottom;
|
||||
legend2.Font = new System.Drawing.Font("Segoe UI", 10F);
|
||||
legend2.ForeColor = System.Drawing.Color.White;
|
||||
legend2.IsTextAutoFit = false;
|
||||
legend2.Name = "Legend1";
|
||||
legend2.TitleForeColor = System.Drawing.Color.White;
|
||||
this.chartResultPie.Legends.Add(legend2);
|
||||
chartArea1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
chartArea1.Name = "ChartArea1";
|
||||
this.chartResultPie.ChartAreas.Add(chartArea1);
|
||||
legend1.Alignment = System.Drawing.StringAlignment.Center;
|
||||
legend1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Bottom;
|
||||
legend1.Font = new System.Drawing.Font("Segoe UI", 10F);
|
||||
legend1.ForeColor = System.Drawing.Color.White;
|
||||
legend1.IsTextAutoFit = false;
|
||||
legend1.Name = "Legend1";
|
||||
legend1.TitleForeColor = System.Drawing.Color.White;
|
||||
this.chartResultPie.Legends.Add(legend1);
|
||||
this.chartResultPie.Location = new System.Drawing.Point(3, 3);
|
||||
this.chartResultPie.Name = "chartResultPie";
|
||||
this.chartResultPie.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.None;
|
||||
@@ -1145,21 +1145,21 @@
|
||||
System.Drawing.Color.Green,
|
||||
System.Drawing.Color.Orange,
|
||||
System.Drawing.Color.Red};
|
||||
series4.ChartArea = "ChartArea1";
|
||||
series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
|
||||
series4.Font = new System.Drawing.Font("微软雅黑", 10F);
|
||||
series4.LabelForeColor = System.Drawing.Color.White;
|
||||
series4.Legend = "Legend1";
|
||||
series4.Name = "Series1";
|
||||
this.chartResultPie.Series.Add(series4);
|
||||
series1.ChartArea = "ChartArea1";
|
||||
series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
|
||||
series1.Font = new System.Drawing.Font("微软雅黑", 10F);
|
||||
series1.LabelForeColor = System.Drawing.Color.White;
|
||||
series1.Legend = "Legend1";
|
||||
series1.Name = "Series1";
|
||||
this.chartResultPie.Series.Add(series1);
|
||||
this.chartResultPie.Size = new System.Drawing.Size(728, 584);
|
||||
this.chartResultPie.TabIndex = 0;
|
||||
this.chartResultPie.Text = "chartFPY";
|
||||
title4.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
title4.ForeColor = System.Drawing.Color.White;
|
||||
title4.Name = "Title1";
|
||||
title4.Text = "合格率";
|
||||
this.chartResultPie.Titles.Add(title4);
|
||||
title1.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
title1.ForeColor = System.Drawing.Color.White;
|
||||
title1.Name = "Title1";
|
||||
title1.Text = "合格率";
|
||||
this.chartResultPie.Titles.Add(title1);
|
||||
//
|
||||
// rpvpSearch
|
||||
//
|
||||
@@ -1199,14 +1199,14 @@
|
||||
this.rddlPageRecorderCount.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
|
||||
this.rddlPageRecorderCount.Font = new System.Drawing.Font("Segoe UI", 12F);
|
||||
this.rddlPageRecorderCount.ForeColor = System.Drawing.Color.White;
|
||||
radListDataItem7.Text = "20";
|
||||
radListDataItem8.Text = "50";
|
||||
radListDataItem9.Text = "100";
|
||||
radListDataItem10.Text = "200";
|
||||
this.rddlPageRecorderCount.Items.Add(radListDataItem7);
|
||||
this.rddlPageRecorderCount.Items.Add(radListDataItem8);
|
||||
this.rddlPageRecorderCount.Items.Add(radListDataItem9);
|
||||
this.rddlPageRecorderCount.Items.Add(radListDataItem10);
|
||||
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);
|
||||
this.rddlPageRecorderCount.Location = new System.Drawing.Point(718, 9);
|
||||
this.rddlPageRecorderCount.Name = "rddlPageRecorderCount";
|
||||
//
|
||||
@@ -1751,43 +1751,43 @@
|
||||
| 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)))));
|
||||
chartArea5.AxisX.LabelStyle.ForeColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisX.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisX.MajorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisX.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.NotSet;
|
||||
chartArea5.AxisX.MajorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisX.MinorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisX.MinorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisX.TitleForeColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisY.LabelStyle.ForeColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisY.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisY.MajorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisY.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
|
||||
chartArea5.AxisY.MajorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisY.MinorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisY.MinorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea5.AxisY.TitleForeColor = System.Drawing.Color.White;
|
||||
chartArea5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
chartArea5.Name = "ChartArea1";
|
||||
this.chartFPYLine.ChartAreas.Add(chartArea5);
|
||||
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(1240, 127);
|
||||
this.chartFPYLine.Name = "chartFPYLine";
|
||||
series5.BorderWidth = 3;
|
||||
series5.ChartArea = "ChartArea1";
|
||||
series5.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line;
|
||||
series5.Color = System.Drawing.Color.Lime;
|
||||
series5.MarkerSize = 9;
|
||||
series5.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle;
|
||||
series5.Name = "Series1";
|
||||
this.chartFPYLine.Series.Add(series5);
|
||||
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(596, 517);
|
||||
this.chartFPYLine.TabIndex = 77;
|
||||
this.chartFPYLine.Text = "chartFPY";
|
||||
title5.Font = new System.Drawing.Font("微软雅黑", 12F);
|
||||
title5.ForeColor = System.Drawing.Color.White;
|
||||
title5.Name = "Title1";
|
||||
title5.Text = "合格率";
|
||||
this.chartFPYLine.Titles.Add(title5);
|
||||
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;
|
||||
//
|
||||
// dgvSelectMeasureData
|
||||
@@ -1800,14 +1800,14 @@
|
||||
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;
|
||||
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;
|
||||
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;
|
||||
this.dgvSelectMeasureData.ColumnHeadersHeight = 37;
|
||||
this.dgvSelectMeasureData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.Column2,
|
||||
@@ -1825,20 +1825,20 @@
|
||||
this.dgvSelectMeasureData.Name = "dgvSelectMeasureData";
|
||||
this.dgvSelectMeasureData.ReadOnly = true;
|
||||
this.dgvSelectMeasureData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
|
||||
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;
|
||||
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;
|
||||
this.dgvSelectMeasureData.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
|
||||
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;
|
||||
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;
|
||||
this.dgvSelectMeasureData.RowTemplate.Height = 37;
|
||||
this.dgvSelectMeasureData.Size = new System.Drawing.Size(1204, 805);
|
||||
this.dgvSelectMeasureData.TabIndex = 174;
|
||||
@@ -1928,14 +1928,14 @@
|
||||
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;
|
||||
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;
|
||||
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;
|
||||
this.dgvFPYResult.ColumnHeadersHeight = 37;
|
||||
this.dgvFPYResult.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.dataGridViewTextBoxColumn9,
|
||||
@@ -1952,20 +1952,20 @@
|
||||
this.dgvFPYResult.Name = "dgvFPYResult";
|
||||
this.dgvFPYResult.ReadOnly = true;
|
||||
this.dgvFPYResult.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
|
||||
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;
|
||||
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;
|
||||
this.dgvFPYResult.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
|
||||
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;
|
||||
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;
|
||||
this.dgvFPYResult.RowTemplate.Height = 37;
|
||||
this.dgvFPYResult.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
|
||||
this.dgvFPYResult.Size = new System.Drawing.Size(1205, 798);
|
||||
@@ -2507,38 +2507,38 @@
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chartCPCPK.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
chartArea6.AxisX.LabelStyle.ForeColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisX.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisX.MajorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisX.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.NotSet;
|
||||
chartArea6.AxisX.MajorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisX.MinorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisX.MinorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisX.TitleForeColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisY.LabelStyle.ForeColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisY.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisY.MajorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisY.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
|
||||
chartArea6.AxisY.MajorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisY.MinorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisY.MinorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea6.AxisY.TitleForeColor = System.Drawing.Color.White;
|
||||
chartArea6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
chartArea6.Name = "ChartArea1";
|
||||
this.chartCPCPK.ChartAreas.Add(chartArea6);
|
||||
chartArea3.AxisX.LabelStyle.ForeColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisX.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisX.MajorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisX.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.NotSet;
|
||||
chartArea3.AxisX.MajorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisX.MinorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisX.MinorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisX.TitleForeColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisY.LabelStyle.ForeColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisY.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisY.MajorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisY.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
|
||||
chartArea3.AxisY.MajorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisY.MinorGrid.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisY.MinorTickMark.LineColor = System.Drawing.Color.White;
|
||||
chartArea3.AxisY.TitleForeColor = System.Drawing.Color.White;
|
||||
chartArea3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
|
||||
chartArea3.Name = "ChartArea1";
|
||||
this.chartCPCPK.ChartAreas.Add(chartArea3);
|
||||
this.chartCPCPK.Location = new System.Drawing.Point(30, 140);
|
||||
this.chartCPCPK.Name = "chartCPCPK";
|
||||
series6.ChartArea = "ChartArea1";
|
||||
series6.Name = "Series1";
|
||||
this.chartCPCPK.Series.Add(series6);
|
||||
series3.ChartArea = "ChartArea1";
|
||||
series3.Name = "Series1";
|
||||
this.chartCPCPK.Series.Add(series3);
|
||||
this.chartCPCPK.Size = new System.Drawing.Size(1207, 667);
|
||||
this.chartCPCPK.TabIndex = 78;
|
||||
this.chartCPCPK.Text = "chartFPY";
|
||||
title6.Font = new System.Drawing.Font("微软雅黑", 12F);
|
||||
title6.ForeColor = System.Drawing.Color.White;
|
||||
title6.Name = "Title1";
|
||||
title6.Text = "Cp/Cpk分析";
|
||||
this.chartCPCPK.Titles.Add(title6);
|
||||
title3.Font = new System.Drawing.Font("微软雅黑", 12F);
|
||||
title3.ForeColor = System.Drawing.Color.White;
|
||||
title3.Name = "Title1";
|
||||
title3.Text = "Cp/Cpk分析";
|
||||
this.chartCPCPK.Titles.Add(title3);
|
||||
this.chartCPCPK.Visible = false;
|
||||
//
|
||||
// radGroupBox2
|
||||
@@ -2599,10 +2599,10 @@
|
||||
this.rddlSizeName.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
|
||||
this.rddlSizeName.Font = new System.Drawing.Font("Segoe UI", 12F);
|
||||
this.rddlSizeName.ForeColor = System.Drawing.Color.White;
|
||||
radListDataItem1.Text = "F (面差)";
|
||||
radListDataItem2.Text = "G (间隙)";
|
||||
this.rddlSizeName.Items.Add(radListDataItem1);
|
||||
this.rddlSizeName.Items.Add(radListDataItem2);
|
||||
radListDataItem5.Text = "F (面差)";
|
||||
radListDataItem6.Text = "G (间隙)";
|
||||
this.rddlSizeName.Items.Add(radListDataItem5);
|
||||
this.rddlSizeName.Items.Add(radListDataItem6);
|
||||
this.rddlSizeName.Location = new System.Drawing.Point(602, 38);
|
||||
this.rddlSizeName.Name = "rddlSizeName";
|
||||
this.rddlSizeName.Size = new System.Drawing.Size(154, 27);
|
||||
@@ -3299,7 +3299,6 @@
|
||||
this.Name = "CenterControl";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "海克斯康间隙面差分析系统";
|
||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.CenterControl_FormClosing);
|
||||
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.CenterControl_FormClosed);
|
||||
this.Load += new System.EventHandler(this.CenterControl_Load);
|
||||
((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit();
|
||||
|
||||
+74
-81
@@ -150,83 +150,6 @@
|
||||
IHTCfZQWuRBGlIrQoi/wc3unYB2yIezXtu/xFw+lctWAOpr3s5YWKFgAon3/xnp3cjPKCDsamCTUelHG
|
||||
M5zL/kBDiUN9j/R9EOdzZ+k8yb/At2NlgydJjTKiVtSdVKk/m/kVANjAPs34ScEaMJfVMw3t6bm6s6lp
|
||||
qEc4R0mJ+26dgwn6qipE706fjsJ1VnvEI8VA/PC3/lOjX79/AdonQT85iOsDAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="rpvpAnalysis.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAYCAYAAADtaU2/AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AkVCAAngM/SOwAAAoNJREFU
|
||||
SEu1lsvLTWEUh7cIJQbEwIRipoSRiRiIAf4AxcB1YGJgIkWhFBHKyOQrA5JigmKipIQJGZCJWwauySWX
|
||||
iOf5etfu/XbrHMftV0/tvd61fr/O2e9+z2kG1GRYAUfgGjyFtwWvrblmj71/rSmwGa7Ce/jxC+yx1xln
|
||||
f1ujYDlo8h26AbdhS8Hr7rozzuqh10AaC9vgNXQN5Q0shpDX1rJePfTSs69s2A1fIDOS+zANQlPBWtYr
|
||||
X0HPvuFbIUJvwTG4At9KTd7BKgh5bS3W7XXGWT2s6al3Kr+yF2DjdZgByl16DsJYHsK+gtf1mr2xs/XQ
|
||||
y7reS2CEJsEliOG9UGsjxFoXN5LPODbhBqilV/SaYVar1eCziIaTMAZC+yHWupyA+XC53Nsb0kOv6DXD
|
||||
rGFNgIsQi/IRNFgK2+EV1OuBz24lqONgzV5nnNVDr3rGLDObRdDL+HNSq3kEM8Gv72apBb1mzTKz2VUK
|
||||
f8J5GA0LoNe7nGFmc6Eq+CoMcjQGO0F5RGbrgZ71K2lm+/J72G+ChbAHPkA0ZnyCZaCGIOvRQy899TbD
|
||||
upnN83Kzw5sid+MZqE26PIDp4I/BnVLrokf9dphh3cz22azxptJRqE0Cd7KGsZvnwkvIevWoZYZ1M5sn
|
||||
5eYseO6qOXAXapPgIIyHkNeHIOvVQy+ltxnWzWzPU08ejzcPhHul1uUxzIKurLmWzeilp95xuvnq9dwY
|
||||
GQ6MOPKKJsINyGYyzGzWQ31c9sNPNRu66veJu5i1DoaH3KFZU4bPeByEvD4AWW+GWe3jOgxZU4ZH4SlY
|
||||
C+7S06WW9WaY1WoePIOs8V9ihlmt/EPm3xP/SXja/A/0NoOspvkJxD7h7QqkS00AAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="rpvpSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AEGATc06Xu77gAAAihJREFU
|
||||
WEft1j1rFUEUgOH1IwYLCzEKSSAQVLBRkkZ/gEYs468w1iJoY6ud2gqKIfEXWAh2GhNrP8DYRcEETaNi
|
||||
YSHq+152YLKe3J1ELiLcAw8sO2fO7MfM7Fb96Mf/GIPYj0MYrXnsOdt6EgdwGlcwjwW8wErNY8/ZZo65
|
||||
9vnrGMclLOIzfhUy1z72tcaWYx8uwDv7iWiQEva1hrWsWRSHMYfviIomX7FW8zjKSaxlTWt3jUk8RVQk
|
||||
ccDbOIcjNY89Z1vUJ7H2BMI4jueIOiYvcRY7sAvOfnls2GZO1Dd5hmPYEMN4hKhD4t05gOFd3MNy7S58
|
||||
eoY5bU/iIRyzEwO4jrbJdgs7YVxEc468wkkY5uZtTY51A3tQnccnRInJF5xBir24hm/I8+5jN8y1T97W
|
||||
5JiO3VmvUUJuFc5g372PbgRHcQc/kPLe4CBc+/bJa0Qcu1rKTmzGYhZ1d3uCD3iPj8hfnRfgpCy9AFdF
|
||||
8Stwe3W+uN1GOZpF6StYxzQ6E8EJ0TYJb8I4hddotnvONsPcZntuwyQ0fK8ujSg5cWlNwXDJufTe1vJl
|
||||
aM6WlmEKNwc3iahD4iaTLiLaiGxr24iceH9sRClO4DGijomTy3Xe3Io91zbxrO0YXWMMTqaSj5EDquRj
|
||||
ZE1rF4Wfzhn4ONsmZzf2tYa1ij/HebieL2O7PyT23dYPSTOG4D5wFQ/g75d39q7msedsM8dc+/Qk/slP
|
||||
aT/60aOoqt9oGogfMlqpmgAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="rpvpCpCpk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOARcj8ni9FAAAAq1JREFU
|
||||
WEe910uoTVEcx/HrFUIiUlJMkHfCQBIZyEAppQxMGHjEQFFKioEkz5J3DCgGwsxIXhkojxIlJe+QIkre
|
||||
z+/33rNOy9nr7LM7d9/7q0/3nvU4+3/3WWetfVsS6Ypp2IpreIO/FZ9xD4cwB91QaoZiN14hXLSed9iJ
|
||||
wSgl43AF4QIfK6+PYC+2YT/O4y3CuBPoi3ZlCC7CN/yFM5iJPqhNd/gRXYDjf2MN2pXNCG/mX5u6cG2G
|
||||
4Qac588BaCrj8RS+kX9VP5gu6Nn2a92sgvM+YbYNOXHBevcyWY8/+IL5NhAvvhx+LHNtSMTF50dlAbqL
|
||||
BUhlIA7iNEbYECd8lrcQbmMvXIXtLrxUZuArQgE6jFSmI4xdZkOcJ7DjeOurtvRGKMC9YCW83cEK7MEP
|
||||
hIvrOhqNte2/hI59ra/aEhdQtkwBocOdLyQu4Bs+JLjwXDthvr6j0di6Bfj1C4kLOIspmBqZDBepxYX5
|
||||
cpNqNDZTwHvY4SoNiQs4YEMiblR+c8LFVW8RxmMzBdyHHafgQWTiAuLC4sxCbQFu26nEYzMFnIMdN9Hf
|
||||
BtKpBWyBHR4wHkimSAHufLVr4ChSyS1gIez0HFhiAylSgMU+Qrj4T2xEKrkFDMdD2BkWXJECjHfB5wLH
|
||||
uQDDOVKb3AI8JE7Czttw34634rwCfA5YjU1wu62X3ALMUtjpoHnogSIFFE3DAkbjJRzgllz0DhRNwwLi
|
||||
j+EBRuJy5bUr2+cC10UzvJse6bkFmEVwJbtnr8UlOMEHVJ8NvSPNcK7PCn7LfD9Py2QGwWeCcBdeV34v
|
||||
m0dz3WxAalKZnmMskhmFx0hNLNMOJONi9PhNTSqTd2EMMpmAF0hNKtt2ZLILqcEd4RkmoZqJCJtRZzmG
|
||||
atYhNagj+axYzWL473dqYAdpufMPbVcEeB1qsV0AAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="rpvpSetup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOAhEQGbTF3QAABH1JREFU
|
||||
WEe111mobmMcx/FtnnKcDJlFiDLPM+UgQy50RIZSCDdKUUKIQm7IkIgoKQ7HPAtlvJFypSjKPBbKPP8+
|
||||
613/09rLepe95fzqe1rredd+hv/4nJn/oLXDHeHP8FfLH+H+sF5Y7jo2/BK+Dx+0eP49LA7/m1YJq00e
|
||||
Z+mS4NS3hc1abmzHrg59rdoyL+0floanw6mhNrJCuC9Y7CwDrU4Jxh4PKxmIHODE8FQwfniYkw4I7wYT
|
||||
4tdwe9gu7BHeDj+Fg0PJ+HfhvbBf2DrcHHxX83wcjg6jcvJ3Qp3mivB5+87X9fxG2CCUFoZXgt++CO+3
|
||||
z1+GK4O5vNvEkWFQTMbsPvQHGwdikWeC03wdHgoHhb72CtzzVfg5vBgODbRJeCyYm0uGYqsZtJCPnLwr
|
||||
Jzww7BrGAsohdgm+XddARxcGcz8fVjcwJAHH558F7hjTgrBlyzoGRrRb4MLfwhkGpokVBJydsoaT97Vj
|
||||
uCow6Ustj7ZjfutrrVCuvSesEUYl2u2Wz5myJL1OD8+FywKfb9Gye1Af/HZ2qFSkfYNCJThZYlTyXEqJ
|
||||
dgHH5yWLvxz2bN4m324YBOuKBiIWeCSc07xNtH34JHwTBK+/myW1XXm9OIhiec5cD4YKOBM7XS1uk3cH
|
||||
qYcHQtWFHYJva/M2d2cwpxTXMy4Nx4UmUDUWtd0HYHp53k01/mV2svibwdhOwYKXh7dCpd0F4brJYyOm
|
||||
fz38GGodAWnjTVfjI7VdeXWSbpER7QKOz5nPyS3elxhgtZXDzkEZ73bH9YOYOjPcGqxpI80/gk5TGZI0
|
||||
E+mCbaPA5E7el+B9LZjHARScrcKQfGPNOW9A8NmAgLMBZu9rm/Bq2DzYwJNh2gY2Dcs24DLBHDeEkwMf
|
||||
d/NfkZHn/Cig+K3ioavzg3xXDW3w2dB1pXmk60nh+rDMBaLSZcILdDUmr4gnPudjOiQIuIsCszu5xQXm
|
||||
okDnhZsmj41s6IVg7lrHmg7WBMrx4ZrwRKhOdm9wGqo0rEon2gUcn3OJk9fi2wbf7t28TaxW1fXDIDau
|
||||
DSeEf1zhRLAeoI3qaqK5pMI9HMr/vhU3fF4btfiScG7zNhEracPfhsOCvxuVywQraKn9UqzCOZ08lwl8
|
||||
LL1sitn53eLdUuxAPwQNbqhXzJKTuMkwl37eb6kkGAWRPBfp3GZhPi+zd6XS1oXkrjB4Fyi5w6mEXFBV
|
||||
bZr4T5qhG+1DsjH9QKs/zcCQ1H0BYqeuUV1pqfsEjaUaz5D8xufuhU7eVd2mp15IbIA5faT01pVMUxHl
|
||||
8tYpNJZulyyJA9H+UeDzKt+0ZrglmJvrprrhiCBifShHXaOqYnGLlupZYxF8Jf1CnvtNtAs4zzasy9bi
|
||||
n4ajwqiOCbUJ6FpuMoJPh9RSdbVuhqhwiow8l2qiXcDxec1jcW1/TrJL8eBU7nB1jdINlWITdu92yqsx
|
||||
f1N5zswCjs+Z/V9P3pcJhoLFZcJiWqpCpLFIS2MqXF/mGE29+cpNhlsEpfiAZ7VdeV3uUpzKDV0E7Tz/
|
||||
ez4z8zeeNDGa23P9IwAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="DimensionID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
@@ -253,11 +176,21 @@
|
||||
<metadata name="MResult.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">
|
||||
<data name="rpvpAnalysis.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAAAUAAAAECAYAAABGM/VAAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
|
||||
vAAADrwBlbxySQAAACFJREFUGFdjEHXq/o+OGf4DAbIACDCAAEwCLgADCAEGBgDP4STWpID5ywAAAABJ
|
||||
RU5ErkJggg==
|
||||
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAYCAYAAADtaU2/AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AkVCAAngM/SOwAAAoNJREFU
|
||||
SEu1lsvLTWEUh7cIJQbEwIRipoSRiRiIAf4AxcB1YGJgIkWhFBHKyOQrA5JigmKipIQJGZCJWwauySWX
|
||||
iOf5etfu/XbrHMftV0/tvd61fr/O2e9+z2kG1GRYAUfgGjyFtwWvrblmj71/rSmwGa7Ce/jxC+yx1xln
|
||||
f1ujYDlo8h26AbdhS8Hr7rozzuqh10AaC9vgNXQN5Q0shpDX1rJePfTSs69s2A1fIDOS+zANQlPBWtYr
|
||||
X0HPvuFbIUJvwTG4At9KTd7BKgh5bS3W7XXGWT2s6al3Kr+yF2DjdZgByl16DsJYHsK+gtf1mr2xs/XQ
|
||||
y7reS2CEJsEliOG9UGsjxFoXN5LPODbhBqilV/SaYVar1eCziIaTMAZC+yHWupyA+XC53Nsb0kOv6DXD
|
||||
rGFNgIsQi/IRNFgK2+EV1OuBz24lqONgzV5nnNVDr3rGLDObRdDL+HNSq3kEM8Gv72apBb1mzTKz2VUK
|
||||
f8J5GA0LoNe7nGFmc6Eq+CoMcjQGO0F5RGbrgZ71K2lm+/J72G+ChbAHPkA0ZnyCZaCGIOvRQy899TbD
|
||||
upnN83Kzw5sid+MZqE26PIDp4I/BnVLrokf9dphh3cz22azxptJRqE0Cd7KGsZvnwkvIevWoZYZ1M5sn
|
||||
5eYseO6qOXAXapPgIIyHkNeHIOvVQy+ltxnWzWzPU08ejzcPhHul1uUxzIKurLmWzeilp95xuvnq9dwY
|
||||
GQ6MOPKKJsINyGYyzGzWQ31c9sNPNRu66veJu5i1DoaH3KFZU4bPeByEvD4AWW+GWe3jOgxZU4ZH4SlY
|
||||
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">
|
||||
@@ -318,6 +251,66 @@
|
||||
<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
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AEGATc06Xu77gAAAihJREFU
|
||||
WEft1j1rFUEUgOH1IwYLCzEKSSAQVLBRkkZ/gEYs468w1iJoY6ud2gqKIfEXWAh2GhNrP8DYRcEETaNi
|
||||
YSHq+152YLKe3J1ELiLcAw8sO2fO7MfM7Fb96Mf/GIPYj0MYrXnsOdt6EgdwGlcwjwW8wErNY8/ZZo65
|
||||
9vnrGMclLOIzfhUy1z72tcaWYx8uwDv7iWiQEva1hrWsWRSHMYfviIomX7FW8zjKSaxlTWt3jUk8RVQk
|
||||
ccDbOIcjNY89Z1vUJ7H2BMI4jueIOiYvcRY7sAvOfnls2GZO1Dd5hmPYEMN4hKhD4t05gOFd3MNy7S58
|
||||
eoY5bU/iIRyzEwO4jrbJdgs7YVxEc468wkkY5uZtTY51A3tQnccnRInJF5xBir24hm/I8+5jN8y1T97W
|
||||
5JiO3VmvUUJuFc5g372PbgRHcQc/kPLe4CBc+/bJa0Qcu1rKTmzGYhZ1d3uCD3iPj8hfnRfgpCy9AFdF
|
||||
8Stwe3W+uN1GOZpF6StYxzQ6E8EJ0TYJb8I4hddotnvONsPcZntuwyQ0fK8ujSg5cWlNwXDJufTe1vJl
|
||||
aM6WlmEKNwc3iahD4iaTLiLaiGxr24iceH9sRClO4DGijomTy3Xe3Io91zbxrO0YXWMMTqaSj5EDquRj
|
||||
ZE1rF4Wfzhn4ONsmZzf2tYa1ij/HebieL2O7PyT23dYPSTOG4D5wFQ/g75d39q7msedsM8dc+/Qk/slP
|
||||
aT/60aOoqt9oGogfMlqpmgAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="rpvpCpCpk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOARcj8ni9FAAAAq1JREFU
|
||||
WEe910uoTVEcx/HrFUIiUlJMkHfCQBIZyEAppQxMGHjEQFFKioEkz5J3DCgGwsxIXhkojxIlJe+QIkre
|
||||
z+/33rNOy9nr7LM7d9/7q0/3nvU4+3/3WWetfVsS6Ypp2IpreIO/FZ9xD4cwB91QaoZiN14hXLSed9iJ
|
||||
wSgl43AF4QIfK6+PYC+2YT/O4y3CuBPoi3ZlCC7CN/yFM5iJPqhNd/gRXYDjf2MN2pXNCG/mX5u6cG2G
|
||||
4Qac588BaCrj8RS+kX9VP5gu6Nn2a92sgvM+YbYNOXHBevcyWY8/+IL5NhAvvhx+LHNtSMTF50dlAbqL
|
||||
BUhlIA7iNEbYECd8lrcQbmMvXIXtLrxUZuArQgE6jFSmI4xdZkOcJ7DjeOurtvRGKMC9YCW83cEK7MEP
|
||||
hIvrOhqNte2/hI59ra/aEhdQtkwBocOdLyQu4Bs+JLjwXDthvr6j0di6Bfj1C4kLOIspmBqZDBepxYX5
|
||||
cpNqNDZTwHvY4SoNiQs4YEMiblR+c8LFVW8RxmMzBdyHHafgQWTiAuLC4sxCbQFu26nEYzMFnIMdN9Hf
|
||||
BtKpBWyBHR4wHkimSAHufLVr4ChSyS1gIez0HFhiAylSgMU+Qrj4T2xEKrkFDMdD2BkWXJECjHfB5wLH
|
||||
uQDDOVKb3AI8JE7Czttw34634rwCfA5YjU1wu62X3ALMUtjpoHnogSIFFE3DAkbjJRzgllz0DhRNwwLi
|
||||
j+EBRuJy5bUr2+cC10UzvJse6bkFmEVwJbtnr8UlOMEHVJ8NvSPNcK7PCn7LfD9Py2QGwWeCcBdeV34v
|
||||
m0dz3WxAalKZnmMskhmFx0hNLNMOJONi9PhNTSqTd2EMMpmAF0hNKtt2ZLILqcEd4RkmoZqJCJtRZzmG
|
||||
atYhNagj+axYzWL473dqYAdpufMPbVcEeB1qsV0AAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="rpvpSetup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOAhEQGbTF3QAABH1JREFU
|
||||
WEe111mobmMcx/FtnnKcDJlFiDLPM+UgQy50RIZSCDdKUUKIQm7IkIgoKQ7HPAtlvJFypSjKPBbKPP8+
|
||||
613/09rLepe95fzqe1rredd+hv/4nJn/oLXDHeHP8FfLH+H+sF5Y7jo2/BK+Dx+0eP49LA7/m1YJq00e
|
||||
Z+mS4NS3hc1abmzHrg59rdoyL+0floanw6mhNrJCuC9Y7CwDrU4Jxh4PKxmIHODE8FQwfniYkw4I7wYT
|
||||
4tdwe9gu7BHeDj+Fg0PJ+HfhvbBf2DrcHHxX83wcjg6jcvJ3Qp3mivB5+87X9fxG2CCUFoZXgt++CO+3
|
||||
z1+GK4O5vNvEkWFQTMbsPvQHGwdikWeC03wdHgoHhb72CtzzVfg5vBgODbRJeCyYm0uGYqsZtJCPnLwr
|
||||
Jzww7BrGAsohdgm+XddARxcGcz8fVjcwJAHH558F7hjTgrBlyzoGRrRb4MLfwhkGpokVBJydsoaT97Vj
|
||||
uCow6Ustj7ZjfutrrVCuvSesEUYl2u2Wz5myJL1OD8+FywKfb9Gye1Af/HZ2qFSkfYNCJThZYlTyXEqJ
|
||||
dgHH5yWLvxz2bN4m324YBOuKBiIWeCSc07xNtH34JHwTBK+/myW1XXm9OIhiec5cD4YKOBM7XS1uk3cH
|
||||
qYcHQtWFHYJva/M2d2cwpxTXMy4Nx4UmUDUWtd0HYHp53k01/mV2svibwdhOwYKXh7dCpd0F4brJYyOm
|
||||
fz38GGodAWnjTVfjI7VdeXWSbpER7QKOz5nPyS3elxhgtZXDzkEZ73bH9YOYOjPcGqxpI80/gk5TGZI0
|
||||
E+mCbaPA5E7el+B9LZjHARScrcKQfGPNOW9A8NmAgLMBZu9rm/Bq2DzYwJNh2gY2Dcs24DLBHDeEkwMf
|
||||
d/NfkZHn/Cig+K3ioavzg3xXDW3w2dB1pXmk60nh+rDMBaLSZcILdDUmr4gnPudjOiQIuIsCszu5xQXm
|
||||
okDnhZsmj41s6IVg7lrHmg7WBMrx4ZrwRKhOdm9wGqo0rEon2gUcn3OJk9fi2wbf7t28TaxW1fXDIDau
|
||||
DSeEf1zhRLAeoI3qaqK5pMI9HMr/vhU3fF4btfiScG7zNhEracPfhsOCvxuVywQraKn9UqzCOZ08lwl8
|
||||
LL1sitn53eLdUuxAPwQNbqhXzJKTuMkwl37eb6kkGAWRPBfp3GZhPi+zd6XS1oXkrjB4Fyi5w6mEXFBV
|
||||
bZr4T5qhG+1DsjH9QKs/zcCQ1H0BYqeuUV1pqfsEjaUaz5D8xufuhU7eVd2mp15IbIA5faT01pVMUxHl
|
||||
8tYpNJZulyyJA9H+UeDzKt+0ZrglmJvrprrhiCBifShHXaOqYnGLlupZYxF8Jf1CnvtNtAs4zzasy9bi
|
||||
n4ajwqiOCbUJ6FpuMoJPh9RSdbVuhqhwiow8l2qiXcDxec1jcW1/TrJL8eBU7nB1jdINlWITdu92yqsx
|
||||
f1N5zswCjs+Z/V9P3pcJhoLFZcJiWqpCpLFIS2MqXF/mGE29+cpNhlsEpfiAZ7VdeV3uUpzKDV0E7Tz/
|
||||
ez4z8zeeNDGa23P9IwAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="tmSystem.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ namespace NSAnalysis
|
||||
gAuthorizationMode = FileIni.ReadInt(ConfigDfn.strConfigFile, "Chery", "AuthorizationMode", 1);
|
||||
|
||||
#endregion 创建Log文件
|
||||
//Application.Run(new CenterControl());
|
||||
Application.Run(new CenterControl());
|
||||
if (gAuthorizationMode == 1)
|
||||
{
|
||||
MyBase.TraceWriteLine("Log in using the CLMS authorization.");
|
||||
|
||||
@@ -32,8 +32,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.27.0")]
|
||||
[assembly: AssemblyFileVersion("2025.08.27.0")]
|
||||
//奇瑞总装软件
|
||||
//2024.09.27.1 该版本增加读取编码器数值功能
|
||||
//2024.10.08.1 该版本修改了EHY和EH3的测点图片 以及增加了上传IOT时，在1.5倍公差内，都是OK的结果，传给IOT
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,9 +1,25 @@
|
||||
2025-05-19 14:11:36.576----软件Program Main函数开始执行--
|
||||
2025-05-19 14:11:36.578--加载配置文件——>开始
|
||||
2025-05-19 14:11:36.625--数据库连接 SqlServerName：127.0.0.1
|
||||
2025-05-19 14:11:36.626--数据库连接 SqlUserName：sa
|
||||
2025-05-19 14:11:36.627--数据库连接 SqlPassword：Hexagon123
|
||||
2025-05-19 14:11:36.629--数据库连接 SqlDbName：NextSenseStandardDB
|
||||
2025-05-19 14:11:36.630--加载配置文件——>完成
|
||||
2025-05-19 14:11:36.631--Log in using the CLMS authorization.
|
||||
2025-05-19 14:11:36.758--CLMS check license failed! Please authorize the operation.
|
||||
2025-08-27 23:23:46.910----软件Program Main函数开始执行--
|
||||
2025-08-27 23:23:46.912--加载配置文件——>开始
|
||||
2025-08-27 23:23:46.923--数据库连接 SqlServerName：127.0.0.1
|
||||
2025-08-27 23:23:46.924--数据库连接 SqlUserName：sa
|
||||
2025-08-27 23:23:46.925--数据库连接 SqlPassword：Hexagon123
|
||||
2025-08-27 23:23:46.926--数据库连接 SqlDbName：NextSenseStandardDB
|
||||
2025-08-27 23:23:46.927--加载配置文件——>完成
|
||||
2025-08-27 23:23:48.235--数据库连接 SqlServerName：127.0.0.1
|
||||
2025-08-27 23:23:48.236--数据库连接 SqlUserName：sa
|
||||
2025-08-27 23:23:48.236--数据库连接 SqlPassword：Hexagon123
|
||||
2025-08-27 23:23:48.236--数据库连接 SqlDbName：NextSenseStandardDB
|
||||
2025-08-27 23:23:48.239--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=NextSenseStandardDB;User ID=sa;password=Hexagon123;
|
||||
2025-08-27 23:23:48.713-- 进入显示车身模式！显示车身界面。
|
||||
2025-08-27 23:23:49.324--启动PLC写线程！
|
||||
2025-08-27 23:23:49.326-- 进入解析CSV文件模式，开始解析扫码CSV文件！
|
||||
2025-08-27 23:23:49.326--连接PLC....
|
||||
2025-08-27 23:23:49.328--软件首次启动， Nextsense EH3 CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEH3
|
||||
2025-08-27 23:23:49.329--软件首次启动， Nextsense EHY CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEHY
|
||||
2025-08-27 23:23:51.392--PLC S7连接失败。
|
||||
2025-08-27 23:23:55.657--Update To IOT Data Content: {"serno":"20250827232354966","requestData":[{"vin":"LNNBDDEF4SDF49707","model":"EHY","equipmentNo":"NS002","equipmentName":"Hexagon","calibrationResult":"NG","detectionTime":"","targetRate":"97.00%","rate":"","GapList":[{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD01L","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD02L","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD03L","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD04L","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD05L","actualValue":"","controlLine":"0.0/0.5","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD06L","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD01R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD02R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD03R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD04R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD06R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD07","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD08","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD09","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD10","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD11","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD12","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD13","actualValue":"","controlLine":"0.0/1.2","measurementResult":"NG"}]}]}
|
||||
2025-08-27 23:24:11.551--EHY数据上传IOT完成，结果返回为：Error: System.Net.WebException: 操作超时
|
||||
在 System.Net.HttpWebRequest.GetRequestStream(TransportContext& context)
|
||||
在 System.Net.HttpWebRequest.GetRequestStream()
|
||||
在 NSAnalysis.CenterControl.PostJsonToIOT(String url, String jsonData, Nullable`1 timeout) 位置 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\CenterControl.cs:行号 1623
|
||||
2025-08-27 23:24:14.271--EHY数据上传IOT失败！
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
+3
-1
@@ -112,7 +112,9 @@ namespace DAL
|
||||
DataTable dt = new DataTable();
|
||||
cmd = new SqlCommand(cmdText, GetConn());
|
||||
cmd.CommandType = ct;
|
||||
using (sdr = cmd.ExecuteReader(CommandBehavior.CloseConnection))
|
||||
cmd.CommandTimeout = 60;
|
||||
|
||||
using (sdr = cmd.ExecuteReader(CommandBehavior.CloseConnection))
|
||||
{
|
||||
dt.Load(sdr);
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ namespace DAL
|
||||
DataTable dt = new DataTable();
|
||||
string strSql = "select MeasureValue from TMeasureData where CarID = '" + strCarID + "' and MeasPointName = '" + strMeaPointName + "' and DimensionName = '" + strDimensionName + "'";
|
||||
dt = SQLHelper.ExecuteQuery(strSql, CommandType.Text);
|
||||
if (dt.Rows.Count==1)
|
||||
if (dt.Rows.Count>=1) //有可能存在解析两次导致查询两次的问题
|
||||
{
|
||||
return dt.Rows[0][0].ToString();
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
|
||||
351fa8818e1c2db8dfa9cfe7b557e74f60c60ef886f53f3f4619b043b4cb5b9b
|
||||
@@ -1,48 +0,0 @@
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\DAL.dll.config
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\DAL.dll
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\DAL.pdb
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\EntityFramework.dll
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\EntityFramework.SqlServer.dll
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\System.Data.SQLite.dll
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\System.Data.SQLite.EF6.dll
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\System.Data.SQLite.Linq.dll
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\EntityFramework.xml
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\EntityFramework.SqlServer.xml
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\bin\Debug\System.Data.SQLite.xml
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\obj\Debug\1.DAL.csproj.AssemblyReference.cache
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\obj\Debug\1.DAL.csproj.CoreCompileInputs.cache
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\obj\Debug\1.DAL.csproj.Up2Date
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\obj\Debug\DAL.dll
|
||||
E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\DAL\obj\Debug\DAL.pdb
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\DAL.dll.config
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\DAL.dll
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\DAL.pdb
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\EntityFramework.dll
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\EntityFramework.SqlServer.dll
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\System.Data.SQLite.dll
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\System.Data.SQLite.EF6.dll
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\System.Data.SQLite.Linq.dll
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\EntityFramework.xml
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\EntityFramework.SqlServer.xml
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\bin\Debug\System.Data.SQLite.xml
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\obj\Debug\1.DAL.csproj.AssemblyReference.cache
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\obj\Debug\1.DAL.csproj.CoreCompileInputs.cache
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\obj\Debug\1.DAL.csproj.Up2Date
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\obj\Debug\DAL.dll
|
||||
E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\DAL\obj\Debug\DAL.pdb
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\DAL.dll.config
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\DAL.dll
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\DAL.pdb
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\EntityFramework.dll
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\EntityFramework.SqlServer.dll
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\System.Data.SQLite.dll
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\System.Data.SQLite.EF6.dll
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\System.Data.SQLite.Linq.dll
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\EntityFramework.xml
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\EntityFramework.SqlServer.xml
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\bin\Debug\System.Data.SQLite.xml
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\obj\Debug\1.DAL.csproj.AssemblyReference.cache
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\obj\Debug\1.DAL.csproj.CoreCompileInputs.cache
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\obj\Debug\1.DAL.csproj.Up2Date
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\obj\Debug\DAL.dll
|
||||
D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\DAL\obj\Debug\DAL.pdb
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user