diff --git a/src/assets/images/diskSize.png b/src/assets/images/diskSize.png new file mode 100644 index 0000000..490b6ec Binary files /dev/null and b/src/assets/images/diskSize.png differ diff --git a/src/components/table/index.vue b/src/components/table/index.vue index e2041e6..0483d3a 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -33,14 +33,14 @@
{{ column.label }} - +
@@ -246,8 +246,12 @@ buttonConfigs.forEach(config => { // 判断按钮是否显示 if (this.isButtonVisible(config, row)) { - // 12是图标的宽度 8是按钮padding宽度 - const btnWidth = this.calculateButtonWidth(config) + 14 + 8; + let iconWid = 0; + if (config.icon || config.more) { + iconWid = 14; + } + // iconWid:是图标的宽度 8是按钮padding宽度 + const btnWidth = this.calculateButtonWidth(config) + iconWid + 8; currentLineWidth += btnWidth; visibleButtonCount++; } diff --git a/src/router/index.js b/src/router/index.js index 98babba..6757105 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -403,6 +403,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/resource/serverRegister/flowForm', + component: Layout, + hidden: true, + permissions: ['rocketmq:traffic'], + children: [ + { + path: ':id?', + component: () => import('@/views/resource/serverRegister/flowForm'), + name: 'SerRegisterFlowForm', + meta: { title: '查看出省流量', activeMenu: '/resource/serverRegister' } + } + ] + }, // 交换机管理 { path: '/resource/switchRegister/edit', @@ -739,7 +753,7 @@ export const dynamicRoutes = [ ] }, // 告警日志 - { + { path: '/resource/alarmLog/details', component: Layout, hidden: true, @@ -754,6 +768,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/resource/alarmLog/add', + component: Layout, + hidden: true, + permissions: ['resource:alarmLog:details'], + children: [ + { + path: ':id?', + component: () => import('@/views/resource/alarmLog/alarmLogDetails'), + name: 'alarmLogAdd', + meta: { title: '告警阈值配置', activeMenu: '/resource/alarmLog' } + } + ] + }, // 文件管理 { path: '/resource/fileManage/view', diff --git a/src/views/resource/alarmLog/alarmLog.vue b/src/views/resource/alarmLog/alarmLog.vue index 7b1002d..34dbf80 100644 --- a/src/views/resource/alarmLog/alarmLog.vue +++ b/src/views/resource/alarmLog/alarmLog.vue @@ -74,6 +74,7 @@ config: { tableButton: { top: [ + {content: '告警阈值配置', fnCode: 'add', type: 'primary', icon: 'el-icon-add', hasPermi: 'resource:alarmLog:add'}, {content: '导出', fnCode: 'export', type: 'warning', icon: 'el-icon-download', hasPermi: 'resource:alarmLog:export'}, ], line: [ @@ -122,6 +123,12 @@ callback(result, rowData, selectChange) { if (result && result.fnCode) { switch (result.fnCode) { + case 'add': + this.$router.push({ + path: '/resource/alarmLog/add', + query: {id: rowData.clientId} + }); + break; case 'details': // this.$router.push({ // path:'/resource/alarmLog/details', @@ -151,13 +158,6 @@ // } break; case 'export': - // let dataList = []; - // Object.keys(this.columns).forEach(item => { - // if (item.visible) { - // dataList.push(item.prop); - // } - // }); - // this.download("/system/alarmManage/export", {properties: dataList,}, `拓扑管理_${new Date().getTime()}.xlsx`); let paramsList = Object.assign({}, this.queryParams,rowData); this.download("rocketmq/alarmLog/export", paramsList, `告警日志 _${new Date().getTime()}.xlsx`, null, 'json'); break; diff --git a/src/views/resource/alarmLog/alarmLogDetails.vue b/src/views/resource/alarmLog/alarmLogDetails.vue index a83a2aa..f9a69a9 100644 --- a/src/views/resource/alarmLog/alarmLogDetails.vue +++ b/src/views/resource/alarmLog/alarmLogDetails.vue @@ -1,23 +1,42 @@ - diff --git a/src/views/resource/serverRegister/details.vue b/src/views/resource/serverRegister/details.vue index 8154ccd..e0d4137 100644 --- a/src/views/resource/serverRegister/details.vue +++ b/src/views/resource/serverRegister/details.vue @@ -1,8 +1,8 @@