From e2ca9e582e9f0f7b8a26ad81477a6af56f06cc39 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 09:59:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-inspection/index.vue  | 17 +----
 .../trials/trials-panel/hirVisit/index.vue    | 62 ++++++++++++++-----
 .../trials-panel/reading/read-task/index.vue  | 59 +++++++++++++-----
 .../reading/reading-tracking/index.vue        | 59 +++++++++++++-----
 .../components/ClinicalData.vue               | 47 +++++++++-----
 5 files changed, 168 insertions(+), 76 deletions(-)

diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue
index 1d484fd..65e9277 100644
--- a/src/views/trials/trials-inspection/index.vue
+++ b/src/views/trials/trials-inspection/index.vue
@@ -214,7 +214,7 @@
     <el-dialog title="" :visible.sync="RecordVisible" :fullscreen="true">
       <downloadRecord :isSystem="true" v-if="RecordVisible" />
     </el-dialog>
-    <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
+    <!-- <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
       :close-on-click-modal="false" :close-on-press-escape="false" :before-close="handleClose">
       <div v-if="downloadType == 'downLoad' || downloadType == 'start'">
         <span style="margin-bottom: 5px;">{{ $t('dialog:sattus:downLoading') }}</span>
@@ -224,7 +224,7 @@
       <div v-else>
         <span>{{ $t('dialog:sattus:ziping') }}</span>
       </div>
-    </el-dialog>
+    </el-dialog>  -->
   </BaseContainer>
 </template>
 <script>
@@ -239,7 +239,7 @@ import { getPatientList, deletePatientStudyAllData, getDownloadPatientStudyInfo,
 import { getDicomCalledAEList, getDicomCallingAEList } from '@/api/dicomAE.js'
 import downloadRecord from "@/views/trials/trials-panel/trial-summary/download-record"
 import { getToken } from '@/utils/auth'
-import * as signalR from '@microsoft/signalr'
+// import * as signalR from '@microsoft/signalr' 
 import {
   downloadImageSuccess,
 } from '@/api/trials.js'
@@ -644,17 +644,6 @@ export default {
     this.$EventBus.$on("reload", (data) => {
       window.location.reload()
     });
-    let connection = new signalR.HubConnectionBuilder()
-      .withUrl("/DownloadHub", { accessTokenFactory: () => getToken() })
-      .configureLogging(signalR.LogLevel.Information)
-      .withAutomaticReconnect()
-      .build()
-    connection.start()
-    connection.on("ReceivProgressAsync", (id, obj) => {
-      console.log(obj)
-      this.speed = obj.speed
-      this.onUploadProgress(id, obj.sizePercent, 'downLoad')
-    });
   }
 }
 </script>
diff --git a/src/views/trials/trials-panel/hirVisit/index.vue b/src/views/trials/trials-panel/hirVisit/index.vue
index 0b634bf..b099512 100644
--- a/src/views/trials/trials-panel/hirVisit/index.vue
+++ b/src/views/trials/trials-panel/hirVisit/index.vue
@@ -186,7 +186,7 @@
     <editStudyList :visible.sync="editStudyVisible" :data="editStudyData" v-if="editStudyVisible" @getList="getList" />
     <!--访视详情-->
     <visitInfo v-if="visitVisible" :visible.sync="visitVisible" :rowData="rowData" />
-    <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
+    <!-- <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
       :close-on-click-modal="false" :close-on-press-escape="false" :before-close="handleClose">
       <div v-if="downloadType == 'downLoad' || downloadType == 'start'">
         <span style="margin-bottom: 5px;">{{ $t('dialog:sattus:downLoading') }}</span>
@@ -196,7 +196,7 @@
       <div v-else>
         <span>{{ $t('dialog:sattus:ziping') }}</span>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </BaseContainer>
 </template>
 <script>
@@ -209,7 +209,7 @@ import { getPatientSubejctVisitList } from '@/api/trials/visit.js'
 import { submitVisitStudyBinding } from '@/api/inspection.js'
 import { downLoadFile } from '@/utils/stream.js'
 import { getToken } from '@/utils/auth'
-import * as signalR from '@microsoft/signalr'
+// import * as signalR from '@microsoft/signalr'
 import {
   getDownloadSubjectVisitStudyInfo,
   VisitImageDownload,
@@ -277,17 +277,17 @@ export default {
     this.getList()
   },
   mounted() {
-    let connection = new signalR.HubConnectionBuilder()
-      .withUrl("/DownloadHub", { accessTokenFactory: () => getToken() })
-      .configureLogging(signalR.LogLevel.Information)
-      .withAutomaticReconnect()
-      .build()
-    connection.start()
-    connection.on("ReceivProgressAsync", (id, obj) => {
-      console.log(obj)
-      this.speed = obj.speed
-      this.onUploadProgress(id, obj.sizePercent, 'downLoad')
-    });
+    // let connection = new signalR.HubConnectionBuilder()
+    //   .withUrl("/DownloadHub", { accessTokenFactory: () => getToken() })
+    //   .configureLogging(signalR.LogLevel.Information)
+    //   .withAutomaticReconnect()
+    //   .build()
+    // connection.start()
+    // connection.on("ReceivProgressAsync", (id, obj) => {
+    //   console.log(obj)
+    //   this.speed = obj.speed
+    //   this.onUploadProgress(id, obj.sizePercent, 'downLoad')
+    // });
   },
   methods: {
     handleSelectionChange(val) {
@@ -454,9 +454,39 @@ export default {
         }
         this.downloadId = this.generate()
         data.CurrentNoticeId = this.downloadId
-        this.onUploadProgress(this.downloadId)
+        // this.onUploadProgress(this.downloadId)
         // this.downloading = true
-        await VisitImageDownload(data)
+        let params = null
+        data.SubjectVisitIdList.forEach(item => {
+          if (!params) {
+            params = `SubjectVisitIdList=${item}`
+          } else {
+            params += `&SubjectVisitIdList=${item}`
+          }
+        })
+        // data.ScpStudyIdList.forEach(item => {
+        //   if (!params) {
+        //     params = `ScpStudyIdList=${item}`
+        //   } else {
+        //     params += `&ScpStudyIdList=${item}`
+        //   }
+        // })
+        if (!params) {
+          params = `CurrentNoticeId=${this.downloadId}`
+        } else {
+          params += `&CurrentNoticeId=${this.downloadId}`
+        }
+        params += `&TrialId=${this.$route.query.trialId}`
+        if (params) {
+          params += `&access_token=${getToken()}`
+          let url = `/api/download/VisitImageDownload?${params}`
+          // let url = `http://106.14.89.110:30021/download/DownloadBigFileBatch?fileName=Test_HIR_New_log.ldf`
+          let a = document.createElement('a')
+          a.href = url
+          a.click()
+          a = null
+        }
+        // await VisitImageDownload(data)
         // this.downloading = false
         // if (res.IsSuccess) {
         //   this.downloadId = res.OtherInfo
diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 3f9e0fc..385601f 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -437,7 +437,7 @@
       width="600px">
       <ChatForm :row-data="currentRow" @getList="getList" @close="auditRecordVisible = false" />
     </el-dialog>
-    <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
+    <!-- <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
       :close-on-click-modal="false" :close-on-press-escape="false" :before-close="handleClose">
       <div v-if="downloadType == 'downLoad' || downloadType == 'start'">
         <span style="margin-bottom: 5px;">{{ $t('dialog:sattus:downLoading') }}</span>
@@ -447,7 +447,7 @@
       <div v-else>
         <span>{{ $t('dialog:sattus:ziping') }}</span>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </BaseContainer>
 </template>
 <script>
@@ -563,17 +563,17 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.getTrialCriterionList()
-    let connection = new signalR.HubConnectionBuilder()
-      .withUrl("/DownloadHub", { accessTokenFactory: () => getToken() })
-      .configureLogging(signalR.LogLevel.Information)
-      .withAutomaticReconnect()
-      .build()
-    connection.start()
-    connection.on("ReceivProgressAsync", (id, obj) => {
-      console.log(obj)
-      this.speed = obj.speed
-      this.onUploadProgress(id, obj.sizePercent, 'downLoad')
-    });
+    // let connection = new signalR.HubConnectionBuilder()
+    //   .withUrl("/DownloadHub", { accessTokenFactory: () => getToken() })
+    //   .configureLogging(signalR.LogLevel.Information)
+    //   .withAutomaticReconnect()
+    //   .build()
+    // connection.start()
+    // connection.on("ReceivProgressAsync", (id, obj) => {
+    //   console.log(obj)
+    //   this.speed = obj.speed
+    //   this.onUploadProgress(id, obj.sizePercent, 'downLoad')
+    // });
   },
   beforeDestroy() {
     if (this.openWindow) {
@@ -670,9 +670,36 @@ export default {
         }
         this.downloadId = this.generate()
         data.CurrentNoticeId = this.downloadId
-        this.onUploadProgress(this.downloadId)
-        // this.downloading = true
-        await VisitImageDownload(data)
+        let params = null
+        data.SubjectVisitIdList.forEach(item => {
+          if (!params) {
+            params = `SubjectVisitIdList=${item}`
+          } else {
+            params += `&SubjectVisitIdList=${item}`
+          }
+        })
+        // data.ScpStudyIdList.forEach(item => {
+        //   if (!params) {
+        //     params = `ScpStudyIdList=${item}`
+        //   } else {
+        //     params += `&ScpStudyIdList=${item}`
+        //   }
+        // })
+        if (!params) {
+          params = `CurrentNoticeId=${this.downloadId}`
+        } else {
+          params += `&CurrentNoticeId=${this.downloadId}`
+        }
+        params += `&TrialId=${this.$route.query.trialId}`
+        if (params) {
+          params += `&access_token=${getToken()}`
+          let url = `/api/download/VisitImageDownload?${params}`
+          // let url = `http://106.14.89.110:30021/download/DownloadBigFileBatch?fileName=Test_HIR_New_log.ldf`
+          let a = document.createElement('a')
+          a.href = url
+          a.click()
+          a = null
+        }
         // this.downloading = false
         // if (res.IsSuccess) {
         //   this.downloadId = res.OtherInfo
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index c185382..a962c21 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -224,7 +224,7 @@
         </template>
       </base-model>
     </template>
-    <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
+    <!-- <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
       :close-on-click-modal="false" :close-on-press-escape="false" :before-close="handleClose">
       <div v-if="downloadType == 'downLoad' || downloadType == 'start'">
         <span style="margin-bottom: 5px;">{{ $t('dialog:sattus:downLoading') }}</span>
@@ -234,7 +234,7 @@
       <div v-else>
         <span>{{ $t('dialog:sattus:ziping') }}</span>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </BaseContainer>
 </template>
 <script>
@@ -351,17 +351,17 @@ export default {
     }
   },
   mounted() {
-    let connection = new signalR.HubConnectionBuilder()
-      .withUrl("/DownloadHub", { accessTokenFactory: () => getToken() })
-      .configureLogging(signalR.LogLevel.Information)
-      .withAutomaticReconnect()
-      .build()
-    connection.start()
-    connection.on("ReceivProgressAsync", (id, obj) => {
-      console.log(obj)
-      this.speed = obj.speed
-      this.onUploadProgress(id, obj.sizePercent, 'downLoad')
-    });
+    // let connection = new signalR.HubConnectionBuilder()
+    //   .withUrl("/DownloadHub", { accessTokenFactory: () => getToken() })
+    //   .configureLogging(signalR.LogLevel.Information)
+    //   .withAutomaticReconnect()
+    //   .build()
+    // connection.start()
+    // connection.on("ReceivProgressAsync", (id, obj) => {
+    //   console.log(obj)
+    //   this.speed = obj.speed
+    //   this.onUploadProgress(id, obj.sizePercent, 'downLoad')
+    // });
   },
   methods: {
     handleSelectionChange(val) {
@@ -609,9 +609,38 @@ export default {
         }
         this.downloadId = this.generate()
         data.CurrentNoticeId = this.downloadId
-        this.onUploadProgress(this.downloadId)
+        // this.onUploadProgress(this.downloadId)
         // this.downloading = true
-        await VisitImageDownload(data)
+        let params = null
+        data.SubjectVisitIdList.forEach(item => {
+          if (!params) {
+            params = `SubjectVisitIdList=${item}`
+          } else {
+            params += `&SubjectVisitIdList=${item}`
+          }
+        })
+        // data.ScpStudyIdList.forEach(item => {
+        //   if (!params) {
+        //     params = `ScpStudyIdList=${item}`
+        //   } else {
+        //     params += `&ScpStudyIdList=${item}`
+        //   }
+        // })
+        if (!params) {
+          params = `CurrentNoticeId=${this.downloadId}`
+        } else {
+          params += `&CurrentNoticeId=${this.downloadId}`
+        }
+        params += `&TrialId=${this.$route.query.trialId}`
+        if (params) {
+          params += `&access_token=${getToken()}`
+          let url = `/api/download/VisitImageDownload?${params}`
+          // let url = `http://106.14.89.110:30021/download/DownloadBigFileBatch?fileName=Test_HIR_New_log.ldf`
+          let a = document.createElement('a')
+          a.href = url
+          a.click()
+          a = null
+        }
         // this.downloading = false
         // if (res.IsSuccess) {
         //   this.downloadId = res.OtherInfo
diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
index 1278867..aa073d0 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
@@ -317,7 +317,7 @@
         </el-dialog>
       </div>
     </div>
-    <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
+    <!-- <el-dialog :title="$t('dialog:title:downLoadProgress')" :visible.sync="downloadVisible" width="35%"
       :close-on-click-modal="false" :close-on-press-escape="false" :before-close="handleClose">
       <div v-if="downloadType == 'downLoad' || downloadType == 'start'">
         <span style="margin-bottom: 5px;">{{ $t('dialog:sattus:downLoading') }}</span>
@@ -327,7 +327,7 @@
       <div v-else>
         <span>{{ $t('dialog:sattus:ziping') }}</span>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 <script>
@@ -415,17 +415,17 @@ export default {
         this.getList()
       }
     })
-    let connection = new signalR.HubConnectionBuilder()
-      .withUrl("/DownloadHub", { accessTokenFactory: () => getToken() })
-      .configureLogging(signalR.LogLevel.Information)
-      .withAutomaticReconnect()
-      .build()
-    connection.start()
-    connection.on("ReceivProgressAsync", (id, obj) => {
-      console.log(obj)
-      this.speed = obj.speed
-      this.onUploadProgress(id, obj.sizePercent, 'downLoad')
-    });
+    // let connection = new signalR.HubConnectionBuilder()
+    //   .withUrl("/DownloadHub", { accessTokenFactory: () => getToken() })
+    //   .configureLogging(signalR.LogLevel.Information)
+    //   .withAutomaticReconnect()
+    //   .build()
+    // connection.start()
+    // connection.on("ReceivProgressAsync", (id, obj) => {
+    //   console.log(obj)
+    //   this.speed = obj.speed
+    //   this.onUploadProgress(id, obj.sizePercent, 'downLoad')
+    // });
   },
   methods: {
     handleClose(done) {
@@ -487,8 +487,25 @@ export default {
         }
         this.downloadId = this.generate()
         param.CurrentNoticeId = this.downloadId
-        this.onUploadProgress(this.downloadId)
-        await ClinicalDataDownload(param)
+        // this.onUploadProgress(this.downloadId)
+        let params = null
+        Object.keys(param).forEach(key => {
+          if (!params) {
+            params = `${key}=${param[key]}`
+          } else {
+            params += `&${key}=${param[key]}`
+          }
+        })
+        if (params) {
+          params += `&access_token=${getToken()}`
+          let url = `/api/download/ClinicalDataDownload?${params}`
+          // let url = `http://106.14.89.110:30021/download/DownloadBigFileBatch?fileName=Test_HIR_New_log.ldf`
+          let a = document.createElement('a')
+          a.href = url
+          a.click()
+          a = null
+        }
+        // await ClinicalDataDownload(param)
       } catch (err) {
         console.log(err)
       }