From 867adb4914a815c1a1bcf542dcb44ce957e61331 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 14 Sep 2022 14:29:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E6=A6=82=E5=86=B5=20=3D=E3=80=8B=20=E6=8A=98=E7=BA=BF=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E5=88=B7=E6=96=B0=E5=90=8E=E5=9F=BA=E5=87=86=E7=BA=BF?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=EF=BC=8Ctab=E5=88=87=E6=8D=A2=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/charts2/networkOverviewLine.scss    |  9 ++--
 src/views/charts2/chart-tools.js              |  4 +-
 .../networkOverview/NetworkOverviewLine.vue   | 42 +++++++++++++------
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/assets/css/components/views/charts2/networkOverviewLine.scss b/src/assets/css/components/views/charts2/networkOverviewLine.scss
index 03249c84..580f57b0 100644
--- a/src/assets/css/components/views/charts2/networkOverviewLine.scss
+++ b/src/assets/css/components/views/charts2/networkOverviewLine.scss
@@ -46,6 +46,9 @@
           }
         }
       }
+      .link-traffic-select.line-select-metric {
+        margin-right: 20px;
+      }
       .line-select-metric,.line-select-reference-line {
         display: flex;
         align-items: center;
@@ -126,7 +129,7 @@
               flex: 1;
               padding-left: 19px;
             }
-            .total,.inbound,.outbound,.internal,.through,.other {
+            .total,.inbound,.outbound,.internal,.through,.other,.ingress,.egress {
               width: 14px;
               height: 14px;
               border-radius: 50%;
@@ -137,10 +140,10 @@
             .total {
               background: #00A7AB;
             }
-            .inbound {
+            .inbound,.ingress {
               background: #7FA054;
             }
-            .outbound {
+            .outbound,.egress {
               background: #35ADDA;
             }
             .internal {
diff --git a/src/views/charts2/chart-tools.js b/src/views/charts2/chart-tools.js
index 736c1736..fcdc9cfb 100644
--- a/src/views/charts2/chart-tools.js
+++ b/src/views/charts2/chart-tools.js
@@ -23,10 +23,10 @@ export const typeMapping = {
   linkMonitor: {
     linkBlock: 707,
     linkTrafficSankey: 708,
-    linkTrafficLine: 710
+    linkTrafficLine: 105
   },
   dnsInsight: {
-    dnsTrafficLine: 704,
+    dnsTrafficLine: 106,
     dnsEventChart: 711,
     dnsRecentEvents: 605,
     dnsActiveMaliciousDomain: 604
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
index e97a6237..ce894695 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
@@ -172,7 +172,11 @@ export default {
     timeFilter: {
       deep: true,
       handler (n) {
-        this.init(this.lineMetric, this.showMarkLine, 'active')
+        if (this.lineTab) {
+          this.init(this.lineMetric, this.showMarkLine, 'active')
+        } else {
+          this.init()
+        }
       }
     }
   },
@@ -466,33 +470,45 @@ export default {
       const dataIntegrationArray = []
       if (stackedLineChartOption.series[0]) {
         const totalData = stackedLineChartOption.series[0].data.find(t => t[0] === time) // [time, value]
-        dataIntegrationArray.push(totalData)
-        totalData[2] = 0
+        if (totalData) {
+          dataIntegrationArray.push(totalData)
+          totalData[2] = 0
+        }
       }
       if (stackedLineChartOption.series[1]) {
         const inboundData = stackedLineChartOption.series[1].data.find(t => t[0] === time)
-        dataIntegrationArray.push(inboundData)
-        inboundData[2] = 1
+        if (inboundData) {
+          dataIntegrationArray.push(inboundData)
+          inboundData[2] = 1
+        }
       }
       if (stackedLineChartOption.series[2]) {
         const outboundData = stackedLineChartOption.series[2].data.find(t => t[0] === time)
-        dataIntegrationArray.push(outboundData)
-        outboundData[2] = 2
+        if (outboundData) {
+          dataIntegrationArray.push(outboundData)
+          outboundData[2] = 2
+        }
       }
       if (stackedLineChartOption.series[3]) {
         const internalData = stackedLineChartOption.series[3].data.find(t => t[0] === time)
-        dataIntegrationArray.push(internalData)
-        internalData[2] = 3
+        if (internalData) {
+          dataIntegrationArray.push(internalData)
+          internalData[2] = 3
+        }
       }
       if (stackedLineChartOption.series[4]) {
         const throughData = stackedLineChartOption.series[4].data.find(t => t[0] === time)
-        dataIntegrationArray.push(throughData)
-        throughData[2] = 4
+        if (throughData) {
+          dataIntegrationArray.push(throughData)
+          throughData[2] = 4
+        }
       }
       if (stackedLineChartOption.series[5]) {
         const otherData = stackedLineChartOption.series[5].data.find(t => t[0] === time)
-        dataIntegrationArray.push(otherData)
-        otherData[2] = 5
+        if (otherData) {
+          dataIntegrationArray.push(otherData)
+          otherData[2] = 5
+        }
       }
       dataIntegrationArray.sort((a, b) => { return a[1] - b[1] })
       const sortIndex = dataIntegrationArray.findIndex(a => a[2] === index)