From aeb016615b96bf7db34d88f01c68c1d66522b4f5 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 6 Mar 2023 16:53:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/pms/reportDesign/index.vue  | 42 ++++++++++++++++---
 src/views/modules/pms/reportPreview/index.vue | 19 ++++++---
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/pms/reportDesign/index.vue b/src/views/modules/pms/reportDesign/index.vue
index 934b590..87b0526 100644
--- a/src/views/modules/pms/reportDesign/index.vue
+++ b/src/views/modules/pms/reportDesign/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <div>design</div>
+  <div v-loading="loading" style="" class="main-container">
+    <iframe ref="report-view" id="report-view" name="main-iframe" :src="url" frameborder="0" scrolling="auto" />
+  </div>
 </template>
 
 <script>
@@ -7,12 +9,42 @@ export default {
   name: "ReportDesign",
   props: {},
   data() {
-    return {};
+    return {
+      loading: true,
+      url: "",
+      // url: "/pms-am/ureport/preview", // 不行
+      // url: "http://192.168.1.62:8080/pms-am/ureport/preview",  // 可以，但不通用
+      // url: window.SITE_CONFIG["apiURL"] + "/ureport/designer",
+    };
+  },
+  beforeRouteEnter(to, from, next) {
+    next((vm) => {
+      vm.loading = true;
+      vm.url = window.SITE_CONFIG["apiURL"] + "/ureport/designer?_u=db:" + to.query.name; // + ".ureport.xml";
+    });
+  },
+  mounted() {
+    const iframe = this.$refs["report-view"];
+    iframe.onload = () => {
+      this.loading = false;
+    };
   },
-  created() {},
-  mounted() {},
   methods: {},
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.main-container {
+  min-height: inherit;
+  /* padding: 16px; */
+  background: white;
+  /* border-radius: 6px; */
+  /* box-shadow: 0 0 1.125px 0.125px rgba(0, 0, 0, 0.125); */
+  /* height: 100%; */
+}
+
+#report-view {
+  width: 100%;
+  min-height: inherit;
+}
+</style>
diff --git a/src/views/modules/pms/reportPreview/index.vue b/src/views/modules/pms/reportPreview/index.vue
index 50fba87..0138fc6 100644
--- a/src/views/modules/pms/reportPreview/index.vue
+++ b/src/views/modules/pms/reportPreview/index.vue
@@ -11,14 +11,20 @@ export default {
   data() {
     return {
       loading: true,
+      url: "",
       // url: "/pms-am/ureport/preview", // 不行
       // url: "http://192.168.1.62:8080/pms-am/ureport/preview",
-      url: window.SITE_CONFIG['apiURL'] + '/ureport/preview'
+      // url: window.SITE_CONFIG['apiURL'] + '/ureport/preview'
     };
   },
-  created() {},
+  beforeRouteEnter(to, from, next) {
+    next((vm) => {
+      vm.loading = true;
+      vm.url = window.SITE_CONFIG["apiURL"] + "/ureport/preview?_u=db:" + to.query.name; // + ".ureport.xml";
+    });
+  },
+
   mounted() {
-    this.url += "?_u=db:" + this.$route.query.name  // + ".ureport.xml";
     if (this.$route.query.substrateId) {
       this.url += "&substrateId=" + this.$route.query.substrateId;
     }
@@ -34,9 +40,10 @@ export default {
     if (this.$route.query.id) {
       this.url += "&id=" + this.$route.query.id;
     }
-    const iframe = this.$refs['report-view']
-    console.log('iframe', iframe)
-    iframe.onload = () => this.loading = false
+    const iframe = this.$refs["report-view"];
+    iframe.onload = () => {
+      this.loading = false;
+    };
   },
   methods: {},
 };