|
|
@@ -57,7 +57,8 @@ BOOL CPageLog::OnInitDialog()
|
|
|
m_ctrlList.SetHeadings(
|
|
|
_T("批次号,90"),
|
|
|
_T("SN,90"),
|
|
|
- _T("调试时间,190"),
|
|
|
+ _T("调试开始,160"),
|
|
|
+ _T("调试结束,160"),
|
|
|
_T("调试耗时,90"),
|
|
|
_T("调试结果,90"),
|
|
|
_T("▲E实际值,90"),
|
|
|
@@ -129,9 +130,9 @@ void CPageLog::OnBnClickedQuery()
|
|
|
m_dtStartTime.GetTime(tStart);
|
|
|
m_dtEndTime.GetTime(tEnd);
|
|
|
|
|
|
- strWhere.append("TestTime >= '");
|
|
|
+ strWhere.append("StartTime >= '");
|
|
|
strWhere.append(CharEncoding::UNICODE2ASCII((LPWCH)tStart.Format(_T("%Y-%m-%d %H:%M:%S")).GetString()));
|
|
|
- strWhere.append("' and TestTime <='");
|
|
|
+ strWhere.append("' and StartTime <='");
|
|
|
strWhere.append(CharEncoding::UNICODE2ASCII((LPWCH)tEnd.Format(_T("%Y-%m-%d %H:%M:%S")).GetString()));
|
|
|
strWhere.append("'");
|
|
|
}
|
|
|
@@ -214,6 +215,7 @@ void CPageLog::UpdateList(std::vector<TB_SN> &vtSNData)
|
|
|
arryString.Add(CharEncoding::ASCII2UNICODE(it->strOrder.c_str()));
|
|
|
arryString.Add(CharEncoding::ASCII2UNICODE(it->strSN.c_str()));
|
|
|
arryString.Add(CharEncoding::ASCII2UNICODE(it->strStartTime.c_str()));
|
|
|
+ arryString.Add(CharEncoding::ASCII2UNICODE(it->strFinishTime.c_str()));
|
|
|
arryString.Add(CharEncoding::ASCII2UNICODE(it->strElapsed.c_str()));
|
|
|
arryString.Add(it->strTestResult == "1" ? _T("PASS") : _T("FAIL"));
|
|
|
arryString.Add(CharEncoding::ASCII2UNICODE(it->strDeltaAVGEValue.c_str()));
|
