diff --git a/QMainwindow/QMainwindow.cpp b/QMainwindow/QMainwindow.cpp index b6313e5..6963b3f 100644 --- a/QMainwindow/QMainwindow.cpp +++ b/QMainwindow/QMainwindow.cpp @@ -381,7 +381,7 @@ QString QMainwindow::toFixedDigitNumber(const QString& input) { // 检查是否全为0-9数字 QRegularExpression re("^\\d+$"); if (!re.match(input).hasMatch()) { - return QString(); // 弹出提示框,code 输入错误,暂时先返回 空 + return QString(); // 弹出提示框,code 输入错误,暂时先返回空 } // 长度检查和处理 diff --git a/QTradeProgram.VC.db b/QTradeProgram.VC.db index db1da01..6e90a64 100644 Binary files a/QTradeProgram.VC.db and b/QTradeProgram.VC.db differ diff --git a/Sqbase/qbigorderviewer.cpp b/Sqbase/qbigorderviewer.cpp index 2f7f36e..f0d459a 100644 --- a/Sqbase/qbigorderviewer.cpp +++ b/Sqbase/qbigorderviewer.cpp @@ -19,7 +19,7 @@ // ==================== QBigOrderViewer ==================== QBigOrderViewer::QBigOrderViewer(QWidget *parent) : QWidget(parent), - m_model(new QStandardItemModel(0, 7, this)), + m_model(new QStandardItemModel(0, 8, this)), m_proxyModel(new QSortFilterProxyModel(this)), m_typeDelegate(new OrderTypeDelegate(this)), m_lastOrderDelegate(new HighlightDelegate(this)) @@ -82,18 +82,15 @@ void QBigOrderViewer::initUI() m_proxyModel->setSourceModel(m_model); m_tableView->setModel(m_proxyModel); m_tableView->setEditTriggers(QAbstractItemView::NoEditTriggers); + + // 璁剧疆琛ㄥご锛堣偂绁ㄤ唬鐮併佸悕绉般佺被鍨嬨佹暟閲忋佷环鏍笺佽鍗曟暟銆佹椂闂淬佹椂闂存埑锛 + QStringList headers; + headers << "鑲$エ浠g爜" << "鑲$エ鍚嶇О" << "璁㈠崟绫诲瀷" + << "鑲$エ鏁伴噺" << "鑲$エ浠锋牸" << "璁㈠崟妗d綅" + << "鏃堕棿"<< "Timestamp"; + m_model->setHorizontalHeaderLabels(headers); + m_tableView->setColumnHidden(7, true); - // 璁剧疆琛ㄥご锛堣偂绁ㄤ唬鐮併佸悕绉般佺被鍨嬨佹暟閲忋佷环鏍笺佽鍗曟暟銆佹椂闂达級 - m_model->setHorizontalHeaderLabels( - QStringList() - << "鑲$エ浠g爜" - << "鑲$エ鍚嶇О" - << "璁㈠崟绫诲瀷" - << "鑲$エ鏁伴噺" - << "鑲$エ浠锋牸" - << "璁㈠崟妗d綅" - << "鏃堕棿" - ); // 璁剧疆琛ㄥご鏂囧瓧灞呬腑 for (int col = 0; col < m_model->columnCount(); ++col) { @@ -110,7 +107,7 @@ void QBigOrderViewer::initUI() // 璁剧疆楂樹寒濮旀墭鍒版墍鏈夊垪 m_tableView->setItemDelegate(m_lastOrderDelegate); - // 榛樿鎸夋椂闂村垪锛堢6鍒楋紝绱㈠紩5锛夊崌搴忔帓搴 -> 鏂版彃鍏ョ殑琛屾斁鍦ㄦ渶椤朵笂锛屾晠淇敼涓洪檷搴忔帓搴 @2025.08.30 stone + // 榛樿鎸夋椂闂村垪锛堢7鍒楋紝绱㈠紩6锛夊崌搴忔帓搴 -> 鏂版彃鍏ョ殑琛屾斁鍦ㄦ渶椤朵笂锛屾晠淇敼涓洪檷搴忔帓搴 @2025.08.30 stone const int timeColumnIndex = 6; m_proxyModel->sort(timeColumnIndex, Qt::DescendingOrder); @@ -214,6 +211,11 @@ void QBigOrderViewer::updateView() timeItem->setTextAlignment(Qt::AlignCenter); rowItems << timeItem; + // 娣诲姞鏃堕棿鎴冲垪 + QStandardItem* timestampItem = new QStandardItem(order->svrRecvTime); + timestampItem->setTextAlignment(Qt::AlignCenter); + rowItems << timestampItem; + m_model->appendRow(rowItems); } } @@ -335,6 +337,9 @@ void QBigOrderViewer::setRowData(int row, QSharedPointer order) } m_model->setData(m_model->index(row, 6), timeStr); + // 娣诲姞鏃堕棿鎴冲垪锛堢7鍒楋級 + m_model->setData(m_model->index(row, 7), order->svrRecvTime); + // 娣诲姞涓涓殣钘忕殑鏃堕棿鎴冲垪鐢ㄤ簬绮剧‘鎺掑簭 QDateTime fullDateTime; if (order->svrRecvTime.length() >= 19) {