diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue index b3970dcd7..f908fef56 100644 --- a/nezha-fronted/src/components/cli/webSSH.vue +++ b/nezha-fronted/src/components/cli/webSSH.vue @@ -194,7 +194,7 @@ - +
Connect
@@ -217,7 +217,7 @@
- +
Connect
diff --git a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue index fe5a570de..8608b6cf2 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue @@ -22,7 +22,7 @@ + show-word-limit size="small" type="password" @blur="pinBlur" autocomplete="new-password"> @@ -41,7 +41,8 @@ @@ -147,9 +148,9 @@ export default { immediate: true, handler (n) { this.editUser = JSON.parse(JSON.stringify(n)) - if (this.editUser.roles && this.editUser.roles.length > 0) { - this.editUser.roleIds = this.editUser.roles.map(t => t.id) - } + // if (this.editUser.roles && this.editUser.roles.length > 0) { + // this.editUser.roleIds = this.editUser.roles.map(t => t.id) + // } } } }, diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index 6eae779cd..ba1da2ece 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -187,7 +187,7 @@ - + @@ -200,13 +200,13 @@ - + - + diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue index da50af21a..1539a4049 100644 --- a/nezha-fronted/src/components/page/config/user.vue +++ b/nezha-fronted/src/components/page/config/user.vue @@ -64,10 +64,12 @@ export default { name: '', username: '', email: '', + pin: '', + pinChange: '', status: '1', createTime: '', receiver: [], - roleIds: 0, + roleIds: '', roles: [], lang: '', notifications: [] @@ -99,7 +101,32 @@ export default { } this.getTableData() }) - } + }, + edit (u) { + this.$get(`${this.url}/${u.id}`).then(response => { + console.log(response) + const user = response.user + if (response.code === 200) { + this.object = { + id: user.id, + name: user.name, + username: user.username, + email: user.email, + status: user.status + '', + createAt: this.utcTimeToTimezoneStr(user.createAt), + receiver: user.receiver, + roleIds: Number(user.roles.map(item => item.id).join(',')), + roles: user.roles, + lang: user.lang, + notifications: user.notifications, + pin: '', + pinChange: '' + } + console.log(this.object); + this.rightBox.show = true + } + }) + }, }, computed: { isCurrentUser () { diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 578760685..ce6f21a40 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -41,8 +41,8 @@ id="panel" :params="filter" :permissions="{ - import: 'panel_chart_import', - export: 'panel_chart_export' + import: 'panel_chart_add', + export: 'panel_view' }" class="top-tool-export" export-file-name="chart" diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index 8a0ab98ed..fd4b792da 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -20,7 +20,7 @@ import-url="monitor/endpoint/import" export-file-name="expression-template" :params="searchLabel" - :permissions="{import: 'endpoint_import', export: 'endpoint_import'}" + :permissions="{import: 'monitor_endpoint_add', export: 'monitor_module_view'}" @afterImport="getTableData" class="top-tool-export margin-r-10" >