From 7c595fc9fe18599a11a375c47469a905c28e9657 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 24 Nov 2021 09:41:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97panel=20=E4=BB=A5=E5=8F=8A=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/tabs/chartTempPreview.vue   | 6 ++++--
 .../src/components/common/bottomBox/tabs/panelTabNew.vue    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue b/nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
index f5fc59a30..6e6c5c070 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
@@ -14,7 +14,7 @@
           <div class="table-list" id="tableList">
             <div ref="dashboardScrollbar" id="dashboardScrollbar" style="height: 100%; overflow: auto;">
               <div class="box-content">
-                <chart-list :additional-info="obj" :detail="detail" :draggable="draggable" :from="from" :is-model="from == $CONSTANTS.fromRoute.model" @on-edit-chart="editChart"
+                <chart-list :nowTimeType='nowTimeType' :additional-info="obj" :detail="detail" :draggable="draggable" :from="from" :is-model="from == $CONSTANTS.fromRoute.model" @on-edit-chart="editChart"
                             @on-refresh-time="refreshTime" @on-remove-chart="delChart" ref="chartList" :panel-lock="panelLock"></chart-list>
               </div>
             </div>
@@ -109,7 +109,8 @@ export default {
       // removeModal: false, // 删除弹出
       // deleteObj: {}, // 删除对象
       // ---图表相关参数--end
-      scrollbarWrap: null
+      scrollbarWrap: null,
+      nowTimeType: {}
     }
   },
   components: {
@@ -192,6 +193,7 @@ export default {
     dateChange (val) {
       // this.searchTime = [...val];
       const nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
+      this.nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
       this.setSearchTime(nowTimeType.type, nowTimeType.value)
       this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss')
       this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss')
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 6bcd83060..0b35ad694 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -100,7 +100,7 @@
           <div class="table-list" id="tableList">
             <div ref="dashboardScrollbar" id="dashboardScrollbar" style="height: 100%; overflow: auto;">
               <div class="box-content">
-                <chart-list :draggable="draggable" :from="from" :is-model="from === fromRoute.model" :obj="obj" @on-edit-chart="editChart"
+                <chart-list :nowTimeType='nowTimeType' :draggable="draggable" :from="from" :is-model="from === fromRoute.model" :obj="obj" @on-edit-chart="editChart"
                             @on-refresh-time="refreshTime" @on-remove-chart="delChart" ref="chartList" :panel-lock="panelLock" :panel-data-list="panelDataList"
                             @on-add-group-item-chart="addGroupItem"></chart-list>
               </div>
@@ -220,7 +220,8 @@ export default {
       // ---图表相关参数--end
       scrollbarWrap: null,
       panelDataList: [],
-      batchDeleteObjs: []
+      batchDeleteObjs: [],
+      nowTimeType: {}
     }
   },
   components: {
@@ -354,6 +355,7 @@ export default {
       // this.searchTime = [...val];
       if (this.$refs.pickTime) {
         const nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
+        this.nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
         this.setSearchTime(nowTimeType.type, nowTimeType.value)
         this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss')
         this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss')