From 1a488de25df5a1d1e10a0ce87537ce7f248f0fda Mon Sep 17 00:00:00 2001 From: zhujiyan <17812234322@163.com> Date: Tue, 29 Oct 2024 15:46:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=B3=E6=80=81=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E6=8E=92=E5=BA=8F=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govern/device/control/tabs/components/realtrend.vue | 3 ++- src/views/govern/device/control/tabs/trend.vue | 5 ++++- src/views/govern/device/planData/index.vue | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/govern/device/control/tabs/components/realtrend.vue b/src/views/govern/device/control/tabs/components/realtrend.vue index 3b88547..e15be9e 100644 --- a/src/views/govern/device/control/tabs/components/realtrend.vue +++ b/src/views/govern/device/control/tabs/components/realtrend.vue @@ -321,6 +321,7 @@ defineExpose({ open, setRealTrendData, setOverLimitData }) align-items: center; line-height: 50px; font-weight: 800; + padding-bottom: 5px; p { width: 100%; height: 100%; @@ -346,7 +347,7 @@ defineExpose({ open, setRealTrendData, setOverLimitData }) height: 100%; text-align: center; border: 1px solid #eee; - line-height: 40px; + line-height: 50px; margin: 0 !important; } p:nth-child(1) { diff --git a/src/views/govern/device/control/tabs/trend.vue b/src/views/govern/device/control/tabs/trend.vue index 2e7316f..f1ee5e8 100644 --- a/src/views/govern/device/control/tabs/trend.vue +++ b/src/views/govern/device/control/tabs/trend.vue @@ -135,7 +135,10 @@ const countOptions: any = ref([]) const legendDictList: any = ref([]) queryByCode('portable-harmonic').then(res => { queryCsDictTree(res.data.id).then(item => { - indexOptions.value = item.data + //排序 + indexOptions.value = item.data.sort((a: any, b: any) => { + return a.sort - b.sort + }) searchForm.value.index[0] = indexOptions.value[0].id }) queryStatistical(res.data.id).then(vv => { diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue index 8f0ec08..5c37a38 100644 --- a/src/views/govern/device/planData/index.vue +++ b/src/views/govern/device/planData/index.vue @@ -266,7 +266,9 @@ const countOptions: any = ref([]) const legendDictList: any = ref([]) queryByCode('portable-harmonic').then(res => { queryCsDictTree(res.data.id).then(item => { - indexOptions.value = item.data + indexOptions.value = item.data.sort((a: any, b: any) => { + return a.sort - b.sort + }) searchForm.value.index[0] = indexOptions.value[0].id // searchForm.value.index = indexOptions.value[0].id })