From 30f434d78b58e3a4198cf5ba5a9e5a0ce1cd5292 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 七月 2022 14:32:36 +0800
Subject: [PATCH] 'bug修复'

---
 app/level2DataDlg.cpp |   64 ++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/app/level2DataDlg.cpp b/app/level2DataDlg.cpp
index 33f4fba..15d0f31 100644
--- a/app/level2DataDlg.cpp
+++ b/app/level2DataDlg.cpp
@@ -29,6 +29,7 @@
 void Clevel2DataDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CDialogEx::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_LIST1, m_list);
 }
 
 BEGIN_MESSAGE_MAP(Clevel2DataDlg, CDialogEx)
@@ -77,9 +78,14 @@
 	GetDlgItem(IDC_STATIC)->SetWindowTextW(st);
 	//璁剧疆list鐨勬暟鎹�
 	list<TradeData>::iterator ele;
-	CListBox* listBox = (CListBox*)GetDlgItem(IDC_LIST1);
-	CString st1;
-	st1.Format(_T("%-3s %10s	%6s %5s %s %8s"), _T("搴忓彿"), _T("鏃堕棿"), _T("浠锋牸"), _T("鏄惁娑ㄥ仠浠�"), _T("鎵嬫暟"), _T("绫诲瀷"));
+	m_list.InsertColumn(0, _T("搴忓彿"), LVCFMT_CENTER, 40);
+	m_list.InsertColumn(1, _T("鏃堕棿"), LVCFMT_LEFT, 80);
+	m_list.InsertColumn(2, _T("浠锋牸"), LVCFMT_CENTER, 80);
+	m_list.InsertColumn(3, _T("鎵嬫暟"), LVCFMT_CENTER, 50);
+	m_list.InsertColumn(4, _T("绫诲瀷"), LVCFMT_RIGHT, 40);
+	
+
+
 
 
 	int index = 0;
@@ -103,13 +109,44 @@
 			break;
 		}
 
-		CString st;
-		st.Format(_T("%03d %15s	%6.2f %10s %05d %10s"), index, time, stof(data.price), data.limitPrice ? _T("娑ㄥ仠浠�") : _T("闈炴定鍋�"), data.num, operate);
+		char chCode[20];
+		sprintf(chCode, "%.2lf", stod(data.price));
+		std::string price(chCode);
 
-		listBox->InsertString(index - 1, st);
+		if (data.limitPrice == LIMIT_PRICE_NORMAL) {
+			price.append("(姝e父)");
+		}
+		else  if (data.limitPrice == LIMIT_PRICE_UP) {
+			price.append("(娑ㄥ仠)");
+		}
+		else  if (data.limitPrice == LIMIT_PRICE_DOWN) {
+			price.append("(璺屽仠)");
+		}
+
+		string t=data.time;
+		if (data.cancelTime > 0)
+		{
+			t.append(" ").append(to_string( data.cancelTime));
+			string cancelTimeUnit;
+			if (data.cancelTimeUnit == TIME_SECOND) {
+				cancelTimeUnit = "s";
+			}
+			else  if (data.cancelTimeUnit == TIME_MINITE) {
+				cancelTimeUnit = "m";
+			}
+			else  if (data.cancelTimeUnit == TIME_HOUR) {
+				cancelTimeUnit = "h";
+			}
+			t.append(cancelTimeUnit);
+		}
+
+		m_list.InsertItem(index-1, NULL);
+		m_list.SetItemText(index - 1, 0, CString(to_string( index).c_str()));
+		m_list.SetItemText(index - 1, 1, CString(t.c_str()));
+		m_list.SetItemText(index - 1, 2, CString(price.c_str()));
+		m_list.SetItemText(index - 1, 3, CString(to_string(data.num).c_str()));
+		m_list.SetItemText(index - 1, 4, operate);
 	}
-	listBox->InsertString(0, st1);
-
 
 
 
@@ -157,10 +194,13 @@
 
 void Clevel2DataDlg::OnBnClickedButton1()
 {
-	CString root=	GUITool::selectFolder(_T("璇烽�夋嫨瀵煎嚭鐨勭洰褰�"));
+	CString root = GUITool::selectFolder(_T("璇烽�夋嫨瀵煎嚭鐨勭洰褰�"));
 	string path = (CW2A(root.GetString()));
-	path.append("\\").append(to_string( time(0))).append( ".xls");
-	ExcelUtil::save(level2Data.dataList,path);
+	if (path.length() > 0)
+	{
+		path.append("\\").append(to_string(time(0))).append(".xls");
+		ExcelUtil::save(level2Data.dataList, path);
 
-	AfxMessageBox(_T("淇濆瓨鎴愬姛"));
+		AfxMessageBox(_T("淇濆瓨鎴愬姛"));
+	}
 }

--
Gitblit v1.8.0