From ba9e399ffaa3253a2a878144b72d28fa704d5ec7 Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Tue, 23 Jan 2024 17:10:38 +0800
Subject: [PATCH] gx

---
 src/views/grape/components/grapeFilterForm.vue | 4 ++--
 vue.config.js                                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/grape/components/grapeFilterForm.vue b/src/views/grape/components/grapeFilterForm.vue
index f733a41..3f103f2 100644
--- a/src/views/grape/components/grapeFilterForm.vue
+++ b/src/views/grape/components/grapeFilterForm.vue
@@ -2,7 +2,7 @@
   <div class="right-panel-search" v-if="grapeWidget.filterList && grapeWidget.filterList.length > 0">
     <template v-for="filterColumn in grapeWidget.filterList" :key="filterColumn.name">
       <el-input-number v-if="filterColumn.type == 'number'" v-model="search[filterColumn.name]" :placeholder="filterColumn.label" clearable />
-      <el-select v-else-if="filterColumn.type == 'select' || filterColumn.type == 'radio' || filterColumn.type == 'radio-group'" v-model="search[filterColumn.name]" :placeholder="filterColumn.label" clearable>
+      <el-select v-else-if="filterColumn.type == 'select' || filterColumn.type == 'radio' || filterColumn.type == 'radio-group'" filterable v-model="search[filterColumn.name]" :placeholder="filterColumn.label" clearable>
         <el-option v-for="item in filterColumn.options" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
       <el-select v-else-if="filterColumn.type == 'bool'" v-model="search[filterColumn.name]" :placeholder="filterColumn.label" clearable>
@@ -13,7 +13,7 @@
       <el-date-picker v-else-if="filterColumn.type == 'date' || filterColumn.type == 'datetime'" :placeholder="filterColumn.label" v-model="search[filterColumn.name]" :type="filterColumn.type" clearable />
       <el-date-picker
         v-else-if="filterColumn.type == 'datetime-range'"
-        :placeholder="filterColumn.label" 
+        :placeholder="filterColumn.label"
         v-model="search[filterColumn.name]"
         type="datetimerange"
         range-separator=" 至 "
diff --git a/vue.config.js b/vue.config.js
index 9be0962..d207c5f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,7 +14,7 @@ module.exports = {
         proxy: {
             '/api': {
                 // target: 'https://yxx.ydool.net',
-                target: 'http://192.168.2.29:8080',
+                target: 'http://192.168.1.99:8080',
                 //target: 'http://192.168.0.230:8090',
                 //target: 'http://192.168.0.57:8090',
                 //target: 'http://127.0.0.1:8090',