From e2d10e68e22310fdfcf3c6e13707d791c108ae1a Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期一, 14 十月 2024 22:09:19 +0800
Subject: [PATCH] 1014

---
 internal_system_v1/converinfo2.cpp |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/internal_system_v1/converinfo2.cpp b/internal_system_v1/converinfo2.cpp
index 7e3f124..b9930c3 100644
--- a/internal_system_v1/converinfo2.cpp
+++ b/internal_system_v1/converinfo2.cpp
@@ -15,7 +15,7 @@
     ui->setupUi(this);
     m_menu = nullptr;
     //initUi();
-    readInfo(); // 鍔犺浇琛ㄦ牸
+    //readInfo(); // 鍔犺浇琛ㄦ牸
     addMenu(); // 澧炲姞鑿滃崟
 
     // 鑷�傚簲澶勭悊
@@ -49,7 +49,7 @@
     it4->setCheckState(0,Qt::Checked);
 
     // 澶嶉�夋鐘舵�佸鐞�
-    connect(ui->treeWidget,QOverload<QTreeWidgetItem*,int>::of(QTreeWidget::itemClicked),this,[=](QTreeWidgetItem* it,int index){
+    connect(ui->treeWidget,QOverload<QTreeWidgetItem*,int>::of(&QTreeWidget::itemClicked),this,[=](QTreeWidgetItem* it,int index){
         qDebug()<<it<<index;
         if(it == top1){
             qDebug()<<"鐐瑰嚮浜嗙爜铓侀泦鍥�";
@@ -90,12 +90,16 @@
 {
     if(m_curItem==nullptr)return;
     qDebug()<<"娣诲姞鍏徃淇℃伅,鍦ㄨ妭鐐癸細"<<m_curItem->text(0);
+    on_pushButton_laodFile_clicked();
 }
 
 void ConverInfo2::deleteInfo()
 {
     if(m_curItem==nullptr)return;
     qDebug()<<"鍒犻櫎鍏徃淇℃伅,鑺傜偣锛�"<<m_curItem->text(0);
+    auto resList = m_curItem->takeChildren();
+
+    qDebug()<<"鍒犻櫎鏁伴噺:"<<resList.size();
 }
 
 void ConverInfo2::on_treeWidget_doubleClicked(const QModelIndex &index)
@@ -209,11 +213,15 @@
         it.next();
         list.append(it.fileInfo().absoluteFilePath());
     }
+    int allSize = list.size();
+    float cntIdx=1.0;
     foreach(QString str, list)
     {
         qDebug() << str;
         int index = str.indexOf("鍐呭缁�01琛�");
         qDebug()<<"index:"<<index;
+
+
         if(index > 0){
             QAxObject excel("ket.Application");
             if(!excel.setControl("ket"
@@ -713,10 +721,16 @@
 
             qDebug()<<"鍗曚綅淇℃伅鏁伴噺锛�"<<m_nameAndComInfos.size();
         }
+
+        // 鎺у埗鏄剧ず杩涘害鐩稿叧
+        emit loadProgress((cntIdx/allSize)*100);
+        cntIdx++;
     }
 
     createTreeNode(); // 鏋勫缓鏍戝舰鑺傜偣
 
+    // 鍙戝皠 鍔犺浇瀹屾垚鐨勪俊鍙�
+    emit loadFinished();
 
 //    QAxObject excel("./debug/Data/闄勪欢2_鍐呭缁�01琛╛鍗曚綅鍙婂唴閮ㄥ璁℃満鏋勫熀鏈儏鍐佃〃-1.301鐗�(1).xls");
 //    excel.setProperty("Visible",true);
@@ -1553,7 +1567,8 @@
         for(int k=0;k<ui->treeWidget->topLevelItemCount();++k){
             QTreeWidgetItem *tmp = ui->treeWidget->topLevelItem(k);
             qDebug()<<k<<tmp->text(0)<<upName.toString();
-            if(upName.toString()+"(姹囨��)" == tmp->text(0)){
+            int pos = tmp->text(0).indexOf(upName.toString()+"(姹囨��)");
+            if(upName.toString()+"(姹囨��)" == tmp->text(0) || pos != -1){
                 top = tmp;
                 break;
             }
@@ -1562,11 +1577,13 @@
             if(top){ // 瀛樺湪锛屽垯娣诲姞鍒板瀛愬垪琛ㄤ腑
                 QTreeWidgetItem *top1 = new QTreeWidgetItem(top);
                 top1->setText(0,name.toString());
+                top->setText(0,upName.toString()+"(姹囨��)涓嬬骇鏁�:"+QString::number(top->childCount()-1));
             }else{ // 涓嶅瓨鍦紝鍒欐柊寤轰竴涓垪琛�
                 QTreeWidgetItem *top1 = new QTreeWidgetItem(ui->treeWidget);
                 top1->setText(0,name.toString()+"(姹囨��)");
                 QTreeWidgetItem *top2 = new QTreeWidgetItem(top1);
                 top2->setText(0,name.toString()+"(鏈骇)");
+                top1->setText(0,name.toString()+"(姹囨��)涓嬬骇鏁�:"+QString::number(top1->childCount()-1));
             }
         }
 
@@ -1578,6 +1595,7 @@
             top1->setText(0,name.toString()+"(姹囨��)");
             QTreeWidgetItem *top2 = new QTreeWidgetItem(top1);
             top2->setText(0,name.toString()+"(鏈骇)");
+            top1->setText(0,name.toString()+"(姹囨��)涓嬬骇鏁�:"+QString::number(top1->childCount()-1));
         }
 
     }
@@ -1590,3 +1608,8 @@
         readExcelFromPath(path);
     }
 }
+
+void ConverInfo2::showExcelSlot()
+{
+    readInfo(); // 鍔犺浇琛ㄦ牸
+}

--
Gitblit v1.8.0