From 65a030af79f7be0efa5ad5a95391091714b5963f Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 22 Mar 2023 18:23:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9comparison?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartStat.vue      |  6 +++---
 .../common/bottomBox/tabs/dashboardTab.vue        |  2 --
 .../common/popBox/topToolMoreOptions.vue          | 15 ---------------
 .../src/components/page/dashboard/dashboard.vue   |  3 ---
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue
index 654f8f11c..9b8cff6ba 100644
--- a/nezha-fronted/src/components/chart/chart/chartStat.vue
+++ b/nezha-fronted/src/components/chart/chart/chartStat.vue
@@ -11,7 +11,7 @@
         background:item.mapping ? item.mapping.color.bac : (statData.length===1 ? '' : colorList[index]),
         height:item.height+'px',
         width:item.width + 'px',
-        fontSize: item.fontSize,
+        fontSize: item.fontSize + 'px',
       }"
     >
       <div style="maxWidth:100%;z-index: 10;">
@@ -54,7 +54,7 @@
 
         <!-- comparison -->
         <template v-if="comparisonShow(item)">
-          <div :class="{'comparison-text-center':chartInfo.param.text==='none'}" class="comparison-text" :style="{fontSize: parseInt(item.fontSize)/3>12?parseInt(item.fontSize)/3+'px':'12px'}">
+          <div :class="{'comparison-text-center':chartInfo.param.text==='none'}" class="comparison-text" :style="{fontSize:item.fontSize>=36?'16px':'12px'}">
             <span v-if="chartInfo.param.comparison==='hour'">{{$t('dashboard.hourComparison')}}</span>
             <span v-if="chartInfo.param.comparison==='day'">{{$t('dashboard.dayComparison')}}</span>
             <span v-if="chartInfo.param.comparison==='week'">{{$t('dashboard.weekComparison')}}</span>
@@ -356,7 +356,7 @@ export default {
         }
         item.scale = scale < 1 ? 1 : parseFloat(scale)
         fontSize = fontSize > 12 ? fontSize : this.minFontSzie
-        item.fontSize = fontSize + 'px'
+        item.fontSize = fontSize
       })
       this.isInit = false
     },
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
index f95e4dddb..27b0f32ce 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
@@ -33,7 +33,6 @@
             @afterImport="getTableData"
             :link="obj"
             :showLock="from === fromRoute.asset"
-            :exportBoxShow="true"
             @export="exportType"
             @panelLockChange="panelLockChange"
           >
@@ -70,7 +69,6 @@
             export-url="/visual/dashboard/export"
             import-url="/visual/dashboard/import"
             @afterImport="getTableData"
-            :exportBoxShow="true"
             @export="exportType"
             @panelLockChange="panelLockChange"
           >
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index 53eaf9736..cb8b86b9a 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -273,9 +273,6 @@ export default {
       default: ''
     },
     deleteObjs: Array,
-    exportBoxShow: {
-      type: Boolean, default: false
-    },
     type: String
   },
   computed: {
@@ -721,18 +718,6 @@ export default {
         this.importBox.title = this.$t('overall.importExcel')
       } else if (type == 2) { // export
         this.importBox.title = this.$t('overall.exportExcel')
-        // if (this.exportBoxShow) {
-        //   this.formatArr = [
-        //     { name: 'XLSX', value: 1 },
-        //     { name: 'CSV', value: 2 },
-        //     { name: 'JSON', value: 3 },
-        //     { name: 'PDF', value: 4 },
-        //     { name: 'Html', value: 5 }]
-        // } else {
-        //   this.formatArr = [{ name: 'XLSX', value: 1 },
-        //     { name: 'CSV', value: 2 },
-        //     { name: 'JSON', value: 3 }]
-        // }
       }
     },
     getTimeString () {
diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue
index e9ad0b536..54eb52cfc 100644
--- a/nezha-fronted/src/components/page/dashboard/dashboard.vue
+++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue
@@ -70,7 +70,6 @@
                 export-file-name="chart"
                 export-url="/visual/dashboard/export"
                 import-url="/visual/dashboard/import"
-                :exportBoxShow="true"
                 @export="exportType"
                 @afterImport="afterImport"
               >
@@ -325,8 +324,6 @@ export default {
       batchDeleteObjs: [],
       nowTimeType: {},
       showTopLine: false,
-      // 导出html 以及 pdf的弹窗
-      exportBoxShow: false,
       // 查看模式
       mode: '',
       variables: [],