From 6a38495b8f31c1f2f00aa315a3118a7b51db24ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Wed, 29 Mar 2023 10:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/globalAdvancedQuery/index.vue  |  6 +++---
 .../components/listAddModel.vue               | 12 ++++++------
 .../components/modules/addModel.vue           | 16 ++++++++--------
 .../components/virtualListDetails.vue         | 14 +++++++-------
 .../ParameterItemCollectionList.vue           | 17 ++++++++---------
 .../components/certificationList/index.vue    | 11 +++++------
 .../components/listAddModel.vue               | 12 ++++++------
 .../components/listOfRegulations.vue          | 11 +++++------
 .../src/views/regulationsKanban/index.vue     | 19 +++++++++----------
 9 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue
index b8e71934d..82c5b4f2b 100644
--- a/jero-web/src/components/globalAdvancedQuery/index.vue
+++ b/jero-web/src/components/globalAdvancedQuery/index.vue
@@ -11,15 +11,15 @@
           <a @click="handleReset">{{$t('empty')}}</a>
         </template>
         <a-button-group>
-          <a-button type="primary" @click="handleOpen" style="height: 38px":style='`marginRight:${MarginRight?MarginRight:"8px"}`'>
+          <a-button type="primary" @click="handleOpen" style="height: 38px":style='`marginLeft:${MarginRight?MarginRight:"8px"}`'>
 <!--            <a-icon type="appstore" theme="twoTone" spin/>-->
             <a-icon type="filter" theme="filled"/>
             <span>{{$t('advancedQuery')}}</span>
           </a-button>
-          <a-button style="margin-right: 8px;height: 38px" v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
+          <a-button style="margin-left: 8px;height: 38px" v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
         </a-button-group>
       </a-tooltip>
-      <a-button v-else style="height: 38px" type="primary" icon="filter" @click="handleOpen" :style='`marginRight:${MarginRight?MarginRight:"8px"}`'>{{$t('advancedQuery')}}</a-button>
+      <a-button v-else style="height: 38px" type="primary" icon="filter" @click="handleOpen" :style='`marginLeft:${MarginRight?MarginRight:"8px"}`'>{{$t('advancedQuery')}}</a-button>
     </slot>
   <j-modal
     :title="$t('advancedQuery')"
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
index 6eb8a71be..844c05870 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
@@ -45,15 +45,15 @@
             </template>
             <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
+                  <a @click="handleToggleSearch">
+                          {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                           <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
                                        @handleSuperQuery="handleSuperQuery"
                                        :fieldList="fieldList"/>
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-                  <a @click="handleToggleSearch" style="margin-left: 8px">
-                              {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                  </a>
                </a-col>
       </span>
           </a-row>
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
index 83303ced2..891996117 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
@@ -45,15 +45,15 @@
             </template>
             <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
-                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                        @handleSuperQuery="handleSuperQuery"
-                                        :fieldList="fieldList"/>
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-                  <a @click="handleToggleSearch" style="margin-left: 8px">
-                              {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  <a @click="handleToggleSearch">
+                          {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                           <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
                   </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
                </a-col>
       </span>
           </a-row>
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 41ef684b2..e2577d9e7 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -94,15 +94,15 @@
                 </template>
                 <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                       @handleSuperQuery="handleSuperQuery"
-                                       :fieldList="fieldList"/>
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-                   <a @click="handleToggleSearch" style="margin-left: 8px">
+                  <a @click="handleToggleSearch">
                           {{ !toggleSearchStatus ? $t('open') : $t('away') }}
                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                   </a>
+                  </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                      @handleSuperQuery="handleSuperQuery"
+                                      :fieldList="fieldList"/>
                </a-col>
             </span>
               </a-row>
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 9fe341730..968fc7dff 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -110,16 +110,15 @@
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
 <!--                 v-if="this.$route.query.it === undefined"-->
-                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
-
-                                      @handleSuperQuery="handleSuperQuery"
-                                      :fieldList="fieldList"/>
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-                  <a @click="handleToggleSearch" style="margin-left: 8px">
-                              {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  <a @click="handleToggleSearch">
+                          {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                           <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
                   </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
                </a-col>
             </span>
                 </a-row>
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 48626c18f..0c407627d 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -48,12 +48,11 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                        @handleSuperQuery="handleSuperQuery"
-                                        :fieldList="fieldList"/>
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px"
-                            @click="searchReset">{{ $t('reset') }}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
                  <!--                 <a @click="handleToggleSearch" style="margin-left: 8px">-->
                  <!--                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
                  <!--                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue
index 357bafbd2..e639112d9 100644
--- a/jero-web/src/views/projectManagement/components/listAddModel.vue
+++ b/jero-web/src/views/projectManagement/components/listAddModel.vue
@@ -45,15 +45,15 @@
           </template>
           <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
+                  <a @click="handleToggleSearch">
+                          {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                           <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
                                        @handleSuperQuery="handleSuperQuery"
                                        :fieldList="fieldList"/>
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-                  <a @click="handleToggleSearch" style="margin-left: 8px">
-                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                 </a>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 34ba87b53..e3c918e25 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -79,12 +79,11 @@
           <!--          </template>-->
           <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                        @handleSuperQuery="handleSuperQuery"
-                                        :fieldList="fieldList"/>
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px"
-                            @click="searchReset">{{ $t('reset') }}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
                  <!--                 <a @click="handleToggleSearch" style="margin-left: 8px">-->
                  <!--                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
                  <!--                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />-->
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index 7bce34131..2f6e21cb8 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -54,16 +54,15 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                        @handleSuperQuery="handleSuperQuery"
-                                        :fieldList="fieldList"/>
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px"
-                            @click="searchReset">{{ $t('reset') }}</a-button>
-                                   <a @click="handleToggleSearch" style="margin-left: 8px">
-                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                 </a>
+                  <a @click="handleToggleSearch">
+                          {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                           <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
                </a-col>
             </span>
         </a-row>