From cbe6fdc60aa771a661591ae45489ee931c1f2dd2 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 9 Dec 2021 16:59:46 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E6=8A=BD=E5=8F=96=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=82=E6=95=B0=E8=87=B3vuex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartLog.vue   |  1 -
 .../src/components/chart/chartMixin.js        |  8 +++++++
 .../src/components/page/dashboard/panel.vue   | 13 +++++++++++
 nezha-fronted/src/store/panel.js              | 22 +++++++++++++++++--
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartLog.vue b/nezha-fronted/src/components/chart/chart/chartLog.vue
index 5b5773df9..aec8515ec 100644
--- a/nezha-fronted/src/components/chart/chart/chartLog.vue
+++ b/nezha-fronted/src/components/chart/chart/chartLog.vue
@@ -39,7 +39,6 @@
         ref="logTable"
         class="nz-table2"
         size="mini"
-        width="100%"
         v-if="tableData.length"
       >
         <el-table-column
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index aed184fa2..b3d20bf27 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -21,6 +21,14 @@ export default {
     chartOption: Object,
     isFullscreen: Boolean
   },
+  computed: {
+    filterTime () {
+      return this.$store.getters.getTimeRange
+    },
+    nowTimeType () {
+      return this.$store.getters.getNowTimeType
+    }
+  },
   methods: {
     handleTimeSeries (chartInfo, seriesTemplate, originalDatas) {
       const series = []
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 66f86e5cb..1928ff551 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -524,6 +524,10 @@ export default {
       this.filter.id = this.$refs.pickTime.$refs.timePicker.showTime.id
       this.getTableData()
       this.getData(this.filter)
+      this.$store.dispatch('dispatchPanelTime',{
+        time: this.searchTime,
+        nowTimeType: this.nowTimeType
+      })
     },
     setSearchTime (type, val, nowTimeType) { // 设置searchTime
       if (type === 'minute') {
@@ -763,6 +767,15 @@ export default {
   },
   created () {
     this.getTableData()
+    this.$store.dispatch('dispatchPanelTime',{
+      time: this.searchTime,
+      nowTimeType: {
+        id: 4,
+        text: this.$t('dashboard.panel.lastOneHour'),
+        type: 'hour',
+        value: 1
+      }
+    })
   },
   mounted () {
     this.scrollbarWrap = this.$refs.dashboardScrollbar
diff --git a/nezha-fronted/src/store/panel.js b/nezha-fronted/src/store/panel.js
index 021f6cb00..94c9abadc 100644
--- a/nezha-fronted/src/store/panel.js
+++ b/nezha-fronted/src/store/panel.js
@@ -4,7 +4,9 @@ const panel = {
     chart: '',
     delChart: false,
     groupId: '',
-    type: ''
+    type: '',
+    timeRange: [],
+    nowTimeType: {}
   },
   mutations: {
     setShowRightBox (state, flag) {
@@ -22,6 +24,12 @@ const panel = {
     setGroupId (state, id) {
       state.groupId = id
     },
+    setPanelTime (state, time) {
+      state.timeRange = time
+    },
+    setPanelNowTimeType (state, nowTimeType) {
+      state.nowTimeType = nowTimeType
+    },
     cleanPanel (state) {
       state.showRightBox = false
       state.chart = ''
@@ -43,12 +51,18 @@ const panel = {
     getGroupId (state) {
       return state.groupId
     },
+    getTimeRange (state) {
+      return state.timeRange
+    },
+    getNowTimeType (state) {
+      return state.nowTimeType
+    },
     getDelChart (state) {
       return state.delChart
     }
   },
   actions: {
-    dispatchShowRightBox (store,flag) {
+    dispatchShowRightBox (store, flag) {
       store.commit('setShowRightBox', flag)
     },
     dispatchChart (store, chart) {
@@ -59,6 +73,10 @@ const panel = {
       store.commit('setChart', playload.chart)
       store.commit('setType', playload.type)
     },
+    dispatchPanelTime (store, playload) {
+      store.commit('setPanelTime', playload.time)
+      store.commit('setPanelNowTimeType', playload.nowTimeType)
+    },
     dispatchEditChart (store, playload) {
       store.commit('setShowRightBox', true)
       store.commit('setChart', playload.chart)