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

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

@@ -2981,9 +2981,9 @@ export default {
     },
     // 重置视口
     async resetViewport() {
-      this.setToolsPassive()
       const renderingEngine = getRenderingEngine(renderingEngineId)
       if (this.isFusion) {
+        this.setToolsPassive()
         const fusionViewportIds = ['viewport-fusion-0', 'viewport-fusion-1', 'viewport-fusion-2', 'viewport-fusion-3']
         const fusionAllViewportIds = [...fusionViewportIds, 'viewport-fusion-hidden-sag']
         for (const id of fusionAllViewportIds) {
@@ -3049,6 +3049,7 @@ export default {
 
         return this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setFullScreen(index)
       }
+      this.setToolsPassive()
       if (this.readingTool === 3 && this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series.Modality === 'PT') {
         viewport.setProperties({ voiRange: { upper: 5, lower: 0 } })
       }
@@ -3524,7 +3525,7 @@ export default {
       if (!obj.IsDicom) {
         return this.previewNoneDicoms(obj)
       }
-      this.activeViewportIndex = 0
+      // this.activeViewportIndex = 0
       this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(obj)
       this.clipPlaying = false
       this.fps = 15

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

@@ -145,6 +145,7 @@ export default {
             }
         },
         async handleChange(e, key) {
+            this.handleClear(e, key)
             if (key === 'study') {
                 this.seriesList = this.studyList.find(item => item.StudyId === this.form.studyId).SeriesArr
             }