From dac6ce8cea3c2bebd75e65a78fd913953e641259 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Thu, 7 Sep 2023 17:57:30 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3170=20fix=EF=BC=9Aparams=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?json=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertMessageInfo.vue          | 4 ++++
 nezha-fronted/src/components/common/rightBox/alertRuleBox.vue | 4 +++-
 nezha-fronted/src/components/page/alert/alertMessage.vue      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfo.vue b/nezha-fronted/src/components/common/alert/alertMessageInfo.vue
index 8070dbca1..59b4b533f 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfo.vue
@@ -26,6 +26,7 @@
         <div class="info-box-left-top">
           <chart
             ref="chart"
+            :globalVariables="globalVariables"
             v-if="chartInfo.alertRule && chartInfo.alertRule.type !== 3"
             :chart-data="chartData"
             :chart-info="chartInfo"
@@ -67,8 +68,10 @@ import logsData from '@/components/chart/logsData'
 import lodash from 'lodash'
 import alertMessageInfoTab from '@/components/common/alert/alertMessageInfoTab'
 import alertMessageInfoTimeLine from '@/components/common/alert/alertMessageInfoTimeLine'
+import globalVariablesMixin from '@/components/common/mixin/globalVariables'
 export default {
   name: 'alertMessageInfo',
+  mixins: [globalVariablesMixin],
   components: {
     alertMessageInfoTab,
     chart,
@@ -126,6 +129,7 @@ export default {
       const step = bus.getStep(startTime, endTime)
       startTime = this.$stringTimeParseToUnix(startTime)
       endTime = this.$stringTimeParseToUnix(endTime)
+      this.setGlobalVariablesValue([filter.start_time, filter.end_time])
       const elements = this.chartInfo.elements || []
       if (multipleTime.length) {
         const minusTime = (new Date(bus.formateTimeToTime(filter.start_time)).getTime() - new Date(bus.formateTimeToTime(multipleTime[0])).getTime())
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index 71d6e6ab7..a69b1eed8 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -710,7 +710,7 @@ export default {
         method: this.editAlertRule.method.join(','),
         type: this.editAlertRule.type,
         condition,
-        param
+        param: JSON.stringify(param)
       }
       if (this.editAlertRule.trbShot && this.editAlertRule.trbShot == '<div  class="editor-core ql-container ql-snow"><div class="ql-editor"><p><br></p></div></div>') {
         this.editAlertRule.trbShot = ''
@@ -958,6 +958,8 @@ export default {
           obj.param = {
             dataLink: []
           }
+        } else {
+          obj.param = JSON.parse(obj.param)
         }
         this.editAlertRule = this.$lodash.cloneDeep(obj)
         this.showPanel.id = this.editAlertRule.dashboardId
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index be5293b53..f220e1bfb 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -647,7 +647,7 @@ export default {
 
       // 设置dataLink
       if (this.currentMsg.alertRule.param) {
-        chartInfo.param.dataLink = this.currentMsg.alertRule.param.dataLink
+        chartInfo.param.dataLink = JSON.parse(this.currentMsg.alertRule.param).dataLink
       }
 
       chartInfo.id = this.currentMsg.id