From a04255f7e1d352942ab0310f14ee3b5163d83ef4 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Wed, 20 May 2020 15:55:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:1.explore=E5=9B=BE=E8=A1=A8tooltip=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=202.=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E8=B0=83=E6=95=B4=203.project=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BA=A4=E4=BA=92bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/config/changePwd.vue       | 5 +++--
 .../src/components/page/dashboard/overview/chartConfig.vue   | 3 +++
 nezha-fronted/src/components/page/project/project.vue        | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/changePwd.vue b/nezha-fronted/src/components/page/config/changePwd.vue
index a5144b0e3..f18de9fd2 100644
--- a/nezha-fronted/src/components/page/config/changePwd.vue
+++ b/nezha-fronted/src/components/page/config/changePwd.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-dialog class="nz-dialog" :title="$t('overall.changePwd')" :visible.sync="visible"  @open="dialogOpened"  :modal-append-to-body='false' @closed="dialogClosed" width="600px" :show-close="false" >
-      <el-form :model="user" label-position="right" label-width="135px" :rules="rules" ref="changePwdForm" size="mini">
-        <el-form-item :label="$t('config.account.account')" prop="username">
+      <el-form :model="user" label-position="right" label-width="150px" :rules="rules" ref="changePwdForm" size="mini">
+        <el-form-item :label="$t('config.account.account')" prop="username" v-show="curUser != sysUser">
           <el-input type="text" autocomplete="false" v-model="user.username" disabled></el-input>
         </el-form-item>
         <el-form-item :label="$t('config.account.oldPwd')" prop="pwd">
@@ -63,6 +63,7 @@
             newPwd:'',
             confirmPwd:''
           },
+          sysUser:sessionStorage.getItem("nz-username"),
           rules:{
             pwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'}],
             newPwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'},{validator:validatePass,trigger: 'blur'}],
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
index 010f77ed6..cd07dde64 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
@@ -48,6 +48,9 @@
         trigger: 'axis',
         confine:false,
         extraCssText:'z-index:1000;',
+        backgroundColor:'rgba(221,228,237,1)',
+        borderColor:'rgba(221,228,237,1)',
+        textStyle:{color: "#000"}
         // formatter:null,
         // position:null,
       },
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index e28b32656..8d0481512 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -821,6 +821,7 @@
     },
     watch: {
       currentProjectChange:{
+        immediate:true,
         handler(n, o) {
           this.currentProject = Object.assign({}, n);
           this.detailProjectInfo();