From ea52425755eaea41dec718f1099c56deebc2167f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 24 Apr 2024 09:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E7=81=B6=E6=A0=87=E6=B3=A8=E6=88=AA?=
 =?UTF-8?q?=E5=9B=BE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomCanvas.vue |  5 ++-
 .../reading/dicoms/components/DicomViewer.vue | 43 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 4d77e8a..9282963 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -1719,8 +1719,9 @@ export default {
     },
 
     saveImage() {
-      var uid = cornerstone.getImage(this.canvas).data.string('x00080018')
-      cornerstoneTools.SaveAs(this.canvas, `${uid}.png`)
+      let timestamp = Date.now()
+      // var uid = cornerstone.getImage(this.canvas).data.string('x00080018')
+      cornerstoneTools.SaveAs(this.canvas, `${this.subjectCode}_${this.stack.taskBlindName}_${timestamp}.png`)
     },
     fitToWindow() {
       if (this.stack.seriesNumber) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 3ca7826..24e7aa8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -708,13 +708,12 @@ export default {
         if (!measuredData) return
         await this.imageLocation(measuredData)
         setTimeout(async() => {
-          // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
-          const divForDownloadViewport = document.querySelector(
-            `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
-          )
-          var canvas = await html2canvas(divForDownloadViewport)
+          var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
+          // const divForDownloadViewport = document.querySelector(
+          //   `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
+          // )
+          // var canvas = await html2canvas(divForDownloadViewport)
           var base64Str = canvas.toDataURL('image/png', 1)
-          console.log('getScreenshots')
           callback(base64Str)
         }, 50)
       }
@@ -1692,23 +1691,23 @@ export default {
       this.activeTool = ''
     },
     async saveImage() {
-      // this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].saveImage()
+      this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].saveImage()
       // canvas为转换后的Canvas对象
-      const divForDownloadViewport = document.querySelector(
-        `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
-      )
-      var canvas = await html2canvas(divForDownloadViewport)
-      let oImg = new Image()
-      oImg = canvas.toDataURL('image/png', 1)// 导出图片
-      var oA = document.createElement('a')
-      var subjectCode = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].subjectCode
-      var taskBlindName = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].stack.taskBlindName
-      var timestamp = Date.now()
-      oA.download = `${subjectCode}_${taskBlindName}_${timestamp}`// 设置下载的文件名，默认是'下载'
-      oA.href = oImg
-      document.body.appendChild(oA)
-      oA.click()
-      oA.remove() // 下载之后把创建的元素删除
+      // const divForDownloadViewport = document.querySelector(
+      //   `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
+      // )
+      // var canvas = await html2canvas(divForDownloadViewport)
+      // let oImg = new Image()
+      // oImg = canvas.toDataURL('image/png', 1)// 导出图片
+      // var oA = document.createElement('a')
+      // var subjectCode = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].subjectCode
+      // var taskBlindName = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].stack.taskBlindName
+      // var timestamp = Date.now()
+      // oA.download = `${subjectCode}_${taskBlindName}_${timestamp}`// 设置下载的文件名，默认是'下载'
+      // oA.href = oImg
+      // document.body.appendChild(oA)
+      // oA.click()
+      // oA.remove() // 下载之后把创建的元素删除
     },
     // 设置窗宽/窗位
     setDicomCanvasWwwc(v) {