From 464b5ff3afdc7b6ac60bc74435ee38b50c0726ec Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Thu, 13 Jul 2023 16:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=84=E4=B8=AA=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E4=B8=8B=E8=BD=BD=EF=BC=8C=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=EF=BC=8Czip=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/detail.vue               | 52 +++++++++++++++++--
 .../{imsProducts => }/fileDetail.vue          | 34 +++++++-----
 .../nobleGas/betaGamma/calibphd.vue           |  2 +-
 .../nobleGas/betaGamma/detbkphd.vue           |  2 +-
 .../radionuclide/nobleGas/betaGamma/qcphd.vue |  2 +-
 .../radionuclide/nobleGas/betaGamma/sphdf.vue |  2 +-
 .../radionuclide/nobleGas/betaGamma/sphdp.vue |  2 +-
 .../radionuclide/nobleGas/hpge/calibphd.vue   |  2 +-
 .../radionuclide/nobleGas/hpge/detbkphd.vue   |  2 +-
 .../radionuclide/nobleGas/hpge/qcphd.vue      |  2 +-
 .../radionuclide/nobleGas/hpge/sphdf.vue      |  2 +-
 .../radionuclide/nobleGas/hpge/sphdp.vue      |  2 +-
 .../radionuclide/particulate/blankphd.vue     |  6 ++-
 .../radionuclide/particulate/calibphd.vue     |  2 +-
 .../radionuclide/particulate/detbkphd.vue     |  2 +-
 .../radionuclide/particulate/qcphd.vue        |  2 +-
 .../radionuclide/particulate/sphdf.vue        |  2 +-
 .../radionuclide/particulate/sphdp.vue        |  2 +-
 .../imsData/stateOfHealth/rmssoh.vue          | 19 ++++++-
 .../statistics/imsProducts/arr/index.vue      |  2 +-
 .../statistics/imsProducts/rrr/index.vue      |  2 +-
 src/views/statistics/list.vue                 | 11 ++--
 22 files changed, 114 insertions(+), 42 deletions(-)
 rename src/views/statistics/{imsProducts => }/fileDetail.vue (71%)

diff --git a/src/views/statistics/detail.vue b/src/views/statistics/detail.vue
index 68b3899..4b9caf7 100644
--- a/src/views/statistics/detail.vue
+++ b/src/views/statistics/detail.vue
@@ -7,13 +7,28 @@
         </div>
         <div class="top-actions">
           <div class="right-btn">
-            <img class="icon-download" src="../../assets/images/web-statistics/download.png" alt=""><span style="margin-left: 10px;">ZIP</span>
+            <a :href="zipSrc" :download="type" target="_blank" rel="noopener noreferrer">
+              <img class="icon-download" src="../../assets/images/web-statistics/download.png" alt="">
+              <span style="margin-left: 10px;">
+                ZIP
+              </span>
+            </a>
           </div>
           <div class="right-btn">
-            <img class="icon-download" src="../../assets/images/web-statistics/download.png" alt=""><span style="margin-left: 10px;">TXT</span>
+            <a :href="fileSrc" :download="type" target="_blank" rel="noopener noreferrer">
+              <img class="icon-download" src="../../assets/images/web-statistics/download.png" alt="">
+              <span style="margin-left: 10px;">
+                TXT
+              </span>
+            </a>
           </div>
           <div class="right-btn">
-            <img class="icon-view" src="../../assets/images/web-statistics/view.png" alt=""><span style="margin-left: 10px;">View Report</span>
+            <a :href="fileSrc" target="_blank" rel="noopener noreferrer">
+              <img class="icon-view" src="../../assets/images/web-statistics/view.png" alt="">
+              <span style="margin-left: 10px;">
+                View Report
+              </span>
+            </a>
           </div>
         </div>
       </div>
@@ -249,6 +264,7 @@
 </template>
 
 <script>
+import { getAction } from '../../api/manage'
 const colorList=["#0D5fff","#287D3C","#DF1512","#F3BF24","#D3D4DE","#000000"]
 import * as echarts from 'echarts'
 export default {
@@ -257,6 +273,14 @@ export default {
         type: Object,
         default: ()=>{}
       },
+      sampleId: {
+        type: String,
+        default:""
+      },
+      type: {
+        type: String,
+        default:""
+      }
     },
     watch: {
       allData: {
@@ -517,6 +541,8 @@ export default {
           level_5:[],
           level_6:[]
         },
+        fileSrc: "",
+        zipSrc:""
       }
     },
     mounted () {
@@ -552,9 +578,24 @@ export default {
           this.dataSourceHistogray.level_6.push(item)
         }
       });
-      this.dataSourceCertificate = this.allData.certificateBlock?this.allData.certificateBlock.certificateSubBlock:[]
+      this.dataSourceCertificate = this.allData.certificateBlock ? this.allData.certificateBlock.certificateSubBlock : []
+      this.getFildBlob()
     },
   methods: {
+    getFildBlob() {
+      let _this = this
+      let params = {
+        // sampleId: this.sampleId,
+        sampleId:"1523651"
+      }
+      let url = "/webStatistics/radionuclideFile"
+      getAction(url, params).then((res) => {
+        const blob = new Blob([res], { type: 'text/plain' })
+        const blobZip = new Blob([res], { type: 'application/zip' })
+        _this.fileSrc = window.URL.createObjectURL(blob)
+        _this.zipSrc = window.URL.createObjectURL(blobZip)
+      })
+    },
     getUid() {
       return (Math.random()+new Date().getTime()).toString(32).slice(0,8)
     },
@@ -791,6 +832,9 @@ export default {
         width: 15px;
         height: 16px;
       }
+      a{
+        color: white;
+      }
     }
   }
 }
diff --git a/src/views/statistics/imsProducts/fileDetail.vue b/src/views/statistics/fileDetail.vue
similarity index 71%
rename from src/views/statistics/imsProducts/fileDetail.vue
rename to src/views/statistics/fileDetail.vue
index 9bd586f..11139f7 100644
--- a/src/views/statistics/imsProducts/fileDetail.vue
+++ b/src/views/statistics/fileDetail.vue
@@ -2,25 +2,25 @@
   <a-card :bordered="false" style="margin-left: 20px;height: 100%;">
     <div class="detail-top">
         <div class="top-back" @click="handleback">
-          <img class="icon-back" src="../../../assets/images/web-statistics/return.png" alt="">
+          <img class="icon-back" src="../../assets/images/web-statistics/return.png" alt="">
           <span style="margin-left: 10px;">return</span>
         </div>
         <div class="top-actions">
           <div class="right-btn">
-            <img class="icon-download" src="../../../assets/images/web-statistics/download.png" alt="">
-            <span style="margin-left: 10px;">
-              <a :href="fileSrc" :download="type" target="_blank" rel="noopener noreferrer">
+            <a :href="fileSrc" :download="type" target="_blank" rel="noopener noreferrer">
+              <img class="icon-download" src="../../assets/images/web-statistics/download.png" alt="">
+              <span style="margin-left: 10px;">
                 TXT
-              </a>
-            </span>
+              </span>
+            </a>
           </div>
           <div class="right-btn">
-            <img class="icon-view" src="../../../assets/images/web-statistics/view.png" alt="">
-            <span style="margin-left: 10px;">
-              <a :href="fileSrc" target="_blank" rel="noopener noreferrer">
+            <a :href="fileSrc" target="_blank" rel="noopener noreferrer">
+              <img class="icon-view" src="../../assets/images/web-statistics/view.png" alt="">
+              <span style="margin-left: 10px;">
                 View Report
-              </a>
-            </span>
+              </span>
+            </a>
           </div>
         </div>
     </div>
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { getAction } from '../../../api/manage'
+import { getAction } from '../../api/manage'
 export default {
   props: {
     type: {
@@ -58,13 +58,19 @@ export default {
     },
     getFildBlob() {
       let _this = this
-      let params = {
+      let paramsRr = {
         type: this.type,
         sampleId: this.sampleId,
         // type: "rrr",
         // sampleId:"1523651"
       }
-      getAction("/radionuclide/reportContent", params).then((res) => {
+      let paramsSoh = {
+        // sohId:"11"
+        sohId:this.sampleId
+      }
+      let url = this.type === "soh" ? "/webStatistics/sohFile" : "/webStatistics/arFile"
+      let params = this.type === "soh" ? paramsSoh : paramsRr
+      getAction(url, params).then((res) => {
         const blob = new Blob([res], { type: 'text/plain' })
         _this.fileSrc = window.URL.createObjectURL(blob)
         var reader = new FileReader();
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/calibphd.vue b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/calibphd.vue
index ab4842b..e47091f 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/calibphd.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/calibphd.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="CALIBPHD"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/detbkphd.vue b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/detbkphd.vue
index 7adf5e9..4d9519e 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/detbkphd.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/detbkphd.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="DETBKPHD"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/qcphd.vue b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/qcphd.vue
index fa096ec..2fde8e7 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/qcphd.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/qcphd.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="QCPHD"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdf.vue b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdf.vue
index 58693a0..c213a9d 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdf.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdf.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDF"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdp.vue b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdp.vue
index 081b24f..7b07e9f 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdp.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdp.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDP"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/calibphd.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/calibphd.vue
index 1f8b315..b0d44ba 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/calibphd.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/calibphd.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="CALIBPHD"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/detbkphd.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/detbkphd.vue
index 6be846c..dda6423 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/detbkphd.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/detbkphd.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="DETBKPHD"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/qcphd.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/qcphd.vue
index 9c70200..0ec933c 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/qcphd.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/qcphd.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="QCPHD"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdf.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdf.vue
index 75d0dff..ca91a9f 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdf.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdf.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDF"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdp.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdp.vue
index 3a98c44..e683ab2 100644
--- a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdp.vue
+++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdp.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDP"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
index d061a73..7445939 100644
--- a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
@@ -26,7 +26,7 @@
         </template>
       </custom-table>
     </a-card>
-    <Detail v-if="isDetail" :allData="detailJson" @back="handleBack"></Detail>
+    <Detail v-if="isDetail" type="BLANKPHD" :sampleId="currSampleId" :allData="detailJson" @back="handleBack"></Detail>
   </div>
 </template>
 <script>
@@ -110,7 +110,8 @@ export default {
       dataSource: [],
       detailJson: {},
       strIds: "",
-      allChecked:false
+      allChecked: false,
+      currSampleId:""
     }
   },
   // mounted() {
@@ -156,6 +157,7 @@ export default {
       })
     },
     handleDetail(record) {
+      this.currSampleId = record.sampleId
       getAction("webStatistics/findGeneratedReport", { sampleId: record.sampleId }).then(res => {
         if (res.success) {
           this.detailJson = res.result
diff --git a/src/views/statistics/imsData/radionuclide/particulate/calibphd.vue b/src/views/statistics/imsData/radionuclide/particulate/calibphd.vue
index de74a3d..c82c691 100644
--- a/src/views/statistics/imsData/radionuclide/particulate/calibphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/calibphd.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="CALIBPHD"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/particulate/detbkphd.vue b/src/views/statistics/imsData/radionuclide/particulate/detbkphd.vue
index 4897fb4..30c7ccd 100644
--- a/src/views/statistics/imsData/radionuclide/particulate/detbkphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/detbkphd.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="DETBKPHD"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/particulate/qcphd.vue b/src/views/statistics/imsData/radionuclide/particulate/qcphd.vue
index 0aae77b..85f1d30 100644
--- a/src/views/statistics/imsData/radionuclide/particulate/qcphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/qcphd.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="QCPHD"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/particulate/sphdf.vue b/src/views/statistics/imsData/radionuclide/particulate/sphdf.vue
index 23e2a4e..cd536c8 100644
--- a/src/views/statistics/imsData/radionuclide/particulate/sphdf.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/sphdf.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDF"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue b/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
index 3b17826..fc278a1 100644
--- a/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDP"></List>
   </div>
 </template>
 
diff --git a/src/views/statistics/imsData/stateOfHealth/rmssoh.vue b/src/views/statistics/imsData/stateOfHealth/rmssoh.vue
index 1ce091d..8b848e8 100644
--- a/src/views/statistics/imsData/stateOfHealth/rmssoh.vue
+++ b/src/views/statistics/imsData/stateOfHealth/rmssoh.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <a-card :bordered="false" style="margin-left: 20px">
+    <a-card v-if="!isFileDetail" :bordered="false" style="margin-left: 20px">
       <search-form :items="formItems" v-model="queryParam" @search="searchQueryData">
         <a-space style="float: right" class="btn-group" slot="additional">
           <a-button @click="handleEdit" type="primary">
@@ -18,12 +18,14 @@
         :loading="loading"
         :canSelect="false"
         @change="handleTableChange"
+        @detail="handleDetail"
       >
         <template slot="index" slot-scope="{ index }">
           {{ index + 1 }}
         </template>
       </custom-table>
     </a-card>
+    <FileDetail v-if="isFileDetail" type="soh" :sampleId="currSampleId" @back="handleBack"></FileDetail>
   </div>
 </template>
 <script>
@@ -74,9 +76,13 @@ import { compareDate } from "../../commom"
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction } from '../../../../api/manage'
 import dateFormat from '../../../../components/jeecg/JEasyCron/format-date'
+import FileDetail from "../../fileDetail.vue"
 export default {
   name: 'menuTree',
   mixins: [JeecgListMixin],
+  components: {
+    FileDetail,
+  },
   data() {
     return {
       isImmediate:true,
@@ -95,13 +101,22 @@ export default {
       stationList: [],
       dataSource: [],
       strIds: "",
-      allChecked:false
+      allChecked: false,
+      isFileDetail: false,
+      currSampleId:""
     }
   },
   created() {
     this.findStationList()
   },
   methods: {
+    handleBack(flag) {
+      this.isFileDetail = flag
+    },
+    handleDetail(record) {
+      this.currSampleId = record.sohId
+      this.isFileDetail = true
+    },
     searchQueryData() {
       let days = compareDate(this.queryParam.startTime, this.queryParam.endTime)
       if (days <= 10) { 
diff --git a/src/views/statistics/imsProducts/arr/index.vue b/src/views/statistics/imsProducts/arr/index.vue
index 2a9ada3..c848852 100644
--- a/src/views/statistics/imsProducts/arr/index.vue
+++ b/src/views/statistics/imsProducts/arr/index.vue
@@ -75,7 +75,7 @@ import { compareDate } from "../../commom"
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction } from '../../../../api/manage'
 import dateFormat from '../../../../components/jeecg/JEasyCron/format-date'
-import FileDetail from "../fileDetail.vue"
+import FileDetail from "../../fileDetail.vue"
 export default {
   name: 'menuTree',
   mixins: [JeecgListMixin],
diff --git a/src/views/statistics/imsProducts/rrr/index.vue b/src/views/statistics/imsProducts/rrr/index.vue
index 72084b2..d0182d7 100644
--- a/src/views/statistics/imsProducts/rrr/index.vue
+++ b/src/views/statistics/imsProducts/rrr/index.vue
@@ -75,7 +75,7 @@ import { compareDate } from "../../commom"
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction } from '../../../../api/manage'
 import dateFormat from '../../../../components/jeecg/JEasyCron/format-date'
-import FileDetail from "../fileDetail.vue"
+import FileDetail from "../../fileDetail.vue"
 export default {
   name: 'menuTree',
   mixins: [JeecgListMixin],
diff --git a/src/views/statistics/list.vue b/src/views/statistics/list.vue
index 0bc60bd..168183f 100644
--- a/src/views/statistics/list.vue
+++ b/src/views/statistics/list.vue
@@ -25,7 +25,7 @@
         </template>
       </custom-table>
     </a-card>
-    <Detail v-if="isDetail" :allData="detailJson" @back="handleBack"></Detail>
+    <Detail v-if="isDetail" :type="fileName" :sampleId="currSampleId" :allData="detailJson" @back="handleBack"></Detail>
   </div>
 </template>
 <script>
@@ -49,6 +49,10 @@ export default {
       type: String,
       default:""
     },
+    fileName: {
+      type: String,
+      default:""
+    },
     spectralQualifie: {
       type: String,
       default:""
@@ -77,7 +81,8 @@ export default {
       },
       dataSource: [],
       detailJson: {},
-      allChecked:false
+      allChecked: false,
+      currSampleId:""
     }
   },
   methods: {
@@ -106,7 +111,7 @@ export default {
       })
     },
     handleDetail(record) {
-      // 测试接口数据 record.sampleId
+      this.currSampleId = record.sampleId
       getAction("webStatistics/findGeneratedReport", { sampleId: record.sampleId }).then(res => {
       // getAction("webStatistics/findGeneratedReport", { sampleId: "1523651" }).then(res => {
         if (res.success){