From 31ad7a475069bb339fdee28ad7cd869f3461dc0c Mon Sep 17 00:00:00 2001 From: gaozheng Date: Thu, 25 Jun 2026 21:48:07 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=92=A4=E8=AF=8A=E6=96=AD=E6=97=A5?= =?UTF-8?q?=E5=BF=97([dsrow-raw]/[arrayfilter]),=E4=BF=9D=E7=95=99=20parse?= =?UTF-8?q?DsRows=20=E5=AF=B9=E8=B1=A1=E5=BD=A2=E6=80=81=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=81=A5=E5=A3=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 诊断结论(自读日志):data/page 所有 ds 行(文件/网格/反演)均不带字段属性(properties=文件元数据或null, attachedParameters=null,无 arrayType);结构树节点亦无 arrayType。装置类型纯属脚本配置(ScriptInfoVO), 不在任何现有拉取数据里 → 装置筛选需新接脚本配置并按 ds→测线→脚本 串联(数据来源待定)。 --- src/app/panels/columns/CategorySection.cpp | 11 ----------- src/data/dto/NavDto.cpp | 9 --------- 2 files changed, 20 deletions(-) diff --git a/src/app/panels/columns/CategorySection.cpp b/src/app/panels/columns/CategorySection.cpp index 1034565..32229c4 100644 --- a/src/app/panels/columns/CategorySection.cpp +++ b/src/app/panels/columns/CategorySection.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include "panels/columns/DateRangeEdit.hpp" @@ -177,16 +176,6 @@ void CategorySection::refreshArrayCombo() { arrayCombo_->addItem(name, val); // data=实际属性值(passesFilters 据此比对) } } - if (arrayCombo_->count() <= 1) // 诊断:装置下拉仍空 → 打印枚举大小 + 首行属性,定位是枚举空还是值不匹配 - qInfo().noquote() << "[arrayfilter]" << QString::fromStdString(spec_.id) << "enum=" - << en.size() << "rows=" << rows_.size() - << (rows_.empty() ? QString() : [&] { - QStringList vs; - for (const auto& kv : rows_.front().properties) - vs << (QString::fromStdString(kv.confFieldId) + "=" + - QString::fromStdString(kv.value)); - return "row0[" + vs.join(',') + "]"; - }()); } const int idx = arrayCombo_->findData(prev); // 尽量保留上次选择 arrayCombo_->setCurrentIndex(idx >= 0 ? idx : 0); diff --git a/src/data/dto/NavDto.cpp b/src/data/dto/NavDto.cpp index eca7513..7c8ef38 100644 --- a/src/data/dto/NavDto.cpp +++ b/src/data/dto/NavDto.cpp @@ -1,7 +1,5 @@ #include "dto/NavDto.hpp" -#include -#include #include #include #include @@ -118,13 +116,6 @@ std::vector parseStructNodes(const QJsonArray& arr) { std::vector parseDsRows(const QJsonArray& arr) { std::vector out; out.reserve(static_cast(arr.size())); - // 诊断(一次):打印首行原始 JSON,定位装置/采集时间等字段实际所在(properties 形态/attachedParameters)。 - static bool s_loggedRaw = false; - if (!s_loggedRaw && !arr.isEmpty()) { - s_loggedRaw = true; - qInfo().noquote() << "[dsrow-raw]" - << QJsonDocument(arr.first().toObject()).toJson(QJsonDocument::Compact); - } for (const QJsonValue& v : arr) { const QJsonObject o = v.toObject(); DsRow d;