From cb8adf6808793aef016dc87f94a5281cd684ae0f Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Wed, 8 Nov 2023 10:08:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20database=E4=BF=AE=E5=A4=8DCollect=20Stop?=
 =?UTF-8?q?=20=E5=92=8CAcq.Start=E5=8F=82=E6=95=B0=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchForm/index.vue |  5 ++++-
 src/views/system/DataBase.vue       | 31 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/components/SearchForm/index.vue b/src/components/SearchForm/index.vue
index 5520d73..0259b36 100644
--- a/src/components/SearchForm/index.vue
+++ b/src/components/SearchForm/index.vue
@@ -10,7 +10,10 @@
           :style="item.style"
         >
           <a-form-model-item :label="item.label" :prop="item.name" :labelCol="item.labelCol">
-            <component :is="item.type" v-bind="item.props" v-model="formModel[item.name]" v-on="item.on"></component>
+            <a-checkbox v-if="item.type == 'a-checkbox'" v-model="formModel[item.name]" v-on="item.on">
+                {{ item.innerLabel }}
+            </a-checkbox>
+            <component v-else :is="item.type" v-bind="item.props" v-model="formModel[item.name]" v-on="item.on"></component>
           </a-form-model-item>
         </a-col>
         <a-button class="search-btn" type="primary" @click="onSearch">
diff --git a/src/views/system/DataBase.vue b/src/views/system/DataBase.vue
index 1d37734..04f5f48 100644
--- a/src/views/system/DataBase.vue
+++ b/src/views/system/DataBase.vue
@@ -292,7 +292,7 @@ export default {
           props: {
             allowClear: true,
             style: {
-              width: '190px',
+              width: '187px',
             },
           },
           style: {
@@ -315,7 +315,7 @@ export default {
             filterOption: this.filterOption,
             allowClear: true,
             style: {
-              width: '190px',
+              width: '187px',
             },
           },
           style: {
@@ -338,7 +338,7 @@ export default {
             filterOption: this.filterOption,
             allowClear: true,
             style: {
-              width: '190px',
+              width: '187px',
             },
           },
           style: {
@@ -355,7 +355,7 @@ export default {
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
             style: {
               minWidth: 'auto',
-              width: '282px',
+              width: '279px',
             },
           },
           style: {
@@ -372,7 +372,7 @@ export default {
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
             style: {
               minWidth: 'auto',
-              width: '282px',
+              width: '279px',
             },
           },
           style: {
@@ -380,16 +380,19 @@ export default {
           },
         },
         {
-          label: '',
-          type: 'a-checkbox-group',
-          props: {
-            options: [
-              { label: 'Collect Stop', value: 'collectStop' },
-              { label: 'Acq.Start', value: 'acqDotStart' },
-            ],
-          },
+          type: 'a-checkbox',
+          name: 'collectStopCheck',
+          innerLabel: 'Collect Stop',
           style: {
-            width: '230px',
+            width: '132px',
+          },
+        },
+        {
+          type: 'a-checkbox',
+          name: 'acqDotStartCheck',
+          innerLabel: 'Acq.Start',
+          style: {
+            width: '113px',
           },
         },
       ]