From 7e23b260ee7251f9fe4d653f33481f479847eaeb Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 15 Jul 2022 16:43:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=A5=E5=91=8A=20box=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 5f188ad3810f64c0a99a240504288b812b0205fd)
---
 src/components/rightBox/report/ReportBox.vue | 21 ++++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue
index f933ee80..fe366ef5 100644
--- a/src/components/rightBox/report/ReportBox.vue
+++ b/src/components/rightBox/report/ReportBox.vue
@@ -246,7 +246,7 @@
                        size="small"
             >
               <template #prefix>
-                  {{param.key}}
+                  {{$t(param.i18n)}}
               </template>
               <template v-for="paramOption in paramsOptions">
                 <template v-if="paramOption.key === param.key">
@@ -407,9 +407,10 @@ export default {
       handler (n) {
         const category = this.categoryList.find(c => c.id === n)
         if (category && category.config && category.config.queryParam) {
-          this.editObject.categoryParams = Object.keys(category.config.queryParam).map(key => {
-            return { key: key, value: category.config.queryParam[key] }
-          })
+          this.editObject.categoryParams = category.config.queryParam
+          if (!this.editObject.id) {
+            this.editObject.categoryParams.forEach(t => {t.value = ''})
+          }
           this.loadParamOptions()
         } else {
           this.editObject.categoryParams = []
@@ -444,10 +445,8 @@ export default {
           this.editObject.schedulerEnd = dateFormat(this.editObject.schedulerEnd, this.dateFormat)
         }
         if (n.id) {
-          if (n.config.queryParam && Object.keys(n.config.queryParam).length > 0) {
-            this.editObject.categoryParams = Object.keys(n.config.queryParam).map(key => {
-              return { key: key, value: n.config.queryParam[key] }
-            })
+          if (n.config.queryParam && n.config.queryParam.length > 0) {
+            this.editObject.categoryParams = n.config.queryParam
           }
         } else if (this.currentCategoryId) {
           this.editObject.categoryId = this.currentCategoryId
@@ -550,11 +549,7 @@ export default {
             copyObject.schedulerEnd = schedulerEnd
           }
           if (this.editObject.categoryParams.length > 0) {
-            const queryParam = {}
-            this.editObject.categoryParams.forEach(p => {
-              queryParam[p.key] = p.value
-            })
-            copyObject.config.queryParam = queryParam
+            copyObject.config.queryParam = this.editObject.categoryParams
           }
 
           // 校验scheduleConfig