From 7c93a47b7cf0e74585e6acc44769eae8e9ee00a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Fri, 5 May 2023 17:54:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E8=B0=83=E6=95=B4=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E8=AF=A6=E6=83=85--=E5=AE=89=E5=85=A8=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E6=80=A7=E8=83=BD=E4=BA=8B=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=9B2=E3=80=81=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81=EF=BC=9B3=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Daxios=E9=94=99=E8=AF=AF=E5=AF=BC=E5=85=A5=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/components/index.scss          |  4 +--
 ...yDetailLine.scss => entityDetailLine.scss} |  0
 ...yDetailTabs.scss => entityDetailTabs.scss} |  6 ++++
 .../charts/entityDetail/EntityDetailTabs.vue  | 20 +++++------
 .../entityDetail/tabs/PerformanceEvent.vue    | 34 ++-----------------
 .../entityDetail/tabs/SecurityEvent.vue       | 34 ++-----------------
 6 files changed, 24 insertions(+), 74 deletions(-)
 rename src/assets/css/components/views/charts2/{EntityDetailLine.scss => entityDetailLine.scss} (100%)
 rename src/assets/css/components/views/charts2/{EntityDetailTabs.scss => entityDetailTabs.scss} (88%)

diff --git a/src/assets/css/components/index.scss b/src/assets/css/components/index.scss
index 1a66a23e..6de947f8 100644
--- a/src/assets/css/components/index.scss
+++ b/src/assets/css/components/index.scss
@@ -79,5 +79,5 @@
 @import 'views/administration/Appearance.scss';
 
 @import 'views/setting/knowledgeBase';
-@import "views/charts2/EntityDetailLine";
-@import "views/charts2/EntityDetailTabs";
+@import "@/assets/css/components/views/charts2/entityDetailLine.scss";
+@import "@/assets/css/components/views/charts2/entityDetailTabs.scss";
diff --git a/src/assets/css/components/views/charts2/EntityDetailLine.scss b/src/assets/css/components/views/charts2/entityDetailLine.scss
similarity index 100%
rename from src/assets/css/components/views/charts2/EntityDetailLine.scss
rename to src/assets/css/components/views/charts2/entityDetailLine.scss
diff --git a/src/assets/css/components/views/charts2/EntityDetailTabs.scss b/src/assets/css/components/views/charts2/entityDetailTabs.scss
similarity index 88%
rename from src/assets/css/components/views/charts2/EntityDetailTabs.scss
rename to src/assets/css/components/views/charts2/entityDetailTabs.scss
index ee6343d3..d0ab7046 100644
--- a/src/assets/css/components/views/charts2/EntityDetailTabs.scss
+++ b/src/assets/css/components/views/charts2/entityDetailTabs.scss
@@ -57,6 +57,7 @@
       height: calc(100% - 39px);
       border: 1px solid $tab-border-color;
       border-top: none;
+      padding: 30px 20px 20px 20px; // 根据原型调整上边距为30px，但20px更协调
     }
 
     .tab-pane--border-card {
@@ -65,3 +66,8 @@
     }
   }
 }
+
+.entity-detail-event-border {
+  border: 1px solid #E2E5EC;
+  border-radius: 4px;
+}
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
index 48676906..a2e6469f 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailTabs.vue
@@ -1,21 +1,19 @@
 <template>
   <div class="entity-detail-tabs">
     <div class="entity-detail-tabs__active-bar"></div>
-    <el-tabs v-model="activeTab"
-             class="cn-chart__tabs--border-card"
-             type="border-card"
-    >
-      <el-tab-pane v-for="tab in tabs"
-                   :key="tab.name"
-                   :name="tab.name"
-                   class="tab-pane--border-card"
-      >
+    <el-tabs v-model="activeTab" class="cn-chart__tabs--border-card" type="border-card">
+      <el-tab-pane
+          v-for="tab in tabs"
+          :key="tab.name"
+          :name="tab.name"
+          class="tab-pane--border-card">
         <template #label>
 <!--          <div class="el-tabs__active-bar is-top" style="width: 80.9998px; transform: translateX(177px);"></div>-->
           <i :class="tab.icon"></i>{{tab.label}}
         </template>
         <information-aggregation v-if="tab.name === entityDetailTabsName.informationAggregation"></information-aggregation>
         <domain-name-resolution v-else-if="tab.name === entityDetailTabsName.domainNameResolution"></domain-name-resolution>
+        <digital-certificate v-else-if="tab.name === entityDetailTabsName.digitalCertificate" />
         <security-event v-else-if="tab.name === entityDetailTabsName.securityEvent" :timeFilter="timeFilter" />
         <performance-event v-else-if="tab.name === entityDetailTabsName.performanceEvent" />
       </el-tab-pane>
@@ -32,11 +30,13 @@ import InformationAggregation from '@/views/charts2/charts/entityDetail/tabs/Inf
 import DomainNameResolution from '@/views/charts2/charts/entityDetail/tabs/DomainNameResolution'
 import SecurityEvent from '@/views/charts2/charts/entityDetail/tabs/SecurityEvent'
 import PerformanceEvent from '@/views/charts2/charts/entityDetail/tabs/PerformanceEvent'
+import DigitalCertificate from '@/views/charts2/charts/entityDetail/tabs/DigitalCertificate'
 
 export default {
   name: 'EntityDetailTabs',
   mixins: [chartMixin],
   components: {
+    DigitalCertificate,
     PerformanceEvent,
     SecurityEvent,
     InformationAggregation,
@@ -77,7 +77,7 @@ export default {
     if (entityType === 'domain') {
       tabs.splice(2, 0, { name: entityDetailTabsName.subdomain, label: i18n.global.t('entities.subdomain'), icon: 'cn-icon cn-icon-sub-type' })
     }
-    const activeTab = ref(tabs[0].name)
+    const activeTab = ref(tabs[2].name)
     return {
       entityType,
       activeTab,
diff --git a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue
index 24c7f2a1..3989ff66 100644
--- a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue
+++ b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue
@@ -1,7 +1,7 @@
 <template>
   <chart-no-data v-if="isNoData && !showError"></chart-no-data>
   <div
-      class="detection-border"
+      class="entity-detail-event-border"
       v-for="item in eventList"
       :key="item.eventId"
       style="margin-bottom: 10px;">
@@ -46,10 +46,10 @@
 </template>
 
 <script>
-import { getMillisecond, getNowTime, getSecond } from '@/utils/date-util'
+import { getNowTime, getSecond } from '@/utils/date-util'
 import { eventSeverityColor1 } from '@/utils/constants'
 import unitConvert from '@/utils/unit-convert'
-import axios from '_axios@0.21.4@axios'
+import axios from 'axios'
 import { api } from '@/utils/api'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
@@ -94,19 +94,6 @@ export default {
   mounted () {
     this.initData()
   },
-  computed: {
-    pointColor () {
-      return function (item) {
-        let color = '#8FA1BE'
-        if (item.startTime && item.endTime) {
-          if (getMillisecond(item.endTime) - getMillisecond(item.startTime) < 5 * 60 * 1000) {
-            color = '#D84C4C'
-          }
-        }
-        return { backgroundColor: color }
-      }
-    }
-  },
   methods: {
     unitConvert,
     initData () {
@@ -143,18 +130,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-.detection-border {
-  border: 1px solid #E2E5EC;
-  border-radius: 4px;
-}
-
-.basic-info__item-duration {
-  display: inline-block;
-  height: 6px;
-  width: 6px;
-  border-radius: 50%;
-  margin-right: 8px;
-}
-</style>
diff --git a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue
index 05beee08..478d0ddf 100644
--- a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue
+++ b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue
@@ -1,7 +1,7 @@
 <template>
   <chart-no-data v-if="isNoData && !showError"></chart-no-data>
   <div
-      class="detection-border"
+      class="entity-detail-event-border"
       v-for="item in eventList"
       :key="item.eventId"
       style="margin-bottom: 10px;">
@@ -70,10 +70,10 @@
 </template>
 
 <script>
-import { getMillisecond, getNowTime, getSecond } from '@/utils/date-util'
+import { getNowTime, getSecond } from '@/utils/date-util'
 import { eventSeverityColor1 } from '@/utils/constants'
 import unitConvert from '@/utils/unit-convert'
-import axios from '_axios@0.21.4@axios'
+import axios from 'axios'
 import { api } from '@/utils/api'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
@@ -118,19 +118,6 @@ export default {
   mounted () {
     this.initData()
   },
-  computed: {
-    pointColor () {
-      return function (item) {
-        let color = '#8FA1BE'
-        if (item.startTime && item.endTime) {
-          if (getMillisecond(item.endTime) - getMillisecond(item.startTime) < 5 * 60 * 1000) {
-            color = '#D84C4C'
-          }
-        }
-        return { backgroundColor: color }
-      }
-    }
-  },
   methods: {
     unitConvert,
     initData () {
@@ -167,18 +154,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-.detection-border {
-  border: 1px solid #E2E5EC;
-  border-radius: 4px;
-}
-
-.basic-info__item-duration {
-  display: inline-block;
-  height: 6px;
-  width: 6px;
-  border-radius: 50%;
-  margin-right: 8px;
-}
-</style>