diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js index f3c1071cf..61129123a 100644 --- a/nezha-fronted/src/components/common/js/constants.js +++ b/nezha-fronted/src/components/common/js/constants.js @@ -103,6 +103,16 @@ export const agent2 = { } ] } + ], + protocol: [ + { + label: 'http', + value: 1 + }, + { + label: 'https', + value: 2 + } ] } diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index e20830383..d9aaf1ff4 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -810,6 +810,7 @@ const cn = { dataCenter: '数据中心', up: 'UP', down: 'Down', + protocol: '协议', agent: { agent: '客户端', title: '下载客户端', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 0508dcc37..c27b84966 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -805,6 +805,7 @@ const en = { down: 'Down', host: 'Host', port: 'Port', + protocol: 'Protocol', agent: { agent: 'Agent', title: 'Download agent', diff --git a/nezha-fronted/src/components/common/rightBox/agentBox.vue b/nezha-fronted/src/components/common/rightBox/agentBox.vue index 7a8b9364b..546300461 100644 --- a/nezha-fronted/src/components/common/rightBox/agentBox.vue +++ b/nezha-fronted/src/components/common/rightBox/agentBox.vue @@ -56,9 +56,16 @@ - + + + + + {{item.label}} + + + diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue index a064a697d..79e201edb 100644 --- a/nezha-fronted/src/components/common/table/settings/agentTable.vue +++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue @@ -47,6 +47,10 @@ + + http + https + {{scope.row[item.prop]}} @@ -118,6 +122,11 @@ export default { prop: 'checkTime', show: false, minWidth: 150 + }, { + label: this.$t('config.agent.protocol'), + prop: 'protocol', + show: false, + minWidth: 150 } ] } diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue index fbf28f4f4..5fbd22b10 100644 --- a/nezha-fronted/src/components/page/config/agent.vue +++ b/nezha-fronted/src/components/page/config/agent.vue @@ -127,7 +127,8 @@ export default { id: '', host: '', port: 10090, - dc: { id: '', name: '', location: '' } + dc: { id: '', name: '', location: '' }, + protocol: 'http' }, agent: agent, agent2: agent2, diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 2cfdba305..d2740e15c 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -7,7 +7,7 @@
-
+
@@ -557,10 +557,7 @@ export default { } else { this.showPanel.id = '' this.filter.panelId = '' - this.isLoading = true - if (response.data.list.length == 0) { - this.showPanel = false - } + this.isLoading = !response.data.list.length === 0 } this.pageObj.total = response.data.total if (!isInitData && (this.panel.id === '' || this.panel.id === this.showPanel.id)) {