From fb9034229e9ecb1a798a9167dfc224641750f97f Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 8 Mar 2023 17:57:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=A5=E5=91=8A=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0input=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/rightBox/report/ReportBox.vue | 37 +++++++++++---------
 src/views/report/reportTest.vue              |  4 +--
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue
index ed4d11bc..6eb018ca 100644
--- a/src/components/rightBox/report/ReportBox.vue
+++ b/src/components/rightBox/report/ReportBox.vue
@@ -233,26 +233,29 @@
 <!--            <el-input v-model="param.value" placeholder=" " v-for="(param, index) in editObject.categoryParams" :key="index" size="small" style="vertical-align: unset;" :disabled="!!editObject.id">
               <template #prepend>{{param.key}}</template>
             </el-input>-->
-            <el-select v-model="param.value"
-                       v-for="(param, index) in editObject.categoryParams"
-                       :key="index"
-                       class="right-box__select right-box__select--param"
-                       placeholder=" "
-                       filterable
-                       :disabled="!!editObject.id"
-                       popper-class="right-box-select-dropdown right-box-select-report "
-                       size="small"
-            >
-              <template #prefix>
-                {{$t(param.i18n)}}
-              </template>
-              <template v-for="paramOption in paramsOptions">
-                <template v-if="paramOption.key === param.key">
+            <template v-for="(param, index) in editObject.categoryParams" :key="index">
+              <el-input v-if="param.labelType === 'input'" v-model="param.value" placeholder=" " size="small" style="vertical-align: unset;" :disabled="!!editObject.id">
+                <template #prepend>{{param.key}}</template>
+              </el-input>
+              <el-select v-model="param.value"
+                         v-else
+                         class="right-box__select right-box__select--param"
+                         placeholder=" "
+                         filterable
+                         :disabled="!!editObject.id"
+                         popper-class="right-box-select-dropdown right-box-select-report "
+                         size="small"
+              >
+                <template #prefix>
+                  {{$t(param.i18n)}}
+                </template>
+                <template v-for="paramOption in paramsOptions">
+                  <template v-if="paramOption.key === param.key">
                     <el-option :key="p" :value="p" v-for="p in paramOption.options"></el-option>
                   </template>
                 </template>
-
-            </el-select>
+              </el-select>
+            </template>
           </el-form-item>
         </el-form>
       </div>
diff --git a/src/views/report/reportTest.vue b/src/views/report/reportTest.vue
index bea02128..0f4e65c1 100644
--- a/src/views/report/reportTest.vue
+++ b/src/views/report/reportTest.vue
@@ -210,7 +210,7 @@ export default {
   methods: {
     queryGetTempData () {
       this.builtinLeftLoading = true
-      get(api.reportCategory).then(res => {
+      get(api.reportCategory, { pageSize: 999 }).then(res => {
         if (res.code === 200) {
           this.builtinReportLeftMenu = res.data.list.map(c => {
             return {
@@ -265,7 +265,7 @@ export default {
                 }
               })
               this.pageObj.total = response.data.total
-            })            
+            })
             // TODO 回到顶部
           }
         })