diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue
index 0346fa84c..cd5d2c05b 100644
--- a/jero-web/src/components/AssignedBy/index.vue
+++ b/jero-web/src/components/AssignedBy/index.vue
@@ -23,8 +23,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span='6' style='margin-top: 5px;'>
-            <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' @click='searchReset'>{{ $t('reset') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
           </a-col>
         </a-row>
       </a-form-model>
diff --git a/jero-web/src/components/AssignedByHomo/index.vue b/jero-web/src/components/AssignedByHomo/index.vue
index 1e5cce5f5..67cebc36f 100644
--- a/jero-web/src/components/AssignedByHomo/index.vue
+++ b/jero-web/src/components/AssignedByHomo/index.vue
@@ -23,8 +23,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span='6' style='margin-top: 5px;'>
-            <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' @click='searchReset'>{{ $t('reset') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
           </a-col>
         </a-row>
       </a-form-model>
diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue
index 4d972d944..3d409a54e 100644
--- a/jero-web/src/components/ParameterLibraryAdd/index.vue
+++ b/jero-web/src/components/ParameterLibraryAdd/index.vue
@@ -46,8 +46,8 @@
           <a-col :md="12" :sm="8">
             <span style="float: right;overflow: hidden;margin-right: 16px;margin-bottom: 20px"
                   class="table-page-search-submitButtons">
-            <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' @click='searchReset'>{{ $t('reset') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
             </span>
 
           </a-col>
diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue
index 077aa9be9..615a561d3 100644
--- a/jero-web/src/components/SplitSearch/index.vue
+++ b/jero-web/src/components/SplitSearch/index.vue
@@ -138,12 +138,12 @@
       </a-col>
       <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a @click="handleToggleSearch" v-if="searchList.length > 3">
+                    <span class="icon-open">{{ !toggleSearchStatus ? $t('open') : $t('away') }}</span>
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-                <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
-                <span class="icon-open">{{ !toggleSearchStatus ? $t('open') : $t('away') }}</span>
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
     </a-row>
diff --git a/jero-web/src/components/currencySearch/index.vue b/jero-web/src/components/currencySearch/index.vue
index fd3adad5c..b295f13b0 100644
--- a/jero-web/src/components/currencySearch/index.vue
+++ b/jero-web/src/components/currencySearch/index.vue
@@ -135,12 +135,12 @@
       </a-col>
       <span style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px"
             class="table-page-search-submitButtons">
-                  <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" v-if="searchList.length > 3">
-            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-          </a>
+                 <a @click="handleToggleSearch" v-if="searchList.length > 3">
+                    {{ !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>
       </span>
     </a-row>
   </a-form>
diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index 5b2671df5..af43a52be 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -174,12 +174,12 @@
       </a-col>
       <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
          <a-col :md="6" :sm="24">
-            <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" v-if="searchList.length > 3">
+          <a @click="handleToggleSearch" v-if="searchList.length > 3">
             {{ !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>
          </a-col>
       </span>
     </a-row>
diff --git a/jero-web/src/components/searchaloneorcfile/index.vue b/jero-web/src/components/searchaloneorcfile/index.vue
index 4a65293a5..0daf05a31 100644
--- a/jero-web/src/components/searchaloneorcfile/index.vue
+++ b/jero-web/src/components/searchaloneorcfile/index.vue
@@ -138,12 +138,12 @@
       </a-col>
       <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
          <a-col :md="4" :sm="24" style='display: flex'>
-            <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+            <a @click="handleToggleSearch" v-if="searchList.length > 3">
+              {{ !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 @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
-            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-          </a>
+            <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
          </a-col>
       </span>
     </a-row>
diff --git a/jero-web/src/components/searchalonesplit/index.vue b/jero-web/src/components/searchalonesplit/index.vue
index 38ac47cf7..ddae1f6b6 100644
--- a/jero-web/src/components/searchalonesplit/index.vue
+++ b/jero-web/src/components/searchalonesplit/index.vue
@@ -138,12 +138,12 @@
       </a-col>
       <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
          <a-col :md="6" :sm="24">
-            <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" v-if="searchList.length > 3">
-            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-          </a>
+                 <a @click="handleToggleSearch" v-if="searchList.length > 3">
+                    {{ !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>
          </a-col>
       </span>
     </a-row>
diff --git a/jero-web/src/components/searchalonetext/index.vue b/jero-web/src/components/searchalonetext/index.vue
index 273281bf0..a2d3fa013 100644
--- a/jero-web/src/components/searchalonetext/index.vue
+++ b/jero-web/src/components/searchalonetext/index.vue
@@ -138,12 +138,12 @@
       </a-col>
       <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
          <a-col :md="9" :sm="24">
-            <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+            <a @click="handleToggleSearch" v-if="searchList.length > 3">
+              {{ !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 @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
-            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-          </a>
+            <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
          </a-col>
       </span>
     </a-row>
diff --git a/jero-web/src/views/dashboard/customContentList.vue b/jero-web/src/views/dashboard/customContentList.vue
index 5f2d5fc4f..1954acee0 100644
--- a/jero-web/src/views/dashboard/customContentList.vue
+++ b/jero-web/src/views/dashboard/customContentList.vue
@@ -17,8 +17,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
          </span>
 
diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue
index f1f2e44e6..541994b2e 100644
--- a/jero-web/src/views/documentManage/collection/index.vue
+++ b/jero-web/src/views/documentManage/collection/index.vue
@@ -40,8 +40,8 @@
                     <span style="float: right;overflow: hidden;margin-right: 11px"
                           class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
                  </span>
                   </a-row>
diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue
index 17a47a1ee..7c384187b 100644
--- a/jero-web/src/views/documentManage/subscribtion/index.vue
+++ b/jero-web/src/views/documentManage/subscribtion/index.vue
@@ -39,8 +39,8 @@
                 <span style="float: right;overflow: hidden;margin-right: 11px"
                       class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
                  </span>
               </a-row>
diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
index 1dbc4c4ac..41307da80 100644
--- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
@@ -9,8 +9,8 @@
           </a-form-item>
         </a-form>
         <div class="form-btn">
-          <a-button class="form-btn-search" type="primary" @click="search">{{$t('query')}}</a-button>
           <a-button class="form-btn-reset" @click="reset">{{$t('reset')}}</a-button>
+          <a-button class="form-btn-search" type="primary" @click="search">{{$t('query')}}</a-button>
         </div>
       </div>
       <div class="table-operator">
@@ -561,6 +561,7 @@
 
         .form-btn {
           .form-btn-search {
+            margin-left: 8px;
             margin-right: 10px;
           }
         }
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
index 74bcfe483..0ffbbeeb4 100644
--- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
@@ -14,8 +14,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
             </span>
         </a-row>
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue
index 2ab6a362e..9958043f2 100644
--- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue
@@ -33,8 +33,8 @@
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
       </a-row>
diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
index ad0dbe1b0..c91b754a3 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
@@ -35,9 +35,8 @@
                   </a-col>
                   <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="8" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQueryLeft">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px"
-                            @click="searchResetLeft">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" @click="searchResetLeft">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQueryLeft">{{$t('query')}}</a-button>
                </a-col>
                </span>
                 </a-row>
@@ -90,9 +89,8 @@
                   </a-col>
                   <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="8" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQueryRight">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px"
-                            @click="searchResetRight">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" @click="searchResetRight">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQueryRight">{{$t('query')}}</a-button>
                </a-col>
                </span>
                 </a-row>
diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue
index f0b81da41..f7e13f6ec 100644
--- a/jero-web/src/views/documentTools/documentComparison/index.vue
+++ b/jero-web/src/views/documentTools/documentComparison/index.vue
@@ -34,8 +34,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
index bcf9093fb..3f30dc402 100644
--- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
@@ -34,12 +34,12 @@
             </template>
             <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
-                  <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'"/>
+                     {{ !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>
                </a-col>
            </span>
           </a-row>
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
index 29779bb19..1ffb73b44 100644
--- a/jero-web/src/views/documentTools/documentTranslation/index.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -47,12 +47,12 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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>
+                    {{ !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>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 3d8924c97..cc26a0fa5 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -61,9 +61,8 @@
           </div>
         </div>
         <div class="table-page-search-submitButtons submitButtons">
-          <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" @click="searchReset">{{$t('reset')}}</a-button>
+          <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
         </div>
       </div>
       <div class="text-right">
diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
index 39fe20342..d8e6c8ae8 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
@@ -29,9 +29,8 @@
           </div>
         </div>
         <div class="table-page-search-submitButtons submitButtons">
-          <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" @click="searchReset">{{$t('reset')}}</a-button>
+          <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
         </div>
       </div>
       <div class="text-right">
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index 95e9b29d8..a4ff4f8aa 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/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">
+                  <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/transferList.vue b/jero-web/src/views/documentTools/virtualList/components/transferList.vue
index 3198cb9d6..beabfc3e7 100644
--- a/jero-web/src/views/documentTools/virtualList/components/transferList.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/transferList.vue
@@ -23,8 +23,8 @@
             </a-col>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
           </a-row>
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index cad27a2b7..06ba96031 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -25,8 +25,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index 9fcf1bc8a..d947ca94f 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -78,12 +78,12 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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>
                </a-col>
       </span>
         </a-row>
@@ -147,7 +147,7 @@
               @click="detailclick(record)">{{$t('See')}}</a>
           <a class="text-operation"
              @click="maintenanceClick(record)">{{$t('maintenance')}}</a>
- 
+
           <a class="text-operation"
              @click="endUpgrade(record , '0')" v-if="record.sjzt==0 && record.bazt=='4'">{{$t('endUpgrade')}}</a>
              <a class="text-operation"
@@ -202,7 +202,7 @@ export default {
       url: {
         list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
         deleteBatch: '/ota/otaBaSjList/delete'
-      
+
       },
       visible: false,
       loading: false,
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
index 2764a0ad4..af337a5f0 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
@@ -78,12 +78,12 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
-              <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-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>
             </a-col>
           </span>
         </a-row>
@@ -374,10 +374,10 @@ export default {
         }
       })
         }
-        
-      } 
+
       }
-     
+      }
+
     },
     // 创建车型
     createvehicleandfunctionrecords() {
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index 205ff409c..4d8a7997e 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -25,8 +25,8 @@
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
       </a-row>
diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue
index b7aa496dd..13527dda3 100644
--- a/jero-web/src/views/parameter/escalationlibrary/index.vue
+++ b/jero-web/src/views/parameter/escalationlibrary/index.vue
@@ -23,8 +23,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 66d960461..2b8cea82a 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -74,12 +74,12 @@
             </template>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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-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>
                </a-col>
             </span>
           </a-row>
diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue
index 9a806dbcd..e30099472 100644
--- a/jero-web/src/views/parameter/parameterexport/index.vue
+++ b/jero-web/src/views/parameter/parameterexport/index.vue
@@ -25,8 +25,8 @@
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
       </a-row>
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index 872d44561..2ffda150a 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -34,8 +34,8 @@
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
       </a-row>
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index b10d1013b..da03e081c 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -14,8 +14,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
             </span>
         </a-row>
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
index 4a299abd8..f9fa721ef 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
@@ -23,8 +23,8 @@
             </a-col>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
           </a-row>
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
index 25ccd69f9..f1fda8f8b 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
@@ -24,8 +24,8 @@
               </a-col>
               <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
             </a-row>
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index 5879a3959..1cf7194cd 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -68,13 +68,13 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px;margin-bottom: 20px"
                 class="table-page-search-submitButtons">
-                  <a-button class="box-button-search" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <a-button class="box-button-search" 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-button class="box-button-search" style="margin-left: 8px"
+                            @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button-search" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
       </span>
         </a-row>
       </a-form>
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 1371c11a3..e097b6f4b 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -34,8 +34,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index 232174545..2c77137b0 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -23,8 +23,8 @@
             </a-col>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
           </a-row>
diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
index 556ddceeb..ea671769a 100644
--- a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
@@ -28,8 +28,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span='6' style='margin-top: 4px;'>
-            <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' @click='searchReset'>{{ $t('reset') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
           </a-col>
         </a-row>
       </a-form-model>
diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
index 486fe5b67..76c193aeb 100644
--- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
@@ -136,8 +136,8 @@
             <!--            </a-form-model-item>-->
           </a-col>
           <a-col :span='6' style='margin-top: 5px'>
-            <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' @click='searchReset'>{{ $t('reset') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
           </a-col>
         </a-row>
       </a-form-model>
diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
index 064bbf6df..a4bcebb6d 100644
--- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
@@ -84,8 +84,8 @@
           <!--            </a-form-model-item>-->
           <!--          </a-col>-->
           <a-col :span='11' style="margin-top: 5px">
-            <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' @click='searchReset'>{{ $t('reset') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
           </a-col>
         </a-row>
       </a-form-model>
diff --git a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue
index ff56161e1..43395bb1d 100644
--- a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue
+++ b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue
@@ -45,8 +45,8 @@
             </div>
           </a-col>
           <a-col :span='6' style='margin-top: 5px'>
-            <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' @click='searchReset'>{{ $t('reset') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
           </a-col>
         </a-row>
       </a-form-model>
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue
index 6047a5216..fe8b22da4 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue
@@ -102,12 +102,12 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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-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>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index e94228121..d72393dd9 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -130,12 +130,12 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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-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>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
index 3f5e7e577..62a7b57ce 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
@@ -80,9 +80,9 @@
               </a-col>
               <span style="float: right" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px"
+                  <a-button class="box-button"
                             @click="searchReset">{{ $t('reset') }}</a-button>
+                  <a-button style="margin-left: 8px" class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
                </a-col>
           </span>
             </a-row>
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index fe8ef3d12..57c25a03a 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -36,9 +36,9 @@
           </a-col>
           <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px"
+                  <a-button class="box-button"
                             @click="searchReset">{{ $t('reset') }}</a-button>
+                  <a-button style="margin-left: 8px" class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
                </a-col>
         </span>
         </a-row>
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index 46500f82b..88d5bc1be 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -52,8 +52,8 @@
           </a-col>
           <a-col :span='8' style='margin-top: 2px;'>
             <span style="float: right;margin-right: 8px">
-            <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' @click='searchReset'>{{ $t('reset') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue
index 91503bbb7..0ff139f8e 100644
--- a/jero-web/src/views/system/DictList.vue
+++ b/jero-web/src/views/system/DictList.vue
@@ -34,8 +34,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue
index 55514965f..f53732a59 100644
--- a/jero-web/src/views/system/RoleUserList.vue
+++ b/jero-web/src/views/system/RoleUserList.vue
@@ -16,8 +16,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index b8edf2afe..0dc986d12 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -35,9 +35,9 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px"
+                  <a-button class="box-button"
                             @click="searchReset">{{ $t('reset') }}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
                </a-col>
          </span>
 
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index 991784e40..96615f565 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -81,12 +81,12 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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('away') : $t('open') }}
                 <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>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue
index 166aba2f5..aae13301b 100644
--- a/jero-web/src/views/system/modules/DeptUserInfo.vue
+++ b/jero-web/src/views/system/modules/DeptUserInfo.vue
@@ -12,8 +12,8 @@
           </a-col>
           <span style="float: left;overflow: hidden;margin-top: 1px" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
-               <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" @click="searchReset">{{$t('reset')}}</a-button>
+               <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
             </a-col>
           </span>
         </a-row>
diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
index f9f974792..6953e3448 100644
--- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
@@ -23,8 +23,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
           </span>
         </a-row>
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
index 6b7901469..43f97efa6 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
@@ -65,12 +65,12 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
index 7849db357..602685ad6 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
@@ -34,8 +34,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
           </span>
         </a-row>
diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue
index 25ccd69f9..21e1569fe 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue
@@ -24,10 +24,10 @@
               </a-col>
               <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
-                  <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-col>
-      </span>
+                  <a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+              </a-col>
+              </span>
             </a-row>
           </a-form>
         </div>
diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue
index 44e465822..45293970d 100644
--- a/jero-web/src/views/virtualAuthenticationList/index.vue
+++ b/jero-web/src/views/virtualAuthenticationList/index.vue
@@ -25,8 +25,8 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <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" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
         </a-row>
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index bf4f2b8dc..ddc60716c 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -82,13 +82,12 @@
                 </template>
                 <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                   <a-col :md="6" :sm="24">
-                    <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>
                   </a-col>
                 </span>
               </a-row>