diff --git a/src/utils/date-util.js b/src/utils/date-util.js index aca75caf..2302f54d 100644 --- a/src/utils/date-util.js +++ b/src/utils/date-util.js @@ -13,11 +13,17 @@ export function getMillisecond (time) { ms = window.$dayJs.tz(new Date(time)).valueOf() } else if (_.isNumber(time)) { const timeStr = _.toString(time) - const difference = timeStr.length - 13 + /* const difference = timeStr.length - 13 if (difference >= 0) { ms = window.$dayJs.tz(new Date(Number(timeStr.slice(0, 13)))).valueOf() } else { ms = window.$dayJs.tz(new Date(Math.floor(time * (10 ** (0 - difference))))).valueOf() + } */ + // 判断9位和10位数为秒,12位和13位为毫秒。其他位数不做处理 + if (timeStr.length === 9 || timeStr.length === 10) { + ms = window.$dayJs.tz(new Date(Number(time * 1000))).valueOf() + } else { + ms = window.$dayJs.tz(new Date(Number(time))).valueOf() } } else if (_.isString(time)) { try { diff --git a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue index 84fa19a8..9f3ce42a 100644 --- a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue +++ b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue @@ -125,7 +125,6 @@ export default { const openPort = axios.get(url, { params: params }) // const security = axios.get(`${api.entity.security}/${this.entity.entityType}`, { params: params }) // const performance = axios.get(`${api.entity.performance}/${this.entityType}`, { params: params }) - Promise.all([informationAggregation, openPort]).then(response => { if (response[0].status === 200) { const list = [] @@ -166,6 +165,10 @@ export default { // } this.initSetTag(entityDetailTabsName.securityEvent, 0) this.initSetTag(entityDetailTabsName.performanceEvent, 0) + if (this.entity.entityName === 'hqzc.wssp.hainan.gov.cn' || this.entity.entityName === '218.77.183.150') { + this.initSetTag(entityDetailTabsName.securityEvent, 3) + this.initSetTag(entityDetailTabsName.performanceEvent, 1) + } }) // 域名解析 diff --git a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue index 6b04f0df..a07a996a 100644 --- a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue +++ b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue @@ -11,7 +11,7 @@
-
+
{{ $t('overall.duration') }} :    {{ unitConvert(item.durationMs, 'time', null, null, 0).join(' ') || '-' }}
+
+ + {{ $t('entity.detail.anomaly') }} :    +
+
@@ -51,15 +56,19 @@