diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js index 51a95b4f1..cae215ffd 100644 --- a/nezha-fronted/src/components/common/js/constants.js +++ b/nezha-fronted/src/components/common/js/constants.js @@ -195,5 +195,6 @@ export const fromRoute = { project: 'project', endpointQuery: 'endpointQuery', terminalLog: 'terminalLog', - operationLog: 'operationLog' + operationLog: 'operationLog', + menus: 'menus' } diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index f6c8774ae..32b58e0b4 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -7,6 +7,8 @@ const cn = { alert: '告警', asset: '资产', config: '设置', + administration: '行政管理', + configuration: '设置', create: '新增', edit: '编辑', delete: '删除', @@ -836,7 +838,7 @@ const cn = { response: '响应' }, mib: { - mib: 'SNMP MIB', + mib: 'MIB文件', fileName: '文件名称', remark: '备注', updateUser: '更新用户', @@ -964,14 +966,14 @@ const cn = { createAssetState: '新增资产状态', editAssetState: '编辑资产状态' }, - assetMeta: { + assetLabel: { example: '示例', - assetMeta: '资产元数据', + assetLabel: '资产标签', all: '全部', addGroup: '创建分组', editGroup: '编辑分组', - addMeta: '创建Meta', - editMeta: '编辑Meta', + addLabel: '创建标签', + editLabel: '编辑标签', groupName: '名称', key: '键名', name: '名称', @@ -980,9 +982,9 @@ const cn = { display: '显示', type: '类型', params: '参数', - updateMeta: '编辑Meta', - deleteMeta: '删除 Meta', - infoMeta: 'Meta 信息', + updateLabel: '编辑标签', + deleteLabel: '删除标签', + infoLabel: '标签信息', text: '单行文本', multitext: '多行文本', textarea: '文本域', @@ -1005,7 +1007,7 @@ const cn = { decimals: '精度', moreOptionsError: '选项最多20条', onlyOptionError: '至少需要一个选项', - metaOptionNull: '请填写选项信息' + labelOptionNull: '请填写选项信息' }, exprTemp: { exprTemp: 'expression模板', @@ -1400,216 +1402,10 @@ const cn = { } }, buttons: { - panel: { - view: 'View panel', - toAdd: 'Add panel', - toEdit: 'Edit panel', - delete: 'Delete panel', - save: 'Save panel', - chart: { - toAdd: 'Add chart', - import: 'Import chart', - export: 'Export chart', - toEdit: 'Edit chart', - save: 'Save chart', - delete: 'Delete chart', - duplicate: 'Duplicate chart' - } - }, - explore: { - view: 'View explore', - toAdd: 'Add chart', - save: 'Save chart' - }, - asset: { - view: 'View asset', - toAdd: 'Add asset', - toEdit: 'Edit asset', - toBatchEdit: 'Batch edit asset', - delete: 'Delete asset', - save: 'Save asset', - import: 'Import asset', - export: 'Export asset', - connect: 'Connect to asset', - endpoint: { - view: 'View endpoint', - toAdd: 'Add endpoint', - toEdit: 'Edit endpoint', - delete: 'Delete endpoint', - save: 'Save endpoint', - import: 'Import endpoint', - export: 'Export endpoint' - }, - alerts: { - view: 'View alerts', - delete: 'Delete alerts', - export: 'Export alerts' - }, - chart: { - toAdd: 'Add chart', - toEdit: 'Edit chart', - delete: 'Delete chart', - save: 'Save chart', - import: 'Import chart', - export: 'Export chart', - duplicate: 'Duplicate chart', - sync: 'Sync chart' - }, - vendor: { - toAdd: 'Add vendor', - save: 'Save chart' - } - }, - project: { - view: 'View project', - toEdit: 'Edit project', - delete: 'Delete project', - save: 'Save project', - topo: { - edit: 'Edit topo', - save: 'Save topo' - }, - module: { - toEdit: 'Edit module', - delete: 'Delete module', - save: 'Save module' - }, - endpoint: { - toAdd: 'Add endpoint', - toEdit: 'Edit endpoint', - delete: 'Delete endpoint', - save: 'Save endpoint', - import: 'Import endpoint', - export: 'Export endpoint', - alerts: { - view: 'View alerts', - delete: 'Delete alerts', - export: 'Export alerts' - }, - query: { - view: 'View query', - toAdd: 'Add chart', - save: 'Save chart' - } - } - }, - message: { - view: 'View alerts', - delete: 'Delete alerts', - export: 'Export alerts' - }, - rule: { - view: 'View rule', - toAdd: 'Add rule', - toEdit: 'Edit rule', - delete: 'Delete rule', - save: 'Save rule', - alerts: { - view: 'View alerts', - delete: 'Delete alerts', - export: 'Export alerts' - } - }, - account: { - view: 'View account', - toAdd: 'Add account', - toEdit: 'Edit account', - delete: 'Delete account', - save: 'Save account' - }, - role: { - view: 'View role', - toAdd: 'Add role', - toEdit: 'Edit role', - delete: 'Delete role', - save: 'Save role' - }, - prom: { - view: 'View prom', - toAdd: 'Add prom', - toEdit: 'Edit prom', - delete: 'Delete prom', - save: 'Save prom' - }, - dc: { - view: 'View data center', - toAdd: 'Add data center', - toEdit: 'Edit data center', - delete: 'Delete data center', - save: 'Save data center', - trafficSetting: 'Traffic setting', - trafficSettingSave: 'Save traffic setting', - cabinet: { - view: 'View cabinet', - toAdd: 'Add cabinet', - toEdit: 'Edit cabinet', - delete: 'Delete cabinet', - save: 'Save cabinet' - } - }, - model: { - view: 'View model', - toAdd: 'Add model', - toEdit: 'Edit model', - delete: 'Delete model', - save: 'Save model', - panel: 'View panel', - chart: { - view: 'View chart', - toAdd: 'Add chart', - toEdit: 'Edit chart', - delete: 'Delete chart', - save: 'Save chart', - import: 'Import chart', - export: 'Export chart', - duplicate: 'Duplicate chart', - sync: 'Sync chart' - } - }, - snmp: { - view: 'View mib file', - toAdd: 'Add mib file', - toEdit: 'Edit mib file', - delete: 'Delete mib file', - save: 'Save mib file', - download: 'Download mib file', - browserExport: 'Export mib browser', - browserView: 'View mib browser' - }, - system: { - basic: 'Basic save', - email: 'Email save', - terminal: 'Terminal save', - ldap: 'LDAP save', - notification: { - add: 'Add notification', - toEdit: 'Edit notification', - delete: 'Delete notification', - save: 'Save notification' - }, - link: { - add: 'Add link', - toEdit: 'Edit link', - delete: 'Delete link', - save: 'Save link' - }, - reset: 'Reset system config' - }, - header: { - header: 'Header', - link: 'Link', - terminal: 'Terminal', - terminalUpload: 'Upload in terminal', - terminalDownload: 'Download in terminal', - add: { - view: 'View add button', - project: 'Add project', - module: 'Add module', - endpoint: 'Add endpoint', - rule: 'Add rule', - asset: 'Add asset' - } - } + view: '查看', + add: '新增', + edit: '修改', + delete: '删除' }, ...zhLocale } diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index e5729721f..2c6a84b8e 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -13,6 +13,8 @@ const en = { alert: 'Alerts', // "告警" asset: 'Assets', // '资产' config: 'Settings', // '设置' + administration: 'Administration', + configuration: 'configuration', create: 'New', // '新增' edit: 'Edit', // '编辑' delete: 'Delete', // '删除' @@ -839,7 +841,7 @@ const en = { } }, mib: { - mib: 'SNMP MIB', + mib: 'MIB file', fileName: 'File name', remark: 'Remark', updateUser: 'Update user', @@ -967,14 +969,14 @@ const en = { createAssetState: 'Create asset state', editAssetState: 'Edit asset state' }, - assetMeta: { + assetLabel: { example: 'Example', - assetMeta: 'Asset meta', + assetLabel: 'Asset labels', all: 'All', addGroup: 'Create group', editGroup: 'Edit group', - addMeta: 'Create meta', - editMeta: 'Edit meta', + addLabel: 'Create label', + editLabel: 'Edit label', groupName: 'Name', key: 'Key', name: 'Name', @@ -983,9 +985,9 @@ const en = { display: 'Display', type: 'Type', params: 'Params', - updateMeta: 'Update Meta', - deleteMeta: 'Delete Meta', - infoMeta: 'Meta Info', + updateLabel: 'Update label', + deleteLabel: 'Delete label', + infoLabel: 'Label Info', text: 'TEXT', multitext: 'MULTITEXT', textarea: 'TEXTAREA', @@ -1008,7 +1010,7 @@ const en = { decimals: 'Decimals', moreOptionsError: 'There are up to 20 options', onlyOptionError: 'You need at least one option', - metaOptionNull: 'Please input option' + labelOptionNull: 'Please input option' }, exprTemp: { exprTemp: 'Expression template', @@ -1284,230 +1286,10 @@ const en = { } }, buttons: { - panel: { - view: 'View panel', - toAdd: 'Add panel', - toEdit: 'Edit panel', - delete: 'Delete panel', - save: 'Save panel', - chart: { - toAdd: 'Add chart', - import: 'Import chart', - export: 'Export chart', - toEdit: 'Edit chart', - save: 'Save chart', - delete: 'Delete chart', - duplicate: 'Duplicate chart' - } - }, - explore: { - view: 'View explore', - toAdd: 'Add chart', - save: 'Save chart' - }, - asset: { - view: 'View asset', - toAdd: 'Add asset', - toEdit: 'Edit asset', - toBatchEdit: 'Batch edit asset', - delete: 'Delete asset', - save: 'Save asset', - import: 'Import asset', - export: 'Export asset', - connect: 'Connect to asset', - endpoint: { - view: 'View endpoint', - toAdd: 'Add endpoint', - toEdit: 'Edit endpoint', - delete: 'Delete endpoint', - save: 'Save endpoint', - import: 'Import endpoint', - export: 'Export endpoint' - }, - alerts: { - view: 'View alerts', - delete: 'Delete alerts', - export: 'Export alerts' - }, - chart: { - toAdd: 'Add chart', - toEdit: 'Edit chart', - delete: 'Delete chart', - save: 'Save chart', - import: 'Import chart', - export: 'Export chart', - duplicate: 'Duplicate chart', - sync: 'Sync chart' - }, - vendor: { - toAdd: 'Add vendor', - save: 'Save chart' - } - }, - project: { - view: 'View project', - toEdit: 'Edit project', - delete: 'Delete project', - save: 'Save project', - topo: { - edit: 'Edit topo', - save: 'Save topo' - }, - module: { - toEdit: 'Edit module', - delete: 'Delete module', - save: 'Save module' - }, - endpoint: { - toAdd: 'Add endpoint', - toEdit: 'Edit endpoint', - delete: 'Delete endpoint', - save: 'Save endpoint', - import: 'Import endpoint', - export: 'Export endpoint', - alerts: { - view: 'View alerts', - delete: 'Delete alerts', - export: 'Export alerts' - }, - query: { - view: 'View query', - toAdd: 'Add chart', - save: 'Save chart' - } - } - }, - message: { - view: 'View alerts', - delete: 'Delete alerts', - export: 'Export alerts' - }, - rule: { - view: 'View rule', - toAdd: 'Add rule', - toEdit: 'Edit rule', - delete: 'Delete rule', - save: 'Save rule', - alerts: { - view: 'View alerts', - delete: 'Delete alerts', - export: 'Export alerts' - } - }, - account: { - view: 'View account', - toAdd: 'Add account', - toEdit: 'Edit account', - delete: 'Delete account', - save: 'Save account' - }, - role: { - view: 'View role', - toAdd: 'Add role', - toEdit: 'Edit role', - delete: 'Delete role', - save: 'Save role' - }, - prom: { - view: 'View prom', - toAdd: 'Add prom', - toEdit: 'Edit prom', - delete: 'Delete prom', - save: 'Save prom' - }, - dc: { - view: 'View data center', - toAdd: 'Add data center', - toEdit: 'Edit data center', - delete: 'Delete data center', - save: 'Save data center', - trafficSetting: 'Traffic setting', - trafficSettingSave: 'Save traffic setting', - cabinet: { - view: 'View cabinet', - toAdd: 'Add cabinet', - toEdit: 'Edit cabinet', - delete: 'Delete cabinet', - save: 'Save cabinet' - } - }, - model: { - view: 'View model', - toAdd: 'Add model', - toEdit: 'Edit model', - delete: 'Delete model', - save: 'Save model', - panel: 'View panel', - chart: { - view: 'View chart', - toAdd: 'Add chart', - toEdit: 'Edit chart', - delete: 'Delete chart', - save: 'Save chart', - import: 'Import chart', - export: 'Export chart', - duplicate: 'Duplicate chart', - sync: 'Sync chart' - } - }, - snmp: { - view: 'View mib file', - toAdd: 'Add mib file', - toEdit: 'Edit mib file', - delete: 'Delete mib file', - save: 'Save mib file', - download: 'Download mib file', - browserExport: 'Export mib browser', - browserView: 'View mib browser' - }, - system: { - basic: 'Basic save', - email: 'Email save', - terminal: 'Terminal save', - ldap: 'LDAP save', - notification: { - add: 'Add notification', - toEdit: 'Edit notification', - delete: 'Delete notification', - save: 'Save notification' - }, - link: { - add: 'Add link', - toEdit: 'Edit link', - delete: 'Delete link', - save: 'Save link' - }, - reset: 'Reset system config' - }, - header: { - header: 'Header', - link: 'Link', - terminal: 'Terminal', - terminalUpload: 'Upload in terminal', - terminalDownload: 'Download in terminal', - add: { - view: 'View add button', - project: 'Add project', - module: 'Add module', - endpoint: 'Add endpoint', - rule: 'Add rule', - asset: 'Add asset' - } - }, - assetType: { - view: 'View', - toAdd: 'Add asset type', - toEdit: 'Edit asset type', - delete: 'Delete asset type', - save: 'Save asset type' - }, - assetState: { - view: 'View', - toAdd: 'Add asset state', - toEdit: 'Edit asset state', - delete: 'Delete asset state', - save: 'Save asset state' - } + view: 'View', + add: 'Add', + edit: 'Edit', + delete: 'Delete' }, ...enLocale } diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index 89f62bfdf..279aa0f15 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -37,14 +37,14 @@ export default { asce: tableSet.asce, desc: tableSet.desc, strTodate: tableSet.strTodate, - tableOperation ([command, row, url]) { + tableOperation ([command, row]) { switch (command) { case 'edit': { this.edit(row) break } case 'delete': { - this.del(row, url) + this.del(row) break } default: @@ -54,6 +54,9 @@ export default { isBuildIn (row) { return (row.buildIn && row.buildIn == 1) || (row.builtIn && row.builtIn == 1) }, + selectionChange (objs) { + this.batchDeleteObjs = objs + }, getTableData () { this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) @@ -81,7 +84,7 @@ export default { cancelButtonText: this.$t('tip.no'), type: 'warning' }).then(() => { - this.$delete(this.url).then(response => { + this.$delete(this.url + '?ids=' + row.id).then(response => { if (response.code === 200) { this.delFlag = true this.$message({ duration: 2000, type: 'success', message: this.$t('tip.deleteSuccess') }) diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js index 194133484..54bddd16d 100644 --- a/nezha-fronted/src/components/common/mixin/table.js +++ b/nezha-fronted/src/components/common/mixin/table.js @@ -16,7 +16,6 @@ export default { }, data () { return { - batchDeleteObjs: [], operationWidth: '165' // 操作列宽 } }, @@ -35,6 +34,9 @@ export default { break } }, + selectionChange (objs) { + this.$emit('selectionChange', objs) + }, isBuiltIn (row) { return (row.buildIn && row.buildIn == 1) || (row.builtIn && row.builtIn == 1) }, diff --git a/nezha-fronted/src/components/common/rightBox/menuBox.vue b/nezha-fronted/src/components/common/rightBox/menuBox.vue index 1125737eb..da7510dcf 100644 --- a/nezha-fronted/src/components/common/rightBox/menuBox.vue +++ b/nezha-fronted/src/components/common/rightBox/menuBox.vue @@ -85,7 +85,9 @@ export default { 'tree-select': Treeselect }, props: { - menu: Object + menu: { + type: Object + } }, computed: { isCurrentUser () { diff --git a/nezha-fronted/src/components/common/rightBox/userBox.vue b/nezha-fronted/src/components/common/rightBox/userBox.vue index 641cdf2fd..3dc609810 100644 --- a/nezha-fronted/src/components/common/rightBox/userBox.vue +++ b/nezha-fronted/src/components/common/rightBox/userBox.vue @@ -1,6 +1,3 @@ -