合并分支 'dev_hhq' 到 'master'

src/views/thinkTank/reportOriginal/index.vue

@@ -33,9 +33,14 @@
 
       </div>
       <div class="report-box">
+        <iframe :src="reportUrl" width="50%" height="100%">
 
-        <pdf :pdfUrl="reportUrl" style="width: 48%;" />
-        <pdf :pdfUrl="reportUrlEn" style="width: 48%;" />
+        </iframe>
+        <iframe :src="reportUrlEn" width="50%" height="100%">
+
+        </iframe>
+        <!-- <pdf :pdfUrl="reportUrl" style="width: 48%;" />
+        <pdf :pdfUrl="reportUrlEn" style="width: 48%;" /> -->
         <!-- <iframe src="https://www.rand.org/pubs/research_reports/RRA3572-1.html" width="100%" height="600px"
           frameborder="0" allowfullscreen></iframe> -->
       </div>
@@ -47,7 +52,8 @@
 import { ref, onMounted } from "vue";
 import pdf from "./pdf.vue";
 import {
-  getThinkTankReportSummary
+  getThinkTankReportSummary,
+  getThinkTankReportcontentUrl
 } from "@/api/thinkTank/overview";
 import { useRouter } from "vue-router";
 
@@ -66,15 +72,27 @@ const handleGetThinkTankReportSummary = async () => {
     const res = await getThinkTankReportSummary(router.currentRoute._value.params.id);
     console.log("报告全局信息", res);
     if (res.code === 200 && res.data) {
-      reportUrl.value = res.data.contentUrl
-      reportUrlEn.value = res.data.contentEn
+
       thinkInfo.value = res.data
     }
   } catch (error) {
     console.error("获取报告全局信息error", error);
   }
 };
+//获取原文
+const handleGetThinkTankReportcontentUrl = async () => {
+  try {
+    const res = await getThinkTankReportcontentUrl(router.currentRoute._value.params.id);
+    console.log("获取原文", res);
+    if (res.code === 200 && res.data) {
+      reportUrl.value = res.data.content
+      reportUrlEn.value = res.data.contentEn
 
+    }
+  } catch (error) {
+    console.error("获取原文error", error);
+  }
+};
 
 const tabActiveName = ref("报告分析");
 
@@ -83,6 +101,7 @@ const switchTab = name => {
 };
 onMounted(async () => {
   handleGetThinkTankReportSummary()
+  handleGetThinkTankReportcontentUrl()
 });
 </script>
 
@@ -93,7 +112,7 @@ onMounted(async () => {
 
   .header {
     width: 1920px;
-    height: 125px;
+
     box-sizing: border-box;
     border-bottom: 1px solid rgba(234, 236, 238, 1);
     border-top: 1px solid rgba(234, 236, 238, 1);
@@ -103,6 +122,7 @@ onMounted(async () => {
     .header-top {
       margin-top: 20px;
       margin-left: 160px;
+      margin-bottom: 20px;
       display: flex;
       justify-content: space-between;
       margin-right: 160px;