From 8d37d6807dca2d0690e8f81feeb91958e6f59a29 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 24 Aug 2020 17:08:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dasset=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=98=E6=9B=B4=E5=90=8E=EF=BC=8C=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-list.vue | 4 ++--
 nezha-fronted/src/components/common/leftMenu.vue   | 3 +++
 nezha-fronted/src/components/page/asset/asset.vue  | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index e2398f2b0..61d70c462 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -1295,7 +1295,7 @@
             if(response.code == 200){
               response.data && function() {
                 response.data.Basic && detail.push({
-                  title: vm.$t('asset.basicTitle'),
+                  title: vm.$t('project.chart.basicTitle'),
                   type: 'basic',
                   data: response.data.Basic
                 });
@@ -1310,7 +1310,7 @@
           });
         }else {
           detail.push({
-            title: vm.$t('asset.basicTitle'),
+            title: vm.$t('project.chart.basicTitle'),
             type: 'basic',
             data: {
               sn: 'assetInfo Test',
diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue
index e3c9aa75b..823826660 100644
--- a/nezha-fronted/src/components/common/leftMenu.vue
+++ b/nezha-fronted/src/components/common/leftMenu.vue
@@ -379,6 +379,9 @@
           bus.$on("module-list-change", menu => {
             this.getModuleList();
           });
+          bus.$on('asset-list-change',()=>{
+            this.getLeftMenuList();
+          })
         },
         // 获取asset左侧菜单数据
         getLeftMenuList(){
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 6bb5de8e2..82e3b1f77 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -454,6 +454,7 @@
             if (response.code === 200) {
               this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")});
               this.getTableData();
+              bus.$emit('asset-list-change')
             } else {
               this.$message.error(response.msg);
             }
@@ -485,6 +486,7 @@
         this.rightBox.show = false;
         if (refresh) {
           this.getTableData();
+          bus.$emit('asset-list-change')
         }
       },
       pageNo(val) {

From 7a9e43ca39b2dcb9fe041451c193a12d9124a929 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 24 Aug 2020 17:22:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Doverview=E7=9A=84?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=8A=9F=E8=83=BD=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/dashboard/overview/overview2.scss     | 3 ---
 .../src/components/page/dashboard/overview/overview2.vue      | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
index add8eee11..3693b31f3 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
@@ -1,9 +1,6 @@
 .overview{
   height: 100%;
 }
-.overview-right {
-  background-color: $content-right-background-color;
-}
 .overview-content-header{
   display: flex;
   padding-top: 6px;
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index 9c22eec31..310e27207 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="overview">
+  <div class="overview" style="background-color: #f9f9f9;">
     <!--标题-->
     <div class="overview-content-header">
       <div class="header-title" :class="{'hide-div':!isFullScreen}">{{systemName&&systemName != 'undefined'&&systemName != null?systemName: $t('dashboard.overview.contentTitle')}}</div>
@@ -1073,7 +1073,7 @@
         return document.isFullScreen || document.mozIsFullScreen || document.webkitIsFullScreen;
       },
       fullScreen:function(){
-        let container = document.querySelector(".overview-content");
+        let container = document.querySelector(".overview");
         let fullScreenFunc=container.requestFullscreen||container.mozRequestFullScreen||container.webkitRequestFullscreen||container.msRequestFullscreen;
         fullScreenFunc.call(container);
         this.isFullScreen = true;