diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 4b232d744..dd232d8f0 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -1551,8 +1551,8 @@ export default { brand: basic.brand ? basic.brand.name : '-', model: basic.model ? basic.model.name : '-', tags: basic.fields ? basic.fields : '-', - alert: basic.alertNum ? basic.alertNum : '-', - endpoint: basic.endpointNum ? basic.endpointNum : '-', + alert: basic.alertNum ? basic.alertNum : 0, + endpoint: basic.endpointNum ? basic.endpointNum : 0, // purchaseDate: basic.purchaseDate, // vendor: basic.brand ? basic.brand.name : '-', // sn: basic.sn, diff --git a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue index 149e330a9..0d0f8e7a5 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue @@ -23,7 +23,7 @@ --> - +
@@ -121,6 +121,7 @@ export default { if (response.code == 200) { self.menus = response.data.menus self.selectedIds = response.data.selectedIds + self.menus[0].children[0].disabled = true } else { self.$message.error('load menu faild') } @@ -130,6 +131,7 @@ export default { self.$get('/sys/menu').then(response => { if (response.code == 200) { self.menus = response.data.list + self.menus[0].children[0].disabled = true } else { self.$message.error('load menu faild') } @@ -141,11 +143,6 @@ export default { labelFormatter: function (data, node) { return data && data.i18n ? this.$t(data.i18n) : data.name }, - selectChange: function (data, isCheck, childIsCheck) { - if (this.$refs.menuTree) { - this.editRole.menuIds = this.$refs.menuTree.getCheckedKeys(true) - } - }, selectAllOrNone: function () { if (this.$refs.menuTree) { if (!this.selectAllFlag) { @@ -168,7 +165,7 @@ export default { save () { if (this.prevent_opt.save) { return } ; this.prevent_opt.save = true - + this.editRole.menuIds = this.$refs.menuTree.getCheckedKeys(true) this.$refs.roleForm.validate((valid) => { if (valid) { if (this.editRole.id) {