Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue

@@ -20,16 +20,16 @@
       <div v-if="!isMip && !isFusion">Series: #{{ series.SeriesNumber }}</div>
       <div v-if="series.Stack && !isMip">Image: #{{ `${series.SliceIndex + 1}/${imageInfo.total || series.Stack.length}` }}</div>
       <div v-if="!isMip && !isFusion">{{ series.Modality }}</div>
-      <div v-if="isFusion">{{ ctSeries.Modality }} / {{ series.Modality }}</div>
+      <div v-if="isFusion">{{ series.Modality }} / {{ ctSeries.Modality }}</div>
       <div v-if="isMip">MIP</div>
     </div>
     <div v-if="series && !isMip && !isFusion" class="right-top-text">
       <div>{{ series.Description }}</div>
     </div>
-    <div v-if="isFusion && !isMip" class="fusion-order-toggle" @mousedown.stop @mouseup.stop
+    <!-- <div v-if="isFusion && !isMip" class="fusion-order-toggle" @mousedown.stop @mouseup.stop
       @click.stop="toggleFusionRenderOrder">
       {{ fusionCtOnTop ? `${ctSeries.Modality}/${series.Modality}` : `${series.Modality}/${ctSeries.Modality}` }}
-    </div>
+    </div> -->
     <div v-if="series" class="left-bottom-text">
       <div v-show="mousePosition.index.length > 0 && !isMip">
         Pos: {{ mousePosition.index[0] }}, {{ mousePosition.index[1] }}, {{ mousePosition.index[2] }}
@@ -479,18 +479,19 @@ export default {
       if (!viewport) return
 
       if (this.isFusion) {
-        const ctVolumeId = this.ctSeries?.SeriesInstanceUid
+        // const ctVolumeId = this.ctSeries?.SeriesInstanceUid
         const ptVolumeId = this.ptVolumeId
-        const topVolumeId = this.fusionCtOnTop ? ctVolumeId : ptVolumeId
-        const bottomVolumeId = this.fusionCtOnTop ? ptVolumeId : ctVolumeId
-        const topOpacity = Number(opacity)
-        const bottomOpacity = 1 - topOpacity
-        if (bottomVolumeId) {
-          viewport.setProperties({ colormap: { opacity: bottomOpacity } }, bottomVolumeId)
-        }
-        if (topVolumeId) {
-          viewport.setProperties({ colormap: { opacity: topOpacity } }, topVolumeId)
-        }
+        viewport.setProperties({ colormap: { opacity: Number(opacity) } }, ptVolumeId)
+        // const topVolumeId = this.fusionCtOnTop ? ctVolumeId : ptVolumeId
+        // const bottomVolumeId = this.fusionCtOnTop ? ptVolumeId : ctVolumeId
+        // const topOpacity = Number(opacity)
+        // const bottomOpacity = 1 - topOpacity
+        // if (bottomVolumeId) {
+        //   viewport.setProperties({ colormap: { opacity: bottomOpacity } }, bottomVolumeId)
+        // }
+        // if (topVolumeId) {
+        //   viewport.setProperties({ colormap: { opacity: topOpacity } }, topVolumeId)
+        // }
       }
       viewport.render()
     },
@@ -561,7 +562,7 @@ export default {
           console.log("融合pet渲染成功")
         }
       }
-
+ 
       const volumes = []
       if (this.series.Modality !== 'NM') {
         volumes.push({