From 1ce2e8e0f1583215f31a5b2393e6f5792751d413 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 15 Apr 2022 13:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=85=A7=E8=AE=BE=E8=AE=A1=E5=9B=BE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DocumentLibrary.vue            | 10 ++---
 .../documentTools/searchCenter/index.vue      | 42 +++++++++++++++----
 .../projectManagement/components/addModel.vue | 10 ++---
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 52685b6d0..e92f1ce27 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -272,11 +272,11 @@
             align: 'center',
             dataIndex: 'region'
           },
-          {
-            title: this.$t('functionalAreas'),
-            align: 'center',
-            dataIndex: 'function_territory'
-          },
+          // {
+          //   title: this.$t('functionalAreas'),
+          //   align: 'center',
+          //   dataIndex: 'function_territory'
+          // },
           {
             title: this.$t('technicalField'),
             align: 'center',
diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue
index 92ce01cb9..797999522 100644
--- a/jero-web/src/views/documentTools/searchCenter/index.vue
+++ b/jero-web/src/views/documentTools/searchCenter/index.vue
@@ -29,10 +29,20 @@
               :placeholder="$t('pleaseEnter')+$t('searchContent')"
               @search="wholeOnSearch"
             ></a-input-search>
-            <span v-if="active === $t('whole') || active === $t('DocumentLibrary')" class="textSearch"
-                  @click="wholeTextSearch(selectValueTwo)">{{$t('searchInResults')}}</span>
-            <span v-if="active === $t('whole') || active === $t('DocumentLibrary')" class="textSearch"
-                  @click="ResetSearch()">{{$t('reset')}}</span>
+            <a-button class="textSearch"
+                      v-if="active === $t('whole') || active === $t('DocumentLibrary')"
+                      @click="wholeTextSearch(selectValueTwo)"
+            >{{$t('searchInResults')}}
+            </a-button>
+            <a-button class="textSearch"
+                      v-if="active === $t('whole') || active === $t('DocumentLibrary')"
+                      @click="ResetSearch()"
+            >{{$t('reset')}}
+            </a-button>
+            <!--            <span v-if="active === $t('whole') || active === $t('DocumentLibrary')" class="textSearch"-->
+            <!--                  @click="wholeTextSearch(selectValueTwo)">{{$t('searchInResults')}}</span>-->
+            <!--            <span v-if="active === $t('whole') || active === $t('DocumentLibrary')" class="textSearch"-->
+            <!--                  @click="ResetSearch()">{{$t('reset')}}</span>-->
           </div>
         </div>
         <div class="search-center-content">
@@ -174,10 +184,12 @@
 
       .search-detail {
         display: flex;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
         //justify-content: center;
         .search-detail-wrap {
           display: flex;
-          justify-content: space-between;
 
           .search-detail-title {
             width: 120px;
@@ -208,11 +220,12 @@
   }
 
   .inputSearch {
-    width: 400px;
+    width: 608px;
   }
 
   .input-group {
-    width: 488px;
+    width: 608px;
+    display: inline-block;
   }
 </style>
 <style>
@@ -250,7 +263,20 @@
     line-height: 40px;
     display: inline-block;
     margin-left: 8px;
-    color: #21c9cc;
+    /*color: #21c9cc;*/
     cursor: pointer;
+    height: 40px;
   }
+
+  .textSearch .ant-btn {
+    height: 40px;
+  }
+
+  .search-header-left .ant-tabs-nav-wrap {
+    display: flex;
+    justify-content: center;
+  }
+</style>
+<style>
+
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue
index f19aada95..f4a45ae96 100644
--- a/jero-web/src/views/projectManagement/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/addModel.vue
@@ -63,12 +63,12 @@
               <div class="title-text">
                 <span class="title-text-text" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'StudioEngineer'">
+              <a-form-model-item class="itemModel" :prop="'studioEngineerName'">
                 <PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"
                                     :personneQuery="formInline"
                                     @change="PersonnelSelectionChange"
                                     :disabled="disabled"
-                                    v-model="formInline.studioEngineer"/>
+                                    v-model="formInline.studioEngineerName"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -79,13 +79,13 @@
               <div class="title-text">
                 <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'certificationEngineer'">
+              <a-form-model-item class="itemModel" :prop="'certificationEngineerName'">
                 <PersonnelSelection
                   :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
                   :personneQuery="formInline"
                   @change="PersonnelSelectionChange"
                   :disabled="disabled"
-                  v-model="formInline.certificationEngineer"/>
+                  v-model="formInline.certificationEngineerName"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -245,7 +245,7 @@
         })
       },
       PersonnelSelectionChange(value, id) {
-        this.formInline[value + '_id'] = id
+        this.formInline[value] = id
         this.formInline = { ...this.formInline }
       }
     }