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

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

@@ -3474,6 +3474,10 @@ export default {
     async toggleTaskByViewport(obj) {
       const i = this.visitTaskList.findIndex(v => v.VisitTaskNum === obj.visitTaskNum)
       if (i === -1) return
+      if (this.readingTool === 3) {
+        let res = await this.changeScreenSave()
+        if (!res) return false
+      }
       this.activeTaskId = this.visitTaskList[i].VisitTaskId
       this.activeTaskIndex = i
       if (!this.selectArr.includes(this.activeTaskId)) {
@@ -3509,6 +3513,11 @@ export default {
       this.setToolsPassive()
     },
     async activeSeries(obj) {
+      if (this.readingTool === 3) {
+        let res = await this.changeScreenSave()
+        if (!res) return false
+        DicomEvent.$emit('activeSeries', obj)
+      }
       if (this.isFusion || this.isMPR) {
         if (this.isFusion && this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].verifyAnnotationIsSave()) {
           const confirm = await this.$confirm(this.$t('trials:reading:confirm:clearnAnnotation'))

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

@@ -977,7 +977,7 @@ export default {
                 this.selectSegment(this.segmentList[groupIndex].segments[0])
             }
             this.$emit('resetQuestion')
-            this.saveSegmentGroup([this.segmentList[groupIndex]], false)
+            this.saveSegmentGroup([this.segmentList[groupIndex]], true)
 
         },
         resetViewport(passive = true) {

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

@@ -107,7 +107,7 @@
                     </div>
                     <div v-if="series.Description" class="text-desc" :title="series.Description">
                       {{ series.Description }}
-                      
+
                     </div>
                     <div v-if="series.SliceThickness && !study.IsCriticalSequence" class="text-desc">
                       T: {{ parseFloat(series.SliceThickness).toFixed(digitPlaces) }}
@@ -199,10 +199,9 @@ export default {
   },
   methods: {
     activeSeries(series, seriesIndex, studyIndex) {
+      this.$emit('activeSeries', series)
       this.activeStudyIndex = studyIndex
       this.activeSeriesIndex = seriesIndex
-      this.$emit('activeSeries', series)
-      DicomEvent.$emit('activeSeries', series)
     },
     activeStudy(id) {
       if (this.activeNames.indexOf(id) > -1) return
@@ -267,6 +266,7 @@ export default {
   // display: inline-block;
   text-align: right;
 }
+
 .patient-info-popper {
   font-size: 12px;
   color: #ddd;
@@ -291,7 +291,7 @@ export default {
   line-height: 18px;
 }
 
-.patient-info-popper .patient-info-row + .patient-info-row {
+.patient-info-popper .patient-info-row+.patient-info-row {
   margin-top: 4px;
 }