From d282e7a2f2e23659ef9ed71949ab8387cea1eeff Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Thu, 23 Jan 2025 14:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tree/govern/pointTree.vue | 3 +++ src/views/govern/device/control/index.vue | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/tree/govern/pointTree.vue b/src/components/tree/govern/pointTree.vue index ee3848f..f4d9adc 100644 --- a/src/components/tree/govern/pointTree.vue +++ b/src/components/tree/govern/pointTree.vue @@ -43,12 +43,15 @@ const info = () => { if (item.name == '治理设备') { item.children.forEach((item: any) => { item.icon = 'el-icon-HomeFilled' + item.level=1 item.color = config.getColorVal('elementUiPrimary') item.children.forEach((item2: any) => { item2.icon = 'el-icon-List' + item2.level=1 item2.color = config.getColorVal('elementUiPrimary') item2.children.forEach((item3: any) => { item3.icon = 'el-icon-Platform' + item3.level=1 item3.color = item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important' item3.children.forEach((item4: any) => { diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue index 158561a..e577ecb 100644 --- a/src/views/govern/device/control/index.vue +++ b/src/views/govern/device/control/index.vue @@ -703,14 +703,6 @@ const nodeClick = async (e: anyObj) => { return loading.value = false } searchValue.value = '' - await queryDictType({ - lineId: e?.id, - conType: e.conType - }).then(res => { - oddAndEvenFlag.value = false - queryList.value = res.data - formInline.targetType = res.data[0].id - }) deviceId.value = e?.pid @@ -723,6 +715,15 @@ const nodeClick = async (e: anyObj) => { //选中设备名称后,点击标签页也能查询数据,要求点击设备名称后,点击标签页默认查询第一个监测点数据 if (e.level == 3 || e.level == 2) { + await queryDictType({ + lineId: e?.id, + conType: e.conType + }).then(res => { + oddAndEvenFlag.value = false + queryList.value = res.data + formInline.targetType = res.data[0].id + }) + loading.value = true formInline.lineId = e.level == 3 ? e.id : e.children[0].id await getDeviceData(e.level == 3 ? e.pid : e.id, 'history', e.level == 3 ? e.id : e.children[0].id)