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

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

@@ -418,7 +418,8 @@ export default {
       dialogColor: false,
       dialogType: "",
       color: "",
-      isShow: false
+      isShow: false,
+      countryAreaShow: ''
     };
   },
   methods: {
@@ -654,11 +655,18 @@ export default {
     },
     // 点击查看
     handlePreview(data) {
+      let item = {
+        country: this.countryAreaShow,
+        ssrq: data.ssrq,
+        xcxssrqgj: data.xcxssrqgj,
+        zccssrqgj: data.zccssrqgj
+      }
+      sessionStorage.setItem("accessCountry", JSON.stringify(item));
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
           id: data.id,
-          pageType: data.standType
+          pageType: data.standType,
         }
       });
       window.open(routeUrl.href, "_blank");
@@ -773,6 +781,7 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
       this.pageId = accessRow.id;
       this.sarAccessEO = accessRow;
+      this.countryAreaShow = accessRow.countryAreaShow
       this.selectInfobyAccid();
       this.getOrgTreeSource();
       this.getFileInfo();