From 27ba027dcbb1acd6c3415e6367ce93b914c8cc2d Mon Sep 17 00:00:00 2001
From: laixingyu <xingyu.lai@suwell.cn>
Date: Sun, 10 Dec 2023 23:24:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=A8=E9=87=8F=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=B0=9A=E5=AD=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi/ruoyidatamanager.cpp |  3 +-
 widget/trendswidget.cpp    | 62 +++++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/ruoyi/ruoyidatamanager.cpp b/ruoyi/ruoyidatamanager.cpp
index 3657f81..b29c3e6 100644
--- a/ruoyi/ruoyidatamanager.cpp
+++ b/ruoyi/ruoyidatamanager.cpp
@@ -219,7 +219,8 @@ void RuoyiDataManager::ParseTrends(QNetworkReply *reply)
  * rows:[{title:2级行业,sortDataList:["煤炭","营销服务"]},{title:2023-12-07,sortDataList:["1","2"]}]
  * msg:""
  *
- * 第0行是第一列行业；title是列名
+ * 第0行是第一列行业；title是列名即日期
+ * 第1行是行业名称，所有的行数
 */
         QJsonParseError jsonError;
         QJsonDocument document = QJsonDocument::fromJson(readAllArray,&jsonError);
diff --git a/widget/trendswidget.cpp b/widget/trendswidget.cpp
index f4b4cea..36c70b5 100644
--- a/widget/trendswidget.cpp
+++ b/widget/trendswidget.cpp
@@ -29,31 +29,39 @@ void TrendsWidget::SetUserInfo(UserInfo user)
 
 void TrendsWidget::LoadTrendsData()
 {
-//    QList<QList<QString> > trends = m_UserData.GetTrends(QDate(),m_UserInfo.token);
-//    int rowCount = trends.count();
-//    int columnCount = 0;
-//    //更新到tableview中
-//    if(rowCount > 2)
-//    {
-//        model->insertRow(0);
-//        QList<QString> columns = trends[0];
-//        columnCount = columns.count();
-//        for (int column = 0; column < columnCount; ++column) {
-//            QStandardItem *item = new QStandardItem(columns[column]);
-//            model->setItem(0, column, item);
-//        }
-//    }
-//    rowCount = trends[1].count();
-//    QList<QString> row1List = trends[1];
-//    qDebug() << __FUNCTION__ << trends[1];
-//    for(int row = 1 ; row < rowCount; row++)
-//    {
-//        model->insertRow(row);
-//        for(int col = 0; col < columnCount; col++)
-//        {
-//            qDebug() << __FUNCTION__ << trends[row][col];
-//            QStandardItem *item = new QStandardItem(trends[row][col]);
-//            model->setItem(col, row, item);
-//        }
-//    }
+    QList<QList<QString> > trends = m_UserData.GetTrends(QDate(),m_UserInfo.token);
+    int rowCount = trends.count();
+    int columnCount = 0;
+    //更新到tableview中
+    if(rowCount > 2)
+    {
+        model->insertRow(0);
+        QList<QString> columns = trends[0];
+        columnCount = columns.count();
+        for (int column = 0; column < columnCount; ++column) {
+            QStandardItem *item = new QStandardItem(columns[column]);
+            model->setItem(0, column, item);
+        }
+    }
+    qDebug() << __FUNCTION__ << trends[1];
+    rowCount = trends[1].count();
+    QList<QString> row1List = trends[1];
+    qDebug() << __FUNCTION__ << trends[1];
+    for(int row = 1 ; row < rowCount; row++)
+    {
+        qDebug() << __FUNCTION__ << row << trends[1][row];
+        model->insertRow(row);
+        QStandardItem *item = new QStandardItem(trends[1][row]);
+        model->setItem(row, 0, item);
+
+    }
+    for(int col = 1 ; col < columnCount; col++)
+    {
+        for(int row = 2 ; row < rowCount; row++)
+        {
+            QStandardItem *item = new QStandardItem(trends[col][row]);
+            model->setItem(row, col, item);
+
+        }
+    }
 }