Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-operate-ui/src/views/detail/party-b/index.vue

@@ -13,10 +13,11 @@ export default {
   data() {
     return {
       loading: false, // 是否加载中
+      navHeight: 68,  // iframe距离顶部距离px
       iframeHight: window.innerHeight, // iframe高度
       scrollTop: 0, // 滚动条距离内部页面顶部距离
-      // domain: 'https://pre-plug.jiansheku.com',
-      domain: 'http://192.168.60.30:3300',
+      domain: 'https://pre-plug.jiansheku.com',
+      // domain: 'http://192.168.60.30:3300',
       ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912' // 需要携带的sdkId
     }
   },
@@ -28,7 +29,7 @@ export default {
         this.src = `${this.domain}/enterprise/${this.$route.params.id}?ak=${this.ak}`
       }
       if(this.$route.name=='Personnel'){ //人员详情
-        this.src = `${this.domain}/personnel/${this.$route.params.id}.html?ak=${this.ak}&referrer=true`
+        this.src = `${this.domain}/personnel/${this.$route.params.id}.html?ak=${this.ak}`
       }
     }
   },
@@ -53,7 +54,7 @@ export default {
           }
           // 点击栏目名及子标签动态设置滚动高度
           if (data.scrollHeight) {
-            window.scrollTo(sc, parseInt(data.scrollHeight) + 83)
+            window.scrollTo(sc, parseInt(data.scrollHeight) + _this.navHeight + 15)
           }
           // 点击下拉子标签动态设置滚动高度
           if (data.clientHeight) {
@@ -69,7 +70,7 @@ export default {
       // 准备传值
       this.$nextTick(() => {
         const ifa = this.$refs.companyIframe
-        ifa.contentWindow.postMessage({ 'scrollTop': this.scrollTop }, '*')
+        ifa.contentWindow.postMessage({ 'scrollTop': this.scrollTop, 'navHeight': this.navHeight }, '*')
       })
     }
   }