From 23754651f798045b21cc32c40e4638c8dd77e915 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 11 May 2020 17:17:24 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20overview-top=E5=8F=96=E6=B6=88=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=EF=BC=8C=E6=9F=B1=E4=BD=93=E9=99=90=E5=88=B6=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E5=AE=BD=E5=BA=A630?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/language/en.js      |  6 +++---
 .../src/components/page/dashboard.vue         | 20 -------------------
 .../page/dashboard/overview/overview2.vue     | 18 +++++++++--------
 3 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 nezha-fronted/src/components/page/dashboard.vue

diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 0bf6ee5a9..2b0a2c2c3 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -276,9 +276,9 @@ const en = {
         alertRule:'Alert rule',
         ruleNum:'Rule num',
         alertNum:'Alert num',
-        alertRuleTopN: 'Top alert message',
-        assetTopN: 'Top alert message by Asset',
-        moduleTopN: 'Top alert message by Module',
+        alertRuleTopN: 'Top10 alert message',
+        assetTopN: 'Top10 alert message by Asset',
+        moduleTopN: 'Top10 alert message by Module',
         top:'Top',
         chart:{
           chartTitle:'Alert Trend'
diff --git a/nezha-fronted/src/components/page/dashboard.vue b/nezha-fronted/src/components/page/dashboard.vue
deleted file mode 100644
index 1510632db..000000000
--- a/nezha-fronted/src/components/page/dashboard.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-    <div>
-        <div>
-            <iframe src="http://192.168.40.247:3000/" class="dashboard"></iframe>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-  name: "dashboard"
-}
-</script>
-
-<style scoped>
-.dashboard{
-    height: calc(90vh);
-    width: calc(100%);
-}
-</style>
\ No newline at end of file
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index 9f5ba6b94..45fa25fc1 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -136,12 +136,12 @@
             <div class="content-col-box">
               <div class="content-col-title">
                 <span>{{$t("dashboard.overview.alert.alertRuleTopN")}}</span>
-                <el-dropdown trigger="hover" :show-timeout="0" size="small">
-                  <span>Top&nbsp;{{topFilter.rule}}<i class="el-icon-arrow-down el-icon--right"></i></span>
+                <!--<el-dropdown trigger="hover" :show-timeout="0" size="small">
+                  <span>Top&nbsp;{{topFilter.rule}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i></span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item v-for="(item,index) in topFilter.optionals" :key="index" @click.native="topNChange('rule', item)">{{item}}</el-dropdown-item>
                   </el-dropdown-menu>
-                </el-dropdown>
+                </el-dropdown>-->
               </div>
               <div class="content-col-content">
                 <chart-box axis-tooltip="y" chart-type="bar" ref="ruleMessage" :tooltip-formatter="simpleFormatter" :show-toolbox="false" name="ruleMessage" @is-loading="(isLoading)=>{this.ruleMessageLoading = isLoading}"></chart-box>
@@ -164,18 +164,18 @@
                     </transition>
                   </span>
                 </span>
-                <el-dropdown trigger="hover" v-if="alertMessageShow == 'asset'" :show-timeout="0" size="small">
-                  <span>Top&nbsp;{{topFilter.asset}}<i class="el-icon-arrow-down el-icon--right"></i></span>
+                <!--<el-dropdown trigger="hover" v-if="alertMessageShow == 'asset'" :show-timeout="0" size="small">
+                  <span>Top&nbsp;{{topFilter.asset}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i></span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item v-for="(item,index) in topFilter.optionals" :key="index" @click.native="topNChange('asset', item)">{{item}}</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
                 <el-dropdown trigger="hover" v-if="alertMessageShow == 'module'" :show-timeout="0" size="small">
-                  <span>Top&nbsp;{{topFilter.module}}<i class="el-icon-arrow-down el-icon--right"></i></span>
+                  <span>Top&nbsp;{{topFilter.module}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i></span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item v-for="(item,index) in topFilter.optionals" :key="index" @click.native="topNChange('module', item)">{{item}}</el-dropdown-item>
                   </el-dropdown-menu>
-                </el-dropdown>
+                </el-dropdown>-->
               </div>
               <div class="content-col-content">
                 <chart-box axis-tooltip="y" v-show="alertMessageShow == 'asset'" :tooltip-formatter="simpleFormatter" chart-type="bar" ref="assetMessage" name="assetMessage" :show-toolbox="false" @is-loading="(isLoading)=>{this.assetMessageLoading = isLoading}"></chart-box>
@@ -793,6 +793,7 @@
               name: 'alertStatByRule',
               data: seriesData,
               type: 'bar',
+              barMaxWidth: 30,
               category: categoryData, //自定义，用来判断N/A是否显示
             };
             this.$refs.ruleMessage.modifyOption('yAxis', 'data', categoryData);
@@ -817,6 +818,7 @@
               name: 'alertStatByAsset',
               data: seriesData,
               type: 'bar',
+              barMaxWidth: 30,
               category: categoryData
             };
             this.$refs.assetMessage.modifyOption('yAxis', 'data', categoryData);
@@ -841,6 +843,7 @@
               name: 'alertStatByModule',
               data: seriesData,
               type: 'bar',
+              barMaxWidth: 30,
               category: categoryData
             };
             this.$refs.moduleMessage.modifyOption('yAxis', 'data', categoryData);
@@ -852,7 +855,6 @@
       getDcTrafficData() {
         this.$get('idc/trafficSetting', {pageSize: -1}).then(response => {
           if (response.code === 200) {
-            console.info(response.data.list)
             this.trafficData = this.convertTrafficData(response.data.list);
 
             //console.info(this.trafficData)