diff --git a/src/router/index.js b/src/router/index.js index 8dc985a..2a5434a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -298,7 +298,7 @@ export const dynamicRoutes = [ } ] }, - // 脚本管理 + // 业务脚本管理 { path: '/earnManage/businessScript/details', component: Layout, @@ -309,7 +309,7 @@ export const dynamicRoutes = [ path: ':id?', component: () => import('@/views/earnManage/businessScript/details'), name: 'BusinessScriptDetails', - meta: { title: '脚本信息', noCache: true ,activeMenu: '/earnManage/businessScript' } + meta: { title: '业务脚本信息', noCache: true ,activeMenu: '/earnManage/businessScript' } } ] }, diff --git a/src/views/earnManage/busValueCount/busValueCount.vue b/src/views/earnManage/busValueCount/busValueCount.vue index 1da40cf..ca8a6e8 100644 --- a/src/views/earnManage/busValueCount/busValueCount.vue +++ b/src/views/earnManage/busValueCount/busValueCount.vue @@ -68,16 +68,16 @@ // 列显隐信息 columns: { id: {label: `ID`}, - taskName: {label: `任务名称`, minWidth: '150', visible: true}, + taskName: {label: `任务名称`, minWidth: '250', visible: true}, businessName: {label: `业务名称`, minWidth: '150', visible: true}, resourceType: { label: `包含资源类型`, minWidth: '200', slotName: 'tempResType'}, includedResources: { label: `包含资源`, minWidth: '300'}, calculationType: {label: `计算类型`, minWidth: '150'}, - percentile95: {label: `95值(Mbit)`, minWidth: '100',visible: true}, - monthlyAvgPercentile95: {label: `月均日95值(Mbit)`, minWidth: '150',visible: true}, + percentile95: {label: `95值(Mbit)`, minWidth: '200',visible: true}, + monthlyAvgPercentile95: {label: `月均日95值(Mbit)`, minWidth: '200',visible: true}, // js: {label: `外部数据记录95值(Mbit)`, minWidth: '200'}, timeRange: {label: `时间段`, minWidth: '200',visible: true}, - taskStatus: {label: `任务状态`, minWidth: '80', slotName: 'tempStatus', visible: true}, + taskStatus: {label: `任务状态`, minWidth: '150', slotName: 'tempStatus', visible: true}, updateTime: {label: `修改时间`, minWidth: '150'}, createTime: {label: `创建时间`, minWidth: '150'}, }, diff --git a/src/views/earnManage/businessIssued/businessIssued.vue b/src/views/earnManage/businessIssued/businessIssued.vue index c61b7fe..69b23a5 100644 --- a/src/views/earnManage/businessIssued/businessIssued.vue +++ b/src/views/earnManage/businessIssued/businessIssued.vue @@ -45,15 +45,15 @@ }, // 列显隐信息 columns: { - id: {label: 'ID', width: '50'}, + id: {label: 'ID'}, taskName: { label: `任务名称`, minWidth: '120', visible: true}, businessName: { label: `业务名称`, minWidth: '120', visible: true}, scriptName: { label: `脚本名称`, minWidth: '120', visible: true}, scriptParams: { label: `脚本参数`, minWidth: '120',}, - deployDevice: { label: `部署设备`, minWidth: '120', customTooltip: true}, + deployDevice: { label: `部署设备`, minWidth: '120',}, submitBy: { label: `提交人`, minWidth: '120',}, - reviewStatus: { label: `审核状态`, minWidth: '100', slotName: 'tempStatus', visible: true}, - reviewTime: { label: `审核时间`, minWidth: '120'}, + reviewStatus: { label: `审核状态`, minWidth: '120', slotName: 'tempStatus', visible: true}, + reviewTime: { label: `审核时间`, minWidth: '160'}, reviewComment: { label: `审核意见`, minWidth: '160'}, createTime: { label: `创建时间`, minWidth: '160'}, updateTime: { label: `修改时间`, minWidth: '160'}, diff --git a/src/views/earnManage/businessScript/businessScript.vue b/src/views/earnManage/businessScript/businessScript.vue index cd37f97..7ad580a 100644 --- a/src/views/earnManage/businessScript/businessScript.vue +++ b/src/views/earnManage/businessScript/businessScript.vue @@ -40,7 +40,7 @@ }, // 列显隐信息 columns: { - id: {label: 'ID',width: '50'}, + id: {label: 'ID'}, scriptName: { label: `脚本名称`, visible: true}, scriptPath: { label: `脚本文件地址`, visible: true}, defaultParams: { label: `脚本默认参数`, visible: true}, @@ -143,7 +143,7 @@ // }); // this.download("/system/Business/export", {properties: dataList,}, `业务管理_${new Date().getTime()}.xlsx`); let paramsList = Object.assign({}, this.queryParams,rowData); - this.download("system/businessScript/export", paramsList, `脚本管理_${new Date().getTime()}.xlsx`, null, 'json'); + this.download("system/businessScript/export", paramsList, `业务脚本管理_${new Date().getTime()}.xlsx`, null, 'json'); break; default: diff --git a/src/views/earnManage/revenueMethod/index.vue b/src/views/earnManage/revenueMethod/index.vue index 6ca0d69..f98be7b 100644 --- a/src/views/earnManage/revenueMethod/index.vue +++ b/src/views/earnManage/revenueMethod/index.vue @@ -55,7 +55,7 @@ // 列显隐信息 columns: { - id: {label: `ID`, width: '50', visible: false}, + id: {label: `ID`, visible: false}, updateTime: {label: `修改时间`, minWidth: '160', visible: true}, clientId: {label: `ClientID`, minWidth: '300', visible: true}, hardwareSn: {label: `硬件SN`}, diff --git a/src/views/earnManage/server/serverTabs.vue b/src/views/earnManage/server/serverTabs.vue index cf4d324..75d3c0b 100644 --- a/src/views/earnManage/server/serverTabs.vue +++ b/src/views/earnManage/server/serverTabs.vue @@ -174,14 +174,14 @@ showSearch: true, // 列显隐信息 columns: { - id: {label: `ID`, width: '50'}, - clientId: {label: `ClientID`, minWidth: '280', visible: true}, - hardwareSn: {label: `硬件SN`, minWidth: '150'}, + id: {label: `ID`}, + clientId: {label: `ClientID`, minWidth: '320', visible: true}, + hardwareSn: {label: `硬件SN`, minWidth: '350'}, businessName: {label: `业务名称`, minWidth: '150', visible: true}, businessId: {label: `业务代码`, minWidth: '150'}, - bandwidth95Daily: {label: `95带宽值/日(Mbit)`, minWidth: '150', slotName: 'tempDay',visible: true}, - bandwidth95Monthly: {label: `95带宽值/月(Mbit)`, minWidth: '150', slotName: 'tempMonth',visible: true}, - avgMonthlyBandwidth95: {label: `月均日95值(Mbit)`, minWidth: '150',slotName: 'tempDay',visible: true}, + bandwidth95Daily: {label: `95带宽值/日(Mbit)`, minWidth: '200', slotName: 'tempDay',visible: true}, + bandwidth95Monthly: {label: `95带宽值/月(Mbit)`, minWidth: '200', slotName: 'tempMonth',visible: true}, + avgMonthlyBandwidth95: {label: `月均日95值(Mbit)`, minWidth: '200',slotName: 'tempDay',visible: true}, machineFlow: {label: `金山machineCode`, minWidth: '150',visible: true}, uplinkSwitch: {label: `上联交换机`, minWidth: '150'}, uplinkSwitchPort: {label: `上联交换机端口`, minWidth: '150'}, diff --git a/src/views/earnManage/switch/switchTabs.vue b/src/views/earnManage/switch/switchTabs.vue index e135db6..da8994a 100644 --- a/src/views/earnManage/switch/switchTabs.vue +++ b/src/views/earnManage/switch/switchTabs.vue @@ -215,14 +215,14 @@ // 列显隐信息 columns: { id: { label: `ID`,width: '50', visible: false }, - uplinkSwitch: { label: `交换机名称`, minWidth: '120', visible: true }, - hardwareSn: { label: `硬件SN`, minWidth: '120'}, - interfaceName: { label: `接口名称`, minWidth: '100',visible: true }, - interfaceLinkDeviceType: { label: `接口连接设备类型`, slotName: 'tempType',minWidth: '130', visible: true }, - interfaceRemark: {label: `接口备注`,minWidth: '120'}, - bandwidth95Daily: { label: `95带宽值/日(Mbit)`, minWidth: '180', slotName: 'tempDay', visible: true }, - bandwidth95Monthly: { label: `95带宽值/月(Mbit)`, minWidth: '180', slotName: 'tempMonth', visible: true}, - avgMonthlyBandwidth95: {label: `月均日95值(Mbit`, minWidth: '180', slotName: 'tempDay', visible: true}, + uplinkSwitch: { label: `交换机名称`, minWidth: '180', visible: true }, + hardwareSn: { label: `硬件SN`, minWidth: '200'}, + interfaceName: { label: `接口名称`, minWidth: '120',visible: true }, + interfaceLinkDeviceType: { label: `接口连接设备类型`, slotName: 'tempType',minWidth: '180', visible: true }, + interfaceRemark: {label: `接口备注`,minWidth: '150'}, + bandwidth95Daily: { label: `95带宽值/日(Mbit)`, minWidth: '200', slotName: 'tempDay', visible: true }, + bandwidth95Monthly: { label: `95带宽值/月(Mbit)`, minWidth: '200', slotName: 'tempMonth', visible: true}, + avgMonthlyBandwidth95: {label: `月均日95值(Mbit`, minWidth: '200', slotName: 'tempDay', visible: true}, clientId: {label: `ClientID`,minWidth: '320'}, businessId: {label: `业务代码`,minWidth: '150'}, businessName: {label: `业务名称`,minWidth: '100'}, @@ -230,8 +230,8 @@ // effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay', visible: true }, // effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, minWidth: '200', slotName: 'tempMonth',}, // effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, minWidth: '200', slotName: 'tempDay'}, - createTime: { label: `创建时间`, minWidth: '120'}, - lastModifyTime: { label: `修改时间`, minWidth: '120'} + createTime: { label: `创建时间`, minWidth: '160'}, + lastModifyTime: { label: `修改时间`, minWidth: '160'} }, config: { // searcherForm: [ diff --git a/src/views/resource/alarmLog/alarmLog.vue b/src/views/resource/alarmLog/alarmLog.vue index 932417c..4860038 100644 --- a/src/views/resource/alarmLog/alarmLog.vue +++ b/src/views/resource/alarmLog/alarmLog.vue @@ -12,10 +12,24 @@ - + + + + + + + + - - - - - -