调窗问题修改

src/views/trials/trials-inspection/index.vue

@@ -148,6 +148,8 @@
           ])
         ">
           <template slot-scope="scope">
+            <el-button circle icon="el-icon-view" :title="$t('trials:trialsInspection:button:view')"
+              @click.stop="handleOpenDialog(scope.row, 'study')" />
             <el-button circle v-hasPermi="['trials:trialsInspection:addTrials']" icon="el-icon-plus"
               :title="$t('trials:inspection:button:addTrials')" @click.stop="handleOpenDialog(scope.row, 'add')" />
             <!-- <el-button
@@ -180,7 +182,7 @@
       :callingAeList="callingAeList" />
     <!--pacs拉取列表-->
     <pullImage v-if="pullTrialsVisible" :visible.sync="pullTrialsVisible" :calledAeList="calledAeList"
-      :callingAeList="callingAeList" @getList="getList"/>
+      :callingAeList="callingAeList" @getList="getList" />
   </BaseContainer>
 </template>
 <script>

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

@@ -560,7 +560,7 @@ export default {
         e.stopImmediatePropagation()
         e.stopPropagation()
         e.preventDefault()
-      } else if (this.activeToolName === 'Length' || this.activeToolName === 'Bidirectional' && this.readingTaskState < 2) {
+      } else if ((this.activeToolName === 'Length' || this.activeToolName === 'Bidirectional') && this.readingTaskState < 2) {
         if (!e.detail.image.columnPixelSpacing || !e.detail.image.rowPixelSpacing) {
           // '该影像不具备测量长度所需的必要数据，不能进行长度测量。请选择其他工具进行标注。'
           this.$confirm(this.$t('trials:reading:warnning:msg56'), '', {
@@ -586,6 +586,15 @@ export default {
           e.preventDefault()
         }
       } else if (this.IsCriticalSequence) {
+        if (this.activeToolName) {
+          // '关键帧上不允许画标注。'
+          this.$confirm(this.$t('trials:reading:warnning:msg99'), '', {
+            showCancelButton: false,
+            type: 'warning'
+          }).then(() => {
+
+          }).catch(() => { })
+        }
         e.stopImmediatePropagation()
         e.stopPropagation()
         e.preventDefault()
@@ -1826,6 +1835,9 @@ export default {
       //   console.log(toolName)
       //   cornerstoneTools.setToolPassiveForElement(this.canvas, toolName)
       // })
+      if (toolName === 'Wwwc') {
+        this.isInitWwwc = false
+      }
       this.activeToolName = toolName
       this.$nextTick(() => {
         // console.log(cornerstoneTools.isToolActiveForElement(this.canvas, 'Bidirectional'))

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

@@ -356,7 +356,7 @@ export default {
         if (idx > -1 && this.visitTaskList[idx].StudyList && this.visitTaskList[idx].StudyList.length > 0) {
           this.measureData = this.visitTaskList[idx].MeasureData
           this.studyList = this.visitTaskList[idx].StudyList
-          var sIdx = this.studyList.findIndex(s => s.IsDicom)
+          var sIdx = this.studyList.findIndex(s => s.IsDicom && !s.IsCriticalSequence)
           if (sIdx > -1) {
             // this.studyIndex = sIdx
             // c = 0
@@ -459,7 +459,7 @@ export default {
 
           this.activeNames = [`${this.studyList[secondObj.studyIndex].StudyId}`]
         } else {
-          const sIdx = this.studyList.findIndex(s => s.IsDicom)
+          const sIdx = this.studyList.findIndex(s => s.IsDicom && !i.IsCriticalSequence)
           const series = this.studyList[sIdx].SeriesList[0]
           const imageIdIndex = Math.floor(series.imageIds.length / 2)
           series.imageIdIndex = imageIdIndex > 0 ? imageIdIndex - 1 : 0
@@ -475,7 +475,7 @@ export default {
     },
     getSecondMarkedSeries(baseObj, visitTaskInfo) {
       var obj = {}
-      var studyList = visitTaskInfo.StudyList
+      var studyList = visitTaskInfo.StudyList.filter(item => !item.IsCriticalSequence)
       var measureDatas = visitTaskInfo.MeasureData
       if (baseObj.isMarked) {
         var i = measureDatas.findIndex(i => Object.keys(i.MeasureData).length > 0 && i.OrderMarkName === baseObj.measureData.OrderMarkName)
@@ -552,7 +552,7 @@ export default {
       var mIdx = measureDatas.findIndex(m => Object.keys(m.MeasureData).length > 0)
       if (mIdx !== -1) {
         // 有标记时，显示带标记影像所在序列
-        const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[mIdx].StudyId && sd.IsDicom)
+        const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[mIdx].StudyId && sd.IsDicom && !s.IsCriticalSequence)
         if (sdIndx > -1) {
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)