From ec829e64b3f3e15b363f4827357e5f8935177744 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 28 Apr 2022 18:11:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8A=A8=E6=80=81=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/TimeRange/DateTimeRange.vue    | 12 ++++++------
 src/components/table/report/builtinReportTable.vue   |  2 +-
 src/views/charts/charts/ChartAlarmInfo.vue           |  4 +---
 src/views/charts/charts/ChartDomainWhois.vue         |  4 ++--
 src/views/charts/charts/ChartIpOpenPortBar.vue       |  7 +++++--
 src/views/charts/charts/ChartSingleValue.vue         |  3 ++-
 src/views/charts/charts/chartDetectionsTable.vue     |  2 +-
 src/views/charts/charts/options/line.js              |  1 +
 src/views/charts/charts/tools.js                     |  9 +++++----
 src/views/detections/DetectionRow.vue                |  2 +-
 src/views/detections/options/detectionOptions.js     |  3 ++-
 .../DetectionPerformanceEventDomainOverview.vue      |  4 ++--
 .../overview/DetectionPerformanceEventIpOverview.vue |  4 ++--
 .../entityExplorer/entityList/detailOverview/App.vue |  4 ++--
 .../entityList/detailOverview/Domain.vue             |  4 ++--
 .../entityExplorer/entityList/detailOverview/Ip.vue  |  4 ++--
 16 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue
index dd37d999..5570a4d6 100644
--- a/src/components/common/TimeRange/DateTimeRange.vue
+++ b/src/components/common/TimeRange/DateTimeRange.vue
@@ -3,9 +3,9 @@
     <div @click="showDropdown" class="date-range-text">
       <div class="calendar-popover-text"><i class="cn-icon cn-icon-time"></i></div>
       <div class="calendar-popover-text" style="display: flex" v-if="isCustom">
-        <div class="calendar-popover-text">{{ dayJs.tz(startTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
+        <div class="calendar-popover-text">{{ dateFormatByAppearance(startTime) }}</div>
         <div class="calendar-popover-text"> -</div>
-        <div class="calendar-popover-text">{{ dayJs.tz(endTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
+        <div class="calendar-popover-text">{{ dateFormatByAppearance(endTime) }}</div>
       </div>
       <div class="calendar-popover-text" v-else>
         {{ showDetail }}
@@ -33,11 +33,11 @@
             />
             <div class="content-title">From</div>
             <div @click="myDatePickerShow" tabindex="1" class="content-input">
-              {{ dayJs.tz(myStartTime).format('YYYY-MM-DD HH:mm:ss') }}
+              {{ dateFormatByAppearance(myStartTime) }}
             </div>
             <div class="content-title">To</div>
             <div @click="myDatePickerShow" tabindex="2" class="content-input">
-              {{ dayJs.tz(myEndTime).format('YYYY-MM-DD HH:mm:ss') }}
+              {{ dateFormatByAppearance(myEndTime) }}
             </div>
             <div>
               <el-button @click="timeRange" type="primary" size="mini">Apply time range</el-button>
@@ -46,9 +46,9 @@
             <div class="date-range-history">
               <div v-for="(item, index) in rangeHistoryArr" :key="index" class="date-range-history-item"
                    @click="historyChange(item)">
-                {{ dayJs.tz(item.start).format('YYYY-MM-DD HH:mm:ss') }}
+                {{ dateFormatByAppearance(item.start) }}
                 —
-                {{ dayJs.tz(item.end).format('YYYY-MM-DD HH:mm:ss') }}
+                {{ dateFormatByAppearance(item.end) }}
               </div>
             </div>
           </el-col>
diff --git a/src/components/table/report/builtinReportTable.vue b/src/components/table/report/builtinReportTable.vue
index ff172a9f..b52cc939 100644
--- a/src/components/table/report/builtinReportTable.vue
+++ b/src/components/table/report/builtinReportTable.vue
@@ -34,7 +34,7 @@
       <template #default="scope" :column="item">
         <span v-if="item.prop === 'dataRange'">
           <template v-if="scope.row.startTime && scope.row.endTime">
-            {{scope.row.startTime}}-{{scope.row.endTime}}
+            {{dateFormatByAppearance(scope.row.startTime)}}-{{dateFormatByAppearance(scope.row.endTime)}}
           </template>
         </span>
         <span v-else-if="item.prop === 'type'">
diff --git a/src/views/charts/charts/ChartAlarmInfo.vue b/src/views/charts/charts/ChartAlarmInfo.vue
index 9cba6697..fa799b2a 100644
--- a/src/views/charts/charts/ChartAlarmInfo.vue
+++ b/src/views/charts/charts/ChartAlarmInfo.vue
@@ -58,9 +58,7 @@
                   <div>
                     {{
                       value.startTime
-                        ? dayJs
-                            .tz(getMillisecond(value.startTime))
-                            .format('YYYY-MM-DD HH:mm:ss')
+                        ? dateFormatByAppearance(value.startTime)
                         : '-'
                     }}
                   </div>
diff --git a/src/views/charts/charts/ChartDomainWhois.vue b/src/views/charts/charts/ChartDomainWhois.vue
index 5a50c6cf..704d5c25 100644
--- a/src/views/charts/charts/ChartDomainWhois.vue
+++ b/src/views/charts/charts/ChartDomainWhois.vue
@@ -20,11 +20,11 @@
         </div>
         <div class="domain-detail-list__row">
           <div class="domain-detail-list__label">{{$t('entities.creationDate')}}</div>
-          <div class="domain-detail-list__content">{{ dateFormatByAppearance($_.get(chartData, "createTime")) || '-'}}</div>
+          <div class="domain-detail-list__content">{{ dateFormatByAppearance($_.get(chartData, "createTime") * 1) || '-'}}</div>
         </div>
         <div class="domain-detail-list__row">
           <div class="domain-detail-list__label">{{$t('entities.expirationDate')}}</div>
-          <div class="domain-detail-list__content">{{ dateFormatByAppearance($_.get(chartData, "expirationTime")) || '-'}}</div>
+          <div class="domain-detail-list__content">{{ dateFormatByAppearance($_.get(chartData, "expirationTime") * 1) || '-'}}</div>
         </div>
       </div>
     </div>
diff --git a/src/views/charts/charts/ChartIpOpenPortBar.vue b/src/views/charts/charts/ChartIpOpenPortBar.vue
index d0b81b50..82818848 100644
--- a/src/views/charts/charts/ChartIpOpenPortBar.vue
+++ b/src/views/charts/charts/ChartIpOpenPortBar.vue
@@ -17,8 +17,11 @@
                     :min-width="item.width"
             >
                 <template v-slot="scope" :column="item">
-                    <span v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
-                    <template v-else>-</template>
+                  <span v-if="item.prop === 'utime'">
+                    {{ dateFormatByAppearance(scope.row[item.prop]) }}
+                  </span>
+                  <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+                  <template v-else>-</template>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/src/views/charts/charts/ChartSingleValue.vue b/src/views/charts/charts/ChartSingleValue.vue
index b311f8ea..132a597b 100644
--- a/src/views/charts/charts/ChartSingleValue.vue
+++ b/src/views/charts/charts/ChartSingleValue.vue
@@ -230,6 +230,7 @@ import { get } from '@/utils/http'
 import { unitTypes } from '@/utils/constants'
 import { replaceUrlPlaceholder } from '@/utils/tools'
 import * as echarts from 'echarts'
+import { dateFormatByAppearance } from '@/utils/date-util'
 import {
   getOption,
   getChartColor,
@@ -359,7 +360,7 @@ export default {
                 ...seriesTemplate,
                 name: r.legend,
                 data: r.values.map((v) => [
-                  Number(v[0]) * 1000,
+                  dateFormatByAppearance(Number(v[0]) * 1000),
                   Number(v[1]),
                   chartParams.unitType
                 ]),
diff --git a/src/views/charts/charts/chartDetectionsTable.vue b/src/views/charts/charts/chartDetectionsTable.vue
index 455a711d..01da91d8 100644
--- a/src/views/charts/charts/chartDetectionsTable.vue
+++ b/src/views/charts/charts/chartDetectionsTable.vue
@@ -66,7 +66,7 @@
             <div class="basic-info__item">
               <i class="cn-icon cn-icon-time2"></i>
               <span>{{$t('detection.list.startTime')}}&nbsp;:&nbsp;&nbsp;</span>
-              <span>{{dayJs.tz(getMillisecond(detection.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</span>
+              <span>{{dateFormatByAppearance(detection.startTime) || '-'}}</span>
             </div>
             <div class="basic-info__item">
               <i class="cn-icon cn-icon-time2"></i>
diff --git a/src/views/charts/charts/options/line.js b/src/views/charts/charts/options/line.js
index 900a66bd..0e9fbbc2 100644
--- a/src/views/charts/charts/options/line.js
+++ b/src/views/charts/charts/options/line.js
@@ -180,6 +180,7 @@ export const singleValueLine = {
     showContent: true,
     appendToBody: true,
     trigger: 'axis',
+    formatter: axisFormatter,
     textStyle: {
       width: '20px',
       overflow: 'truncate'
diff --git a/src/views/charts/charts/tools.js b/src/views/charts/charts/tools.js
index 2407470b..7208a5b3 100644
--- a/src/views/charts/charts/tools.js
+++ b/src/views/charts/charts/tools.js
@@ -7,6 +7,7 @@ import { pieWithTable, ipHostedDomain } from './options/pie'
 import { relationShip } from './options/graph'
 import { sankey } from './options/sankey'
 import { chartColor } from '@/utils/constants'
+import { dateFormatByAppearance } from '@/utils/date-util'
 
 export const chartBarColor = ['#0F8AB2', '#57CBAC']
 export function getChartColor (index) {
@@ -320,7 +321,7 @@ export function axisFormatter (params) {
     const tData = item.data[0]
     if (i === 0) {
       str += '<div style="margin-bottom: 5px">'
-      str += window.$dayJs.tz(tData).format('YYYY-MM-DD HH:mm:ss')
+      str += dateFormatByAppearance(tData)
       str += '</div>'
     }
     str += '<div class="cn-chart-tooltip-box">'
@@ -345,7 +346,7 @@ export function timeHorizontalFormatter (params) {
     const tData = item.data[1]
     if (i === 0) {
       str += '<div style="margin-bottom: 5px">'
-      str += window.$dayJs.tz(tData).format('YYYY-MM-DD HH:mm:ss')
+      str += dateFormatByAppearance(tData)
       str += '</div>'
     }
     str += '<div class="cn-chart-tooltip-box">'
@@ -388,7 +389,7 @@ export function timeVerticalFormatter (params) {
     const tData = item.data[0]
     if (i === 0) {
       str += '<div style="margin-bottom: 5px">'
-      str += window.$dayJs.tz(tData).format('YYYY-MM-DD HH:mm:ss')
+      str += dateFormatByAppearance(tData)
       str += '</div>'
     }
     str += '<div class="cn-chart-tooltip-box">'
@@ -417,7 +418,7 @@ export function timeBarTooltipFormatter (params, type) {
   let str = '<div>'
   const tData = params.data[index0]
   str += '<div style="margin-bottom: 5px">'
-  str += window.$dayJs.tz(tData).format('YYYY-MM-DD HH:mm:ss')
+  str += dateFormatByAppearance(tData)
   str += '</div>'
 
   str += '<div class="cn-chart-tooltip-box">'
diff --git a/src/views/detections/DetectionRow.vue b/src/views/detections/DetectionRow.vue
index e4d38a2d..a47e6c59 100644
--- a/src/views/detections/DetectionRow.vue
+++ b/src/views/detections/DetectionRow.vue
@@ -54,7 +54,7 @@
               <div class="basic-info__item">
                 <i class="cn-icon cn-icon-time2"></i>
                 <span>{{$t('detection.list.startTime')}}&nbsp;:&nbsp;&nbsp;</span>
-                <span>{{dayJs.tz(getMillisecond(detection.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</span>
+                <span>{{dateFormatByAppearance(detection.startTime) || '-'}}</span>
               </div>
               <div class="basic-info__item">
                 <i class="cn-icon cn-icon-time2"></i>
diff --git a/src/views/detections/options/detectionOptions.js b/src/views/detections/options/detectionOptions.js
index 1fe245c2..861642d0 100644
--- a/src/views/detections/options/detectionOptions.js
+++ b/src/views/detections/options/detectionOptions.js
@@ -5,6 +5,7 @@ import {
 } from '@/views/charts/charts/tools'
 import unitConvert from '@/utils/unit-convert'
 import _ from 'lodash'
+import { dateFormatByAppearance } from '@/utils/date-util'
 
 const severitySeriesIndexMappings = [
   { value: 'critical', index: '0' },
@@ -296,7 +297,7 @@ export const metricOption = {
       const item = params[0]
       const tData = item.data[0]
       str += '<div style="margin-bottom: 5px">'
-      str += window.$dayJs.tz(tData).format('YYYY-MM-DD HH:mm:ss')
+      str += dateFormatByAppearance(tData)
       str += '</div>'
       str += '<div class="cn-chart-tooltip-box">'
       str += item.marker
diff --git a/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue b/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue
index 79ced9be..ec7d59d3 100644
--- a/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue
+++ b/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue
@@ -75,13 +75,13 @@
         <div class="metric__column">
           <div class="overview__title">{{$t('detections.startTime')}}</div>
           <div class="overview__row">
-            <div class="row__content--metric ">{{dayJs.tz(detection.startTime*1000).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+            <div class="row__content--metric ">{{dateFormatByAppearance(detection.startTime*1000) || '-'}}</div>
           </div>
         </div>
         <div class="metric__column">
           <div class="overview__title">{{$t('detections.endTime')}}</div>
           <div class="overview__row">
-            <div class="row__content--metric ">{{dayJs.tz(detection.endTime*1000).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+            <div class="row__content--metric ">{{dateFormatByAppearance(detection.endTime*1000) || '-'}}</div>
           </div>
         </div>
       </div>
diff --git a/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue b/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue
index 4cd4ea8c..8de2dc16 100644
--- a/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue
+++ b/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue
@@ -66,13 +66,13 @@
         <div class="metric__column">
           <div class="overview__title">{{$t('detections.startTime')}}</div>
           <div class="overview__row">
-            <div class="row__content--metric ">{{dayJs.tz(detection.startTime*1000).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+            <div class="row__content--metric ">{{dateFormatByAppearance(detection.startTime*1000) || '-'}}</div>
           </div>
         </div>
         <div class="metric__column">
           <div class="overview__title">{{$t('detections.endTime')}}</div>
           <div class="overview__row">
-            <div class="row__content--metric ">{{dayJs.tz(detection.endTime*1000).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+            <div class="row__content--metric ">{{dateFormatByAppearance(detection.endTime*1000) || '-'}}</div>
           </div>
         </div>
       </div>
diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue
index 06a86219..37eeba22 100644
--- a/src/views/entityExplorer/entityList/detailOverview/App.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/App.vue
@@ -144,7 +144,7 @@
         <div class="row__content">{{entityData.performanceNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font"   v-for="(performance, index) in entityData.performanceList" :key="index">
-        <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(performance.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+        <div class="row__label row__label--width160">{{dateFormatByAppearance(performance.startTime) || '-'}}</div>
         <div class="row__content row__content--width200">
           <div class="alert-level-tag alert-level-tag--high">{{performance.eventSeverity}}</div>
           <div>{{performance.eventType}}</div>
@@ -164,7 +164,7 @@
         <div class="row__content">{{entityData.securityNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font"   v-for="(security, index) in entityData.securityList" :key="index">
-        <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(security.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+        <div class="row__label row__label--width160">{{dateFormatByAppearance(security.startTime) || '-'}}</div>
         <div class="row__content row__content--width200">
           <div class="alert-level-tag alert-level-tag--high">{{security.eventSeverity}}</div>
           <div>{{security.securityType}}</div>
diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
index e0c5aea8..248b431c 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
@@ -148,7 +148,7 @@
         <div class="row__content">{{entityData.performanceNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font" v-for="(performance, index) in entityData.performanceList" :key="index">
-        <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(performance.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+        <div class="row__label row__label--width160">{{dateFormatByAppearance(performance.startTime) || '-'}}</div>
         <div class="row__content row__content--width200">
           <div class="alert-level-tag alert-level-tag--high">{{performance.eventSeverity}}</div>
           <div>{{performance.eventType}}</div>
@@ -168,7 +168,7 @@
         <div class="row__content">{{entityData.securityNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font" v-for="(security, i) in entityData.securityList" :key="i">
-        <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(security.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+        <div class="row__label row__label--width160">{{dateFormatByAppearance(getMillisecond(security.startTime)) || '-'}}</div>
         <div class="row__content row__content--width200">
           <div class="alert-level-tag alert-level-tag--high">{{security.eventSeverity}}</div>
           <div>{{security.securityType}}</div>
diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
index 0bb75669..65f6306d 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
@@ -170,7 +170,7 @@
         <div class="row__content">{{entityData.performanceNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font" v-for="(performance, index) in entityData.performanceList" :key="index">
-        <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(performance.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+        <div class="row__label row__label--width160">{{dateFormatByAppearance(performance.startTime) || '-'}}</div>
         <div class="row__content row__content--width200">
           <div class="alert-level-tag alert-level-tag--high">{{performance.eventSeverity}}</div>
           <div>{{performance.eventType}}</div>
@@ -190,7 +190,7 @@
         <div class="row__content">{{entityData.securityNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font" v-for="(security, index) in entityData.securityList" :key="index">
-        <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(security.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
+        <div class="row__label row__label--width160">{{dateFormatByAppearance(security.startTime) || '-'}}</div>
         <div class="row__content row__content--width200">
           <div class="alert-level-tag alert-level-tag--high">{{security.eventSeverity}}</div>
           <div>{{security.securityType}}</div>