冲突解决

src/views/trials/trials-panel/reading/none-dicoms/index.vue

@@ -95,6 +95,7 @@ export default {
         localStorage.setItem('taskInfo', JSON.stringify(res.Result))
         sessionStorage.setItem('taskInfo', JSON.stringify(res.Result))
         localStorage.setItem('digitPlaces', JSON.stringify(res.Result.DigitPlaces))
+        localStorage.setItem('subjectCode', res.Result.SubjectCode)
         this.loading = false
         this.$nextTick(() => {
           if (this.taskInfo.IsExistsClinicalData && this.taskInfo.IsNeedReadClinicalData && !this.taskInfo.IsReadClinicalData) {

src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue

@@ -219,6 +219,11 @@
     <el-dialog :title="$t('trials:noneDicom:message:msg2')" :visible.sync="dialogVisible" :close-on-click-modal="false"
       :close-on-press-escape="false" :show-close="false" width="400px">
       <el-form ref="lengthForm" :model="form" :rules="rules">
+        <el-form-item label="" prop="length" v-show="false">
+          <el-input v-model="form.length" type="number">
+            <template slot="append">mm</template>
+          </el-input>
+        </el-form-item>
         <el-form-item label="" prop="length">
           <el-input v-model="form.length" type="number">
             <template slot="append">mm</template>
@@ -248,7 +253,7 @@
         <!-- 手册 -->
         <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute;right: 20px;font-size: 20px;">
-          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+          <svg-icon :icon-class="manualsDialog.isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
             style="margin-right:10px;cursor: pointer;"
             @click="manualsDialog.isFullscreen = !manualsDialog.isFullscreen" />
           <svg-icon icon-class="close" style="cursor: pointer;" @click="manualsDialog.visible = false" />
@@ -266,7 +271,7 @@
   </div>
 </template>
 <script>
-import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo } from '@/api/trials'
+import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo, setReadKeyFile } from '@/api/trials'
 import html2canvas from 'html2canvas'
 import {
   RenderingEngine,
@@ -773,6 +778,7 @@ export default {
       if (this.activeCanvasIndex === this.cells.length - 1) {
         store.dispatch('noneDicomReview/setLastViewportTaskId', obj.visitTaskInfo.VisitTaskId)
       }
+      this.setToolsPassive()
     },
     // 激活视图
     activeCanvas(index) {
@@ -1107,7 +1113,7 @@ export default {
               //   const errorMsg = { message: 'annotation Not allowed to operate' }
               //   throw errorMsg
               // }
-              this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
+              this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
             } catch (err) {
               cornerstoneTools.annotation.state.addAnnotation(annotation)
               const renderingEngine = getRenderingEngine(renderingEngineId)
@@ -1121,7 +1127,7 @@ export default {
           })
 
         }
-        
+
       } catch (e) {
         cornerstoneTools.annotation.state.addAnnotation(annotation)
         const renderingEngine = getRenderingEngine(renderingEngineId)
@@ -1262,7 +1268,7 @@ export default {
           // }  
         }
       })
-      this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
+      this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
     },
     annotationSelectionChangeListener(e) {
       console.log('selection')

src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue

@@ -13,7 +13,7 @@
         <div v-for="s in visitTaskList" v-show="activeTaskVisitId === s.VisitTaskId" :key="s.VisitTaskId"
           style="height:100%;">
           <study-list v-if="selectArr.includes(s.VisitTaskId) && s.StudyList.length > 0" :ref="s.VisitTaskId"
-            :visit-task-info="s" @selectFile="selectFile" :currentMarkedFiles="currentMarkedFiles"/>
+            :visit-task-info="s" @selectFile="selectFile" :currentMarkedFiles="currentMarkedFiles" />
 
         </div>
       </div>
@@ -37,7 +37,7 @@
       /> -->
       <file-viewer ref="fileViewer" :related-study-info="relatedStudyInfo" :ps-arr="psArr" :ecrf="ecrf"
         @toggleTaskByViewer="toggleTaskByViewer" @toggleTask="toggleTask" @toggleImage="toggleImage"
-        @previewCD="previewCD" @setPS="setPS" @getEcrf="getEcrf" @getMarkedFileIds="getMarkedFileIds"/>
+        @previewCD="previewCD" @setPS="setPS" @getEcrf="getEcrf" @getMarkedFileIds="getMarkedFileIds" />
     </div>
     <!-- 表单 -->
     <div class="right-panel">
@@ -368,6 +368,7 @@ export default {
     // 切换任务
     toggleTask(taskInfo) {
       this.setActiveTaskVisitId(taskInfo.VisitTaskId)
+      this.$refs.fileViewer.setToolsPassive()
     },
     // 视图触发任务切换
     async toggleTaskByViewer(visitTaskNum) {