From fceeb685d6f1238da3f8fda210bc2bdc5235e58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= Date: Sat, 25 Apr 2020 12:07:36 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20terminallog=E7=BA=A2=E7=BB=BF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/stylus/main.scss | 4 ++-- .../src/components/page/alert/config.vue | 4 ++-- .../src/components/page/asset/asset.vue | 4 ++-- .../components/page/config/terminallog.vue | 24 ++++++++++++------- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 5052b4c25..4ba7bdf44 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -722,13 +722,13 @@ li{ padding: 0; background-color: $content-right-background-color; } -.nz-table td.has-message .cell>span { +.nz-table td.danger .cell>span { background-color: #ff6666; color: white; padding:2px 5px; border-radius: 4px; } -.nz-table td.has-no-message .cell>span { +.nz-table td.success .cell>span { background-color: #1bd383; color: white; padding:2px 5px; diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index ef37eff98..7afecea67 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -360,9 +360,9 @@ messageStyle(e) { if (e.column.label == this.$t("alert.message")) { if (e.row.alertNum > 0) { - return 'has-message'; + return 'danger'; } else { - return 'has-no-message'; + return 'success'; } } return ''; diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 8e6bc78f3..f30c8522f 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -690,9 +690,9 @@ messageStyle(e) { if (e.column.label == this.$t("asset.tableTitle.alerts")) { if (e.row.alertNum > 0) { - return 'has-message'; + return 'danger'; } else { - return 'has-no-message'; + return 'success'; } } return ''; diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue index c6a9af248..7ea35e837 100644 --- a/nezha-fronted/src/components/page/config/terminallog.vue +++ b/nezha-fronted/src/components/page/config/terminallog.vue @@ -52,6 +52,7 @@ :height="$tableHeight.normal" v-scrollBar:el-table="'large'" v-loading="loading" + :cell-class-name="messageStyle" style="width: 100%;"> - - {{$t("config.terminallog.success")}} - - {{$t("config.terminallog.fail")}} - + {{scope.row[item.prop]}} @@ -301,6 +296,17 @@ } }); }, + messageStyle(e) { + if (e.column.label == this.$t('config.terminallog.status')) { + console.info(e.row) + if (e.row.status == '1') { + return 'success'; + } else { + return 'danger'; + } + } + return ''; + }, toEditReceiver: function (item) { if (!item.isEdit) { //如果不在编辑状态,那么其他项如果有改动,则还原改动,最后开始编辑