Merge branch 'bingo-dev'

t push

以 '#' 开始的行将被忽略，而空的提交说明将终止提交。

public/js/system.config.js

@@ -5,7 +5,7 @@ const SystemConfig = {
  
   PUBLIC_PATH: '/api',
   //TODO VUE_APP_BASE_URL: "http://25.66.210.41/tools",
-  VUE_APP_BASE_URL: "http://192.168.0.113:18088/tools",
+  VUE_APP_BASE_URL: "http://192.168.0.104:18088/tools",
   //TODO VUE_APP_ZJ_IFRAME: "http://25.66.210.41/arch"
   // VUE_APP_ZJ_IFRAME: "http://192.168.0.113/arch"
   VUE_APP_ZJ_IFRAME: "http://localhost:30478/arch"

src/views/layout/analysisCore.vue

 <template>
-
-  <iframe :src="zjIframe" frameborder="0"  id="iframezj" ></iframe>
+  <iframe :src="zjIframe" frameborder="0" id="iframezj"></iframe>
 </template>
 
 <script>
 export default {
-  data(){
-    return{
-    id:sessionStorage.getItem('author'),
-    zjIframe:''
-  }
-
+  data() {
+    return {
+      id: sessionStorage.getItem("author"),
+      zjIframe: "",
+    };
   },
-  mounted(){
-    this.zjIframe=SystemConfig.VUE_APP_ZJ_IFRAME+'/static/'
-    console.log(sessionStorage.getItem('authorized-token'),'zi级session')
-    let auto=sessionStorage.getItem('author')
-    const iFrame = document.getElementById('iframe')
-    iFrame.onload = function(){
-      iFrame.contentWindow.postMessage(auto, '\*');
-    }
-  }
- 
-}
+  mounted() {
+    this.zjIframe = SystemConfig.VUE_APP_ZJ_IFRAME + "/static/";
+    console.log(sessionStorage.getItem("authorized-token"), "zi级session");
+    let auto = sessionStorage.getItem("author");
+    const iFrame = document.getElementById("iframezj");
+    iFrame.onload = function () {
+      iFrame.contentWindow.postMessage(auto, "\*");
+      // iFrame.contentWindow.postMessage(
+      //   // TODO  该逻辑实现iframe父级页面传递数据到iframe子级页面，子级页面接收数据代码示例在这个文件中 => /Users/bingo/worksapce/zhijie-web/src/views/panorama/projectScale/requirement/index.vue
+      //   {
+      //     type: "PARENT_DATA",
+      //     payload: {
+      //       user: 'rigou',
+      //       token: 'gouzi',
+      //     },
+      //   },
+      //   "*"
+      // ); // '*' 表示允许任何域名，建议替换为具体的iframe域名
+    };
+  },
+};
 </script>
 
 <style>
-#iframezj{
+#iframezj {
   width: 100%;
   /* height: 100vh; */
   height: calc(100vh - 100px);
 }
-
-</style>
\ No newline at end of file
+</style>