style:数据采集-设备运行参数分析-树状结果逻辑优化

main
黄伟杰 2 months ago
parent 76f23bc289
commit 3448b85f72

@ -4,8 +4,7 @@
<ContentWrap class="h-1/1"> <ContentWrap class="h-1/1">
<el-input v-model="keyword" clearable placeholder="搜索设备或参数" class="!w-1/1" @input="handleKeywordChange" /> <el-input v-model="keyword" clearable placeholder="搜索设备或参数" class="!w-1/1" @input="handleKeywordChange" />
<div class="mt-12px"> <div class="mt-12px">
<el-tree <el-tree ref="treeRef" v-loading="treeLoading" :data="treeData" :props="treeProps" node-key="id"
ref="treeRef" v-loading="treeLoading" :data="treeData" :props="treeProps" node-key="id"
highlight-current @node-click="handleTreeNodeClick" /> highlight-current @node-click="handleTreeNodeClick" />
</div> </div>
</ContentWrap> </ContentWrap>
@ -15,8 +14,7 @@ ref="treeRef" v-loading="treeLoading" :data="treeData" :props="treeProps" node-k
<ContentWrap> <ContentWrap>
<el-form class="-mb-15px" :inline="true"> <el-form class="-mb-15px" :inline="true">
<el-form-item label="时间"> <el-form-item label="时间">
<el-date-picker <el-date-picker v-model="dateRange" type="daterange" start-placeholder="" end-placeholder=""
v-model="dateRange" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
value-format="YYYY-MM-DD" :shortcuts="dateShortcuts" value-format="YYYY-MM-DD" :shortcuts="dateShortcuts"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-360px" /> :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-360px" />
</el-form-item> </el-form-item>
@ -409,8 +407,10 @@ const handleTreeNodeClick = async (data: DeviceTreeNode) => {
return return
} }
const isEmptyOrgNode = typeof data?.id === 'string' && data.id.startsWith('org-')
const isEquipmentNode = typeof data?.id === 'string' && data.id.startsWith('equipment-') const isEquipmentNode = typeof data?.id === 'string' && data.id.startsWith('equipment-')
if (isEquipmentNode && (data.paramCount ?? 0) <= 0) { if (isEquipmentNode && (data.paramCount ?? 0) <= 0 || isEmptyOrgNode) {
selectedParam.value = data selectedParam.value = data
selectedDeviceId.value = undefined selectedDeviceId.value = undefined
selectedModelId.value = undefined selectedModelId.value = undefined

Loading…
Cancel
Save