From 6f9f7038909292d75719b3bf4b499ab4885120a3 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 7 Mar 2022 10:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  7 +--
 jero-web/src/common/lang/zh-cn.js             |  3 +-
 .../src/components/libraryAddForm/index.vue   | 16 ++++++
 jero-web/src/components/search/index.vue      |  2 +-
 jero-web/src/views/system/DataLogList.vue     | 10 ++--
 jero-web/src/views/system/UserList.vue        | 53 +++++++++++--------
 6 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index e5430aed3..ecb8936f1 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -349,8 +349,8 @@ module.exports = {
   exportWithFile: 'Export with file',
   Push: 'Push',
   templateDownload: 'Template download',
-  textInformation: 'Text information',
-  relatedInformation: 'Related information',
+  textInformation: 'text information',
+  relatedInformation: 'related information',
   RetrieveFiles: 'Retrieve received files',
   SplitText: 'Split received text',
   ImportResults: 'Import split results',
@@ -462,5 +462,6 @@ module.exports = {
   charactersLength1to300 :'1 - 300 characters in length',
   OnlyOneSelected:'Only one piece of data can be selected',
   OnlyPDF:'Only PDF files can be imported',
-
+  open:'open',
+  away:'away',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 143cc201b..01ca7a153 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -466,5 +466,6 @@ module.exports = {
   charactersLength1to300:'长度在 1 - 300字符',
   OnlyOneSelected:'只能选择一条数据',
   OnlyPDF:'只能导入pdf文件',
-
+  open:'展开',
+  away:'收起'
 }
\ No newline at end of file
diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue
index fd7871319..321e58705 100644
--- a/jero-web/src/components/libraryAddForm/index.vue
+++ b/jero-web/src/components/libraryAddForm/index.vue
@@ -115,6 +115,9 @@
                     formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
+                  <span class="button-text-text" v-if="formInline[item.db_field_name]">
+                    {{formInline[item.db_field_name].split(',').length}}
+                  </span>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -562,4 +565,17 @@
     border: 1px #00B3BE solid;
     color: #00B3BE;
   }
+
+  .button-text-text {
+    position: absolute;
+    right: -10px;
+    top: -21px;
+    display: inline-block;
+    padding: 6px;
+    border-radius: 50%;
+    background: red;
+    text-align: center;
+    line-height: 6px;
+    color: #fff;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index c120116fd..198ab1e34 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -136,7 +136,7 @@
                   <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 ? '收起' : '展开' }}
+                {{ toggleSearchStatus ? $t('open') : $t('away') }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
                </a-col>
diff --git a/jero-web/src/views/system/DataLogList.vue b/jero-web/src/views/system/DataLogList.vue
index fabf15cf5..3ad660f5c 100644
--- a/jero-web/src/views/system/DataLogList.vue
+++ b/jero-web/src/views/system/DataLogList.vue
@@ -29,18 +29,16 @@
     <div class="table-operator">
       <a-button @click="handleCompare()" type="primary" icon="plus">{{$t('DataComparison')}}</a-button>
     </div>
-
     <!--table区 -->
     <div>
       <!--已选择的清空 -->
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>{{$t('selected')}}&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>{{$t('term')}}&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">{{$t('empty')}}&nbsp;&nbsp;</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i>{{$t('selected')}}&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>{{$t('term')}}&nbsp;&nbsp;-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">{{$t('empty')}}&nbsp;&nbsp;</a>-->
+<!--      </div>-->
       <a-table
         ref="table"
         size="middle"
-        bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index 27ed6bb15..2a46eda24 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -32,34 +32,40 @@
                        v-model="queryParam.workNo"></j-input>
             </div>
           </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('EmployeeType')">
-                <span>{{$t('EmployeeType')}}</span>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('EmployeeType')">
+                  <span>{{$t('EmployeeType')}}</span>
+                </div>
+                <j-dict-select-tag class="box-input" v-model="queryParam.workerType"
+                                   :placeholder="$t('pleaseSelect')+$t('EmployeeType')"
+                                   :type="'select'"
+                                   :triggerChange="false" dictCode="worker_type"/>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.workerType"
-                                 :placeholder="$t('pleaseSelect')+$t('EmployeeType')"
-                                 :type="'select'"
-                                 :triggerChange="false" dictCode="worker_type"/>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('status')">
-                <span>{{$t('status')}}</span>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('status')">
+                  <span>{{$t('status')}}</span>
+                </div>
+                <a-select class="box-input" v-model="queryParam.status"
+                          :placeholder="$t('pleaseSelect')+$t('status')">
+                  <a-select-option value="">{{$t('pleaseSelect')}}</a-select-option>
+                  <a-select-option value="1">{{$t('normal')}}</a-select-option>
+                  <a-select-option value="2">{{$t('frozen')}}</a-select-option>
+                </a-select>
               </div>
-              <a-select class="box-input" v-model="queryParam.status"
-                        :placeholder="$t('pleaseSelect')+$t('status')">
-                <a-select-option value="">{{$t('pleaseSelect')}}</a-select-option>
-                <a-select-option value="1">{{$t('normal')}}</a-select-option>
-                <a-select-option value="2">{{$t('frozen')}}</a-select-option>
-              </a-select>
-            </div>
-          </a-col>
+            </a-col>
+          </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>
                </a-col>
       </span>
         </a-row>
@@ -72,7 +78,7 @@
         <a-icon type="plus"/>
         {{$t('addUser')}}
       </div>
-<!--      <a-button @click="handleAdd" type="primary" icon="plus">{{$t('addUser')}}</a-button>-->
+      <!--      <a-button @click="handleAdd" type="primary" icon="plus">{{$t('addUser')}}</a-button>-->
       <!--      <a-button type="primary" icon="download" @click="handleExportXls($t('userInformation'))">{{$t('export')}}</a-button>-->
       <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
       <!--        <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
@@ -140,6 +146,7 @@
         description: this.$t('freezePasManagementPage'),
         queryParam: {},
         recycleBinVisible: false,
+        toggleSearchStatus:false,
         columns: [
           {
             title: this.$t('serialNumber'),