From bb19525560f05cc2805eab6d04be8a1e6c70dbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 10 May 2023 11:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue    | 67 +++++++++----------
 .../components/listOfRegulations.vue          | 50 +++++++-------
 2 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index c9b280e65..713cccc45 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -43,40 +43,39 @@
               </a-select>
             </div>
           </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('standardNo')">
-                <span>{{ $t('standardNo') }}</span>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standardNo')">
+                  <span>{{ $t('standardNo') }}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardNo')"
+                         v-model="queryParam.serialNumber"></j-input>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardNo')"
-                       v-model="queryParam.serialNumber"></j-input>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('statisticalNodes')">
-                <span>{{ $t('statisticalNodes') }}</span>
-              </div>
-              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
-                        allowClear
-                        class="box-input"
-                        show-search
-                        optionFilterProp="label"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        v-model="queryParam.firstLevelDutyTerritory">
-                <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
-                                 :key="key"
-                                 :label="item.key"
-                                 :value="item.key">
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('statisticalNodes')">
+                  <span>{{ $t('statisticalNodes') }}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          allowClear
+                          class="box-input"
+                          show-search
+                          optionFilterProp="label"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="queryParam.firstLevelDutyTerritory">
+                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                   :key="key"
+                                   :label="item.key"
+                                   :value="item.key">
                                <span style="display: inline-block;width: 100%" :title=" item.key ">
                                      {{ item.key }}
                                </span>
-                </a-select-option>
-              </a-select>
-            </div>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -85,10 +84,10 @@
                   <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'"/>-->
-                 <!--                 </a>-->
+                  <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 b18e61954..d790d21fa 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -68,29 +68,31 @@
               </a-input-group>
             </div>
           </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('statisticalNodes')">
-                <span>{{ $t('statisticalNodes') }}</span>
-              </div>
-              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
-                        allowClear
-                        show-search
-                        class="box-input"
-                        optionFilterProp="label"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        v-model="queryParam.firstLevelDutyTerritory">
-                <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
-                                 :key="key"
-                                 :label="item.key"
-                                 :value="item.key">
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('statisticalNodes')">
+                  <span>{{ $t('statisticalNodes') }}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          allowClear
+                          show-search
+                          class="box-input"
+                          optionFilterProp="label"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="queryParam.firstLevelDutyTerritory">
+                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                   :key="key"
+                                   :label="item.key"
+                                   :value="item.key">
                                <span style="display: inline-block;width: 100%" :title=" item.key ">
                                      {{ item.key }}
                                </span>
-                </a-select-option>
-              </a-select>
-            </div>
-          </a-col>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+          </template>
           <!--          <template v-if="toggleSearchStatus">-->
           <!--            <a-col :md="6" :sm="8">-->
           <!--              <div class="box-title-text">-->
@@ -120,10 +122,10 @@
                   <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'"/>-->
-                 <!--                                  </a>-->
+                                                   <a @click="handleToggleSearch" style="margin-left: 8px">
+                                                              {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                                                              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                                                   </a>
                </a-col>
             </span>
         </a-row>