From 0646bed43fcea308a1c7ad66e37481ff1967ab2a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 16 Oct 2020 16:44:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=BD=93?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=98=AF=E6=97=B6=E9=97=B4=E6=97=B6=20?=
 =?UTF-8?q?=E5=8E=BB=E5=90=83=E6=9C=80=E5=A4=A7=E5=88=BB=E5=BA=A6=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B9=20=E4=BF=AE=E6=94=B9systen=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/line-chart-block.vue      | 4 +++-
 .../src/components/common/project/popData/lineChart.vue       | 3 +++
 nezha-fronted/src/components/page/config/system.vue           | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 6b025013e..f3e693b09 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -759,7 +759,9 @@
           useUTC: false,//使用本地时间
           series: dataArg
         };
-
+        if(unit.type=='Time'){
+          delete option.yAxis.maxInterval;
+        }
         // params.series = dataArg;
         if (chartSite === 'local') { // 本地显示
           if(legend){
diff --git a/nezha-fronted/src/components/common/project/popData/lineChart.vue b/nezha-fronted/src/components/common/project/popData/lineChart.vue
index b7c29ddf9..4e2723a52 100644
--- a/nezha-fronted/src/components/common/project/popData/lineChart.vue
+++ b/nezha-fronted/src/components/common/project/popData/lineChart.vue
@@ -756,6 +756,9 @@
           useUTC: false,//使用本地时间
           series: dataArg
         };
+        if(unit.type=='Time'){
+          delete option.yAxis.maxInterval;
+        }
         // params.series = dataArg;
         if (chartSite === 'local') { // 本地显示
           if(legend){
diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue
index c0bdd3673..3ba16e7f0 100644
--- a/nezha-fronted/src/components/page/config/system.vue
+++ b/nezha-fronted/src/components/page/config/system.vue
@@ -55,10 +55,10 @@
               <el-input v-model.number="email.email_smtp_port" :disabled="email.email_enable == 'off'"></el-input>
             </el-form-item>
             <el-form-item :label="$t('config.system.email.smtpAccount')" prop="email_smtp_account">
-              <el-input v-model="email.email_smtp_account" :disabled="email.email_enable == 'off'"></el-input>
+              <el-input  v-model="email.email_smtp_account" :disabled="email.email_enable == 'off'"> autocomplete="off"</el-input>
             </el-form-item>
             <el-form-item :label="$t('config.system.email.smtpPwd')" prop="email_smtp_password">
-              <el-input v-model="email.email_smtp_password" type="password" :show-password="false" :disabled="email.email_enable == 'off'"></el-input>
+              <el-input v-model="email.email_smtp_password" type="password" :show-password="false" :disabled="email.email_enable == 'off'"  autocomplete="off"></el-input>
               <div><span>{{$t('config.system.email.pwdTip')}}</span></div>
             </el-form-item>
             <el-form-item :label="$t('config.system.email.sendAccount')" prop="email_send_account">