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

src/pages/config/pages/mechanismManage/index.vue

@@ -325,7 +325,7 @@ export default {
   watch: {
     filterText(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   mounted () {
     // 获取组织结构树

src/pages/details/otherStandardDetails/index.vue

@@ -63,7 +63,7 @@
                 <p>
                   <label style=" margin-right: 132px;"
                          title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-                  >文本状态<i class="el-icon-warning-outline"></i></label>
+                  >文本状态</label>
                   <span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                 </p>
                 <p><label style=" margin-right: 150px;">发布日期</label><span>{{

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -16,7 +16,7 @@
         <p class="transition-box-p"  v-if="sarAccessEO.sortKey === '1'">
           <label class="transition-box-label">国家/地区：</label>
           <span class="transition-box-span">
-             {{ sarAccessEO.countryArea }}
+             {{ sarAccessEO.countryAreaShow }}
             </span>
         </p>
         <p v-else></p>