From 44b29b38d82e555b557b6a02bc2117232f5fb074 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Wed, 7 Jul 2021 16:57:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8F=B3=E4=BE=A7=E5=9B=BE=E7=89=87=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=202.=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E6=8E=92=E5=BA=8F=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=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 --- .../common/project/popData/alertTable.vue | 2 +- .../components/common/table/asset/assetTable.vue | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue index a5978e96a..66ed149cf 100644 --- a/nezha-fronted/src/components/common/project/popData/alertTable.vue +++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue @@ -112,7 +112,7 @@ export default { prop: 'labels', show: true, NotSet: true, - minWidth: 200 + minWidth: 220 }, { label: this.$t('alert.severity'), prop: 'severityId', diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue index 5ca627f46..9858daeea 100644 --- a/nezha-fronted/src/components/common/table/asset/assetTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue @@ -206,6 +206,20 @@ export default { methods: { showTableTooltip, hideTableTooltip, + tableDataSort (item) { + let orderBy = '' + let str = item.prop + if (str === 'dc') { + orderBy = str + } + if (item.order === 'ascending') { + orderBy = str + } + if (item.order === 'descending') { + orderBy = '-' + str + } + this.$emit('orderBy', orderBy) + }, messageStyle (title, row) { if (title.prop === 'alertNum') { if (row.alertNum > 0) {