diff --git a/nezha-fronted/src/components/common/nezhaColor.vue b/nezha-fronted/src/components/common/nezhaColor.vue index 1ba9472c6..c849ed012 100644 --- a/nezha-fronted/src/components/common/nezhaColor.vue +++ b/nezha-fronted/src/components/common/nezhaColor.vue @@ -218,6 +218,7 @@ export default { } .color-tab{ height: 28px; + line-height: 28px; border-radius: 5px 5px 0 0; border: 1px solid #EBEEF5; border-bottom: none; @@ -240,14 +241,14 @@ export default { /*border-right-color: #DCDFE6;*/ /*}*/ .color-tab div:hover{ - color: #409EFF; + color: var(--theme-color); } .color-tab .color-active{ background-color: #FFF; font-size: 14px; - color: #FA901C; + color: var(--theme-color); font-weight: 700; - border-color: #FA901C;; + border-color: var(--theme-color); } .color { diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue index 0c5c5108f..e91711907 100644 --- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue @@ -10,96 +10,99 @@ -
- - - - - - -
- - {{ $t("overall.oneHour") }} - {{ $t("overall.twoHour") }} - {{ $t("overall.sixHour") }} - {{ $t("overall.twelveHour") }} - {{ $t("overall.oneDay") }} - {{ $t("overall.twoDay") }} - {{ $t("overall.week") }} - -
-
-
- {{ $t("overall.startTime") }} - - +
+
+ + + + + + +
+ + {{ $t("overall.oneHour") }} + {{ $t("overall.twoHour") }} + {{ $t("overall.sixHour") }} + {{ $t("overall.twelveHour") }} + {{ $t("overall.oneDay") }} + {{ $t("overall.twoDay") }} + {{ $t("overall.week") }} +
-
- {{ $t("overall.endTime") }} - - +
+
+ {{ $t("overall.startTime") }} + + +
+
+ {{ $t("overall.endTime") }} + + +
+
- -
-
+ - -
- - - - = - - - Regex - - -
-
+ +
+ + + + = + + + Regex + + +
+
-
-
+
+
- - + + - - + + + +
+
-
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue index 63e08e5bf..3e498f97b 100644 --- a/nezha-fronted/src/components/common/table/settings/userTable.vue +++ b/nezha-fronted/src/components/common/table/settings/userTable.vue @@ -140,11 +140,10 @@ export default { methods: { statusChange (user) { if (user.roles) { - user.roleIds = user.roles.map(t => t.id) + user.roleIds = user.roles.map(t => t.id).join(',') } - this.$put(this.url, user).then(response => { + this.$put(this.api, user).then(response => { if (response.code === 200) { - this.rightBox.show = false this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') }) } else { this.$message.error(response.msg)