diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 59ebadac3..84144a626 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -971,7 +971,7 @@ li{ /*此处自定义弹框尺寸,不同功能可能需要的尺寸不一样,需自行添加*/ .right-box-menu ,.right-box-role ,.right-box-account, .right-box-prom, .right-box-alert-config, .right-box-project, .right-box-module, .right-box-cabinet, .right-box-edit-endpoint, .right-box-panel, .right-box-dc, .right-box-model, .right-box-mib, .right-box-asset, .right-box-add-chart, .right-box-asset-type, -.right-box-asset-state { +.right-box-asset-state , .right-box-credential{ width: 850px; } .right-box-chart .el-input__inner, .right-box-chart input { diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js index 52939a2ab..f49001d80 100644 --- a/nezha-fronted/src/components/common/js/constants.js +++ b/nezha-fronted/src/components/common/js/constants.js @@ -129,7 +129,23 @@ export const setting = { { value: 'OFF', label: i18n.t('config.dc.suspended') } ] } - +export const snmpProtocolTypes=[ + // {label:'V1',value:1}, + {label:'V2',value:2}, + {label:'V3',value:3} +] +export const snmpAuthMethod=[ + {label:'None',value:''}, + {label:'MD5',value:'MD5'}, + {label:'SHA',value:'SHA'}, +] +export const snmpEncryptionMethod=[ + {label:'None',value:''}, + {label:'DES',value:'DES'}, + {label:'AES-128',value:'AES-128'}, + {label:'AES-192',value:'AES-192'}, + {label:'AES-256',value:'AES-256'}, +] export const terminalLog = { status: { 0: i18n.t('config.terminallog.statusItem.connecting'), diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 6dbe412bb..4f4ec0a73 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -698,11 +698,13 @@ const cn = { perms: '权限', button: '按钮', menu: '菜单', + tab:'Tab', parent: '上级菜单', mainMenu: '主菜单', createMenu: '新增菜单', editMenu: '编辑菜单', - orderNum: '排序' + orderNum: '排序', + icon:'图标', }, promServer: { promServerList: 'Prometheus服务', @@ -856,7 +858,17 @@ const cn = { vendor: '厂商', type: '类型', mibBrowser: 'MIB浏览器', - noData: '暂无数据' + credentials: '证书', + noData: '暂无数据', + credential:{ + type:"协议类型", + port:"端口", + remark:"备注", + auth:"认证", + method:'方式', + encryption:"加密", + pin:"密码" + } }, system: { system: '系统设置', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 2b3eb04e8..fc66c6802 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -701,11 +701,13 @@ const en = { perms: 'Permission', button: 'Button', menu: 'Menu', + tab:'Tab', parent: 'Previous menu', mainMenu: 'Primary menu', createMenu: 'Create menu', editMenu: 'Edit menu', - orderNum: 'Order' + orderNum: 'Order', + icon:'Icon' }, agent: { // 侧滑框 @@ -858,7 +860,19 @@ const en = { vendor: 'Vendor', type: 'Type', mibBrowser: 'MIB browser', - noData: 'No Data' + credentials: 'Credentials', + noData: 'No Data', + credential:{ + type:"Protocol type", + port:"Port", + remark:"Description", + edit:"Edit", + create:"Create", + auth:'Authentication', + method:'Method', + encryption:"Encryption", + pin:"Password" + } }, system: { system: 'System', diff --git a/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue b/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue new file mode 100644 index 000000000..a7fbabb89 --- /dev/null +++ b/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue @@ -0,0 +1,243 @@ + + + + diff --git a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue new file mode 100644 index 000000000..d19298878 --- /dev/null +++ b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue index 4da20eefc..d683a341c 100644 --- a/nezha-fronted/src/components/page/config/agent.vue +++ b/nezha-fronted/src/components/page/config/agent.vue @@ -12,7 +12,7 @@ type="button" @click="add"> - @@ -72,21 +72,21 @@ + + + + + + + + + + + + + + -
- - - - - -
-
- - - - - -
@@ -203,8 +203,10 @@ export default { this.tools.loading = false if (response.code === 200) { this.allDc = response.data.list - this.loadFinish = true - this.agentParam.dc = this.allDc[0].id + if(this.allDc&&this.allDc.length>0){ + this.loadFinish = true + this.agentParam.dc = this.allDc[0].id + } } }) }, @@ -291,14 +293,10 @@ export default { } .agent-box .download-url{ - height: 40px; - position: relative; - margin-bottom: 10px; + margin-left: 12px !important; } .agent-box .download-url .url-copy{ - position: absolute; - right: 10px; - top: 5px; + } .agent-box .download-url .url-copy i{ font-size: 20px; @@ -320,7 +318,7 @@ export default { diff --git a/nezha-fronted/src/components/page/config/menus.vue b/nezha-fronted/src/components/page/config/menus.vue index ce220c513..a447ff59b 100644 --- a/nezha-fronted/src/components/page/config/menus.vue +++ b/nezha-fronted/src/components/page/config/menus.vue @@ -63,7 +63,8 @@ export default { type: 1, route: '', orderNum: 1, - perms: '' + perms: '', + icon:'' }, tableTitle: [ // 原table列 { @@ -87,6 +88,10 @@ export default { label: this.$t('config.menus.type'), prop: 'type', show: true + },{ + label: this.$t('config.menus.icon'), + prop: 'icon', + show: true }, { label: this.$t('config.menus.route'), prop: 'route', diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue index cb6e43699..ecc33d64d 100644 --- a/nezha-fronted/src/components/page/config/mib.vue +++ b/nezha-fronted/src/components/page/config/mib.vue @@ -8,14 +8,17 @@ :from="fromRoute.mib" :layout="['searchInput', 'elementSet']" :search-msg="searchMsg"> -
{{$t("config.mib.mibBrowser")}}
- --> +
+
{{$t("config.mib.credentials")}}
+
+ - + + @@ -56,10 +60,11 @@ import deleteButton from '@/components/common/deleteButton' import nzDataList from '@/components/common/table/nzDataList' import dataListMixin from '@/components/common/mixin/dataList' import mibTable from '@/components/common/table/settings/mibTable' - +import credentials from "./credentials"; export default { name: 'mib', components: { + credentials, mibBox, mibBrowser, deleteButton, diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue index 523056d17..285ecb7ab 100644 --- a/nezha-fronted/src/components/page/config/mibBrowser.vue +++ b/nezha-fronted/src/components/page/config/mibBrowser.vue @@ -8,6 +8,9 @@
{{$t("config.mib.mibBrowser")}}
+
+
{{$t("config.mib.credentials")}}
+