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

src/components/Dicom/DicomCanvas.vue

@@ -34,8 +34,8 @@
     </div>
 
     <div class="info-subject">
-      <div v-if="series.subjectCode">{{ series.subjectCode }}</div>
+      <div v-if="series.subjectCode && IsReadingTaskViewInOrder !== 0">{{ series.subjectCode }}</div>
-      <div v-if="series.visitName">{{ series.visitName }}</div>
+      <div v-if="series.visitName && IsReadingTaskViewInOrder !== 0">{{ series.visitName }}</div>
       <div>{{ stack.description }}</div>
       <!-- <div>{{ dicomInfo.hospital }}</div> -->
       <!-- <div v-show="dicomInfo.pid">{{ dicomInfo.pid }}</div> -->
@@ -174,7 +174,8 @@ export default {
       orientationMarkers: [],
       originalMarkers: [],
       dcmTag: { visible: false, title: this.$t('trials:dicom-tag:title') },
-      tip: ''
+      tip: '',
+      IsReadingTaskViewInOrder: 2
     }
   },
 
@@ -182,6 +183,9 @@ export default {
     this.type = this.$router.currentRoute.query.type
       ? this.$router.currentRoute.query.type
       : ''
+    if (this.$router.currentRoute.query.IsReadingTaskViewInOrder) {
+      this.IsReadingTaskViewInOrder = Number(this.$router.currentRoute.query.IsReadingTaskViewInOrder)
+    }
     this.canvas = this.$refs.canvas
     this.canvas.addEventListener('cornerstonenewimage', this.onNewImage)
     this.canvas.addEventListener(

src/components/downloadDicomAndNonedicom/index.vue

@@ -33,7 +33,7 @@
       <el-table-column type="index" width="40" />
       <!--受试者-->
       <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
-        show-overflow-tooltip />
+        show-overflow-tooltip v-if="isReadingTaskViewInOrder !== 0" />
       <!--访视名称-->
       <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" sortable v-if="IsImageSegment" />
       <!--任务名称-->
@@ -78,7 +78,7 @@
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
       :subjectVisitId="modelSubjectVisitId" :IsDicom="IsDicom" :isDownload="true" :visitTaskId="modelTaskId"
-      :IsImageSegment="IsImageSegment" :Criterion="Criterion" />
+      :IsImageSegment="IsImageSegment" :Criterion="Criterion" :IsReadingTaskViewInOrder="isReadingTaskViewInOrder" />
   </el-dialog>
 </template>
 <script>
@@ -136,7 +136,11 @@ export default {
     IsImageSegment: {
       type: Boolean,
       default: false,
-    }
+    },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 2,
+    },
   },
   data() {
     return {
@@ -170,6 +174,7 @@ export default {
     this.getList()
     this.title = `Download Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
     if (this.IsImageSegment) this.title = `Download Images：${this.SubjectCode}`
+    if (this.isReadingTaskViewInOrder === 0) this.title = ''
   },
   beforeDestroy() {
     store.dispatch('trials/setUnLock', false)
@@ -447,6 +452,9 @@ export default {
       if (this.IsImageSegment) {
         this.model_cfg.title = `${item.SubjectCode || ''} > ${item.VisitName}`
       }
+      if (this.isReadingTaskViewInOrder === 0) {
+        this.model_cfg.title = ''
+      }
       if (item.IsDicom) {
         this.modelList = item.DicomStudyList
       } else {
@@ -488,11 +496,11 @@ export default {
       let routeData = null
       if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
         routeData = this.$router.resolve({
-          path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+          path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
         })
       } else {
         routeData = this.$router.resolve({
-          path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+          path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
         })
       }
       this.open = window.open(routeData.href, '_blank')
@@ -505,7 +513,7 @@ export default {
       var token = getToken()
       let trialId = this.$route.query.trialId
       const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?page=download&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+        path: `/showvisitdicoms?page=download&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -10,7 +10,8 @@
     <!--检查列表-->
     <el-table :data="list" style="width: 100%" height="300" :loading="loading">
       <!--受试者-->
-      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" sortable />
+      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" sortable
+        v-if="isReadingTaskViewInOrder !== 0" />
       <!--访视名称-->
       <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" v-if="IsImageSegment" sortable />
       <!--任务名称-->
@@ -553,6 +554,7 @@ export default {
       this.openVisitTaskId = item.VisitTaskId
       this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName
         }`
+      if (this.isReadingTaskViewInOrder === 0) this.model_cfg.title = ''
       this.modelList = item[list]
       this.model_cfg.visible = true
     },
@@ -1642,7 +1644,7 @@ export default {
       const routeData = this.$router.resolve({
         path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${this.IsImageSegment ? 'undefined' : row.VisitTaskId
           }&subjectVisitId=${row.SourceSubjectVisitId
-          }&isReading=1&TokenKey=${token}&IsReadingTaskViewInOrder=${this.IsReadingTaskViewInOrder}`,
+          }&isReading=1&TokenKey=${token}&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },

src/components/uploadDicomAndNonedicom/index.vue

@@ -11,7 +11,7 @@
       <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:nonedicom')" name="nonedicom">
         <nonedicomFile v-if="activeName === 'nonedicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
           :Criterion="Criterion" :VisitTaskId="VisitTaskId" :isUpload.sync="isUpload" :IsImageSegment="IsImageSegment"
-          :forbid="forbid" />
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :forbid="forbid" />
       </el-tab-pane>
     </el-tabs>
   </el-dialog>
@@ -70,6 +70,7 @@ export default {
   mounted() {
     this.title = `Upload Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
     if (this.IsImageSegment) this.title = `Upload Images：${this.SubjectCode}`
+    if (this.isReadingTaskViewInOrder === 0) this.title = ''
     store.dispatch('trials/setUnLock', true)
   },
   methods: {

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -14,7 +14,8 @@
     <el-table :data="list" style="width: 100%" v-adaptive="{ bottomOffset: 60 }" :loading="loading"
       :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!--受试者 sortable="custom"-->
-      <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
+      <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')"
+        v-if="isReadingTaskViewInOrder !== 0" />
       <!--访视名称-->
       <el-table-column prop="VisitName" :label="$t('upload:nonedicom:table:VisitName')" sortable
         v-if="IsImageSegment" />
@@ -265,6 +266,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 0,
+    },
   },
   data() {
     return {
@@ -475,7 +480,7 @@ export default {
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}`,
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },

src/components/uploadDicomAndNonedicom/study-view.vue

@@ -7,7 +7,8 @@
         </el-button>
         <el-table :data="modelList" style="width: 100%" height="300">
           <!--检查编号-->
-          <el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')" />
+          <el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')"
+            v-if="IsReadingTaskViewInOrder !== 0" />
           <!--检查类型-->
           <el-table-column prop="ModalityForEdit" :label="$t('trials:uploadImage:table:ModalityForEdit')"
             v-if="IsDicom" />
@@ -187,11 +188,11 @@ export default {
         var token = getToken()
         if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
           routeData = this.$router.resolve({
-            path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
+            path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.IsReadingTaskViewInOrder}`,
           })
         } else {
           routeData = this.$router.resolve({
-            path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
+            path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.IsReadingTaskViewInOrder}`,
           })
         }
 

src/views/dicom-show/dicom-visit.vue

@@ -20,7 +20,7 @@
                         :name="`${study.StudyId}`">
                         <template slot="title">
                           <div class="collapse-title-wrapper">
-                            <div class="text-desc">
+                            <div class="text-desc" v-if="IsReadingTaskViewInOrder !== 0">
                               {{ study.StudyCode }}
                             </div>
                             <!-- <div v-show="study.Description" class="text-desc">
@@ -169,7 +169,7 @@
                           v-if="study.VisitName === item.VisitName">
                           <template slot="title">
                             <div class="collapse-title-wrapper">
-                              <div class="text-desc">
+                              <div class="text-desc" v-if="IsReadingTaskViewInOrder !== 0">
                                 {{ study.StudyCode }}
                               </div>
                               <!-- <div v-show="study.Description" class="text-desc">

src/views/none-dicom-show/index.vue

@@ -153,7 +153,8 @@ export default {
       isAudit: false,
 
       activeNames: [],
-      Asc: false
+      Asc: false,
+      IsReadingTaskViewInOrder: 2
     }
   },
   async created() {
@@ -165,6 +166,9 @@ export default {
       store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
       changeURLStatic('TokenKey', '')
     }
+    if (this.$router.currentRoute.query.IsReadingTaskViewInOrder) {
+      this.IsReadingTaskViewInOrder = Number(this.$router.currentRoute.query.IsReadingTaskViewInOrder)
+    }
     this.subjectVisitId = this.$router.currentRoute.query.subjectVisitId
     this.studyId = this.$router.currentRoute.query.studyId
     this.getNoneDicomList()

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

@@ -585,7 +585,7 @@
       :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" />
     <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
       :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
-      :visible.sync="downloadImageVisible" />
+      :visible.sync="downloadImageVisible" :is-reading-task-view-in-order="isReadingTaskViewInOrder" />
     <readingChart ref="readingChart" />
   </div>
 </template>