From 05ab287e81e95fec2e4aa17c5d1176a0770499a5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 17 Jul 2024 13:05:32 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 30a0efb2..4d8142b0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -183,7 +183,7 @@
           {{ $t("login:title:system_title") }}
         </p>
         <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V1.5.2.001</p>
+        <p style="margin-bottom: 20px">V1.5.3.001</p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
           版权所有

From 32ded4998260254db561a502ea1b39d4eb469de9 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 17 Jul 2024 14:59:10 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=A3=81=E5=88=A4=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E5=8F=8A=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |  1 -
 .../trials-panel/reading/ad-review/index.vue  | 52 +++++++++---------
 .../components/Conclusions.vue                | 55 ++++++++++---------
 3 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/src/main.js b/src/main.js
index ca6f2088..201e709b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -44,7 +44,6 @@ Viewer.setDefaults({
     'rotatable': true,
     'scalable': true,
     'transition': true,
-    'fullscreen': true,
     'keyboard': true,
     'url': 'data-source'
   }
diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue
index ae540920..435edc96 100644
--- a/src/views/trials/trials-panel/reading/ad-review/index.vue
+++ b/src/views/trials/trials-panel/reading/ad-review/index.vue
@@ -203,28 +203,30 @@
           >
             <i slot="default" class="el-icon-plus" />
             <div slot="file" slot-scope="{file}">
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="OSSclientConfig.basePath + file.url"
-                alt=""
-                crossorigin="anonymous"
-              >
-              <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
+              <viewer :images="images" :ref="file.url">
+                <img
+                  class="el-upload-list__item-thumbnail"
+                  :src="OSSclientConfig.basePath + file.url"
+                  alt=""
+                  crossorigin="anonymous"
                 >
-                  <i class="el-icon-zoom-in" />
-                </span>
+                <span class="el-upload-list__item-actions">
+                  <span
+                    class="el-upload-list__item-preview"
+                    @click="handlePictureCardPreview(file)"
+                  >
+                    <i class="el-icon-zoom-in" />
+                  </span>
 
-                <span
-                  v-if="adInfo.ReadingTaskState < 2"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
-                  <i class="el-icon-delete" />
+                  <span
+                    v-if="adInfo.ReadingTaskState < 2"
+                    class="el-upload-list__item-delete"
+                    @click="handleRemove(file)"
+                  >
+                    <i class="el-icon-delete" />
+                  </span>
                 </span>
-              </span>
+              </viewer>
             </div>
           </el-upload>
           
@@ -303,9 +305,6 @@
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
-    <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
-      <img :src="imageUrl"  crossorigin="anonymous" alt="">
-    </viewer>
   </div>
 </template>
 <script>
@@ -388,7 +387,8 @@ export default {
       judgeResultArmEnum: '',
       criterionType: null,
       openWindow: null,
-      isFixed: false
+      isFixed: false,
+      images: []
     }
   },
   // watch: {
@@ -707,9 +707,9 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.imgVisible = true
-      this.$refs.viewer.$viewer.show()
+      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
+      // this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.$refs[file.url].$viewer.show()
     },
     // 删除图片
     handleRemove(file, fileList) {
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 99781199..c34c8289 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -92,28 +92,30 @@
         >
           <i slot="default" class="el-icon-plus" />
           <div slot="file" slot-scope="{file}">
-            <img
-              class="el-upload-list__item-thumbnail"
-              :src="OSSclientConfig.basePath + file.url"
-              crossOrigin="anonymous"
-              alt=""
-            >
-            <span class="el-upload-list__item-actions">
-              <span
-                class="el-upload-list__item-preview"
-                @click="handlePictureCardPreview(file)"
+            <viewer :images="images" :ref="file.url">
+              <img
+                class="el-upload-list__item-thumbnail"
+                :src="OSSclientConfig.basePath + file.url"
+                crossOrigin="anonymous"
+                alt=""
               >
-                <i class="el-icon-zoom-in" />
-              </span>
+              <span class="el-upload-list__item-actions">
+                <span
+                  class="el-upload-list__item-preview"
+                  @click="handlePictureCardPreview(file)"
+                >
+                  <i class="el-icon-zoom-in" />
+                </span>
 
-              <span
-                v-if="!isSendMessage && auditState!==2"
-                class="el-upload-list__item-delete"
-                @click="handleRemove(file)"
-              >
-                <i class="el-icon-delete" />
+                <span
+                  v-if="!isSendMessage && auditState!==2"
+                  class="el-upload-list__item-delete"
+                  @click="handleRemove(file)"
+                >
+                  <i class="el-icon-delete" />
+                </span>
               </span>
-            </span>
+            </viewer>
           </div>
         </el-upload>
         <!-- <el-dialog
@@ -130,9 +132,9 @@
       </el-form-item>
 
     </el-form>
-    <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
+    <!-- <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
       <img :src="imageUrl"  crossorigin="anonymous" alt="">
-    </viewer>
+    </viewer> -->
     <el-dialog
       v-if="chatVisible"
       :visible.sync="chatVisible"
@@ -222,7 +224,8 @@ export default {
       userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
       isClosedDialog: false,
       isSendMessage: false,
-      closeQuestionVisible: false
+      closeQuestionVisible: false,
+      images:[]
     }
   },
   mounted() {
@@ -382,9 +385,9 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.imgVisible = true
-      this.$refs.viewer.$viewer.show()
+      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
+      // this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.$refs[file.url].$viewer.show()
     },
     // 删除图片
     handleRemove(file, fileList) {
@@ -394,7 +397,7 @@ export default {
     },
     initializeViewer() {
       Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
+        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true}
       })
     }
   }

From 81506cc3372c2022fb5e38b42bb2b041584a9909 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 17 Jul 2024 16:49:39 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/uploadZip.js | 68 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js
index 3b0ded22..2844e3da 100644
--- a/src/utils/uploadZip.js
+++ b/src/utils/uploadZip.js
@@ -24,18 +24,20 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
             }
             let a = document.createElement("a");
             let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
-            // let fileName =
-            //     res.Result.split("/")[res.Result.split("/").length - 1];
-            a.download = res.OtherInfo.fileName;
-            a.href = href;
-            a.click();
-            URL.revokeObjectURL(href);
-            let timer = setTimeout(() => {
-                a = null;
-                href = null;
-                timer = null;
-            }, 500)
+            download(href, res.OtherInfo.FileName)
             return 2;
+            // // let fileName =
+            // //     res.Result.split("/")[res.Result.split("/").length - 1];
+            // a.download = res.OtherInfo.FileName;
+            // a.href = href;
+            // a.click();
+            // URL.revokeObjectURL(href);
+            // let timer = setTimeout(() => {
+            //     a = null;
+            //     href = null;
+            //     timer = null;
+            // }, 500)
+            // return 2;
         } else {
             return false;
         }
@@ -142,4 +144,46 @@ export const fileDownload = (content, filename) => {
     document.body.appendChild(eleLink);
     eleLink.click();
     document.body.removeChild(eleLink);
-};
\ No newline at end of file
+};
+let download = async (downloadUrl, downloadFileName) => {
+    const blob = await getBlob(downloadUrl);
+    saveAsB(blob, downloadFileName);
+}
+
+let getBlob = (url) => {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+
+        xhr.open('GET', url, true);
+        xhr.responseType = 'blob';
+        xhr.onload = () => {
+            if (xhr.status === 200) {
+                resolve(xhr.response);
+            } else {
+                reject(new Error(`Request failed with status ${xhr.status}`));
+            }
+        };
+        xhr.onerror = () => {
+            reject(new Error('Request failed'));
+        };
+
+        xhr.send();
+    });
+}
+
+let saveAsB = (blob, filename) => {
+    const link = document.createElement('a');
+    const body = document.body;
+
+    link.href = window.URL.createObjectURL(blob);
+    link.download = filename;
+
+    // hide the link
+    link.style.display = 'none';
+    body.appendChild(link);
+
+    link.click();
+    body.removeChild(link);
+
+    window.URL.revokeObjectURL(link.href);
+}
\ No newline at end of file

From bebd4c4aa0911c6912f4bd8d539e73097f10aea3 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 17 Jul 2024 17:36:52 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/uploadZip.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js
index 2844e3da..45e3063a 100644
--- a/src/utils/uploadZip.js
+++ b/src/utils/uploadZip.js
@@ -7,7 +7,7 @@ import {
 } from "@/api/load.js";
 let flag = {};
 export const downloadImage = async (id, id2, IsDicom = true) => {
-    if (flag[`${id2}_${IsDicom}`]) return
+    if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
     flag[`${id2}_${IsDicom}`] = true
     try {
         let params = {
@@ -16,16 +16,16 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
             IsDicom: IsDicom
         }
         let res = await requestPackageAndAnonymizImage(params);
-        flag[`${id2}_${IsDicom}`] = false;
         if (res.IsSuccess) {
             if (!res.Result) {
                 Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
                 return 1;
             }
-            let a = document.createElement("a");
+            Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
             let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
-            download(href, res.OtherInfo.FileName)
+            download(href, res.OtherInfo.FileName, { id2, IsDicom })
             return 2;
+            // let a = document.createElement("a");
             // // let fileName =
             // //     res.Result.split("/")[res.Result.split("/").length - 1];
             // a.download = res.OtherInfo.FileName;
@@ -39,6 +39,7 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
             // }, 500)
             // return 2;
         } else {
+            flag[`${id2}_${IsDicom}`] = false;
             return false;
         }
     } catch (err) {
@@ -145,8 +146,9 @@ export const fileDownload = (content, filename) => {
     eleLink.click();
     document.body.removeChild(eleLink);
 };
-let download = async (downloadUrl, downloadFileName) => {
+let download = async (downloadUrl, downloadFileName, res) => {
     const blob = await getBlob(downloadUrl);
+    flag[`${res.id2}_${res.IsDicom}`] = false;
     saveAsB(blob, downloadFileName);
 }
 

From d7fcd79cb2cfbaa3b6349c2daf929cfc379dd5d7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 17 Jul 2024 19:16:42 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/uploadZip.js                                       | 4 ++++
 .../visit/qc-check/components/qualityAssurance.vue           | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js
index 45e3063a..657e190f 100644
--- a/src/utils/uploadZip.js
+++ b/src/utils/uploadZip.js
@@ -6,6 +6,9 @@ import {
     requestPackageAndAnonymizImage,
 } from "@/api/load.js";
 let flag = {};
+export const resetFlag = () => {
+    flag = {}
+}
 export const downloadImage = async (id, id2, IsDicom = true) => {
     if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
     flag[`${id2}_${IsDicom}`] = true
@@ -18,6 +21,7 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
         let res = await requestPackageAndAnonymizImage(params);
         if (res.IsSuccess) {
             if (!res.Result) {
+                flag[`${res.id2}_${res.IsDicom}`] = false;
                 Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
                 return 1;
             }
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index e08ec6e5..3b1dc947 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1218,7 +1218,7 @@ import SignForm from "@/views/trials/components/newSignForm";
 import { getToken } from "@/utils/auth";
 import const_ from "@/const/sign-code";
 import uploadPetClinicalData from "@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue";
-import { downloadImage } from "@/utils/uploadZip.js";
+import { downloadImage , resetFlag } from "@/utils/uploadZip.js";
 export default {
   name: "QualityAssurance",
   components: {
@@ -1331,6 +1331,9 @@ export default {
       BodyPart: {},
     };
   },
+  beforeDestroy(){
+    resetFlag();
+  },
   async mounted() {
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId);
     if (this.disabled) {

From 04bd72e90f236613c6a9d55d46b97f01c2ee0c8a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 17 Jul 2024 19:30:26 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/uploadZip.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js
index 657e190f..c027eb85 100644
--- a/src/utils/uploadZip.js
+++ b/src/utils/uploadZip.js
@@ -21,7 +21,7 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
         let res = await requestPackageAndAnonymizImage(params);
         if (res.IsSuccess) {
             if (!res.Result) {
-                flag[`${res.id2}_${res.IsDicom}`] = false;
+                flag[`${id2}_${IsDicom}`] = false;
                 Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
                 return 1;
             }

From 862dcb1b3d396a5bef3e4b2cce0c637c1e238d29 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Jul 2024 09:07:39 +0800
Subject: [PATCH 7/7] 1

---
 src/views/trials/trials-panel/visit/crc-upload/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index ff120243..8d534a8c 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -1045,7 +1045,7 @@ export default {
       formRow: {},
       searchData: searchDataDefault(),
       loading: false,
-      uploadVisible: true,
+      uploadVisible: false,
       qcVisible: false,
       list: [],
       total: 0,