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

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

@@ -3071,10 +3071,11 @@ export default {
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       let index = series.SliceIndex
       const seriesArr = []
+      let activeViewportIndex = 0
       if (v === 1) {
         this.rows = 1
         this.cols = 1
-        this.activeViewportIndex = 0
+        activeViewportIndex = 0
         series.curIndex = index
         if (typeof series === 'object') {
           seriesArr.push(series)
@@ -3082,7 +3083,7 @@ export default {
       } else if (v === 2) {
         this.rows = 1
         this.cols = 2
-        this.activeViewportIndex = 1
+        activeViewportIndex = 1
         series.curIndex = index
         if (typeof series === 'object') {
           seriesArr.push(series)
@@ -3129,7 +3130,7 @@ export default {
             seriesArr.push(series)
           }
         }
-        this.activeViewportIndex = 1
+        activeViewportIndex = 1
       } else if (v === 4) {
         this.rows = 2
         this.cols = 2
@@ -3140,10 +3141,12 @@ export default {
           seriesArr.push(series)
           seriesArr.push(series)
         }
-        this.activeViewportIndex = 3
+        activeViewportIndex = 3
       }
-      seriesArr.map((i, index) => {
+      seriesArr.map(async (i, index) => {
-        this.$refs[`${this.viewportKey}-${index}`][0].setSeriesInfo(i)
+        await this.$refs[`${this.viewportKey}-${index}`][0].setSeriesInfo(i)
+        if (index === seriesArr.length - 1) this.activeViewportIndex = activeViewportIndex
+
       })
       this.$nextTick(() => {
         const renderingEngine = getRenderingEngine(renderingEngineId)

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue

@@ -27,15 +27,15 @@
 
         <el-form-item v-if="readingTaskState < 2">
           <div style="text-align:center;">
-            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible" type="primary"
+            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible || isSaved"
-              @click="skipTask">
+              type="primary" @click="skipTask">
               {{ $t('trials:readingReport:button:skip') }}
             </el-button>
-            <el-button type="primary" :disabled="isTableVisible" @click="handleSave">
+            <el-button type="primary" :disabled="isTableVisible || isSaved" @click="handleSave">
               {{ $t('common:button:save') }}
             </el-button>
-            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible" type="primary"
+            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible || isSaved"
-              @click="handleSubmit">
+              type="primary" @click="handleSubmit">
               {{ $t('common:button:submit') }}
             </el-button>
           </div>
@@ -121,7 +121,8 @@ export default {
       digitPlaces: 2,
       questionImageToolAttributeInfo: {},
       unSaveTargets: [],
-      isTableVisible: false
+      isTableVisible: false,
+      isSaved: false
     }
   },
   mounted() {
@@ -283,6 +284,7 @@ export default {
         const res = await changeDicomReadingQuestionAnswer(params)
         if (res.IsSuccess) {
           if (isMsg) {
+            this.isSaved = true
             this.$message.success(this.$t('common:message:savedSuccessfully'))
           }
           this.loading = false
@@ -1444,6 +1446,12 @@ export default {
       deep: true,
       immediate: true
     },
+    questionForm: {
+      handler() {
+        this.isSaved = false
+      },
+      deep: true
+    }
     // questionMarkInfoList: {
     //   handler() {
     //     console.log(this.questionMarkInfoList, 'questionMarkInfoList')