Merge branch 'dev' into ldx

src/views/jimureport/jimu.vue

+
+<template>
+    <i-frame :src="openUrl" id="jimuReportFrame"></i-frame>
+  </template>
+  <script>
+    import { getToken } from '@/utils/auth'
+    import iFrame from '@/components/iFrame/index'
+    export default {
+      name: "Jimu",
+      components: {iFrame},
+      data() {
+        return {
+          // 这里写暴露的统一的网关地址
+          openUrl: "http://192.168.100.39:8080/report/jmreport/list?token=" +getToken(),
+        };
+      },
+      mounted: function() {
+  
+      }
+    };
+  </script>
\ No newline at end of file

src/views/jimureport/view.vue

+
+<template>
+    <i-frame :src="openUrl"/>
+  </template>
+  
+  <script>
+  import {getToken} from '@/utils/auth'
+  import iFrame from "@/components/iFrame/index";
+  
+  export default {
+    name: 'jimuview',
+    components: {iFrame},
+    props: {
+      reportID: {
+        type: [String],
+        required: false,
+        default: ''
+      },
+    },
+    data() {
+      return {
+        serverUrl: 'http://192.168.100.39:8080',
+        openUrl: '',
+      }
+    },
+    created() {
+      if (this.reportID.length != 0) {
+        this.openUrl = this.serverUrl + '/report/jmreport/view/' + this.reportID + '?token=' +  getToken()
+      } else {
+        this.openUrl = this.serverUrl + '/report/jmreport/view/' + this.$route.path.substring(this.$route.path.lastIndexOf("/") + 1) + '?token=' + getToken()
+      }
+      console.log(this.openUrl)
+    }
+  }
+  </script>
+  
+  <style scoped>
+  
+  </style>
\ No newline at end of file