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

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -374,18 +374,15 @@ export default {
       });
     }
   },
-  created() {
-    this.searchSarAccess();
-  },
   mounted() {
     // 分页查询数据
-    this.searchSarAccess();
     // 从数据库中查询各下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", "", {
       _this: this
     }, res => {
       this.countryOptions = res.data.COUNTRY;
       this.setMap(this.countryOptions);
+      this.searchSarAccess();
     }, e => {
     });
   }

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -389,7 +389,7 @@ export default {
       })
     },
     handleQueryPdf(file){
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.id))
+      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId))
     }
   },
   mounted() {

src/pages/searchCenter/pages/standardSearch.vue

@@ -243,7 +243,7 @@
                                     <div class="AllBoxTitle">
                                         <span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
                                         <span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
-                                        <span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">更多</span>
+                                        <span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
                                     </div>
                                     <div class="AllBoxContent" v-html="item.textContent"></div>
                                     <div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">