From 9065f6d8e3a0e19324f5baa38278b56e4b15037c Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 13 Oct 2022 14:21:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20dns=20events=20recent=20events=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9A=82=E6=97=B6=E4=BD=BF=E7=94=A8=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts/dnsInsight/DnsRecentEvents.vue     | 88 +++++++++----------
 .../charts/linkMonitor/LinkTrafficSankey.vue  |  1 -
 .../LinkTrafficDrillDownLine.vue              |  2 -
 3 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/src/views/charts2/charts/dnsInsight/DnsRecentEvents.vue b/src/views/charts2/charts/dnsInsight/DnsRecentEvents.vue
index 0f89a1ac..6d78a5dd 100644
--- a/src/views/charts2/charts/dnsInsight/DnsRecentEvents.vue
+++ b/src/views/charts2/charts/dnsInsight/DnsRecentEvents.vue
@@ -2,46 +2,46 @@
   <div class="dns-recent-event npm-app-event">
     <div class="dns-recent-event-header">
       <div class="dns-recent-event-title">{{ $t('network.recentEvents') }}</div>
-<!--      <div class="dns-recent-event-select">-->
-<!--        <div class="metric-select">-->
-<!--          <el-select v-model="tableType"-->
-<!--                     class="option__select select-column"-->
-<!--                     popper-class="option-popper common-select"-->
-<!--                     :popper-append-to-body="false"-->
-<!--                     key="tabMetric"-->
-<!--                     :placeholder="$t('overall.select')"-->
-<!--                     @change="changeMetric"-->
-<!--                     size="mini"-->
-<!--                     width="100">-->
-<!--            <el-option-->
-<!--                v-for="item in options"-->
-<!--                :key="item.label"-->
-<!--                :label="item.label"-->
-<!--                :value="item.value"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--          <span>{{$t('overall.type')}}：</span>-->
-<!--        </div>-->
-<!--        <div class="metric-select">-->
-<!--          <el-select v-model="tableSeverity"-->
-<!--                     class="option__select select-column"-->
-<!--                     popper-class="option-popper common-select"-->
-<!--                     :popper-append-to-body="false"-->
-<!--                     key="tabMetric"-->
-<!--                     :placeholder="$t('overall.select')"-->
-<!--                     @change="changeMetric"-->
-<!--                     size="mini"-->
-<!--                     width="100">-->
-<!--            <el-option-->
-<!--                v-for="item in severityOption"-->
-<!--                :key="item.label"-->
-<!--                :label="item.label"-->
-<!--                :value="item.value"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--          <span>{{$t('network.severity')}}：</span>-->
-<!--        </div>-->
-<!--      </div>-->
+      <div class="dns-recent-event-select">
+        <div class="metric-select">
+          <el-select v-model="tableType"
+                     class="option__select select-column"
+                     popper-class="option-popper common-select"
+                     :popper-append-to-body="false"
+                     key="tabMetric"
+                     :placeholder="$t('overall.select')"
+                     @change="changeMetric"
+                     size="mini"
+                     width="100">
+            <el-option
+                v-for="item in options"
+                :key="item.label"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+          <span>{{$t('overall.type')}}：</span>
+        </div>
+        <div class="metric-select">
+          <el-select v-model="tableSeverity"
+                     class="option__select select-column"
+                     popper-class="option-popper common-select"
+                     :popper-append-to-body="false"
+                     key="tabMetric"
+                     :placeholder="$t('overall.select')"
+                     @change="changeMetric"
+                     size="mini"
+                     width="100">
+            <el-option
+                v-for="item in severityOption"
+                :key="item.label"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+          <span>{{$t('network.severity')}}：</span>
+        </div>
+      </div>
     </div>
     <el-table
         :id="`tabTable_${index}`"
@@ -69,7 +69,7 @@
                 </span>
               </template>
               <template v-else-if="item.prop === 'event'">
-                <span class="data-eventType" >{{scope.row[item.prop]}}</span>
+                <span class="data-eventType">{{scope.row[item.prop]}}</span>
               </template>
               <template v-else-if="item.prop === 'severity'">
                 <template v-if="scope.row[item.prop]==='critical'">
@@ -131,12 +131,12 @@ export default {
     return {
       options: [
         {
-          label: this.$t('overall.securityEvents'),
-          value: 'Security events'
+          label: this.$t('dnsInsight.securityEvent'),
+          value: 'securityEvent'
         },
         {
           label: this.$t('dnsInsight.PerEvent'),
-          value: 'Performance Event'
+          value: 'performanceEvent'
         }
       ],
       severityOption: [
diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue
index a6c82068..d2e4f579 100644
--- a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue
+++ b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue
@@ -48,7 +48,6 @@ export default {
   setup () {
     const { query } = useRoute()
     const tab = ref(query.tabIndex || 0)
-    // const d = `egress_link_direction='${256}' AND ingress_link_direction='${256}' `
     const queryCondition = ref(query.queryCondition || '')
     return {
       tab,
diff --git a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue
index 77c37149..29a7fa57 100644
--- a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue
+++ b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue
@@ -73,7 +73,6 @@ export default {
     const { query } = useRoute()
     const lineMetric = ref(query.lineMetric || 'Bits/s')
     const lineTab = ref(query.lineTab || '')
-    // const d = `common_egress_link_id='${246}' AND common_ingress_link_id='${246}'`
     const queryCondition = ref(query.queryCondition || '')
     return {
       lineMetric,
@@ -152,7 +151,6 @@ export default {
         startTime: getSecond(this.timeFilter.startTime),
         endTime: getSecond(this.timeFilter.endTime)
       }
-      // const condition = this.$store.getters.getQueryCondition
       if (this.queryCondition) {
         params.q = this.queryCondition
       }