From c04c735ad537528d68b955e096b39a24e54478f6 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 30 Nov 2022 14:32:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=88=A0=E9=99=A4dashboard?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=9B=BE=E8=A1=A8=E3=80=81=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=A2=9E=E5=9B=BE=E8=A1=A8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/panelTabNew.vue  | 8 ++++----
 .../common/detailView/list/asset/assetDetail.vue          | 2 +-
 .../src/components/common/mixin/detailViewMixin.js        | 1 +
 nezha-fronted/src/components/page/dashboard/panel.vue     | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 8428aaa90..46fe0f3d5 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -38,12 +38,12 @@
             @panelLockChange="panelLockChange"
           >
             <template v-slot:after>
-              <el-dropdown-item v-has="'main_add'">
+              <!-- <el-dropdown-item v-has="'main_add'">
                 <div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{ $t('overall.AddByTemplate') }}</div>
               </el-dropdown-item>
               <el-dropdown-item v-has="'main_edit'">
                 <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
-              </el-dropdown-item>
+              </el-dropdown-item> -->
               <el-dropdown-item v-has="'panel_view'">
                 <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div>
               </el-dropdown-item>
@@ -75,12 +75,12 @@
             @panelLockChange="panelLockChange"
           >
             <template v-slot:after>
-              <el-dropdown-item v-has="'main_add'">
+              <!-- <el-dropdown-item v-has="'main_add'">
                 <div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{ $t('overall.AddByTemplate') }}</div>
               </el-dropdown-item>
               <el-dropdown-item v-has="'main_edit'">
                 <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
-              </el-dropdown-item>
+              </el-dropdown-item> -->
               <el-dropdown-item v-has="'panel_view'">
                 <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div>
               </el-dropdown-item>
diff --git a/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue b/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
index c61876aa3..15e6c2d5a 100644
--- a/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
@@ -20,7 +20,7 @@
       <li
         v-for="(item,index) in tableData"
         :key="index"
-       class="detail-row"
+        class="detail-row"
         :id="'globalSearch' + item.id"
         :class="item.id === detailViewRightObj.id ? 'selected' : ''"
         @click="detailViewRightShow(item)"
diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
index 5c7dc554d..8dfc7ec27 100644
--- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js
+++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
@@ -35,6 +35,7 @@ export default {
         const query = { ...this.$route.query, detailType: flag }
         if (this.detailType == 'view') {
           delete query.bottomBox
+          delete query.selectObj
         }
         this.$router.replace({ query: query }).catch(err => {})
       }, 100)
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 416f5c6cf..02cd7b241 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -46,6 +46,7 @@
                 <i class="nz-icon nz-icon-moshiqiehuan"></i>
               </button>
 
+              <!-- 新增图表 -->
               <button id="panel-add-chart" v-has="'main_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10" type="button" @click="addChartBefore">
                 <i class="nz-icon-create-square nz-icon"></i>
               </button>
@@ -74,12 +75,12 @@
                   </el-dropdown-item>
                 </template>
                 <template v-slot:after>
-                  <el-dropdown-item v-has="'main_add'">
+                  <!-- <el-dropdown-item v-has="'main_add'">
                     <div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{$t('overall.AddByTemplate')}}</div>
                   </el-dropdown-item>
                   <el-dropdown-item v-has="'panel_view'">
                     <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
-                  </el-dropdown-item>
+                  </el-dropdown-item> -->
                   <el-dropdown-item v-has="'panel_view'">
                     <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div>
                   </el-dropdown-item>