Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

# Conflicts: # nezha-fronted/src/components/common/bottomBox/bottomBox.vue
2021-04-25 15:00:01 +08:00
parent 9490f5c309 5dcb0e740a
commit e2962b9e7b
34 changed files with 1231 additions and 1479 deletions
--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -80,12 +80,10 @@ export const asset = {
    { value: 3, label: i18n.t('asset.suspended') }
  ],
  authProtocolOptions: [
-    { value: 0, label: 'Non' },
    { value: 1, label: 'SSH' },
    { value: 2, label: 'TELNET' }
  ],
  authProtocolData: {
-    non: 0,
    ssh: 1,
    telnet: 2
  },