fix(alarm): add reloading method; add style for some components

emqx · Nov 15, 2021 · eda8292 · eda8292
1 parent abc7b57
commit eda8292
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git 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
@@ -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;
+      }
+    }
   }
diff --git 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 = {}) {