'
str += bus.timeFormate(tData)
@@ -752,7 +753,7 @@ export default {
if (i !== 0) {
str += '
'
}
- const value = item.data[0] - self.minusTime
+ const value = bus.computeTimezone(item.data[0])
const tData = new Date(value)
str += '
'
str += bus.timeFormate(tData)
@@ -834,7 +835,11 @@ export default {
show: true,
fontSize: 10,
formatter: function (value) {
- const tData = new Date(value)
+ let offset = localStorage.getItem('nz-sys-timezone')
+ offset = moment.tz(offset).format('Z')
+ offset = Number.parseInt(offset)
+ const localOffset = new Date().getTimezoneOffset() * 60 * 1000 * -1 // 默认 一分钟显示时区偏移的结果
+ const tData = new Date(value - localOffset + offset * 60 * 60 * 1000)
let hour = tData.getHours()
hour = hour > 9 ? hour : '0' + hour // 加0补充为两位数字
let minute = tData.getMinutes()
@@ -1011,7 +1016,7 @@ export default {
const tip = self.legendMagicType[item.seriesIndex]
const color = self.bgColorList[item.seriesIndex]
if (i === 0) {
- const value = item.data[0]
+ const value = bus.computeTimezone(item.data[0])
const tData = new Date(value)
str += '
'
str += bus.timeFormate(tData)
@@ -1179,7 +1184,7 @@ export default {
const tip = self.legendMagicType[item.seriesIndex]
const color = self.bgColorList[item.seriesIndex]
if (i === 0 && tip.alias.indexOf('Previous ') === -1) {
- const value = item.data[0]
+ const value = bus.computeTimezone(item.data[0])
const tData = new Date(value)
str += '
'
str += bus.timeFormate(tData)
@@ -1189,7 +1194,7 @@ export default {
if (i !== 0) {
str += '
'
}
- const value = item.data[0] - self.minusTime
+ const value = bus.computeTimezone(item.data[0])
const tData = new Date(value)
str += '
'
str += bus.timeFormate(tData)
diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue
index 97a0b2d13..71c170b0f 100644
--- a/nezha-fronted/src/components/cli/webSSH.vue
+++ b/nezha-fronted/src/components/cli/webSSH.vue
@@ -201,7 +201,7 @@
+
@@ -172,11 +173,18 @@ export default {
dc: {
cabinet: [
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: true },
- { prop: 'asset', name: this.$t('asset.assets'), active: false }
+ { prop: 'asset', name: this.$t('asset.assets'), active: false },
+ { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false }
],
asset: [
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: false },
- { prop: 'asset', name: this.$t('asset.assets'), active: true }
+ { prop: 'asset', name: this.$t('asset.assets'), active: true },
+ { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false }
+ ],
+ alertMessage: [
+ { prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: false },
+ { prop: 'asset', name: this.$t('asset.assets'), active: false },
+ { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true }
]
}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 4bd25c2a3..b1f1568a8 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -56,7 +56,7 @@ export default {
},
data () {
return {
- url: '/cabinet',
+ url: 'dc/cabinet',
tableId: 'cabinetTable',
blankObject: {
id: '',
@@ -92,6 +92,9 @@ export default {
}
}
},
+ created() {
+ console.log(this.$route);
+ },
methods: {
// 切换tab
changeTab (tab) {
diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js
index 5a54851eb..9780f4e05 100644
--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -89,7 +89,7 @@ export const asset = {
non: 0,
ssh: 1,
telnet: 2
- },
+ }
},
authProtocolOptions: [
{ value: 1, label: 'SSH' },
diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index 35120caa3..a9c2d7f53 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -2,6 +2,7 @@ import { getChart } from './common'
import MessageBox from 'element-ui/packages/message-box/src/main'
import i18n from '../i18n'
import bus from '@/libs/bus'
+import moment from 'moment-timezone'
/* 弹窗点击外部后关闭 */
const exceptClassName = ['prevent-clickoutside', 'config-dropdown', 'nz-pop', 'el-picker', 'chart-box-dropdown', 'metric-dropdown', 'el-cascader__dropdown', 'no-style-class', 'el-message-box', 'nz-dashboard-dropdown', 'el-autocomplete-suggestion', 'nz-temp-box', 'el-time-panel'] // clickoutside排除的class(白名单) no-style-class：没有任何样式的class
export const clickoutside = {
@@ -281,7 +282,13 @@ export const bottomBoxWindow = {
}
}
export function stringTimeParseToUnix (stringTime) {
- const time = new Date(stringTime).getTime()
+ let time = new Date(stringTime).getTime()
+ let offset = localStorage.getItem('nz-sys-timezone')
+ offset = moment.tz(offset).format('Z')
+ offset = Number.parseInt(offset)
+ const localOffset = new Date().getTimezoneOffset() * 60 * 1000 * -1 // 默认 一分钟显示时区偏移的结果
+ console.log(offset,localOffset, time)
+ time = time + localOffset - offset * 60 * 60 * 1000
return time / 1000
}
export function getTime (size, unit) { // 计算时间
diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
index b76dc8a55..304cc951c 100644
--- a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
+++ b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
@@ -212,7 +212,7 @@ export default {
justify-content: space-between;
padding: 15px 0 15px 17px;
box-sizing: border-box;
- border: 1px solid #E7EAED;
+ border: 1px solid $--right-box-border-color;
background-color: #FFFFFF;
overflow-x: hidden;
overflow-y: auto;
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index b035140c2..6a573e676 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -2,6 +2,7 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN' // 引入element语言
const cn = {
overall: {
dashboard: '仪表盘',
+ dc: '数据中心',
project: '系统',
monitor: '监控',
alert: '告警',
@@ -289,7 +290,7 @@ const cn = {
tooltip: 'Tooltip',
displayChart: '图表',
aggregation: 'Aggregation',
- varType: 'Vartype',
+ varType: 'Variable type',
pid: 'Chart 模板',
selectAsset: '请选择Asset',
selectEndpoint: '请选择Endpoint'
@@ -515,6 +516,7 @@ const cn = {
},
asset: {
asset: '资产',
+ alertNum: '资产编号',
assetType: '资产类型', // '资产类型'
batchEditAsset: '批量修改资产',
selectAsset: '已选择的资产',
@@ -677,6 +679,14 @@ const cn = {
type: 'Agent类型'
}
},
+ agent:{
+ name: '名称',
+ type: '类型',
+ createProm: '创建代理服务',
+ agent: {
+ agent: '代理'
+ }
+ },
terminallog: {
terminallog: '终端日志',
status: '状态',
@@ -745,6 +755,7 @@ const cn = {
assets: '资产',
remark: '备注',
cabinets: '机柜',
+ alert: '警报',
traffic: {
title: '流量配置',
add: '添加',
@@ -769,7 +780,7 @@ const cn = {
model: {
model: '资产型号',
name: '资产型号',
- barnd: '品牌',
+ brand: '品牌',
ChartTemplate: '图表模板',
assetNum: '资产编号',
editModel: '编辑型号',
@@ -827,7 +838,8 @@ const cn = {
auth: '认证',
method: '方式',
encryption: '加密',
- pin: '密码'
+ pin: '密码',
+ create: '创建SNMP'
}
},
system: {
@@ -969,6 +981,7 @@ const cn = {
assetLabel: {
example: '示例',
assetLabel: '资产标签',
+ addMeta: '创建标签',
all: '全部',
addGroup: '创建分组',
editGroup: '编辑分组',
@@ -1027,18 +1040,20 @@ const cn = {
create: '创建表达式模板',
expressionError: '请填写表达式',
type: 'Type',
- varType: 'varType'
+ varType: 'Variable type'
},
chartTemp: {
chartTemp: 'Chart 模板',
type: 'Type',
- varType: 'varType'
+ varType: 'Variable type'
}
},
alert: {
alert: '告警',
message: '告警信息',
+ alertMessage: '告警信息',
rule: '告警规则',
+ alertRule: '告警规则',
alertList: '告警信息',
alertConfig: '告警规则',
alertName: '告警名称',
@@ -1092,11 +1107,12 @@ const cn = {
}
},
silence: {
+ name:'名称',
silence: '告警静默',
create: '创建告警静默',
edit: '修改告警静默',
time: '时间',
- matcher: 'Matcher',
+ matchers: 'matchers',
reason: '描述',
selectTime: '请选择时间',
selectMather: '必填项',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 640dda90b..08ed86b1f 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -52,23 +52,23 @@ const en = {
unavailable: 'Unavailable',
available: 'Available',
changePin: 'Change password', // 修改密码
- createChart: 'Create chart',
- createProject: 'Create project',
- createEndpoint: 'Create endpoint',
+ createChart: 'New chart',
+ createProject: 'New project',
+ createEndpoint: 'New endpoint',
batchEndpoint: 'Batch modify endpoint',
- createAsset: 'Create asset',
- createAlertRule: 'Create alert rule',
- createUser: 'Create user',
- createRole: 'Create role',
- createPrometheusServer: 'Create prometheus server',
- createDatacenter: 'Create Data center',
- createCabinet: 'Create cabinet',
- createModel: 'Create model',
- createModule: 'Create module',
- createMib: 'Create MIB',
- createAssetType: 'Create asset type',
- createAssetState: 'Create asset state',
- createTemplate: 'Create template',
+ createAsset: 'New asset',
+ createAlertRule: 'New alert rule',
+ createUser: 'New user',
+ createRole: 'New role',
+ createPrometheusServer: 'New prometheus server',
+ createDatacenter: 'New Data center',
+ createCabinet: 'New cabinet',
+ createModel: 'New model',
+ createModule: 'New module',
+ createMib: 'New MIB',
+ createAssetType: 'New asset type',
+ createAssetState: 'New asset state',
+ createTemplate: 'New template',
exportExcel: 'Export',
importExcel: 'Import',
importExcelLower: 'import',
@@ -210,7 +210,7 @@ const en = {
panelId: 'ID' // ID
},
// 图表-侧滑框
- createChartTitle: 'New chart', // "新增图表"
+ createChartTitle: 'New chart template', // "新增图表"
editChartTitle: 'Edit', // "编辑图表"
chartForm: {
chartId: 'ID',
@@ -299,7 +299,7 @@ const en = {
tooltip: 'Tooltip',
displayChart: 'Display chart',
aggregation: 'Aggregation',
- varType: 'Vartype',
+ varType: 'Variable type',
pid: 'Chart template',
selectAsset: 'Please select the Asset',
selectEndpoint: 'Please select the Endpoint'
@@ -614,7 +614,7 @@ const en = {
roles: 'Role',
language: 'Language', // "语言"
receiver: 'Receiver', // "用户组"
- createTime: 'Create time', // "创建时间"
+ createTime: 'New time', // "创建时间"
enable: 'Enable', // "可用"
option: 'Operation', // "操作"
lastLoginTime: 'Last login time', // 最后登录时间
@@ -645,7 +645,7 @@ const en = {
option: 'Operation', // "操作"
permission: 'Permission',
menu: 'Menu',
- createRole: 'Create role',
+ createRole: 'New role',
editRole: 'Edit role',
remark: 'Remark'
},
@@ -664,7 +664,7 @@ const en = {
tab: 'Tab',
parent: 'Previous menu',
mainMenu: 'Primary menu',
- createMenu: 'Create menu',
+ createMenu: 'New menu',
editMenu: 'Edit menu',
orderNum: 'Order',
icon: 'Icon'
@@ -677,6 +677,7 @@ const en = {
type: 'Type', // "类别"
checkTime: 'Check time',
dataCenter: 'Data center',
+ name : 'Name',
agent: {
agent: 'Agent',
title: 'Download agent',
@@ -695,9 +696,10 @@ const en = {
assets: 'Assets',
remark: 'Remark',
cabinets: 'Cabinets',
- createDc: 'Create data center',
+ createDc: 'Nre data center',
editDc: 'Edit data center',
editCabinet: 'Edit cabinet',
+ alert: 'Alert',
traffic: {
title: 'Traffic Setting',
add: 'Add',
@@ -714,16 +716,16 @@ const en = {
},
cabinet: {
editCabinet: 'Edit Cabinet',
- createCabinet: 'Create Cabinet'
+ createCabinet: 'New Cabinet'
},
model: {
model: 'Asset model',
brand: 'Brand',
name: 'Name',
- ChartTemplate: 'ChartTemplate',
- assetNum: 'AssetNum',
+ ChartTemplate: 'Chart template',
+ assetNum: 'Asset',
editModel: 'Edit model',
- createModel: 'Add model',
+ createModel: 'New model',
remark: 'Description',
type: 'Type'
},
@@ -826,7 +828,7 @@ const en = {
editMib: 'Edit MIB',
models: 'Models',
modelTip: 'Please select models',
- createMib: 'Create MIB',
+ createMib: 'New MIB',
mibFiles: 'MIB file',
uploadTip: 'Please upload MIB file',
requiredMibFile: 'MIB file is required',
@@ -946,7 +948,7 @@ const en = {
nameMaxLength: 'The length should be less than 64',
uriRequired: 'Required',
filePathReg: 'Please enter the correct file path',
- create: 'Create notification',
+ create: 'New notification',
invalid: 'Invalid',
valid: 'Valid'
},
@@ -980,28 +982,28 @@ const en = {
authProtocol:'AuthProtocol',
snmpEnable: 'SnmpEnable',
snmpCollect:'SnmpCollect',
- createModel:'Add Type',
+ createModel:'New Type',
sshCollect:'SshCollect',
sshCollectScript:'SshCollectScript',
parent: 'Parent',
pname: 'Parent name',
editAssetType: 'Edit asset type',
- createAssetType: 'Create asset type'
+ createAssetType: 'New asset type'
},
assetState: {
assetState: 'Asset State',
monitor: 'Monitor',
alert: 'Alert',
assetTotal: 'Total assets',
- createAssetState: 'Create asset state',
+ createAssetState: 'New asset state',
editAssetState: 'Edit asset state'
},
assetLabel: {
- addMeta:'Add lables',
+ addMeta: 'Add labels',
example: 'Example',
assetLabel: 'Asset labels',
all: 'All',
- addGroup: 'Create group',
+ addGroup: 'Add group',
editGroup: 'Edit group',
addLabel: 'Create label',
editLabel: 'Edit label',
@@ -1058,12 +1060,12 @@ const en = {
create: 'New expression template',
expressionError: 'Please fill in the "expression" value',
type: 'Type',
- varType: 'varType'
+ varType: 'Variable type'
},
chartTemp: {
chartTemp: 'Chart template',
type: 'Type',
- varType: 'varType'
+ varType: 'Variable type'
}
},
alert: {
@@ -1072,7 +1074,7 @@ const en = {
rule: 'Rule', // '规则'
alertMessage: 'Alert message', // "告警信息"
alertRule: 'Alert rule', // "告警规则"
- alertName: 'Alert name', // "告警名称"
+ alertName: 'Name', // "告警名称"
severity: 'Priority', // "等级"
description: 'Description', // "描述"
summary: 'Summary', // "概要"
@@ -1122,14 +1124,15 @@ const en = {
alertRuleInfo: 'Alert rule information',
alertNumTrend: 'Alert num trend',
affectEntity: 'Affect entity'
- }
+ },
},
silence: {
+ name:'Name',
silence: 'Alert silence',
create: 'New alert silence',
edit: 'Edit alert silence',
time: 'Time',
- matcher: 'Matcher',
+ matchers: 'matchers',
reason: 'Description',
selectTime: 'Please select time',
selectMather: 'Required',
@@ -1180,7 +1183,7 @@ const en = {
alerts: 'Alerts',
asset: 'Asset',
editEndpoint: 'Edit endpoint',
- createEndpoint: 'Created endpoint',
+ createEndpoint: 'New endpoint',
batchEndpoint: 'Batch Endpoint',
endpointName: 'Endpoint name',
tip: {
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index 643495fb7..ef19f6b19 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -64,6 +64,7 @@ export default {
this.$emit('showBottomBox', targetTab, JSON.parse(JSON.stringify(row)))
},
tableDataSort (item) {
+ console.log(item)
let orderBy = ''
if (item.order === 'ascending') {
orderBy = item.prop
@@ -71,6 +72,7 @@ export default {
if (item.order === 'descending') {
orderBy = '-' + item.prop
}
+ console.log(orderBy)
this.$emit('orderBy', orderBy)
}
}
diff --git a/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue b/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue
index 7a72e17a8..2e4873afc 100644
--- a/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue
+++ b/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue
@@ -169,8 +169,8 @@
diff --git a/nezha-fronted/src/components/common/myDatePicker/src/panel/time-range.vue b/nezha-fronted/src/components/common/myDatePicker/src/panel/time-range.vue
index 8208a781a..0261c2484 100644
--- a/nezha-fronted/src/components/common/myDatePicker/src/panel/time-range.vue
+++ b/nezha-fronted/src/components/common/myDatePicker/src/panel/time-range.vue
@@ -41,8 +41,8 @@