From d25fd68db7aa0404b1f1fd15bb6ab972a1ecf93e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 4 Sep 2024 16:53:03 +0800
Subject: [PATCH] 1

---
 src/components/Dicom/DicomCanvas.vue |  9 ++-------
 src/components/Dicom/DicomTags.vue   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue
index 2f1dd287..4372983a 100644
--- a/src/components/Dicom/DicomCanvas.vue
+++ b/src/components/Dicom/DicomCanvas.vue
@@ -90,7 +90,7 @@
       custom-class="base-dialog-wrapper"
       append-to-body
     >
-      <DicomTags :image-data="imageData" @close="dcmTag.visible = false" />
+      <DicomTags :imageId="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
     </el-dialog>
   </div>
 </template>
@@ -176,8 +176,7 @@ export default {
       markers: { top: '', right: '', bottom: '', left: '' },
       orientationMarkers: [],
       originalMarkers: [],
-      dcmTag: { visible: false, title: 'DICOM Tags' },
-      imageData: null
+      dcmTag: { visible: false, title: 'DICOM Tags' }
     }
   },
 
@@ -761,11 +760,7 @@ export default {
       cornerstoneTools.SaveAs(this.canvas, `${uid}.png`)
     },
     showTags() {
-      var image = cornerstone.getImage(this.canvas)
-      // var dataSet = dicomParser.parseDicom(image.data.byteArray)
-      // console.log('showTags', dataSet)
       this.dcmTag.visible = true
-      this.imageData = image.data
     },
     fitToWindow() {
       if (this.stack.seriesNumber) {
diff --git a/src/components/Dicom/DicomTags.vue b/src/components/Dicom/DicomTags.vue
index c0d859b2..9e9332f3 100644
--- a/src/components/Dicom/DicomTags.vue
+++ b/src/components/Dicom/DicomTags.vue
@@ -54,15 +54,14 @@
 </template>
 <script>
 import TAG_DICT from './dataDictionary'
+import * as cornerstone from 'cornerstone-core'
 import dicomParser from 'dicom-parser'
 export default {
   name: 'DicomTags',
   props: {
-    imageData: {
-      type: Object,
-      default() {
-        return []
-      }
+    imageId: {
+      type: String,
+      required: true
     }
   },
   data() {
@@ -72,8 +71,9 @@ export default {
       search: ''
     }
   },
-  mounted() {
-    var dataSet = dicomParser.parseDicom(this.imageData.byteArray)
+  async mounted() {
+    let image = await cornerstone.loadAndCacheImage(this.imageId)
+    var dataSet = dicomParser.parseDicom(image.data.byteArray)
     var output = []
     this.dumpDataSet(dataSet, output)
     this.list = output
@@ -95,7 +95,7 @@ export default {
           const tag = this.getTag(element.tag)
           elementObject.id = `${this.idx++}${new Date().getTime()}`
           elementObject.tagCode = element.tag
-          elementObject.tagName = tag.name
+          elementObject.tagName = tag ? tag.name : ''
           elementObject.tagLength = element.length
           elementObject.value = ''
 
@@ -224,7 +224,7 @@ export default {
           exception: err,
           output: output
         }
-        throw ex
+        console.log(ex)
       }
     },
     getTag(tag) {