From eda829293c63d2c1b6d116a3c3da6e236d166af3 Mon Sep 17 00:00:00 2001 From: Kerry Date: Mon, 15 Nov 2021 17:17:39 +0800 Subject: [PATCH] fix(alarm): add reloading method; add style for some components --- package.json | 2 +- src/style/normalize.scss | 36 ++++++++++++++++++++++++++++++++++++ src/views/Alarm/Alarm.vue | 4 +--- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4783daebe..62415b71a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "emqx-dashboard-web-new", - "version": "0.2.0", + "version": "0.3.0", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/style/normalize.scss b/src/style/normalize.scss index 74195abad..9287439d8 100644 --- a/src/style/normalize.scss +++ b/src/style/normalize.scss @@ -290,4 +290,40 @@ color: #8d96a2ff; border: none; } + } + + .el-message { + padding: 16px; + border-radius: 4px; + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); + background: #fff; + border: none; + &--success { + .el-message__content, + .el-icon-success { + color: var(--el-color-primary) + } + } + } + + .el-card { + --el-card-border-color:#ececefff; + } + + .el-loading-parent--relative { + border-width: 1px; + &::before { + height: 0; + } + .el-loading-mask { + z-index: 99; + } + } + + .el-form{ + &--label-top{ + .el-form-item__label{ + padding:0; + } + } } \ No newline at end of file diff --git a/src/views/Alarm/Alarm.vue b/src/views/Alarm/Alarm.vue index fbcdb7733..a7181939e 100644 --- a/src/views/Alarm/Alarm.vue +++ b/src/views/Alarm/Alarm.vue @@ -174,8 +174,6 @@ export default { }; }, mounted() { - // this.$refs.p1.$emit("loadPage"); - // this.$refs.p2.$emit("loadPage"); this.loadData(); this.loadHData(); }, @@ -188,8 +186,8 @@ export default { let res = await clearHistoryAlarm().catch(() => {}); if (res) { this.$message.success(this.$t("Alarm.clearSuccess")); + this.loadHData(); } - // this.$refs.p2.$emit("loadPage"); }, dateFormat: dateFormat, async loadData(params = {}) {