From 165bb463c6fa183bc2efc444ad82d7a092541389 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 21 Dec 2020 15:09:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BB=8Eexplore=20save?=
 =?UTF-8?q?=20chart=E6=97=A0=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E9=A2=84=E8=A7=88=E6=97=A0=E6=B3=95=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=97=B6=E9=97=B4=E7=9A=84=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/chartPreview.vue        | 5 ++---
 nezha-fronted/src/components/common/pickTime.vue            | 1 +
 nezha-fronted/src/components/common/timePicker.vue          | 6 +++++-
 .../src/components/page/dashboard/explore/explore.vue       | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue
index c073f78d5..ada280624 100644
--- a/nezha-fronted/src/components/charts/chartPreview.vue
+++ b/nezha-fronted/src/components/charts/chartPreview.vue
@@ -59,7 +59,8 @@
         <span class="nz-dialog-title chart-title-text">{{chart.title}}</span>
         <div class="float-right panel-calendar dialog-tool"  v-if="chart.type!=='url' && chart.type !=='alertList'">
 
-          <time-picker ref="calendarPanel" class="nz-dashboard-picker" style="margin-top: -12px;" @change="dateChange" v-if="chart.type !='text'"></time-picker>
+<!--          <time-picker ref="calendarPanel" class="nz-dashboard-picker" style="margin-top: -12px;" @change="dateChange" v-if="chart.type !='text'"></time-picker>-->
+          <pick-time :refresh-data-func="dateChange" v-model="searchTime" :use-chart-unit="false" ref="pickTime" style="height: 28px;"></pick-time>
           <!--
           <el-date-picker ref="calendar" prefix-icon=" " size="mini" class="nz-preview-picker"
                           format="yyyy/MM/dd HH:mm"
@@ -1088,7 +1089,6 @@
       },
       */
       dateChange(time) {
-        this.searchTime = [...time];
         let chartType = this.chart.type;
         if (chartType === 'table') {
           this.seriesItemScreen = [];
@@ -1121,7 +1121,6 @@
       getQueryChart(type) {
         let axiosArr = [];
         const chartItem = this.chart;
-        console.log(chartItem);
         this.$nextTick(() => {
           let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
           let endTime = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue
index e39ee95dc..bc014a8fe 100644
--- a/nezha-fronted/src/components/common/pickTime.vue
+++ b/nezha-fronted/src/components/common/pickTime.vue
@@ -156,6 +156,7 @@
 <style>
   .interval-refresh-popover{
     min-width: unset !important;
+    z-index:3000 !important;
   }
   .sub-top-tools .interval-refresh {
     margin-top: -1px;
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index 33ecaf53c..db9938559 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -2,6 +2,9 @@
   .loading-font{
     color:#232f3e !important;
   }
+  popper-z-index{
+    z-index: 3000 !important;
+  }
   .calendar{
   }
   .nz-dashboard-dropdown-bg {
@@ -86,6 +89,7 @@
         :visible-arrow="false"
         :disabled="isPopoverDisabled"
         trigger="hover"
+        popper-class="popper-z-index"
         id="panel-calender-popover">
         <template v-if="this.searchTime&&this.searchTime.length>1">
           <el-row  :gutter="10" class="calendar-popover">
@@ -107,7 +111,7 @@
           <i class="nz-icon nz-icon-arrow-down"  style="padding-left:0px !important;width:20px;"></i>
         </div>
       </el-popover>
-      <el-dropdown-menu class="nz-dashboard-dropdown" slot="dropdown">
+      <el-dropdown-menu class="nz-dashboard-dropdown popper-z-index" slot="dropdown">
         <!-- <el-dropdown-item >{{$t('dashboard.panel.customTimeRange')}}</el-dropdown-item>  -->
         <template v-for="item in timeData" >
           <el-dropdown-item :class="showTime.id==item.id?'nz-dashboard-dropdown-bg':''" :command="item" v-if="item.id != 12 || showEmpty">
diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
index f3c6a3d98..5f8f1a44f 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
@@ -200,7 +200,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
 
     </div>
     <transition name="right-box">
-      <chart-box :chart="chart" :from="$CONSTANTS.explore" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'explore'}" @close="handleBox(false)" @on-create-success="createSuccess" ref="addChartModal" v-if="rightBox.show"></chart-box>
+      <chart-box :chart="chart" :from="$CONSTANTS.fromRoute.explore" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'explore'}" @close="handleBox(false)" @on-create-success="createSuccess" ref="addChartModal" v-if="rightBox.show"></chart-box>
     </transition>
   </div>
 </template>