1

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

@@ -147,13 +147,19 @@ export default {
         async handleChange(e, key) {
             if (key === 'study') {
                 this.seriesList = this.studyList.find(item => item.StudyId === this.form.studyId).SeriesArr
+                this.form.seriesId = null
+                this.form.segmentGroupId = null
+                this.form.segmentId = null
             }
             if (key === 'series') {
                 this.segmentGroupList = this.segmentionList.filter(item => item.SeriesId === this.form.seriesId)
+                this.form.segmentGroupId = null
+                this.form.segmentId = null
             }
             if (key === 'segmentGroup') {
                 let list = await this.getSegmentList(this.form.segmentGroupId)
                 this.segmentList = list.filter(item => item.SegmentJson)
+                this.form.segmentId = null
             }
         },
         handleClear(e, key) {

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

@@ -221,6 +221,7 @@ export default {
             Object.keys(this.seriesData).forEach(key => {
                 if (key !== 'default' || this.isNeedDefault) seriesData.push(this.seriesData[key])
             })
+            console.log(seriesData, 'seriesData')
             this.chart.clear();
             const option = {
                 useUTC: true,
@@ -297,10 +298,10 @@ export default {
             } else {
                 res = await this.getCurrentSliceValuesFromVoxelManager(this.renderingEngineId, `${this.viewportKey}-${this.activeViewportIndex}`)
             }
-            if (res) {
-                let obj = {
+            let obj = {
 
-                }
+            }
+            if (res) {
                 res.values.forEach(item => {
                     if (obj[item]) {
                         obj[item]++
@@ -323,10 +324,24 @@ export default {
                 })
             }
             seriesData.sort((a, b) => a[0] - b[0])
+            let MIN = seriesData[0][0]
+            let MAX = seriesData[seriesData.length - 1][0]
+            seriesData = []
+            for (let i = MIN; i <= MAX; i++) {
+                if (obj[i]) {
+                    let arr = [i, obj[i]]
+                    seriesData.push(arr)
+                } else {
+                    let arr = [i, 0]
+                    seriesData.push(arr)
+                }
+            }
+            seriesData.sort((a, b) => a[0] - b[0])
             return {
                 seriesData: {
                     type: 'line',
                     symbolSize: 0,
+                    stack: 'Total',
                     data: seriesData
                 },
                 min: min,