From f25805ea0afe04a821bd1cb7e350234cb5e8e585 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 22 Nov 2023 16:48:17 +0800
Subject: [PATCH] =?UTF-8?q?CN-1456=20feat:=20=E4=B8=80=E4=BA=9B=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/detections/detection-overview.scss     |  5 ++++-
 src/components/rightBox/report/ReportBox.vue     |  1 -
 .../entityDetail/EntityDetailBasicInfo.vue       |  2 +-
 .../charts/entityDetail/EntityDetailLine.vue     | 14 ++++++++++++--
 .../charts/linkMonitor/LinkTrafficSankey.vue     | 16 ++++++++--------
 .../networkOverview/NetworkOverviewApps.vue      |  2 +-
 .../charts2/charts/npm/NpmNetworkQuantity.vue    |  8 ++++----
 .../overview/DetectionSecurityEventOverview.vue  |  2 +-
 .../entityGraph/GraphEntityList.vue              |  2 +-
 src/views/entityExplorer/entityList/Row.vue      |  6 +++---
 10 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/assets/css/components/views/detections/detection-overview.scss b/src/assets/css/components/views/detections/detection-overview.scss
index f76946c4..6c5756d8 100644
--- a/src/assets/css/components/views/detections/detection-overview.scss
+++ b/src/assets/css/components/views/detections/detection-overview.scss
@@ -37,7 +37,7 @@
       flex-direction: row;
       align-items: flex-start;
       flex-wrap: nowrap;
-      padding: 2px 10px 2px 0;
+      padding: 6px 10px 6px 0;
       font-size: 14px;
       word-break: break-all;
 
@@ -45,6 +45,8 @@
         padding-right: 20px;
         min-width: 100px;
         color: #6B717B;
+        line-height: 14px;
+        word-break: normal;
       }
 
       .row__charts {
@@ -68,6 +70,7 @@
         font-size: 14px;
         align-items: center;
         flex-wrap: wrap;
+        line-height: 14px;
 
         &.row__content--link {
           font-style: italic;
diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue
index 140b26fb..5ba985e5 100644
--- a/src/components/rightBox/report/ReportBox.vue
+++ b/src/components/rightBox/report/ReportBox.vue
@@ -154,7 +154,6 @@
                       <el-checkbox v-for="item in dateList" :key="item" :label="item"/>
                     </el-checkbox-group>
                   </div>
-                  <div class="enable-month-value">*一月，三月，五月，七月，八月，十月和12月含31天;闰年二月含29天*</div>
                 </template>
                 <!-- 按周 -->
                 <template v-else-if="monthScheduleType === 'weekly'">
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue b/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue
index 57c0a07b..e3c82acd 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue
@@ -439,7 +439,7 @@ export default {
       case 'domain': {
         detailCards.value = _.concat(detailCards.value,
           { icon: 'cn-icon cn-icon-category2', name: 'categoryName', label: i18n.global.t('entities.category'), value: '' },
-          { icon: 'cn-icon cn-icon-sub-type', name: 'categoryGroup', label: i18n.global.t('entities.group'), value: '' },
+          { icon: 'cn-icon cn-icon-sub-type', name: 'categoryGroup', label: i18n.global.t('entities.domainDetail.categoryGroup'), value: '' },
           { icon: 'cn-icon cn-icon-credit-rating', name: 'reputationLevel', label: i18n.global.t('entities.creditLevel2'), value: '' },
           { icon: 'cn-icon cn-icon-expire-date', name: 'expireDate', label: i18n.global.t('entities.expirationDate2'), value: '' },
           { icon: 'cn-icon cn-icon-registrar', name: 'registrarName', label: i18n.global.t('entities.registrar'), value: '' },
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailLine.vue b/src/views/charts2/charts/entityDetail/EntityDetailLine.vue
index fa1a2aea..8b898e4c 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailLine.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailLine.vue
@@ -46,7 +46,7 @@
               />
             </div>
             <div class="line-select-metric">
-              <span class="select-prefix line-margin-right">Metric:</span>
+              <span class="select-prefix line-margin-right">{{$t('network.metric')}}:</span>
               <el-select
                   size="mini"
                   v-model="metric"
@@ -71,7 +71,9 @@
                   :popper-append-to-body="false"
                   @change="referenceSelectChange"
               >
-                <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                <el-option :key="options2[0].value" :label="$t(options2[0].label)" :value="options2[0].value"></el-option>
+                <el-option :key="options2[1].value" :label="$t(options2[1].label[0], options2[1].label[1])" :value="options2[1].value"></el-option>
+                <el-option :key="options2[2].value" :label="$t(options2[2].label)" :value="options2[2].value"></el-option>
               </el-select>
             </div>
           </div>
@@ -306,6 +308,14 @@ export default {
               label: {
                 formatter (params) {
                   const arr = unitConvert(params.value, unitTypes.number).join('')
+                  const referIndex = _this.options2.findIndex(o => o.value === _this.lineRefer)
+                  if (referIndex > -1) {
+                    if (referIndex === 1) {
+                      return _this.$t(_this.options2[1].label[0], _this.options2[1].label[1]) + '(' + arr + echartsData[0].unitType + ')'
+                    } else {
+                      return _this.$t(_this.options2[referIndex].label) + '(' + arr + echartsData[0].unitType + ')'
+                    }
+                  }
                   return _this.lineRefer + '(' + arr + echartsData[0].unitType + ')'
                 },
                 position: 'insideStartTop',
diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue
index aeef0a5a..3f747c84 100644
--- a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue
+++ b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue
@@ -13,16 +13,16 @@
       </el-tab-pane>
     </el-tabs>
     <template v-if="parseInt(tab) === 0 && !ingressNoData">
-      <div class="sankey__label" style="left: 5%;">External Locations</div>
-      <div class="sankey__label" style="left: 35%;">Next-Hop Internets</div>
-      <div class="sankey__label" style="left: 63%;">Links</div>
-      <div class="sankey__label" style="right: 9%; transform: translateX(50%)">Internal Locations</div>
+      <div class="sankey__label" style="left: 5%;">{{$t('linkMonitor.externalLocations')}}</div>
+      <div class="sankey__label" style="left: 35%;">{{$t('linkMonitor.nextHopInternet')}}</div>
+      <div class="sankey__label" style="left: 63%;">{{$t('linkMonitor.links')}}</div>
+      <div class="sankey__label" style="right: 9%; transform: translateX(50%)">{{$t('linkMonitor.internalLocations')}}</div>
     </template>
     <template v-else-if="parseInt(tab) === 1 && !egressNoData">
-      <div class="sankey__label" style="left: 5%;">Internal Locations</div>
-      <div class="sankey__label" style="left: 33.2%;">Links</div>
-      <div class="sankey__label" style="left: 64.5%;">Next-Hop Internets</div>
-      <div class="sankey__label" style="right: 9%; transform: translateX(50%)">External Locations</div>
+      <div class="sankey__label" style="left: 5%;">{{$t('linkMonitor.internalLocations')}}</div>
+      <div class="sankey__label" style="left: 33.2%;">{{$t('linkMonitor.links')}}</div>
+      <div class="sankey__label" style="left: 64.5%;">{{$t('linkMonitor.nextHopInternet')}}</div>
+      <div class="sankey__label" style="right: 9%; transform: translateX(50%)">{{$t('linkMonitor.externalLocations')}}</div>
     </template>
   </div>
 </template>
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
index 32751bde..ceec15b5 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
@@ -39,7 +39,7 @@
             </div>
             <div class="app-card__body-unit">{{this.metric}}</div>
             <div class="app-card__body-previous">
-              <div>Total</div>
+              <div>{{$t('network.total')}}</div>
               <div v-if="metric === 'Bits/s'" :test-id="`total${index}`">{{valueToRangeValue(app.total, unitTypes.byte).join(' ')}}</div>
               <div v-else :test-id="`total${index}`">{{valueToRangeValue(app.total, unitTypes.number).join(' ')}}</div>
             </div>
diff --git a/src/views/charts2/charts/npm/NpmNetworkQuantity.vue b/src/views/charts2/charts/npm/NpmNetworkQuantity.vue
index 02fb149a..7291893e 100644
--- a/src/views/charts2/charts/npm/NpmNetworkQuantity.vue
+++ b/src/views/charts2/charts/npm/NpmNetworkQuantity.vue
@@ -36,17 +36,17 @@
       <div class="single-value__circle">
         <div class="single-value__circle-p95" :test-id="`singleValueP95${index}`">
         <span v-if="index ===0 || index ===1 || index ===2">
-          P95:{{ valueToRangeValue(npm.P95, unitTypes.time).join(' ') }}</span>
+          P95:&nbsp;{{ valueToRangeValue(npm.P95, unitTypes.time).join(' ') }}</span>
           <span v-else>
-          P95:{{ valueToRangeValue(npm.P95, unitTypes.percent).join(' ') }}
+          P95:&nbsp;{{ valueToRangeValue(npm.P95, unitTypes.percent).join(' ') }}
         </span>
         </div>
         <div class="single-value__circle-p99" :test-id="`singleValueP99${index}`">
         <span v-if="index ===0 || index ===1 || index ===2">
-          P99:{{ valueToRangeValue(npm.P99, unitTypes.time).join(' ') }}
+          P99:&nbsp;{{ valueToRangeValue(npm.P99, unitTypes.time).join(' ') }}
         </span>
           <span v-else>
-          P99:{{ valueToRangeValue(npm.P99, unitTypes.percent).join(' ') }}
+          P99:&nbsp;{{ valueToRangeValue(npm.P99, unitTypes.percent).join(' ') }}
         </span>
         </div>
       </div>
diff --git a/src/views/detections/overview/DetectionSecurityEventOverview.vue b/src/views/detections/overview/DetectionSecurityEventOverview.vue
index f3de876c..64a5e8bd 100644
--- a/src/views/detections/overview/DetectionSecurityEventOverview.vue
+++ b/src/views/detections/overview/DetectionSecurityEventOverview.vue
@@ -148,7 +148,7 @@
       </template>
       <template v-else-if="detection.darkweb">
         <div class="overview__row">
-          <div class="row__label">{{ $t('detection.nodeTypeLower') }}</div>
+          <div class="row__label">{{ $t('detection.nodeType') }}</div>
           <div class="row__content">{{ $_.get(detection, 'darkweb.nodeType', '-') || '-' }}</div>
         </div>
         <template v-if="$_.get(detection.darkweb, 'nodeType', '') === 'tor'">
diff --git a/src/views/entityExplorer/entityGraph/GraphEntityList.vue b/src/views/entityExplorer/entityGraph/GraphEntityList.vue
index 06c4f7dc..c478843a 100644
--- a/src/views/entityExplorer/entityGraph/GraphEntityList.vue
+++ b/src/views/entityExplorer/entityGraph/GraphEntityList.vue
@@ -61,7 +61,7 @@
                   <div class="graph-list-item-value">{{ $_.get(item.detail, 'category.categoryName', '-') || '-' }}</div>
                 </div>
                 <div class="graph-list-item__app">
-                  <div class="graph-list-item-label__app">{{$t('entities.group')}}:</div>
+                  <div class="graph-list-item-label__app">{{$t('entities.domainDetail.categoryGroup')}}:</div>
                   <div class="graph-list-item-value">{{ $_.get(item.detail, 'category.categoryGroup', '-') || '-' }}</div>
                 </div>
                 <div class="graph-list-item__app">
diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue
index 83002095..9ad47855 100644
--- a/src/views/entityExplorer/entityList/Row.vue
+++ b/src/views/entityExplorer/entityList/Row.vue
@@ -59,12 +59,12 @@
                 <div class="basic-info__item">
                   <i class="cn-icon cn-icon-category-group"></i>
                   <span class="row-item-label">{{ $t('entities.category') }}&nbsp;:&nbsp;&nbsp;</span>
-                  <span class="row-item-value" v-high-light="keywordList">{{ $_.get(entityData, 'category.categoryGroup', '-') || '-' }}</span>
+                  <span class="row-item-value" v-high-light="keywordList">{{ $_.get(entityData, 'category.categoryName', '-') || '-' }}</span>
                 </div>
                 <div class="basic-info__item">
                   <i class="cn-icon cn-icon-sub-category"></i>
-                  <span class="row-item-label">{{ $t('entities.subcategory') }}&nbsp;:&nbsp;&nbsp;</span>
-                  <span class="row-item-value" v-high-light="keywordList">{{ $_.get(entityData, 'category.categoryName', '-') || '-' }}</span>
+                  <span class="row-item-label">{{ $t('entities.domainDetail.categoryGroup') }}&nbsp;:&nbsp;&nbsp;</span>
+                  <span class="row-item-value" v-high-light="keywordList">{{ $_.get(entityData, 'category.categoryGroup', '-') || '-' }}</span>
                 </div>
                 <div class="basic-info__item">
                   <i class="cn-icon cn-icon-credit-rating"></i>