From b7ac133cf675a3f6d8246c619f981c3febb0e176 Mon Sep 17 00:00:00 2001
From: zhaolei <353719554@qq.com>
Date: Mon, 30 Mar 2026 15:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logPlus/qtprojectwidgets.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/logPlus/qtprojectwidgets.cpp b/logPlus/qtprojectwidgets.cpp
index 965ce55..a176eb6 100644
--- a/logPlus/qtprojectwidgets.cpp
+++ b/logPlus/qtprojectwidgets.cpp
@@ -216,6 +216,7 @@ void QtProjectWidgets::s_loadTreeWidget(QString fileFull)
 
     //展开树图
     ui->treeWidget->expandItem(parent);
+    itemIndex->setExpanded(true);
 }
 
 void QtProjectWidgets::loadIndexSysTree(QTreeWidgetItem *parent, QString fileFull, QString prjname)
@@ -1286,21 +1287,37 @@ void QtProjectWidgets::onImportSingleWellLogData()
         QTreeWidgetItem *wellItem = *ui->treeWidget->selectedItems().begin();
 
         QString wellname = wellItem->text(0);
-		if (wellname == "井组")
+        QString wellroundname = wellname;
+         QString strTreeTag = wellItem->data(0, Qt::UserRole).toString();
+        if (strTreeTag == "wells")			//井组
 		{
 			QFileInfo temDir(file_name);
 			QString	tempWellName=temDir.completeBaseName();
 			tempWellName.replace(" ","");//whp add 2020.3.3 删除井名中的空格
 			//m_WellLogRoundInfo->SetName(tempWellName.toStdString());
 			wellname = tempWellName;
+            wellroundname = wellname;
 		}
-        QString wellroundname = wellname;
+        else if (strTreeTag == "wellname")  //井名
+        {
+
+        }
+        else if (strTreeTag == "wellItem")  //井次
+        {
+            wellname = wellItem->parent()->text(0);
+        }
         ImportDataDialog *pDialog = new ImportDataDialog(NULL,wellname,wellroundname);
         QTreeWidgetItem rootItem = *ui->treeWidget->topLevelItem(0);
         pDialog->SetProjectname(rootItem.text(0));
         pDialog->DisplayFileInformationAreaData(vConvertor,listFiles[0]);
         if ( pDialog->exec() == QDialog::Accepted )
+        {
+            QString strProjectFolder = GetProjectFolder();
+            QString strProjectFile = strProjectFolder + g_prjname;
+            strProjectFile += ".wwl";
+            s_OpenProject(strProjectFile);
             return ;
+        }
     }
 }