Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period

# Conflicts:
#	jero-web/src/components/tableCollection/index1.vue
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/index.vue

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -44,6 +44,7 @@
 <!--                                         :triggerChange="false" :dictCode="'cert_category'"/>-->
 <!--                    </div>-->
 <!--                  </a-col>-->
+                  <template v-if="toggleSearchStatus">
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
                       <div class="title-text" :title="$t('NareaOfResponsibility')">
@@ -73,6 +74,7 @@
                                v-model="formInline.sdt"></a-input>
                     </div>
                   </a-col>
+                  </template>
 <!--                  <a-col :md="6" :sm="8">-->
 <!--                    <div class="box-title-text">-->
 <!--                      <div class="title-text" :title="$t('status')">-->
@@ -103,6 +105,10 @@
                                       :fieldList="fieldList"/>
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                              {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                </a-col>
             </span>
                 </a-row>
@@ -131,7 +137,7 @@
 <!--                </div>-->
                 <!--      导出-->
                 <div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'>
-                  <a-icon type="export"/>
+                  <a-icon type="export" :rotate="-90"/>
                   {{$t('dataExport')}}
                 </div>
                 <!--     一键下发收集 -->
@@ -141,7 +147,7 @@
                 </div>
                 <!--      冻结配置-->
                 <div @click="freezeConfiguration" class="operator-text-title" v-if='currentPersonRole == "homo"'>
-                  <a-icon type="solution"/>
+                  <a-icon type="lock"/>
                   {{$t('FreezeConfiguration')}}
                 </div>
                 <!--      引用参数列-->
@@ -156,7 +162,7 @@
                 </div>
                 <!--   同步上报库   -->
                 <div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
-                  <a-icon type="setting"/>
+                  <a-icon type="sync"/>
                   {{$t('SynchronousReportLibrary')}}
                 </div>
                 <!--      截止时间-->
@@ -170,11 +176,11 @@
                   {{$t('BatchDelete')}}
                 </div>
                 <div @click="bringInTheProjectInterfaceClick" class="operator-text-title" v-if='currentPersonRole == "homo"'>
-                  <a-icon type="profile"/>
+                  <a-icon type="user"/>
                   {{$t('bringInTheProjectInterface')}}
                 </div>
                 <div @click="AdjustareasofresponsibilityClick" class="operator-text-title" v-if='currentPersonRole == "homo"'>
-                  <a-icon type="solution"/>
+                  <a-icon type="setting"/>
                   {{$t('Adjustareasofresponsibility')}}
                 </div>
                 <!--      认证工程师分配填写人-->
@@ -222,7 +228,7 @@
             <!--      退回-->
             <div @click="returnDataJurisdiction" class="operator-text"
                  v-if='currentPersonRole == "sdt" || currentPersonRole == "homo" || currentPersonRole == "dre"'>
-              <a-icon type="delete"/>
+              <a-icon type="rollback"/>
               {{$t('sendBack')}}
             </div>
             <!--      导入-->
@@ -238,7 +244,7 @@
             <!--      强制撤回-->
             <div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
                  v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
-              <a-icon type="delete"/>
+              <a-icon type="undo":rotate="90"/>
               {{$t('CompulsoryWithdrawal')}}
             </div>
 
@@ -436,7 +442,7 @@
             </div>
           </div>
           <!--          认证工程师-提示-->
-          <div style='font-size: 16px;color: red;text-align: center' v-if='NoEngineer === 1'>
+          <div style='font-size: 18px;text-align: center' v-if='NoEngineer === 1'>
             {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
             $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === "homoQZTH"? $t('Datastateexcept') : $t('Datastatusis')}}
             <!--            下发收集时-->
@@ -464,23 +470,29 @@
               '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'
             </span>
             <!--            退回-->
-            <span v-else-if='jurisdiction === "homoTH"' class="text-wraning">
+            <span v-else-if='jurisdiction === "homoTH"' class="text-wraning" style='color: red'>
               {{$t('Submitted')}}
             </span>
             <span v-else-if='jurisdiction === "sdtTH"' class="text-wraning">
-              '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
+              <p style='display: inline; color: red'>'{{$t('handledInterface')}}'</p>
+              {{$t('or')}}
+              <p style='display: inline; color: red'>'{{$t('Filledreturn')}}'</p>
             </span>
             <span v-else-if='jurisdiction === "dreTH"' class="text-wraning">
-              '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'
+              <p style='display: inline; color: red'>'{{$t('completed')}}'</p>
+              {{$t('or')}}
+              <p style='display: inline; color: red'>'{{$t('ReturnedEngineer')}}'</p>
             </span>
             <!--            强制撤回-->
-            <span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning">
-              '{{$t('SynchronizedLibrary')}}'{{$t('or')}}'{{$t('CollectionInitiated')}}'
+            <span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning" >
+              <p style='display: inline; color: red'>'{{$t('SynchronizedLibrary')}}'</p>
+              {{$t('or')}}
+              <p style='display: inline; color: red'>'{{$t('CollectionInitiated')}}'</p>
             </span>
-            <span v-else-if='jurisdiction === "sdtQZTH"' class="text-wraning">
+            <span v-else-if='jurisdiction === "sdtQZTH"' class="text-wraning" style='color: red'>
               {{$t('completed')}}
             </span>
-            <span v-else-if='jurisdiction === "dreQZTH"' class="text-wraning">
+            <span v-else-if='jurisdiction === "dreQZTH"' class="text-wraning" style='color: red'>
               {{$t('Submitted')}}
             </span>
             {{$t('timeoperation')}}
@@ -589,6 +601,7 @@
         // R&H Manager manager
         // 系统管理员 admin
         // 游客 guest
+        toggleSearchStatus: false,
         columns: [
           {
             title: this.$t('title'),
@@ -770,6 +783,9 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
       handleCancelRoleSwitching() {
         this.visibleRoleSwitching = false
       },