Merge remote-tracking branch 'origin/develop' into develop

src/pages/home2/components/empennage/index.vue

@@ -7,7 +7,7 @@
     </div>
     <div style="display: inline-block;width: 80%;text-align: center">
       <el-row>
-        <span v-for="(item, index) in linkListFirst" :key="index">
+        <span v-for="(item, index) in linkListFirst" :key="index" v-if="index < 5">
               <el-col :span="4">
 <!--                <img
                   style="height: 10px;width: 10px;margin-bottom: 3px"
@@ -27,7 +27,7 @@
             </span>
       </el-row>
       <el-row style="margin-bottom: 10px;">
-        <span v-for="(item, index) in linkListSecond" :key="index">
+        <span v-for="(item, index) in linkListSecond" :key="index" v-if="index< 5">
               <el-col :span="4">
 <!--                <img
                   style="height: 10px;width: 10px;margin-bottom: 3px"

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -2982,6 +2982,7 @@ export default {
         this.sarConfigStandSearch.replaceStandNum = ''
         this.selectConfiguraStand()
       }
+      this.searchBtnClick()
     },
     // 高级检索
     selectMoreBtn() {
@@ -3707,6 +3708,9 @@ export default {
             res.data.list[i].ZCCSSRQ = res.data.list[i].zccssrq
             res.data.list[i].SSRQ = res.data.list[i].ssrq
           }
+          if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.standCommonlySearch.page !== 1) {
+            this.pageChange(1)
+          }
           this.stahndinfoList = res.data.list
           this.total = res.data.count
         } else {