自定义阅片自动对齐bug修复

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

@@ -482,7 +482,7 @@ export default {
         idx > -1 ? seriesInfo = seriesList[idx] : seriesInfo = seriesList[0]
       }
       if (seriesInfo) {
-        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.instanceCount))
+        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.imageIds.length))
         seriesInfo.imageIdIndex = index > 0 ? index - 1 : 0
         obj.studyIndex = seriesInfo.studyIndex
         obj.seriesIndex = seriesInfo.seriesIndex

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -11,6 +11,13 @@
     @mouseup="sliderMouseup"
     @contextmenu.prevent="onContextmenu"
   >
+    <!-- 临床数据 -->
+    <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
+      <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
+        <svg-icon icon-class="documentation" class="svg-icon"/>
+      </el-tooltip>
+
+    </div>
     <!-- 切换访视 -->
     <div
       v-if="stack.imageRendered && isReadingTaskViewInOrder"
@@ -214,7 +221,8 @@ export default {
         visitTaskId: '',
         taskBlindName: '',
         frame: null,
-        imageRendered: false
+        imageRendered: false,
+        isExistsClinicalData:false
         // preventCache: true
       },
       dicomInfo: {
@@ -1042,6 +1050,7 @@ export default {
         this.stack.seriesIndex = dicomSeries.seriesIndex
         this.stack.sliceThickness = dicomSeries.sliceThickness
         this.stack.instanceCount = dicomSeries.instanceCount
+        this.stack.isExistsClinicalData = dicomSeries.isExistsClinicalData
         // this.measuredData = dicomSeries.measuredData
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId)
         this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum
@@ -1920,6 +1929,12 @@ export default {
       e.stopImmediatePropagation()
       e.stopPropagation()
       e.preventDefault()
+    },
+    handleViewCD(e) {
+      DicomEvent.$emit('previewCD', this.stack.visitTaskId)
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
     }
 
   }
@@ -2008,7 +2023,15 @@ export default {
     font-size: 14px;
   }
 }
-
+.info-cd{
+  position: absolute;
+  left: 10px;
+  top: 5px;
+  text-align: left;
+  color: #ddd;
+  font-size: 18px;
+  cursor: pointer;
+}
 .info-series {
   position: absolute;
   left: 10px;

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue

@@ -476,7 +476,7 @@ export default {
         idx > -1 ? seriesInfo = seriesList[idx] : seriesInfo = seriesList[0]
       }
       if (seriesInfo) {
-        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.instanceCount))
+        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.imageIds.length))
         seriesInfo.imageIdIndex = index > 0 ? index - 1 : 0
         obj.studyIndex = seriesInfo.studyIndex
         obj.seriesIndex = seriesInfo.seriesIndex

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -572,10 +572,10 @@
           <UploadNonDicomFiles v-if="rowData.Id" :data="rowData" :subject-visit-id="rowData.Id" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :allow-add-or-edit="false" @getList="getList"/>
         </el-card>
         <!-- 临床数据 -->
-        <h4 v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveSubjectClinicalData" class="box-title" style="margin-top:10px;">
+        <h4 v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && (otherInfo.IsHaveSubjectClinicalData || otherInfo.IsHaveVisitClinicalData)" class="box-title" style="margin-top:10px;">
           {{ $t('trials:crcUpload:label:clinicalData') }}
         </h4>
-        <el-card v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveSubjectClinicalData" class="box-card">
+        <el-card v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && (otherInfo.IsHaveSubjectClinicalData || otherInfo.IsHaveVisitClinicalData)" class="box-card">
           <UploadClinicalData v-if="rowData.Id && rowData.IsBaseLine" :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="false" :data="rowData" :subject-visit-id="rowData.Id" @getList="getList" />
         </el-card>
         <h4 v-if="!rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveVisitClinicalData" class="box-title" style="margin-top:10px;">

vue.config.js

@@ -63,8 +63,8 @@ module.exports = {
         // target: 'http://123.56.181.144:8000/api', // 国内测试环境
         // target: 'http://123.56.94.154:8079', // 国内测试环境2
         // target: 'http://123.56.94.154:7000', // 国内测试环境2
-        // target: 'http://123.56.94.154:30000',
+        target: 'http://123.56.94.154:30000',
-        target: 'http://47.117.164.182:7060/',
+        // target: 'http://47.117.164.182:7060/',
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,
         secure: false,