From 42711dadb54c4faaf53da1a213d8716f446e40f8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 10 Apr 2025 15:26:11 +0800
Subject: [PATCH] =?UTF-8?q?dicom=E9=98=85=E7=89=87=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue  | 1273 ++++++++---
 .../components/Recist/QuestionFormItem.vue    |  318 +++
 .../components/Recist/QuestionList.vue        | 1858 ++++++++++++++++
 .../Recist/TableQuestionFormItem.vue          |  352 +++
 .../dicoms3D/components/ReportPage.vue        |  915 ++++++++
 .../reading/dicoms3D/components/StudyList.vue |   32 +-
 .../reading/dicoms3D/components/Viewport.vue  |  111 +-
 .../dicoms3D/components/VisitReview.vue       |   11 +-
 .../components/mRecist/QuestionFormItem.vue   |  318 +++
 .../components/mRecist/QuestionList.vue       | 1914 +++++++++++++++++
 .../mRecist/TableQuestionFormItem.vue         |  360 ++++
 .../reading/dicoms3D/components/toolConfig.js |   88 +-
 12 files changed, 7144 insertions(+), 406 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
 create mode 100644 src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
 create mode 100644 src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
 create mode 100644 src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
 create mode 100644 src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
 create mode 100644 src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
index d2ca6b8d..e6c7c385 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -14,7 +14,7 @@
           >{{ s.TaskBlindName }}</div>
         </div>
       </div>
-      <div class="study-info" v-loading="sLoading">
+      <div v-loading="sLoading" class="study-info">
         <div
           v-for="s in visitTaskList"
           v-show="activeTaskId === s.VisitTaskId"
@@ -39,38 +39,95 @@
         <div class="tools-wrapper">
           <div class="tools-left">
             <!-- 布局 -->
-            <div class="tool-item" :title="$t('trials:reading:button:layout')">
-              <el-dropdown @command="changeLayout">
-                <span class="el-dropdown-link">
-                  <svg-icon icon-class="layout" class="svg-icon" /><i class="el-icon-arrow-down el-icon--right" />
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="1*1">1*1</el-dropdown-item>
-                  <el-dropdown-item command="1*2">1*2</el-dropdown-item>
-                  <el-dropdown-item command="2*2">2*2</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
+            <div
+              class="tool-item"
+              :title="$t('trials:reading:button:layout')"
+              @click.stop="showPanel($event)"
+              @mouseleave="toolMouseout"
+            >
+              <div class="dropdown">
+                <div class="icon">
+                  <svg-icon icon-class="layout" class="svg-icon" />
+                  <i class="el-icon-arrow-down" style="color:#fff;" />
+                </div>
+                <div class="dropdown-content layout-content">
+                  <ul style="width:50px" class="layout-content-ul">
+                    <li class="layout_flex_row" @click.stop="changeLayout(1)">
+                      <div class="layout_box_1_1">
+                        A
+                      </div>
+                    </li>
+                    <li class="layout_flex_row" @click.stop="changeLayout(2)">
+                      <div class="layout_box_1_1">
+                        A
+                      </div>
+                      <div class="layout_box_1_1">
+                        A
+                      </div>
+                    </li>
+                    <li v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1" class="layout_flex_row" @click.stop="changeLayout(3)">
+                      <div class="layout_box_1_1">
+                        A
+                      </div>
+                      <div class="layout_box_1_1">
+                        B
+                      </div>
+                    </li>
+
+                    <li class="layout_flex_column" @click.stop="changeLayout(4)">
+
+                      <div style="flex:1;display: flex;width:100%;">
+                        <div class="layout_box_1_2">
+                          A
+                        </div>
+                        <div class="layout_box_1_2">
+                          A
+                        </div>
+                      </div>
+                      <div style="flex:1;display: flex;width:100%;">
+                        <div class="layout_box_1_2">
+                          A
+                        </div>
+                        <div class="layout_box_1_2">
+                          A
+                        </div>
+                      </div>
+                    </li>
+                  </ul>
+                </div>
+              </div>
             </div>
             <!-- 调窗 -->
-            <div 
+            <div
               :class="['tool-item', activeTool === 'WindowLevel' ? 'tool-item-active' : '']"
-              :title="$t('trials:reading:button:wwwc')">
-              <el-dropdown @command="changeVoiRange" @click.native="setToolActive('WindowLevel')">
-                <span class="el-dropdown-link">
-                  <svg-icon icon-class="reverse" class="svg-icon" /><i class="el-icon-arrow-down el-icon--right" />
-                </span>
-                <el-dropdown-menu slot="dropdown" style="max-height: 400px;overflow-y: auto;overflow-x: hidden;">
-                  <el-dropdown-item v-for="i in wwwcArr" :command="i" :key="i.label">
-                    <div style="display: flex;justify-content: space-between;width: 220px;">
-                      <div>{{i.label}}</div>
-                      <div v-if="i.ww !== null || i.wc !== null">{{`${i.ww}/${i.wc}`}}</div>
-                    </div>
-                    <el-divider v-if="i.val === 1" class="divider" content-position="center">
-                      {{ ` ${$t('trials:reading:title:preset') }` }}
-                    </el-divider>
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
+              :title="$t('trials:reading:button:wwwc')"
+              @click.stop="setWindowLevelActive($event)"
+              @mouseleave="toolMouseout"
+            >
+              <div class="dropdown">
+                <div class="icon">
+                  <svg-icon icon-class="reverse" class="svg-icon" />
+                  <i class="el-icon-arrow-down" style="color:#fff;" />
+                </div>
+                <div class="dropdown-content">
+                  <ul style="width:165px;">
+                    <li v-for="item in wwwcArr" :key="item.label">
+                      <a href="#" @click.stop="changeVoiRange(item)">
+                        <div v-if="item.wc !== null" style="display:flex;flex-direction: row;justify-content: space-between;">
+                          <div>{{ item.label }}</div>
+                          <div>{{ `${item.ww} / ${item.wc}` }}</div>
+                        </div>
+                        <div v-else style="text-align:left;">
+                          {{ item.label }}
+                        </div>
+                      </a>
+                      <el-divider v-if="item.val === 1" class="divider" content-position="center">
+                        {{ ` ${$t('trials:reading:title:preset') }` }}
+                      </el-divider>
+                    </li>
+                  </ul>
+                </div>
+              </div>
             </div>
             <!-- 反色 -->
             <div
@@ -104,44 +161,49 @@
             >
               <svg-icon icon-class="rotate" class="svg-icon" />
             </div> -->
-            <div class="tool-item" :title="$t('trials:reading:button:rotate')">
-              <el-dropdown @command="setViewportRotate">
-                <span class="el-dropdown-link">
-                  <svg-icon icon-class="rotate" class="svg-icon" /><i class="el-icon-arrow-down el-icon--right" />
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="1">
-                    {{$t('trials:reading:button:rotateDefault')}}
-                  </el-dropdown-item>
-                  <el-dropdown-item command="2">
-                    {{$t('trials:reading:button:rotateVertical')}}
-                  </el-dropdown-item>
-                  <el-dropdown-item command="3">
-                    {{$t('trials:reading:button:rotateHorizontal')}}
-                  </el-dropdown-item>
-                  <el-dropdown-item command="4">
-                    {{$t('trials:reading:button:rotateTurnLeft')}}
-                  </el-dropdown-item>
-                  <el-dropdown-item command="5">
-                    {{$t('trials:reading:button:rotateTurnRight')}}
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
+            <div
+              class="tool-item"
+              :title="$t('trials:reading:button:rotate')"
+              @click.stop="showPanel($event)"
+              @mouseleave="toolMouseout"
+            >
+              <div class="dropdown">
+                <div
+                  class="icon"
+                  data-tool="Rotate"
+                  :class="[activeTool==='Rotate'?'tool_active':'']"
+                >
+                  <svg-icon icon-class="rotate" class="svg-icon" />
+                  <i class="el-icon-arrow-down" style="color:#fff;" />
+                </div>
+                <div class="dropdown-content">
+                  <ul style="width:100px;">
+                    <li v-for="rotate in rotateOptions" :key="rotate.label" style="text-align:left;">
+                      <a href="#" @click.prevent="setViewportRotate(rotate.val)">
+                        {{ rotate.label }}
+                      </a>
+                    </li>
+                  </ul>
+                </div>
+              </div>
             </div>
             <!-- 适应图像或窗口 -->
-            <div
+            <!-- <div
               class="tool-item"
               :title="forceFitToWindow ? `${$t('trials:reading:button:fitWindow')}` : `${$t('trials:reading:button:fitImage')}`"
               @click.prevent="fitToType(forceFitToWindow)"
             >
-            <svg-icon v-if="forceFitToWindow" icon-class="fitToWindow" class="svg-icon" />
-            <svg-icon v-else icon-class="fitToImage" class="svg-icon" />
-            </div>
+              <svg-icon v-if="forceFitToWindow" icon-class="fitToWindow" class="svg-icon" />
+              <svg-icon v-else icon-class="fitToImage" class="svg-icon" />
+            </div> -->
             <div
               v-for="tool in tools"
+              :key="tool.toolName"
               :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === tool.toolName ? 'tool-item-active' : '']"
-              :title="$t(`${tool.i18nKey}`)"
+              :style="{cursor: tool.isDisabled ? 'not-allowed' : 'pointer'}"
+              :title="tool.disabledReason ? tool.disabledReason : $t(`${tool.i18nKey}`)"
               @click.prevent="setAnnotateToolActive(tool.toolName)"
+              @mouseenter="enter($event,tool.toolName)"
             >
               <svg-icon :icon-class="tool.icon" class="svg-icon" />
             </div>
@@ -156,18 +218,18 @@
                 <svg-icon icon-class="previousframe" class="svg-icon" />
               </div>
               <!-- 播放/暂停 -->
-              <div 
-                v-if="clipPlaying" 
-                :title="$t('trials:dicom-show:stop')" 
-                class="icon" 
+              <div
+                v-if="clipPlaying"
+                :title="$t('trials:dicom-show:stop')"
+                class="icon"
                 @click.prevent="toggleClipPlay(false)"
               >
                 <svg-icon icon-class="stop" class="svg-icon" />
               </div>
-              <div 
-                v-else 
-                :title="$t('trials:dicom-show:play')" 
-                class="icon" 
+              <div
+                v-else
+                :title="$t('trials:dicom-show:play')"
+                class="icon"
                 @click.prevent="toggleClipPlay(true)"
               >
                 <svg-icon icon-class="play" class="svg-icon" />
@@ -180,7 +242,7 @@
               <div :title="$t('trials:dicom-show:lastframe')" class="icon" @click.prevent="scrollPage(99999)">
                 <svg-icon icon-class="lastframe" class="svg-icon" />
               </div>
-              <select :title="$t('trials:dicom-show:speed')" v-model="fps" class="select-wrapper" :disabled="clipPlaying">
+              <select v-model="fps" :title="$t('trials:dicom-show:speed')" class="select-wrapper" :disabled="clipPlaying">
                 <!-- 默认值 -->
                 <option :value="5">5</option>
                 <option :value="10">10</option>
@@ -202,24 +264,24 @@
 
           <div>
             <!-- 手册 -->
-            <el-button 
-              v-if="taskInfo && taskInfo.ExistsManual" 
-              type="text" 
+            <el-button
+              v-if="taskInfo && taskInfo.ExistsManual"
+              type="text"
               @click="previewManuals"
             >
               {{ $t('trials:reading:button:handbooks') }}
             </el-button>
             <!-- 临床数据 -->
-            <el-button 
-              v-if="taskInfo && taskInfo.IsExistsClinicalData" 
-              type="text" 
+            <el-button
+              v-if="taskInfo && taskInfo.IsExistsClinicalData"
+              type="text"
               @click="previewCD(taskInfo.VisitTaskId)"
             >
               {{ $t('trials:reading:button:clinicalData') }}
             </el-button>
             <!-- 个性化配置 -->
-            <el-button 
-              type="text" 
+            <el-button
+              type="text"
               @click="previewConfig"
             >
               {{ $t('trials:reading:button:customCfg') }}
@@ -228,7 +290,7 @@
         </div>
         <!-- viewports -->
         <div class="viewports-wrapper">
-          <div class="grid-container" :style="gridStyle" ref="container">
+          <div ref="container" class="grid-container" :style="gridStyle">
             <div
               v-for="(v, index) in cellsMax"
               v-show="index < cells.length"
@@ -238,15 +300,16 @@
               @dblclick="toggleFullScreen($event, index)"
               @click="activeViewport(index)"
             >
-              <Viewport 
+              <Viewport
                 :ref="`viewport-${index}`"
-                :renderingEngineId="renderingEngineId"
-                :viewportId="`viewport-${index}`"
-                :viewportIndex="index"
-                @addHistoryAnnotations="addHistoryAnnotations"
+                :data-viewport-uid="`viewport-${index}`"
+                :rendering-engine-id="renderingEngineId"
+                :viewport-id="`viewport-${index}`"
+                :viewport-index="index"
                 @activeViewport="activeViewport"
                 @toggleTaskByViewport="toggleTaskByViewport"
                 @previewCD="previewCD"
+                @renderAnnotations="renderAnnotations"
               />
             </div>
           </div>
@@ -255,28 +318,20 @@
     </div>
     <!-- 表单 -->
     <div class="right-panel">
-      <div
-        v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo"
-        class="text-info"
-      >
-        <h3>
-          <span
-            v-if="currentVisitInfo && currentVisitInfo.SubjectCode"
-          >
-            {{ currentVisitInfo.SubjectCode }}
-          </span>
-          <span
-            v-if="currentVisitInfo && currentVisitInfo.TaskBlindName"
-            style="margin-left:5px;"
-          >
-            {{ currentVisitInfo.TaskBlindName }}
-          </span>
-        </h3>
-      </div>
-      <!-- <ecrf-list
-        v-if="currentVisitInfo"
-        :visit-task-info="currentVisitInfo"
-      /> -->
+      <mRecisit
+        v-if="lastViewportTaskId && citerionType === 7"
+        ref="ecrf"
+        :reading-task-state="currentVisitInfo.VisitTaskId === taskInfo.VisitTaskId ? readingTaskState : 2"
+        :last-viewport-task-id="lastViewportTaskId"
+        :visit-info="currentVisitInfo"
+        @removeAnnotation="removeAnnotation"
+        @getScreenshots="getScreenshots"
+        @setMarkName="setMarkName"
+        @imageLocation="imageLocation"
+        @resetAnnotations="resetAnnotations"
+        @getAnnotations="getAnnotations"
+        @setToolToTarget="setToolToTarget"
+      />
     </div>
     <!-- 自定义调窗 -->
     <el-dialog
@@ -363,13 +418,13 @@
   </div>
 </template>
 <script>
-import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList} from '@/api/trials'
+import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList } from '@/api/trials'
 import { getDoctorShortcutKey, getUserWLTemplateList } from '@/api/user'
 import {
   RenderingEngine,
   Enums,
-  imageLoader,
-  metaData,
+  // imageLoader,
+  // metaData,
   getRenderingEngine,
   eventTarget,
   utilities as csUtils
@@ -379,16 +434,18 @@ import {
 } from '@cornerstonejs/tools'
 import * as cornerstoneTools from '@cornerstonejs/tools'
 import initLibraries from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initLibraries'
-import { getTools } from './toolConfig';
+import html2canvas from 'html2canvas'
+import { getTools } from './toolConfig'
 import StudyList from './StudyList'
 import Viewport from './Viewport'
+import mRecisit from './mRecist/QuestionList'
 import CustomWwwcForm from '@/views/trials/trials-panel/reading/dicoms/components/CustomWwwcForm'
 import Manuals from '@/views/trials/trials-panel/reading/dicoms/components/Manuals'
 import Hotkeys from '@/views/trials/trials-panel/reading/dicoms/components/Hotkeys'
 import WL from '@/views/trials/trials-panel/reading/dicoms/components/WL'
 import Others from '@/views/trials/trials-panel/reading/dicoms/components/Others'
 import ClinicalData from '@/views/trials/trials-panel/reading/clinical-data'
-const { visibility } = annotation;
+const { visibility } = annotation
 const { ViewportType, Events } = Enums
 const renderingEngineId = 'myRenderingEngine'
 const {
@@ -406,15 +463,41 @@ const {
   ArrowAnnotateTool,
   RectangleROITool,
   PlanarFreehandROITool,
-  EraserTool,
+  EraserTool
   // cursors
 } = cornerstoneTools
+
+const newStyles = {
+  global: {
+    color: 'rgb(255, 0, 0)',
+    colorHighlighted: 'rgb(255, 0, 0)',
+    colorSelected: 'rgb(255, 0, 0)',
+    colorLocked: 'rgb(255, 0, 0)',
+    lineWidth: '1',
+    lineDash: '',
+    shadow: true,
+    textBoxVisibility: true,
+    textBoxFontFamily: 'Helvetica Neue, Helvetica, Arial, sans-serif',
+    textBoxFontSize: '14px',
+    textBoxColor: 'rgb(255, 0, 0)',
+    textBoxColorHighlighted: 'rgb(255, 0, 0)',
+    textBoxColorSelected: 'rgb(255, 0, 0)',
+    textBoxColorLocked: 'rgb(255, 0, 0)',
+    textBoxBackground: '',
+    textBoxLinkLineWidth: '1',
+    textBoxLinkLineDash: '2,3',
+    textBoxShadow: true,
+    markerSize: '10',
+  },
+}
+annotation.config.style.setDefaultToolStyles(newStyles);
 const { MouseBindings, Events: toolsEvents } = csToolsEnums
 export default {
-  name:'ReadPage',
+  name: 'ReadPage',
   components: {
     StudyList,
     Viewport,
+    mRecisit,
     CustomWwwcForm,
     Manuals,
     Hotkeys,
@@ -422,7 +505,7 @@ export default {
     Others,
     ClinicalData
   },
-  data(){
+  data() {
     return {
       loading: false,
       trialId: '',
@@ -434,7 +517,7 @@ export default {
       activeStudyIndex: -1,
       activeSeriesIndex: -1,
       currentVisitInfo: null,
-      layout: '1*2',
+      layout: 1,
       cellsMax: 4,
       rows: 1,
       cols: 1,
@@ -447,6 +530,13 @@ export default {
       renderedTaskIds: [],
       citerionType: null,
       tools: [],
+      rotateOptions: [
+        { label: this.$t('trials:reading:button:rotateDefault'), val: 1 },
+        { label: this.$t('trials:reading:button:rotateVertical'), val: 2 },
+        { label: this.$t('trials:reading:button:rotateHorizontal'), val: 3 },
+        { label: this.$t('trials:reading:button:rotateTurnLeft'), val: 4 },
+        { label: this.$t('trials:reading:button:rotateTurnRight'), val: 5 }
+      ],
       defaultWwwc: [
         { label: this.$t('trials:reading:button:wwwcDefault'), val: -1, ww: null, wc: null }, // 默认值
         { label: this.$t('trials:reading:button:wwwcCustom'), val: 0, ww: null, wc: null }, // 自定义
@@ -471,7 +561,9 @@ export default {
       isShowAnnotations: true,
       clinicalDataVisible: false,
       isClinicalDataFullscreen: false,
-      cdVisitTaskId: ''
+      cdVisitTaskId: '',
+      lastViewportTaskId: '',
+      digitPlaces: 2
     }
   },
   computed: {
@@ -506,19 +598,44 @@ export default {
     },
     activeViewportIndex: {
       immediate: true,
-      handler(id) {
+      handler(index) {
+        let series = null
         if (this.$refs[`viewport-${this.activeViewportIndex}`] && this.$refs[`viewport-${this.activeViewportIndex}`][0]) {
           this.clipPlaying = this.$refs[`viewport-${this.activeViewportIndex}`][0].playClipState
+          series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
         } else {
           this.clipPlaying = false
           this.fps = 15
         }
+        if (index === this.cells.length - 1 && series) {
+          this.lastViewportTaskId = series.TaskInfo.VisitTaskId
+          this.currentVisitInfo = series.TaskInfo
+        }
       }
     },
+    lastViewportTaskId: {
+      immediate: true,
+      handler(id) {
+        if (!id) return
+        if (this.readingTaskState === 2) return
+        if (id !== this.taskInfo.VisitTaskId) {
+          const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.taskInfo.VisitTaskId)
+          const annotationUIDs = this.visitTaskList[taskIdx].AnnotationUIDs
+          const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
+          annotations.forEach(i => {
+            if (!(annotationUIDs.includes(i.annotationUID)) && i.visitTaskId === this.taskInfo.VisitTaskId) {
+              cornerstoneTools.annotation.state.removeAnnotation(i.annotationUID)
+            }
+          })
+        }
+      }
+    }
   },
   mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
     this.citerionType = this.taskInfo.CriterionType
+    const digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.tools = getTools(this.citerionType)
     this.trialId = this.$route.query.trialId
     this.readingTaskState = this.taskInfo.ReadingTaskState
@@ -527,8 +644,8 @@ export default {
       this.cols = 2
       this.activeViewportIndex = 1
     }
-    
-    this.$nextTick(()=>{
+
+    this.$nextTick(() => {
       this.loadRelatedTasks()
       this.initLoader()
       this.getWwcTpl()
@@ -543,14 +660,15 @@ export default {
         const params = {
           visitTaskId: this.taskInfo.VisitTaskId
         }
-        let res = await getRelatedVisitTask(params)
+        const res = await getRelatedVisitTask(params)
         let currentTaskIndex = 0
         let currentTaskId = ''
         this.visitTaskList = []
         for (let i = 0; i < res.Result.length; i++) {
-          let item = res.Result[i]
+          const item = res.Result[i]
           let studyList = []
           let annotations = []
+          let annotationUIDs = []
           let keyImages = []
           let isInit = false
           if (item.IsCurrentTask) {
@@ -562,6 +680,7 @@ export default {
             isInit = true
             studyList = res ? res.studyList : []
             annotations = res ? res.annotations : []
+            annotationUIDs = res ? res.annotationUIDs : []
             keyImages = res ? res.keyImages : []
             if (!this.selectArr.includes(item.VisitTaskId)) {
               this.selectArr.push(item.VisitTaskId)
@@ -572,106 +691,108 @@ export default {
             StudyList: studyList,
             Annotations: annotations,
             KeyImages: keyImages,
+            AnnotationUIDs: annotationUIDs,
             IsInit: isInit
           })
         }
         this.activeTaskId = currentTaskId
         this.activeTaskIndex = currentTaskIndex
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           this.setInitSeries()
         })
-        
+
         this.loading = false
-      } catch(e) {
+      } catch (e) {
         console.log(e)
         this.loading = false
       }
-      
     },
     // 加载检查及标注信息
     async loadTaskDetails(taskInfo, taskIndex) {
       try {
-        let sujectVisitId = taskInfo.VisitId
-        let taskId = taskInfo.VisitTaskId
+        const sujectVisitId = taskInfo.VisitId
+        const taskId = taskInfo.VisitTaskId
         // 获取检查信息
-        let keyImages = []
-        let res1 = await getReadingVisitStudyList(this.trialId, sujectVisitId, taskId)
+        const keyImages = []
+        const res1 = await getReadingVisitStudyList(this.trialId, sujectVisitId, taskId)
         let keyStudyIndex = -1
         let keySeriesIndex = -1
-        res1.Result.forEach((study, studyIndex) => {
+        const arr = res1.Result.filter(i => !i.IsCriticalSequence)
+        // const arr = res1.Result
+        arr.forEach((study, studyIndex) => {
           study.SeriesList.forEach((series, seriesIndex) => {
-            const imageIds = [];
-            series
+            const imageIds = []
             series.InstanceInfoList.forEach((instance, instanceIndex) => {
               if (study.IsCriticalSequence) {
                 keyStudyIndex = studyIndex
                 keySeriesIndex = seriesIndex
-                keyImages.push({Id: instance.Id, Path: instance.Path, KeyFramesList: instance.KeyFramesList, KeyStudyIndex: studyIndex, KeySeriesIndex: seriesIndex})
+                keyImages.push({ Id: instance.Id, Path: instance.Path, KeyFramesList: instance.KeyFramesList, KeyStudyIndex: studyIndex, KeySeriesIndex: seriesIndex })
               } else {
-                let i = keyImages.findIndex(k=>k.Id === instance.Id)
+                const i = keyImages.findIndex(k => k.Id === instance.Id)
                 if (i > -1) {
                   keyImages[i].StudyIndex = studyIndex
                   keyImages[i].SeriesIndex = seriesIndex
                 }
-                const nFrames = instance.NumberOfFrames || 0;
+                const nFrames = instance.NumberOfFrames || 0
                 if (nFrames === 0) {
                   // 单帧
-                  imageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?frame=0&instanceId=${instance.Id}&visitTaskId=${taskId}&idx=${taskIndex}|${studyIndex}|${seriesIndex}`);
+                  imageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?frame=0&instanceId=${instance.Id}&visitTaskId=${taskId}&idx=${taskIndex}|${studyIndex}|${seriesIndex}`)
                 } else {
                   // 多帧
                   for (let frameIndex = 0; frameIndex < nFrames; frameIndex++) {
-                    imageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?frame=${frameIndex}&instanceId=${instance.Id}&visitTaskId=${taskId}&idx=${taskIndex}|${studyIndex}|${seriesIndex}`);
+                    imageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?frame=${frameIndex}&instanceId=${instance.Id}&visitTaskId=${taskId}&idx=${taskIndex}|${studyIndex}|${seriesIndex}`)
                   }
                 }
               }
-            });
-            series.ImageIds = imageIds;
+            })
+            series.ImageIds = imageIds
             series.SliceIndex = 0
             series.LoadedImageCount = 0
             series.LoadedImageProgress = 0
             series.TaskInfo = Object.assign({}, taskInfo)
             series.StudyIndex = studyIndex
             series.SeriesIndex = seriesIndex
-          });
-        });
+          })
+        })
         if (keyStudyIndex > -1 && keySeriesIndex > -1 && keyImages.length > 0) {
-          let keyImageIds = []
-          keyImages.forEach(instance=>{
-            if (instance.KeyFramesList.length > 0){
-              i.KeyFramesList.map(i => {
+          const keyImageIds = []
+          keyImages.forEach(instance => {
+            if (instance.KeyFramesList.length > 0) {
+              instance.KeyFramesList.map(i => {
                 keyImageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${taskId}&idx=${taskIndex}|${instance.StudyIndex}|${instance.SeriesIndex}`)
               })
-            }else {
+            } else {
               keyImageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?frame=0&instanceId=${instance.Id}&visitTaskId=${taskId}&idx=${taskIndex}|${instance.StudyIndex}|${instance.SeriesIndex}`)
             }
-            
           })
           res1.Result[keyStudyIndex].SeriesList[keySeriesIndex].ImageIds = keyImageIds
         }
         // 获取标注信息
-        let res2 = await getTableAnswerRowInfoList(taskId)
+        const res2 = await getTableAnswerRowInfoList(taskId)
+        const annotationUIDs = []
         const annotations = res2.Result.map(i => {
           if (typeof i.MeasureData === 'string' && i.MeasureData) {
             i.MeasureData = JSON.parse(i.MeasureData)
+            annotationUIDs.push(i.MeasureData.annotationUID)
           }
           return i
         })
-
-        return {studyList: res1.Result, annotations: annotations, keyImages}
-      } catch(e) {
+        console.log(res1.Result)
+        return { studyList: arr, annotations: annotations, annotationUIDs, keyImages }
+      } catch (e) {
         console.log(e)
       }
     },
     // 设置初始化序列信息
     setInitSeries() {
-      let seriesArr = []
+      const seriesArr = []
       let activeStudyIndex = -1
       let activeSeriesIndex = -1
       const studyList = this.visitTaskList[this.activeTaskIndex].StudyList.filter(i => i.IsDicom)
       const seriesList = studyList.map(s => s.SeriesList).flat()
       if (this.taskInfo.IsReadingTaskViewInOrder === 0) {
         // 完全随机（默认一个视口，展示第一个序列）
-        let series = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex])
+        const series = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex])
         seriesArr.push(series)
         activeStudyIndex = series.StudyIndex
         activeSeriesIndex = series.SeriesIndex
@@ -679,21 +800,20 @@ export default {
         // 按时间顺序（默认基线时显示一个视口，展示第一个序列；随访时显示基线和当前随访的序列）
         if (this.taskInfo.IsBaseLine) {
           // 基线默认显示第一个序列
-          let series = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex])
+          const series = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex])
           seriesArr.push(series)
           activeStudyIndex = series.StudyIndex
           activeSeriesIndex = series.SeriesIndex
         } else {
           // 随访
-          let i = this.visitTaskList.findIndex(i=>i.IsBaseLineTask)
-          let baseSeries = this.getRelatedSeries(this.visitTaskList[i])
+          const i = this.visitTaskList.findIndex(i => i.IsBaseLineTask)
+          const baseSeries = this.getRelatedSeries(this.visitTaskList[i])
           seriesArr.push(baseSeries)
-          let followUpSeries = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex], baseSeries)
+          const followUpSeries = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex], baseSeries)
           seriesArr.push(followUpSeries)
           activeStudyIndex = followUpSeries.StudyIndex
           activeSeriesIndex = followUpSeries.SeriesIndex
         }
-
       } else if (this.taskInfo.IsReadingTaskViewInOrder === 2) {
         // 受试者内随机（默认两个视口，显示第一个序列和第二个序列；如果只有一个序列则两个视口均显示这个序列）
         if (seriesList.length === 1) {
@@ -706,15 +826,16 @@ export default {
           activeSeriesIndex = seriesList[1].SeriesIndex
         }
       }
-      
+
       if (activeStudyIndex > -1 && activeSeriesIndex > -1) {
-        seriesArr.map((i, index)=>{
+        seriesArr.map((i, index) => {
           this.$refs[`viewport-${index}`][0].setSeriesInfo(i)
         })
-        let visitTaskId = this.visitTaskList[this.activeTaskIndex].VisitTaskId
+        const visitTaskId = this.visitTaskList[this.activeTaskIndex].VisitTaskId
+        this.lastViewportTaskId = visitTaskId
+        this.currentVisitInfo = this.visitTaskList[this.activeTaskIndex]
         this.$refs[visitTaskId][0].setSeriesActive(activeStudyIndex, activeSeriesIndex)
       }
-      
     },
     // 初始化加载器
     async initLoader() {
@@ -774,21 +895,33 @@ export default {
         toolGroup.addViewport(viewportId, renderingEngineId)
         toolGroup.addTool(StackScrollTool.toolName)
         toolGroup.addTool(ScaleOverlayTool.toolName)
-        
+
         toolGroup.addTool(PanTool.toolName)
         toolGroup.addTool(ZoomTool.toolName)
         toolGroup.addTool(WindowLevelTool.toolName)
         toolGroup.addTool(WindowLevelRegionTool.toolName)
         toolGroup.addTool(PlanarRotateTool.toolName)
-        toolGroup.addTool(ArrowAnnotateTool.toolName, {
-          arrowHeadStyle: 'standard',
-          changeTextCallback: async(data, eventData, doneChangingTextCallback) => {
-            return doneChangingTextCallback(await this.customPrompt())
-          },
-          getTextCallback: async(doneChangingTextCallback) => {
-            return doneChangingTextCallback(await this.customPrompt())
-          }
-        })
+        if (this.citerionType === 0) {
+          toolGroup.addTool(ArrowAnnotateTool.toolName, {
+            arrowHeadStyle: 'standard',
+            changeTextCallback: async(data, eventData, doneChangingTextCallback) => {
+              return doneChangingTextCallback(await this.customPrompt())
+            },
+            getTextCallback: async(doneChangingTextCallback) => {
+              return doneChangingTextCallback(await this.customPrompt())
+            }
+          })
+        } else {
+          toolGroup.addTool(ArrowAnnotateTool.toolName, {
+            arrowHeadStyle: 'standard',
+            changeTextCallback: async(data, eventData, doneChangingTextCallback) => {
+              return doneChangingTextCallback('')
+            },
+            getTextCallback: async(doneChangingTextCallback) => {
+              return doneChangingTextCallback('')
+            }
+          })
+        }
         toolGroup.addTool(RectangleROITool.toolName, {
           cachedStats: false,
           getTextLines: this.getRectangleROIToolTextLines
@@ -801,14 +934,13 @@ export default {
 
         toolGroup.addTool(EraserTool.toolName)
         toolGroup.addTool(LengthTool.toolName, {
-          getTextLines: this.getLengthToolTextLines,
-          cachedStats: false
+          getTextLines: this.getLengthToolTextLines
+          // cachedStats: false
         })
         toolGroup.addTool(BidirectionalTool.toolName, {
-          // getTextLines: this.getLengthToolTextLines,
+          // cachedStats: true
+          getTextLines: this.getBidirectionalToolTextLines
         })
-        
-        
 
         toolGroup.setToolActive(StackScrollTool.toolName, {
           bindings: [{ mouseButton: MouseBindings.Wheel }]
@@ -819,7 +951,7 @@ export default {
         toolGroup.setToolPassive(WindowLevelTool.toolName)
         toolGroup.setToolPassive(WindowLevelRegionTool.toolName)
         toolGroup.setToolPassive(PlanarRotateTool.toolName)
-        
+
         if (this.readingTaskState < 2) {
           toolGroup.setToolPassive(ArrowAnnotateTool.toolName)
           toolGroup.setToolPassive(RectangleROITool.toolName)
@@ -835,13 +967,13 @@ export default {
         }
         toolGroup.setToolPassive(EraserTool.toolName)
       })
-      
+
       eventTarget.addEventListener('cornerstoneimageloadprogress', this.imageLoadProgress)
       console.log(Events)
     },
     // 影像下载进度回调
     imageLoadProgress(e) {
-      const {detail} = e
+      const { detail } = e
       const percentComplete = detail.percentComplete
       const imageId = detail.imageId
       const params = this.getInstanceInfo(imageId)
@@ -851,45 +983,65 @@ export default {
       const taskIndex = parseInt(indexArr[0])
       const studyIndex = parseInt(indexArr[1])
       const seriesIndex = parseInt(indexArr[2])
-      const isCriticalSequence  = this.visitTaskList[taskIndex].StudyList[studyIndex].IsCriticalSequence
+      const isCriticalSequence = this.visitTaskList[taskIndex].StudyList[studyIndex].IsCriticalSequence
       const keyImages = this.visitTaskList[taskIndex].KeyImages
       const series = this.visitTaskList[taskIndex].StudyList[studyIndex].SeriesList[seriesIndex]
       this.setImageLoadedProgress(series, percentComplete)
       if (!isCriticalSequence && series.IsBeMark && keyImages.length > 0) {
-        let i = keyImages.findIndex(i=>i.Id = params.instanceId)
+        const i = keyImages.findIndex(i => i.Id === params.instanceId)
         if (i === -1) return
-        let keyStudyIndex = parseInt(keyImages[i].KeyStudyIndex)
-        let keySeriesIndex = parseInt(keyImages[i].KeySeriesIndex)
-        let keySeries = this.visitTaskList[taskIndex].StudyList[keyStudyIndex].SeriesList[keySeriesIndex]
+        const keyStudyIndex = parseInt(keyImages[i].KeyStudyIndex)
+        const keySeriesIndex = parseInt(keyImages[i].KeySeriesIndex)
+        const keySeries = this.visitTaskList[taskIndex].StudyList[keyStudyIndex].SeriesList[keySeriesIndex]
         this.setImageLoadedProgress(keySeries, percentComplete)
       }
     },
     // 设置图像下载进度信息
     setImageLoadedProgress(series, percentComplete) {
-      let instanceCount = series.InstanceCount
+      const instanceCount = series.InstanceCount
       let loadedImageProgress = series.LoadedImageProgress
       let loadedImageCount = series.LoadedImageCount
       if (percentComplete === 100) {
         ++loadedImageCount
-        this.$set(series, 'LoadedImageCount', loadedImageCount);
+        this.$set(series, 'LoadedImageCount', loadedImageCount)
       }
       loadedImageProgress = (loadedImageProgress * instanceCount + percentComplete) / instanceCount
-      this.$set(series, 'LoadedImageProgress', loadedImageProgress);
+      this.$set(series, 'LoadedImageProgress', loadedImageProgress)
     },
     addHistoryAnnotations(taskId) {
-      if (this.renderedTaskIds.includes(taskId)) return
+      // if (this.renderedTaskIds.includes(taskId)) return
+      // this.renderedTaskIds.push(taskId)
+      // let taskIdx = this.visitTaskList.findIndex(i=>i.VisitTaskId === taskId)
+      // if (taskIdx=== -1) return
+      // const annotations = this.visitTaskList[taskIdx].Annotations
+      // annotations.map(i => {
+      //   if (i.MeasureData) {
+      //     const annotation = i.MeasureData
+      //     cornerstoneTools.annotation.state.addAnnotation(annotation)
+      //     if (this.visitTaskList[taskIdx].ReadingTaskState === 2) {
+      //       cornerstoneTools.annotation.locking.setAnnotationLocked(annotation.annotationUID)
+      //     }
+      //   }
+      // })
+    },
+    renderAnnotations(series) {
+      const taskId = series.TaskInfo.VisitTaskId
+      if (!taskId || this.renderedTaskIds.includes(taskId)) return
       this.renderedTaskIds.push(taskId)
-      let i = this.visitTaskList.findIndex(i=>i.VisitTaskId === taskId)
-      if (i=== -1) return
-      const annotations = this.visitTaskList[i].Annotations
+      const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === taskId)
+      if (taskIdx === -1) return
+      const annotations = this.visitTaskList[taskIdx].Annotations
       annotations.map(i => {
-        const annotation = i.MeasureData.data
-        annotation.annotationId = i.Id
-        cornerstoneTools.annotation.state.addAnnotation(annotation)
-        if (this.visitTaskList[i].ReadingTaskState === 2) {
-          cornerstoneTools.annotation.locking.setAnnotationLocked(annotation.annotationUID)
+        if (i.MeasureData) {
+          const annotation = i.MeasureData
+          cornerstoneTools.annotation.state.addAnnotation(annotation)
+          if (this.visitTaskList[taskIdx].ReadingTaskState === 2) {
+            cornerstoneTools.annotation.locking.setAnnotationLocked(annotation.annotationUID)
+          }
         }
       })
+      const arr = cornerstoneTools.annotation.state.getAllAnnotations()
+      console.log(arr)
     },
     addAnnotationListeners() {
       const debouncedCallback = this.debounce((evt) => {
@@ -916,16 +1068,99 @@ export default {
       const { annotation } = e.detail
       if (!annotation) return
       if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
-      let series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+      const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
       if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
-
+        const referencedImageId = annotation.metadata.referencedImageId
+        const params = this.getInstanceInfo(referencedImageId)
+        annotation.visitTaskId = series.TaskInfo.VisitTaskId
+        annotation.studyId = series.StudyId
+        annotation.seriesId = series.Id
+        annotation.instanceId = params.instanceId
+        annotation.numberOfFrames = isNaN(parseInt(params.frame)) ? 0 : parseInt(params.frame)
+        annotation.markTool = annotation.metadata.toolName
+        this.$refs['ecrf'].setAnnotation({ annotation, toolName: annotation.metadata.toolName })
       }
+      this.setToolsPassive()
     },
     annotationModifiedListener(e) {
-
+      console.log('Modified')
+      if (this.readingTaskState === 2) return
+      const { annotation } = e.detail
+      if (!annotation) return
+      if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
+      const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+      if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
+        this.$refs['ecrf'].modifyAnnotation({ annotation, toolName: annotation.metadata.toolName })
+      }
+      this.setToolsPassive()
     },
     annotationRemovedListener(e) {
 
+    },
+    removeAnnotation(annotation) {
+      cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      for (let i = 0; i < this.cells.length; i++) {
+        const viewportId = `viewport-${i}`
+        const viewport = renderingEngine.getViewport(viewportId)
+        viewport.render()
+      }
+    },
+    async getAnnotations(visitTaskId) {
+      if (this.readingTaskState === 2) return
+      const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
+      if (taskIdx === -1) return
+      if (!this.visitTaskList[taskIdx].IsCurrentTask) return
+      // 获取标注信息
+      const res = await getTableAnswerRowInfoList(visitTaskId)
+      const annotationUIDs = []
+      const annotations = res.Result.map(i => {
+        if (typeof i.MeasureData === 'string' && i.MeasureData) {
+          i.MeasureData = JSON.parse(i.MeasureData)
+          annotationUIDs.push(i.MeasureData.annotationUID)
+        }
+        return i
+      })
+      this.$set(this.visitTaskList[taskIdx], 'Annotations', annotations)
+      this.$set(this.visitTaskList[taskIdx], 'AnnotationUIDs', annotationUIDs)
+    },
+    async resetAnnotations(visitTaskId) {
+      if (this.readingTaskState === 2) return
+      const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
+      if (taskIdx === -1) return
+      if (!this.visitTaskList[taskIdx].IsCurrentTask) return
+      // 获取标注信息
+      const res = await getTableAnswerRowInfoList(visitTaskId)
+      const annotations = res.Result.map(i => {
+        if (typeof i.MeasureData === 'string' && i.MeasureData) {
+          i.MeasureData = JSON.parse(i.MeasureData)
+        }
+        return i
+      })
+      this.$set(this.visitTaskList[taskIdx], 'annotations', annotations)
+      // 移除病灶
+      const arr = cornerstoneTools.annotation.state.getAllAnnotations()
+      arr.map(i => {
+        if (i.visitTaskId === visitTaskId) {
+          cornerstoneTools.annotation.state.removeAnnotation(i.annotationUID)
+        }
+      })
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      for (let i = 0; i < this.cells.length; i++) {
+        const viewportId = `viewport-${i}`
+        const viewport = renderingEngine.getViewport(viewportId)
+        viewport.render()
+      }
+    },
+    setMarkName(obj) {
+      const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
+      const idx = annotations.findIndex(i => i.annotationUID === obj.annotationUID)
+      if (idx === -1) return
+      annotations[idx].data.label = obj.name
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewportId = `viewport-${this.activeViewportIndex}`
+      const viewport = renderingEngine.getViewport(viewportId)
+      viewport.render()
     },
     getLengthToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]
@@ -933,7 +1168,11 @@ export default {
       if (length === undefined || length === null || isNaN(length)) {
         return
       }
-      const textLines = [`${parseFloat(length).toFixed(this.digitPlaces)} ${unit}`];
+      const textLines = []
+      if (data.label) {
+        textLines.push(data.label)
+      }
+      textLines.push(`${parseFloat(length).toFixed(this.digitPlaces)} ${unit}`)
       return textLines
     },
     getPlanarFreehandROIToolTextLines(data, targetId) {
@@ -984,19 +1223,46 @@ export default {
     },
     getRectangleROIToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]
-      const { area, mean, max, stdDev, areaUnit, modalityUnit } = cachedVolumeStats
+      // const { area, mean, max, stdDev, areaUnit, modalityUnit } = cachedVolumeStats
+      const { mean } = cachedVolumeStats
 
       if (mean === undefined) {
         return
       }
 
       const textLines = []
-      
-      textLines.push(`Area: ${parseFloat(area).toFixed(this.digitPlaces)} ${areaUnit}`)
+      if (data.label) {
+        textLines.push(data.label)
+      }
+      // textLines.push(`Area: ${parseFloat(area).toFixed(this.digitPlaces)} ${areaUnit}`)
 
-      textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`)
-      textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
-      textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
+      // textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`)
+      // textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
+      // textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
+
+      return textLines
+    },
+    getBidirectionalToolTextLines(data, targetId) {
+      const { cachedStats, label } = data
+      const { length, width, unit } = cachedStats[targetId]
+
+      const textLines = []
+      // if (label) {
+      //   textLines.push(label);
+      // }
+      if (label) {
+        textLines.push(label)
+      }
+      if (length === undefined) {
+        return textLines
+      }
+
+      // spaceBetweenSlices & pixelSpacing &
+      // magnitude in each direction? Otherwise, this is "px"?
+      textLines.push(
+        `L: ${csUtils.roundNumber(length)} ${unit || unit}`,
+        `S: ${csUtils.roundNumber(width)} ${unit}`
+      )
 
       return textLines
     },
@@ -1020,7 +1286,9 @@ export default {
     // 激活标注工具
     setAnnotateToolActive(toolName) {
       if (this.readingTaskState === 2) return
-      let series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+      const toolObj = this.tools.find(i => i.toolName === toolName)
+      if (!toolObj || toolObj.isDisabled) return
+      const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
       if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
         const toolGroupId = `viewport-${this.activeViewportIndex}`
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
@@ -1048,33 +1316,71 @@ export default {
       })
       this.activeTool = ''
     },
+    setToolEnabled() {
+      if (!this.activeTool) return
+      const toolGroupIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
+      toolGroupIds.forEach(toolGroupId => {
+        const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+        toolGroup.setToolEnabled(this.activeTool)
+      })
+      this.activeTool = ''
+    },
+    // 鼠标移入测量工具时，判断工具是否可激活
+    enter(e, toolName) {
+      const i = this.tools.findIndex(i => i.toolName === toolName)
+      if (i === -1) return
+      const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+      const isCurrentTask = series.TaskInfo.IsCurrentTask
+      const readingTaskState = this.readingTaskState
+      if (!isCurrentTask || readingTaskState >= 2) {
+        this.tools[i].isDisabled = true
+        e.target.style.cursor = 'not-allowed'
+        if (this.activeTool) {
+          this.setToolEnabled()
+        }
+      } else {
+        const obj = this.$refs['ecrf'].validTool(toolName, true)
+        this.tools[i].disabledReason = obj.reason
+        if (!obj.isCanActiveTool) {
+          if (this.activeTool === toolName) {
+            this.setToolsPassive()
+          }
+          this.tools[i].isDisabled = true
+          e.target.style.cursor = 'not-allowed'
+        } else {
+          this.tools[i].isDisabled = false
+          e.target.style.cursor = 'pointer'
+        }
+      }
+    },
     // 旋转视口
     setViewportRotate(value) {
+      this.setToolsPassive()
       const renderingEngine = getRenderingEngine(renderingEngineId)
       const viewportId = `viewport-${this.activeViewportIndex}`
-      const viewport = (renderingEngine.getViewport(viewportId))
+      const viewport = renderingEngine.getViewport(viewportId)
       const type = parseInt(value)
       // 1：默认值；2：垂直翻转；3：水平翻转；4：左转90度；5：右转90度；
       if (type === 1) {
-        viewport.resetCamera();
-        viewport.resetProperties();
-        viewport.render();
+        viewport.resetCamera()
+        viewport.resetProperties()
+        viewport.render()
       } else if (type === 2) {
-        const  { flipVertical } = viewport.getCamera();
-        viewport.setCamera({ flipVertical: !flipVertical });
-        viewport.render();
+        const { flipVertical } = viewport.getCamera()
+        viewport.setCamera({ flipVertical: !flipVertical })
+        viewport.render()
       } else if (type === 3) {
-        const { flipHorizontal } = viewport.getCamera();
-        viewport.setCamera({ flipHorizontal: !flipHorizontal });
-        viewport.render();
+        const { flipHorizontal } = viewport.getCamera()
+        viewport.setCamera({ flipHorizontal: !flipHorizontal })
+        viewport.render()
       } else if (type === 4) {
-        const { rotation } = viewport.getViewPresentation();
-        viewport.setViewPresentation({ rotation: rotation + 90 });
-        viewport.render();
+        const { rotation } = viewport.getViewPresentation()
+        viewport.setViewPresentation({ rotation: rotation + 90 })
+        viewport.render()
       } else if (type === 5) {
-        const { rotation } = viewport.getViewPresentation();
-        viewport.setViewPresentation({ rotation: rotation - 90 });
-        viewport.render();
+        const { rotation } = viewport.getViewPresentation()
+        viewport.setViewPresentation({ rotation: rotation - 90 })
+        viewport.render()
       }
       this.$refs[`viewport-${this.activeViewportIndex}`][0].rotateOrientationMarkers(type)
     },
@@ -1083,30 +1389,107 @@ export default {
       this.setToolsPassive()
       const renderingEngine = getRenderingEngine(renderingEngineId)
       const viewportId = `viewport-${this.activeViewportIndex}`
-      const viewport = (renderingEngine.getViewport(viewportId))
+      const viewport = renderingEngine.getViewport(viewportId)
       this.$refs[`viewport-${this.activeViewportIndex}`][0].resetOrientationMarkers()
       viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true })
       renderingEngine.render()
     },
     // 更改视图布局
-    changeLayout(v) {
+    async changeLayout(v) {
+      this.setToolsPassive()
       this.fullScreenIndex = null
       this.layout = v
-      this.rows = parseInt(v.split('*')[0])
-      this.cols = parseInt(v.split('*')[1])
+      const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+      const seriesArr = []
+      if (v === 1) {
+        this.rows = 1
+        this.cols = 1
+        this.activeViewportIndex = 0
+        if (typeof series === 'object') {
+          seriesArr.push(series)
+        }
+      } else if (v === 2) {
+        this.rows = 1
+        this.cols = 2
+        this.activeViewportIndex = 1
+        if (typeof series === 'object') {
+          seriesArr.push(series)
+          seriesArr.push(series)
+        }
+      } else if (v === 3) {
+        this.rows = 1
+        this.cols = 2
+        if (series) {
+          const idx = this.visitTaskList.findIndex(i => i.VisitTaskId === series.TaskInfo.VisitTaskId)
+          const visitTaskNum = idx > -1 ? this.visitTaskList[idx].VisitTaskNum : -1
+          if (visitTaskNum > 0) {
+            let visitTaskIdx = -1
+            if (this.citerionType === 10) {
+              visitTaskIdx = this.visitTaskList.findIndex(i => i.VisitTaskNum === visitTaskNum - 1)
+            } else {
+              visitTaskIdx = this.visitTaskList.findIndex(i => i.IsBaseLineTask)
+            }
+            if (visitTaskIdx > -1) {
+              if (!this.visitTaskList[visitTaskIdx].IsInit) {
+                this.sLoading = true
+                try {
+                  const res = await this.loadTaskDetails(this.visitTaskList[visitTaskIdx], visitTaskIdx)
+                  const studyList = res ? res.studyList : []
+                  const annotations = res ? res.annotations : []
+                  const keyImages = res ? res.keyImages : []
+                  const annotationUIDs = res ? res.annotationUIDs : []
+                  this.$set(this.visitTaskList[visitTaskIdx], 'StudyList', studyList)
+                  this.$set(this.visitTaskList[visitTaskIdx], 'Annotations', annotations)
+                  this.$set(this.visitTaskList[visitTaskIdx], 'KeyImages', keyImages)
+                  this.$set(this.visitTaskList[visitTaskIdx], 'AnnotationUIDs', annotationUIDs)
+                  this.$set(this.visitTaskList[visitTaskIdx], 'IsInit', true)
+                  this.sLoading = false
+                } catch (e) {
+                  this.sLoading = false
+                }
+              }
+              const relatedSeries = this.getRelatedSeries(this.visitTaskList[visitTaskIdx], series)
+              seriesArr.push(relatedSeries)
+              seriesArr.push(series)
+            }
+          } else if (visitTaskNum === 0) {
+            seriesArr.push(series)
+            seriesArr.push(series)
+          }
+        }
+        this.activeViewportIndex = 1
+      } else if (v === 4) {
+        this.rows = 2
+        this.cols = 2
+        if (typeof series === 'object') {
+          seriesArr.push(series)
+          seriesArr.push(series)
+          seriesArr.push(series)
+          seriesArr.push(series)
+        }
+        this.activeViewportIndex = 3
+      }
+      seriesArr.map((i, index) => {
+        this.$refs[`viewport-${index}`][0].setSeriesInfo(i)
+      })
+      this.$nextTick(() => {
+        const renderingEngine = getRenderingEngine(renderingEngineId)
+        renderingEngine.resize(true, false)
+      })
     },
     // 更改窗宽窗位
     changeVoiRange(v) {
+      this.setToolsPassive()
       const renderingEngine = getRenderingEngine(renderingEngineId)
       const viewportId = `viewport-${this.activeViewportIndex}`
-      const viewport = (renderingEngine.getViewport(viewportId))
+      const viewport = renderingEngine.getViewport(viewportId)
       if (v.val === -1) {
         // 默认值
-        viewport.resetProperties();
-        viewport.render();
+        viewport.resetProperties()
+        viewport.render()
       } else if (v.val === 0) {
         // 自定义
-        let wwwc = this.$refs[`viewport-${this.activeViewportIndex}`][0].imageInfo.wwwc
+        const wwwc = this.$refs[`viewport-${this.activeViewportIndex}`][0].imageInfo.wwwc
         this.activeViewportWW = wwwc ? parseInt(wwwc.split('/')[0]) : null
         this.activeViewportWC = wwwc ? parseInt(wwwc.split('/')[1]) : null
         this.customWwc.visible = true
@@ -1114,48 +1497,58 @@ export default {
         // 区域窗宽窗位
         this.setToolActive('WindowLevelRegion')
       } else {
-        const lower = v.wc - v.ww / 2;
-        const upper = v.wc + v.ww / 2 - 1;
-        viewport.setProperties({ voiRange: { upper: upper, lower: lower } });
-        viewport.render();
+        const lower = v.wc - v.ww / 2
+        const upper = v.wc + v.ww / 2 - 1
+        viewport.setProperties({ voiRange: { upper: upper, lower: lower }})
+        viewport.render()
       }
     },
+    setWindowLevelActive(e) {
+      this.setToolActive('WindowLevel')
+      this.showPanel(e)
+    },
+    // 设置窗宽窗位
     setWwwc(v) {
       const renderingEngine = getRenderingEngine(renderingEngineId)
       const viewportId = `viewport-${this.activeViewportIndex}`
-      const viewport = (renderingEngine.getViewport(viewportId))
-      const lower = v.wc - v.ww / 2;
-      const upper = v.wc + v.ww / 2 - 1;
-      viewport.setProperties({ voiRange: { upper: upper, lower: lower } });
-      viewport.render();
+      const viewport = renderingEngine.getViewport(viewportId)
+      const lower = v.wc - v.ww / 2
+      const upper = v.wc + v.ww / 2 - 1
+      viewport.setProperties({ voiRange: { upper: upper, lower: lower }})
+      viewport.render()
       this.customWwc.visible = false
     },
+    // 反色
     toggleInvert() {
-      const renderingEngine = getRenderingEngine(renderingEngineId);
-      const viewport = renderingEngine.getViewport(`viewport-${this.activeViewportIndex}`);
-      const { invert } = viewport.getProperties();
-      viewport.setProperties({ invert: !invert });
-      viewport.render();
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewport = renderingEngine.getViewport(`viewport-${this.activeViewportIndex}`)
+      const { invert } = viewport.getProperties()
+      viewport.setProperties({ invert: !invert })
+      viewport.render()
     },
+    // 翻页
     scrollPage(type) {
       this.$refs[`viewport-${this.activeViewportIndex}`][0].scrollPage(type)
     },
+    // 播放
     toggleClipPlay(isPlay) {
       this.clipPlaying = !this.clipPlaying
       this.$refs[`viewport-${this.activeViewportIndex}`][0].toggleClipPlay(isPlay, this.fps)
     },
+    // 获取窗宽窗位模板
     async getWwcTpl() {
       try {
         const res = await getUserWLTemplateList()
-        let customWwcTpl = []
+        const customWwcTpl = []
         res.Result.map(i => {
           customWwcTpl.push({ label: i.TemplateName, wc: i.WL, ww: i.WW })
         })
         this.wwwcArr = [...this.defaultWwwc, ...customWwcTpl]
-      } catch(e) {
+      } catch (e) {
         console.log(e)
       }
     },
+    // 获取热键配置信息
     async getHotKeys() {
       try {
         const res = await getDoctorShortcutKey({ imageToolType: 0 })
@@ -1167,6 +1560,7 @@ export default {
         console.log(e)
       }
     },
+    // 绑定热键事件
     bindHotKey() {
       const container = this.$refs['container']
       container.addEventListener('keydown', event => {
@@ -1177,11 +1571,11 @@ export default {
 
         if (shortcutKeyEnum === 1) {
           // 前一图像视口
-          let viewportIndex = this.activeViewportIndex === 0 ? this.activeViewportIndex : this.activeViewportIndex - 1
+          const viewportIndex = this.activeViewportIndex === 0 ? this.activeViewportIndex : this.activeViewportIndex - 1
           this.activeViewport(viewportIndex)
         } else if (shortcutKeyEnum === 2) {
           // 后一图像视口
-          let viewportIndex = this.activeViewportIndex === this.cells.length - 1 ? this.activeViewportIndex : this.activeViewportIndex + 1
+          const viewportIndex = this.activeViewportIndex === this.cells.length - 1 ? this.activeViewportIndex : this.activeViewportIndex + 1
           this.activeViewport(viewportIndex)
         } else if (shortcutKeyEnum === 3) {
           // 上一个序列
@@ -1228,8 +1622,8 @@ export default {
           this.toggleInvert()
         } else if (shortcutKeyEnum === 17) {
           // 窗宽/窗位
-          let wwwcIdx = this.$refs[`viewport-${this.activeViewportIndex}`][0].wwwcIdx
-          let newWwwcIdx = wwwcIdx === this.wwwcArr.length -1 ? 3 : wwwcIdx + 1
+          const wwwcIdx = this.$refs[`viewport-${this.activeViewportIndex}`][0].wwwcIdx
+          const newWwwcIdx = wwwcIdx === this.wwwcArr.length - 1 ? 3 : wwwcIdx + 1
           const wwwcTpl = this.wwwcArr[newWwwcIdx]
           this.changeVoiRange(wwwcTpl)
           this.$refs[`viewport-${this.activeViewportIndex}`][0].setWwwcIdx(newWwwcIdx)
@@ -1240,19 +1634,20 @@ export default {
           // 显示或隐藏标记
           this.isShowAnnotations = !this.isShowAnnotations
           if (this.isShowAnnotations) {
-            visibility.showAllAnnotations();
+            visibility.showAllAnnotations()
           } else {
-            const annotationsUIDs = annotation.state.getAllAnnotations().map((a) => a.annotationUID);
-            annotationsUIDs.forEach((annotationUID) => {
-              visibility.setAnnotationVisibility(annotationUID, false);
-            });
+            const annotationUIDs = annotation.state.getAllAnnotations().map((a) => a.annotationUID)
+            annotationUIDs.forEach((annotationUID) => {
+              visibility.setAnnotationVisibility(annotationUID, false)
+            })
           }
-          const renderingEngine = getRenderingEngine(renderingEngineId);
+          const renderingEngine = getRenderingEngine(renderingEngineId)
           const viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
-          renderingEngine.renderViewports(viewportIds);
+          renderingEngine.renderViewports(viewportIds)
         }
       })
     },
+    // 重置热键信息
     resetHotkeyList(arr) {
       this.hotKeyList = []
       arr.map(item => {
@@ -1281,13 +1676,16 @@ export default {
           const res = await this.loadTaskDetails(taskInfo, taskIndex)
           const studyList = res ? res.studyList : []
           const annotations = res ? res.annotations : []
+          const annotationUIDs = res ? res.annotationUIDs : []
           const keyImages = res ? res.keyImages : []
           this.$set(taskInfo, 'StudyList', studyList)
           this.$set(taskInfo, 'Annotations', annotations)
           this.$set(taskInfo, 'KeyImages', keyImages)
+          this.$set(taskInfo, 'AnnotationUIDs', annotationUIDs)
           this.$set(taskInfo, 'IsInit', true)
+
           this.sLoading = false
-        } catch(e) {
+        } catch (e) {
           this.sLoading = false
         }
       }
@@ -1306,38 +1704,45 @@ export default {
           const res = await this.loadTaskDetails(this.visitTaskList[i], i)
           const studyList = res ? res.studyList : []
           const annotations = res ? res.annotations : []
+          const annotationUIDs = res ? res.annotationUIDs : []
           const keyImages = res ? res.keyImages : []
           this.$set(this.visitTaskList[i], 'StudyList', studyList)
           this.$set(this.visitTaskList[i], 'Annotations', annotations)
           this.$set(this.visitTaskList[i], 'KeyImages', keyImages)
+          this.$set(this.visitTaskList[i], 'AnnotationUIDs', annotationUIDs)
           this.$set(this.visitTaskList[i], 'IsInit', true)
           this.sLoading = false
-        } catch(e) {
+        } catch (e) {
           this.sLoading = false
         }
       }
-      let series = this.getRelatedSeries(this.visitTaskList[i], obj.series)
-      this.$nextTick(()=>{
+      const series = this.getRelatedSeries(this.visitTaskList[i], obj.series)
+      this.$nextTick(() => {
         this.$refs[`viewport-${this.activeViewportIndex}`][0].setSeriesInfo(series)
         this.$refs[this.activeTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
+        if (this.activeViewportIndex === this.cells.length - 1) {
+          this.lastViewportTaskId = series.TaskInfo.VisitTaskId
+          this.currentVisitInfo = series.TaskInfo
+        }
       })
     },
     async activeSeries(obj) {
       this.$refs[`viewport-${this.activeViewportIndex}`][0].setSeriesInfo(obj)
       this.clipPlaying = false
       this.fps = 15
+      if (this.activeViewportIndex === this.cells.length - 1) {
+        this.lastViewportTaskId = obj.TaskInfo.VisitTaskId
+        this.currentVisitInfo = obj.TaskInfo
+      }
     },
     // 激活视口
     activeViewport(index) {
       if (this.activeViewportIndex === index) return
       this.activeViewportIndex = index
-      if (index === this.cells.length - 1) {
-        // store.dispatch('noneDicomReview/setLastViewportTaskId', this.viewportInfos[i].taskInfo.VisitTaskId)
-      }
       // 切换检查列表
-      let series =this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+      const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
       if (series) {
-        let i = this.visitTaskList.findIndex(v => v.VisitTaskId === series.TaskInfo.VisitTaskId)
+        const i = this.visitTaskList.findIndex(v => v.VisitTaskId === series.TaskInfo.VisitTaskId)
         if (i > -1) {
           this.activeTaskId = series.TaskInfo.VisitTaskId
           this.activeTaskIndex = i
@@ -1348,12 +1753,12 @@ export default {
     },
     getRelatedSeries(visitTaskInfo, baselineSeries) {
       let obj = {}
-      let studyList = visitTaskInfo.StudyList
-      let annotations = visitTaskInfo.Annotations
+      const studyList = visitTaskInfo.StudyList
+      const annotations = visitTaskInfo.Annotations
       if (baselineSeries) {
-        let seriesList = studyList.map(s => s.IsDicom && s.SeriesList).flat()
+        const seriesList = studyList.map(s => s.IsDicom && s.SeriesList).flat()
         if (baselineSeries.IsMarked) {
-          let i = annotations.findIndex(i => Object.keys(i.MeasureData).length > 0 && i.OrderMarkName === baselineSeries.MeasureData.OrderMarkName)
+          const i = annotations.findIndex(i => Object.keys(i.MeasureData).length > 0 && i.OrderMarkName === baselineSeries.MeasureData.OrderMarkName)
           if (i > -1) {
             obj = this.getMarkedSeries(studyList, annotations[i])
           }
@@ -1366,46 +1771,47 @@ export default {
           similarArr = similarArr.sort((a, b) => {
             return b.similar - a.similar
           })
-          let idx = similarArr[0] && similarArr[0].similar > 0.85 ? similarArr[0].index : -1
+          const idx = similarArr[0] && similarArr[0].similar > 0.85 ? similarArr[0].index : -1
           if (idx > -1) {
             obj = Object.assign({}, seriesList[idx])
-            let imageIds = seriesList[idx].ImageIds
-            let sliceIdx = Math.floor(imageIds.length / 2)
+            const imageIds = seriesList[idx].ImageIds
+            const sliceIdx = Math.floor(imageIds.length * ((baselineSeries.SliceIndex + 1) / baselineSeries.ImageIds.length))
+            // let sliceIdx = Math.floor(imageIds.length / 2)
             obj.SliceIndex = sliceIdx > 0 ? sliceIdx - 1 : 0
           }
         }
         if (Object.keys(obj).length === 0) {
           // 筛选层厚一致
-          let idx = seriesList.findIndex(series => series.InstanceCount === baselineSeries.InstanceCount)
+          const idx = seriesList.findIndex(series => series.InstanceCount === baselineSeries.InstanceCount)
           if (idx > -1) {
             obj = Object.assign({}, seriesList[idx])
-            let imageIds = seriesList[idx].ImageIds
-            let sliceIdx = Math.floor(imageIds.length / 2)
+            const imageIds = seriesList[idx].ImageIds
+            const sliceIdx = Math.floor(imageIds.length / 2)
             obj.SliceIndex = sliceIdx > 0 ? sliceIdx - 1 : 0
           }
         }
         if (Object.keys(obj).length === 0) {
           // 筛选层厚为5的序列
-          let idx = seriesList.findIndex(series => series.IsDicom && parseInt(series.SliceThickness) === 5)
+          const idx = seriesList.findIndex(series => series.IsDicom && parseInt(series.SliceThickness) === 5)
           if (idx > -1) {
             obj = Object.assign({}, seriesList[idx])
-            let imageIds = seriesList[idx].ImageIds
-            let sliceIdx = Math.floor(imageIds.length / 2)
+            const imageIds = seriesList[idx].ImageIds
+            const sliceIdx = Math.floor(imageIds.length / 2)
             obj.SliceIndex = sliceIdx > 0 ? sliceIdx - 1 : 0
           }
         }
       } else {
-        let i = annotations.findIndex(a => Object.keys(a.MeasureData).length > 0)
+        const i = annotations.findIndex(a => Object.keys(a.MeasureData).length > 0)
         if (i > -1) {
           // 有标记时，显示带标记影像所在序列
           obj = this.getMarkedSeries(studyList, annotations[i])
         } else {
           for (let k = 0; k < studyList.length; k++) {
-            let seriesIdx = studyList[k].SeriesList.findIndex(s => s.SliceThickness && parseInt(s.SliceThickness) === 5)
+            const seriesIdx = studyList[k].SeriesList.findIndex(s => s.SliceThickness && parseInt(s.SliceThickness) === 5)
             if (seriesIdx > -1) {
               obj = Object.assign({}, studyList[k].SeriesList[seriesIdx])
-              let imageIds = studyList[k].SeriesList[seriesIdx].ImageIds
-              let sliceIdx = Math.floor(imageIds.length / 2)
+              const imageIds = studyList[k].SeriesList[seriesIdx].ImageIds
+              const sliceIdx = Math.floor(imageIds.length / 2)
               obj.SliceIndex = sliceIdx > 0 ? sliceIdx - 1 : 0
               obj.IsMarked = false
               break
@@ -1414,11 +1820,11 @@ export default {
         }
       }
       if (Object.keys(obj).length === 0) {
-        let sIdx = studyList.findIndex(s => s.IsDicom)
+        const sIdx = studyList.findIndex(s => s.IsDicom)
         if (sIdx > -1) {
           obj = Object.assign({}, studyList[sIdx].SeriesList[0])
-          let imageIds = studyList[sIdx].SeriesList[0].ImageIds
-          let sliceIdx = Math.floor(imageIds.length / 2)
+          const imageIds = studyList[sIdx].SeriesList[0].ImageIds
+          const sliceIdx = Math.floor(imageIds.length / 2)
           obj.SliceIndex = sliceIdx > 0 ? sliceIdx - 1 : 0
           obj.IsMarked = false
         }
@@ -1427,12 +1833,12 @@ export default {
     },
     getMarkedSeries(studyList, annotation) {
       let obj = {}
-      let sIdx = studyList.findIndex(s => s.StudyId === annotation.StudyId)
+      const sIdx = studyList.findIndex(s => s.StudyId === annotation.StudyId)
       if (sIdx > -1) {
-        let seriesList = studyList[sIdx].SeriesList
-        let seriesIdx = seriesList.findIndex(s => s.SeriesId === annotation.SeriesId)
+        const seriesList = studyList[sIdx].SeriesList
+        const seriesIdx = seriesList.findIndex(s => s.Id === annotation.SeriesId)
         if (seriesIdx > -1) {
-          let instanceIdx = seriesList[seriesIdx].InstanceInfoList.findIndex(i=>i.Id === annotation.InstanceId)
+          const instanceIdx = seriesList[seriesIdx].InstanceInfoList.findIndex(i => i.Id === annotation.InstanceId)
           let filterStr = ''
           if (instanceIdx > -1 && seriesList[seriesIdx].IsExistMutiFrames) {
             if (seriesList[seriesIdx].InstanceInfoList[instanceIdx].NumberOfFrames > 0) {
@@ -1443,8 +1849,8 @@ export default {
           } else {
             filterStr = `instanceId=${annotation.InstanceId}`
           }
-          let imageIds = seriesList[seriesIdx].ImageIds
-          let imageIdIdx = imageIds.findIndex(is => is.includes(filterStr))
+          const imageIds = seriesList[seriesIdx].ImageIds
+          const imageIdIdx = imageIds.findIndex(is => is.includes(filterStr))
           if (imageIdIdx) {
             obj = Object.assign({}, seriesList[seriesIdx])
             obj.SliceIndex = imageIdIdx
@@ -1455,6 +1861,138 @@ export default {
       }
       return obj
     },
+    async getScreenshots(measureData, callback) {
+      if (measureData) {
+        await this.imageLocation(measureData)
+        setTimeout(async() => {
+          const divForDownloadViewport = document.querySelector(
+            `div[data-viewport-uid="viewport-${this.activeViewportIndex}"]`
+          )
+          const canvas = await html2canvas(divForDownloadViewport)
+          const base64Str = canvas.toDataURL('image/png', 1)
+          callback(base64Str)
+        }, 50)
+      } else {
+        callback()
+      }
+    },
+    imageLocation(obj) {
+      return new Promise(async resolve => {
+        let loading = null
+        const index = this.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
+        if (index === -1) {
+          resolve()
+          return
+        }
+        if (obj.annotationUID) {
+          obj.StudyId = obj.studyId
+          obj.SeriesId = obj.seriesId
+          obj.InstanceId = obj.instanceId
+          obj.isMarked = true
+        } else {
+          obj.isMarked = false
+        }
+
+        let firstAddSeries = {}
+        let currentAddSeries = {}
+        if (this.taskInfo.IsReadingTaskViewInOrder === 1) {
+          // 有序
+          // 获取病灶第一次出现的访视序列
+          let firstAddVisitTaskId = null
+          const idx = this.visitTaskList[index].Annotations.findIndex(item => {
+            return item.OrderMarkName === obj.lesionName
+          })
+          if (idx > -1) {
+            firstAddVisitTaskId = this.visitTaskList[index].Annotations[idx].FristAddTaskId
+            const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === firstAddVisitTaskId)
+            if (taskIdx > -1 && !this.visitTaskList[taskIdx].IsInit) {
+              loading = this.$loading({ fullscreen: true })
+              try {
+                const res = await this.loadTaskDetails(this.visitTaskList[taskIdx], taskIdx)
+                const studyList = res ? res.studyList : []
+                const annotations = res ? res.annotations : []
+                const annotationUIDs = res ? res.annotationUIDs : []
+                const keyImages = res ? res.keyImages : []
+                this.$set(this.visitTaskList[taskIdx], 'StudyList', studyList)
+                this.$set(this.visitTaskList[taskIdx], 'Annotations', annotations)
+                this.$set(this.visitTaskList[taskIdx], 'KeyImages', keyImages)
+                this.$set(this.visitTaskList[taskIdx], 'AnnotationUIDs', annotationUIDs)
+                this.$set(this.visitTaskList[taskIdx], 'IsInit', true)
+                loading.close()
+              } catch (e) {
+                loading.close()
+              }
+            }
+            const annotationIdx = this.visitTaskList[taskIdx].Annotations.findIndex(i => i.OrderMarkName === obj.lesionName)
+            if (annotationIdx > -1) {
+              firstAddSeries = this.getMarkedSeries(this.visitTaskList[taskIdx].StudyList, this.visitTaskList[taskIdx].Annotations[annotationIdx])
+            }
+          }
+          if (obj.isMarked) {
+            currentAddSeries = this.getMarkedSeries(this.visitTaskList[index].StudyList, obj)
+          }
+
+          if (Object.keys(firstAddSeries).length === 0 && Object.keys(currentAddSeries).length !== 0) {
+            firstAddSeries = currentAddSeries
+          } else if (Object.keys(firstAddSeries).length === 0 && Object.keys(currentAddSeries).length === 0) {
+            this.setToolsPassive()
+            if (obj.isActiveTarget) {
+              this.setToolToTarget(obj)
+            }
+            resolve()
+            return
+          } else if (Object.keys(firstAddSeries).length !== 0 && Object.keys(currentAddSeries).length === 0) {
+            // 当前访视序列与首次出现病灶的序列对齐
+            currentAddSeries = this.getRelatedSeries(this.visitTaskList[index], firstAddSeries)
+
+            if (Object.keys(currentAddSeries).length === 0) {
+              // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息
+              currentAddSeries = this.$refs[`viewport-${this.cells.length - 1}`][0].series
+            }
+          }
+        } else {
+          // 无序
+          currentAddSeries = this.getMarkedSeries(this.visitTaskList[index].StudyList, obj)
+          if (Object.keys(currentAddSeries).length === 0) {
+            // 未找到标注序列的，则就显示当前最后一个窗口现实的序列信息cells.length - 1
+            currentAddSeries = this.$refs[`viewport-${this.cells.length - 1}`][0].series
+          }
+          firstAddSeries = currentAddSeries
+        }
+        for (let i = 0; i < this.cells.length; i++) {
+          if (i === this.cells.length - 1) {
+            this.$refs[`viewport-${i}`][0].setSeriesInfo(currentAddSeries, true)
+            this.activeViewportIndex = i
+          } else {
+            this.$refs[`viewport-${i}`][0].setSeriesInfo(firstAddSeries, true)
+          }
+        }
+        this.setToolsPassive()
+        if (obj.isActiveTarget) {
+          this.setToolToTarget(obj)
+        }
+
+        resolve()
+      })
+    },
+    setToolToTarget(obj) {
+      console.log('setToolToTarget')
+      if (obj.visitTaskId === this.taskInfo.VisitTaskId && this.readingTaskState !== 2 && obj.markTool && !obj.isMarked) {
+        const toolName = obj.markTool
+        if (this.activeTool) {
+          this.setToolsPassive()
+        }
+        const toolGroupId = `viewport-${this.activeViewportIndex}`
+        const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+        toolGroup.setToolActive(toolName, {
+          bindings: [{ mouseButton: MouseBindings.Primary }]
+        })
+        this.activeTool = toolName
+      }
+    },
+    setReadingTaskState(state) {
+      this.readingTaskState = state
+    },
     // 两个字符串的相似程度，并返回相似度百分比
     strSimilarity2Percent(s, t) {
       var l = s.length > t.length ? s.length : t.length
@@ -1528,7 +2066,12 @@ export default {
         return null
       }
     },
-
+    showPanel(e) {
+      e.currentTarget.firstChild.lastChild.style.display = 'block'
+    },
+    toolMouseout(e) {
+      e.currentTarget.firstChild.lastChild.style.display = 'none'
+    },
     debounce(callback, delay) {
       let timerId
       return function() {
@@ -1638,19 +2181,6 @@ export default {
                 font-size: 20px;
               }
             }
-            .divider{
-              display: block;
-              height: 1px;
-              width: 100%;
-              margin: 10px 0;
-            }
-            .el-divider__text{
-              padding: 0 10px;
-              // color: #fff;
-              // background-color: #383838;
-              font-size: 12px;
-              width: 80px;
-            }
           }
           .tool-item-active {
             background-color: #607d8b;
@@ -1693,6 +2223,91 @@ export default {
               display: none;
             }
           }
+          // .icon:hover{
+          //   background-color: #607d8b;
+          // }
+          .dropdown {
+            position: relative;
+            display: inline-block;
+            .text{
+              text-align: center;
+            }
+          }
+          .dropdown-content {
+            display: none;
+            position: absolute;
+            background-color: #383838;
+            color: #fff;
+            box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+            z-index: 9999;
+            font-size: 12px;
+            ul{
+              list-style: none;
+              margin: 0;
+              padding: 0;
+              text-align: center;
+              li{
+                a{
+                  display: block;
+                  padding: 5px;
+                }
+              }
+            }
+            ul li a:hover{
+              background-color: #727272;
+            }
+          }
+          .layout-content-ul li:hover{
+            background-color: #727272;
+          }
+          .layout-content ul li{
+            border-top:1px solid #ddd;
+            border-left:1px solid #ddd;
+          }
+          .layout_flex_row {
+            display: flex;
+            justify-content: space-between;
+            flex-direction: row;
+            align-items: center;
+            text-align: center;
+            margin-bottom: 2px;
+          }
+          .layout_flex_column{
+            display: flex;
+            justify-content: space-between;
+            flex-direction: column;
+            align-items: center;
+            margin-bottom: 2px;
+          }
+          .layout_box_1_1{
+            flex:1;
+            line-height: 30px;
+            font-size: 12px;
+            text-align: center;
+            border-bottom:1px solid #ddd;
+            border-right:1px solid #ddd;
+          }
+          .layout_box_1_2{
+            flex:1;
+            line-height: 15px;
+            font-size: 10px;
+            text-align: center;
+            border-bottom:1px solid #ddd;
+            border-right:1px solid #ddd;
+          }
+          .divider{
+            display: block;
+            height: 1px;
+            width: 100%;
+            margin: 10px 0;
+          }
+          .el-divider__text{
+            padding: 0 10px;
+            font-size: 12px;
+            width: 80px;
+            background-color: #383838;
+            color: #fff;
+          }
         }
         .viewports-wrapper {
           flex: 1;
@@ -1722,14 +2337,8 @@ export default {
     .right-panel {
       width: 400px;
       border: 1px solid #727272;
-      padding: 0 10px;
       overflow-y: auto;
-      .text-info {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        color: #ddd;
-      }
+      user-select: none;
     }
     .personal_config {
       ::v-deep .el-tabs__content{
@@ -1771,7 +2380,7 @@ export default {
         position: relative;
       }
     }
-    
+
     ::v-deep .cd-full-dialog-container{
       background: #fff !important;
       .el-dialog__body{
@@ -1782,6 +2391,42 @@ export default {
         position: relative;
       }
     }
+    ::v-deep .el-dropdown-menu{
+      .el-dropdown-menu__item {
+        padding: 0 5px;
+      }
+      .layout_flex_row {
+        display: flex;
+        justify-content: space-between;
+        flex-direction: row;
+        align-items: center;
+        width: 40px;
+        align-items: center;
+        text-align: center;
+      }
+      .layout_flex_column{
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+        align-items: center;
+      }
+      .layout_box_1_1{
+        flex:1;
+        line-height: 30px;
+        font-size: 12px;
+        text-align: center;
+        // border-bottom:1px solid #ddd;
+        // border-right:1px solid #ddd;
+      }
+      .layout_box_1_2{
+        flex:1;
+        line-height: 15px;
+        font-size: 10px;
+        text-align: center;
+        // border-bottom:1px solid #ddd;
+        // border-right:1px solid #ddd;
+      }
+    }
   }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
new file mode 100644
index 00000000..2c3211c5
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
@@ -0,0 +1,318 @@
+<template>
+  <div>
+    <div
+      v-if="!!question.GroupName && question.Type==='group'"
+    >
+      <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        {{ language==='en'?question.GroupEnName:question.GroupName }}
+      </h4>
+    </div>
+    <template v-else>
+      <el-form-item
+        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0 "
+        :label="`${question.QuestionName}`"
+        :prop="question.Id"
+        :rules="[
+          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (questionForm[question.RelevanceId] === question.RelevanceValue))) && question.Type!=='group' && question.Type!=='summary',
+            message: ['radio', 'select', 'checkbox'].includes(question.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+        :class="[question.Type==='group' ? 'mb' : (question.Type==='upload' || question.QuestionName.length > 15) ?'uploadWrapper' : '']"
+      >
+
+        <!-- 输入框 -->
+        <el-input
+          v-if="question.Type==='input'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 多行文本输入框 -->
+        <el-input
+          v-else-if="question.Type==='textarea'"
+          v-model="questionForm[question.Id]"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 下拉框 -->
+        <el-select
+          v-else-if="question.Type==='select'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode)"
+          clearable
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.TableQuestionType === 1">
+            <el-option
+              v-for="item in organList"
+              :key="item.Id"
+              :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]"
+            />
+          </template>
+          <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </template>
+          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </template>
+          <template v-else>
+            <el-option
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+              :value="val"
+            />
+          </template>
+        </el-select>
+        <!-- 单选 -->
+        <el-radio-group
+          v-else-if="question.Type==='radio'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.DictionaryCode">
+            <el-radio
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :label="String(item.value)"
+            >
+              {{ item.label }}
+            </el-radio>
+          </template>
+          <template v-else-if="question.TypeValue">
+            <el-radio
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+            >
+              {{ val }}
+            </el-radio>
+          </template>
+        </el-radio-group>
+        <!-- 复选框 -->
+        <el-checkbox-group
+          v-else-if="question.Type==='checkbox'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+        >
+          <el-checkbox
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+          >
+            {{ val }}
+          </el-checkbox>
+        </el-checkbox-group>
+        <!-- 数值 -->
+        <template v-else-if="question.Type==='number'">
+          <el-input-number
+            v-if="question.ValueType === 0"
+            v-model="questionForm[question.Id]"
+            :precision="0"
+            :disabled="readingTaskState >= 2"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 3"
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 1 || question.ValueType === 2"
+            v-model="questionForm[question.Id]"
+            :precision="digitPlaces"
+            :disabled="readingTaskState >= 2"
+          />
+        </template>
+        <el-input
+          v-else-if="question.Type==='calculation'"
+          v-model="questionForm[question.Id]"
+          disabled
+        >
+          <template v-if="question.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+          </template>
+        </el-input>
+        <!-- 上传图像 -->
+        <el-upload
+          v-else-if="question.Type==='upload'"
+          action
+          :accept="accept"
+          :limit="question.ImageCount"
+          :on-preview="handlePictureCardPreview"
+          :before-upload="handleBeforeUpload"
+          :http-request="uploadScreenshot"
+          list-type="picture-card"
+          :on-remove="handleRemove"
+          :file-list="fileList"
+          :class="{disabled:fileList.length >= question.ImageCount}"
+          :disabled="readingTaskState >= 2"
+        >
+          <i slot="default" class="el-icon-plus" />
+          <div slot="file" slot-scope="{file}">
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="OSSclientConfig.basePath + file.url"
+              alt=""
+            >
+            <span class="el-upload-list__item-actions">
+              <span
+                class="el-upload-list__item-preview"
+                @click="handlePictureCardPreview(file)"
+              >
+                <i class="el-icon-zoom-in" />
+              </span>
+
+              <span
+                v-if="readingTaskState < 2"
+                class="el-upload-list__item-delete"
+                @click="handleRemove(file)"
+              >
+                <i class="el-icon-delete" />
+              </span>
+            </span>
+          </div>
+        </el-upload>
+        <el-dialog
+          v-if="question.Type==='upload'"
+          append-to-body
+          :visible.sync="imgVisible"
+          width="600px"
+        >
+          <el-image :src="imageUrl" width="100%">
+            <div slot="placeholder" class="image-slot">
+              加载中<span class="dot">...</span>
+            </div>
+          </el-image>
+        </el-dialog>
+      </el-form-item>
+    </template>
+
+    <question-form-item
+      v-for="(item) in question.Childrens"
+      :key="item.Id"
+      :question="item"
+      :question-form="questionForm"
+      :reading-task-state="readingTaskState"
+      :visitTaskId="visitTaskId"
+    />
+  </div>
+</template>
+<script>
+// import { uploadReadingAnswerImage } from '@/api/trials'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'QuestionFormItem',
+  props: {
+    questionForm: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    question: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    visitTaskId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      fileList: [],
+      accept: '.png,.jpg,.jpeg',
+      imgVisible: false,
+      imageUrl: '',
+      urls: [],
+      digitPlaces: 2
+    }
+  },
+  computed: {
+    ...mapGetters(['language'])
+  },
+  watch: {
+    questionForm: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+        // console.log(v)
+      }
+    }
+  },
+  mounted() {
+    let digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+  },
+  methods: {
+    formItemChange(v, question) {
+      if (question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      } else {
+        this.$emit('setFormItemData', { key: question.Id, val: v })
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.$emit('resetFormItemData', i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
+    },
+    resetFormItemData(v) {
+      this.$emit('resetFormItemData', v)
+    },
+    setFormItemData(obj) {
+      this.$emit('setFormItemData', obj)
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.mb{
+  margin-bottom: 0px;
+}
+.disabled{
+  ::v-deep .el-upload--picture-card {
+    display: none;
+  }
+}
+.uploadWrapper{
+  display: flex;
+  flex-direction: column !important;
+  align-items: flex-start;
+}
+::v-deep .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+::v-deep .el-input-group__append, .el-input-group__prepend{
+  padding: 0 10px;
+}
+::v-deep .el-form-item__content {
+  width: 100%;
+}
+::v-deep .el-select.is-disabled .el-input__inner{
+  background-color: #646464a1;
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
new file mode 100644
index 00000000..da67deb9
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -0,0 +1,1858 @@
+<template>
+  <div class="questionList-wrapper">
+
+    <div class="container">
+      <div class="basic-info">
+        <h3 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo">
+          <span v-if="visitInfo.SubjectCode">{{ visitInfo.SubjectCode }} </span>
+          <span style="margin-left:5px;">{{ visitInfo.TaskBlindName }}</span>
+        </h3>
+        <div v-if="readingTaskState < 2">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetForm"
+            />
+          </el-tooltip>
+        </div>
+      </div>
+
+      <!-- 影像质量评估 -->
+      <div v-if="outerQuestions.length > 0" class="outer_form_wrapper">
+        <el-form
+          ref="outerForm"
+          size="small"
+          :model="outerForm"
+        >
+          <question-form-item 
+            v-for="outerQs in outerQuestions"
+            :key="outerQs.Id"
+            :question="outerQs"
+            :questionForm="outerForm"
+            :readingTaskState="readingTaskState"
+            :visitTaskId="visitTaskId"
+          />
+          <el-form-item v-if="readingTaskState < 2">
+            <div class="outer_form-footer">
+              <i class="el-icon-warning feedback-icon" @click="openFeedBackTable" :style="{color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff'}"/>
+              <el-button size="mini" @click="saveOuterForm">{{ $t('common:button:save') }}</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <!-- 病灶评估 -->
+      <template v-if="tableQuestions.length > 0 && criterionType !== 10">
+        <div 
+          v-for="(qs,index) in tableQuestions" 
+          :key="index"
+          class="lesions lesions_wrapper">
+          <h4 
+            v-if="qs.Type === 'group'" 
+            style="color: #ddd;padding: 5px 0px;margin: 0;"
+          >
+            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+          </h4>
+          <div class="lesion_list">
+            <div 
+              v-for="table in qs.Childrens" 
+              v-show="!(isBaseLineTask && table.LesionType === 2)" 
+              :key="table.Id"
+            >
+              <div v-if="table.Type === 'table'" 
+                class="flex-row" 
+                style="margin:3px 0;"
+              >
+                <div class="title">{{ table.QuestionName }}</div>
+                <div 
+                  v-if="readingTaskState<2 && (isBaseLineTask || table.LesionType === 2)" 
+                  class="add-icon" 
+                  @click.prevent="addTarget(table)"
+                >
+                  <i class="el-icon-plus" />
+                </div>
+              </div>
+              <el-collapse
+                v-if="table.Type === 'table' && table.TableQuestions"
+                v-model="activeName"
+                accordion
+                @change="handleCollapseChange"
+              >
+                <el-collapse-item
+                  v-for="(answer,i) in table.TableQuestions.Answers"
+                  :key="`${table.Id}_${answer.RowIndex}`"
+                  :name="`${table.Id}_${answer.RowIndex}`"
+                  @contextmenu.prevent.native="collapseRightClick($event, table.Id, answer.RowIndex)"
+                >
+                  <template slot="title">
+                    <div 
+                      style="width:340px;position: relative;" 
+                      :style="{color:(activeName===table.Id+answer.RowIndex?'#ffeb3b':'#fff')}"
+                    >
+                      {{ getLesionName(table.OrderMark,answer.RowIndex) }}
+                      <!-- 未保存 -->
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                        <i class="el-icon-warning" style="color:red"/>
+                      </el-tooltip>
+                      <!-- 信息不完整 -->
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                        <i class="el-icon-warning" style="color:#ff9800" />
+                      </el-tooltip>
+                      <div style="position: absolute;left: 50px;top: 2px;">
+                        <div style="font-size: 11px;width:220px;height: 30px;">
+                          <div
+                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
+                            :title="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                          >
+                            {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart }}
+                          </div>
+                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                            <span v-if="table.LesionType === 0">
+                              {{ $fd('TargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                            </span>
+                            <span v-else-if="table.LesionType === 1">
+                              {{ $fd('NoTargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                            </span>
+                            <span v-else>
+                              {{ $fd('NewLesionState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                            </span>
+                          </div>
+                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                            <template v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
+                              {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm
+                            </template>
+                            <template v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                              {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
+                            </template>
+                          </div>
+                        </div>
+                      </div>
+                      <!-- 分裂 -->
+                      <div v-if="((table.LesionType === 0 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0) || (table.LesionType === 1 && [0,1].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (table.LesionType === 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0)) && innerFormData[`${table.Id}_${answer.RowIndex}`].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        <el-tooltip v-show="readingTaskState<2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false" class="table" :content="$t('trials:reading:button:split')" placement="left">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="lesionSplit(table.Id, innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)" />
+                        </el-tooltip>
+                      </div>
+
+                    </div>
+
+                  </template>
+                  <el-form
+                    :ref="`${table.Id}_${answer.RowIndex}`"
+                    size="small"
+                    :model="innerFormData[`${table.Id}_${answer.RowIndex}`]"
+                  >
+                    <table-question-form-item
+                      :tableInfo="table"
+                      :answer="answer"
+                      :questionForm="innerFormData[`${table.Id}_${answer.RowIndex}`]"
+                      :readingTaskState="readingTaskState"
+                      :organs="organs"
+                      :isBaseLineTask="isBaseLineTask"
+                      :isCurrentTask="isCurrentTask"
+                      @update="innerFormDataUpdate"
+                      @close="closeInnerForm"
+                      @lesionTypeChange="lesionTypeChange"
+                    />
+                    <div
+                      v-if="readingTaskState<2"
+                      style="text-align:right;margin-top:10px;"
+                    >
+                      <!-- 清除标记 -->
+                      <el-button
+                        v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData"
+                        size="mini"
+                        @click="clearMeasureData(table, answer.RowIndex)"
+                      >
+                        {{ $t('trials:reading:button:removeMark') }}
+                      </el-button>
+                      <!-- 删除 -->
+                      <el-button
+                        v-if="table.TableQuestions.Answers[i].IsCurrentTaskAdd !== 'False'"
+                        size="mini"
+                        @click="deleteLesion(table, answer.RowIndex)"
+                      >
+                        {{ $t('common:button:delete') }}
+                      </el-button>
+                      <!-- 保存 -->
+                      <el-button
+                        size="mini"
+                        @click="saveLesion(table, answer.RowIndex)"
+                      >
+                        {{ $t('common:button:save') }}
+                      </el-button>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+
+              </el-collapse>
+            </div>
+          </div>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getDicomReadingQuestionAnswer,
+  getReadingQuestionAndAnswer,
+  getReadingOrganList,
+  saveTaskQuestion,
+  submitTableQuestion,
+  deleteReadingRowAnswer,
+  splitLesion
+} from '@/api/trials'
+import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
+import { mapGetters } from 'vuex'
+import QuestionFormItem from './QuestionFormItem'
+import TableQuestionFormItem from './TableQuestionFormItem'
+export default {
+  name: 'QuestionList',
+  components: {
+    QuestionFormItem,
+    TableQuestionFormItem
+  },
+  props: {
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    lastViewportTaskId: {
+      type: String,
+      required: true
+    },
+    visitInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
+  data(){
+    return {
+      isBaseLineTask: false,
+      isCurrentTask: false,
+      criterionType: null,
+      taskInfo: null,
+      outerQuestions: [],
+      outerForm: {},
+      tableQuestions: [],
+      trialId: '',
+      visitTaskId: '',
+      loading: false,
+      activeName: '',
+      innerFormData: {},
+      organs: [],
+      deleteTargetInfo: null,
+      digitPlaces: 2,
+      imageQualityId: '',
+      imageQualityIssuesId: ''
+    }
+  },
+  computed: {
+    ...mapGetters(['language'])
+  },
+  watch: {
+    lastViewportTaskId: {
+      immediate: true,
+      handler(id) {
+        if (!id) return
+        this.visitTaskId = id
+        this.$nextTick(()=>{
+          this.activeName = ''
+          this.getOuterQuestions()
+          this.getTableQuestions()
+        })
+      }
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.isBaseLineTask = this.taskInfo.IsBaseLine
+    this.criterionType = this.taskInfo.CriterionType
+    let digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+    this.getOrganList()
+  },
+  methods:{
+    // 获取器官信息
+    async getOrganList() {
+      try {
+        let params = {
+          visitTaskId: this.visitTaskId
+        }
+        let res = await getReadingOrganList(params)
+        if (res.IsSuccess) {
+          this.organs = res.Result
+        }
+      } catch(e) {
+        console.log(e)
+      }
+    },
+    // 获取外层问题
+    async getOuterQuestions() {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        let params = {
+          trialId: this.$route.query.trialId,
+          visitTaskId: this.visitTaskId
+        }
+        let res = await getDicomReadingQuestionAnswer(params)
+        if (res.IsSuccess) {
+          this.outerQuestions = res.Result
+          this.outerForm = this.getOuterFormData(this.outerQuestions)
+        }
+        loading.close()
+      } catch(e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    // 初始化外层问题表单
+    getOuterFormData(childrens, formData = {}) {
+      childrens.forEach(item => {
+        if (item.Type !== 'group' && item.Type !== 'summary') {
+          formData[item.Id] = item.Answer || ''
+          if (item.QuestionType === 44) {
+            // 影像质量评估
+            this.imageQualityId = item.Id
+          }
+          if (item.QuestionType === 67) {
+            // 影像质量问题
+            this.imageQualityIssuesId = v.Id
+          }
+          if (item.Childrens?.length) {
+            this.getOuterFormData(item.Childrens, formData)
+          }
+        } else {
+          this.getOuterFormData(item.Childrens, formData)
+        }
+      })
+      return formData
+    },
+    // 获取表格问题
+    async getTableQuestions() {
+      this.isCurrentTask = this.taskInfo.VisitTaskId === this.visitTaskId
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        let params = {
+          trialId: this.$route.query.trialId,
+          visitTaskId: this.visitTaskId
+        }
+        let res = await getReadingQuestionAndAnswer(params)
+        if (res.IsSuccess) {
+          this.tableQuestions = res.Result.SinglePage
+          res.Result.SinglePage.forEach(group=>{
+            group.Childrens.forEach(table=>{
+              const tableKey = table.Id
+              this.$set(this.innerFormData, tableKey, {})
+              table.TableQuestions.Questions.forEach(question=>{
+                if (question.Type !== 'summary') {
+                  this.$set(this.innerFormData[tableKey], question.Id, null)
+                }
+              })
+              this.$set(this.innerFormData[tableKey], 'RowId', '00000000-0000-0000-0000-000000000000')
+              this.$set(this.innerFormData[tableKey], 'LesionLength', null)
+              this.$set(this.innerFormData[tableKey], 'LesionShort', null)
+              this.$set(this.innerFormData[tableKey], 'IsLymphNodes', null)
+              this.$set(this.innerFormData[tableKey], 'LesionState', null)
+              this.$set(this.innerFormData[tableKey], 'LesionPart', null)
+              this.$set(this.innerFormData[tableKey], 'LesionName', null)
+              this.$set(this.innerFormData[tableKey], 'MeasureData', null)
+              this.$set(this.innerFormData[tableKey], 'TableId', tableKey)
+              this.$set(this.innerFormData[tableKey], 'IsCurrentTaskAdd', 'True')
+              
+              // QuestionMark：0--长径；1--短径；2--是否淋巴结；7--状态；8--所在部位； 
+              let lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
+              let shortId = this.getQuestionId(1, table.TableQuestions.Questions)
+              let lymphNodesId = this.getQuestionId(2, table.TableQuestions.Questions)
+              let stateId = this.getQuestionId(7, table.TableQuestions.Questions)
+              let partId = this.getQuestionId(8, table.TableQuestions.Questions)
+              table.TableQuestions.Answers.forEach((answer, index)=>{
+                this.$set(this.innerFormData, `${tableKey}_${answer.RowIndex}`, {})
+                this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionName', this.getLesionName(table.OrderMark, answer.RowIndex))
+                for (const key in answer) {
+                  let val = answer[key]
+                  if (key === 'MeasureData' && val) {
+                    val = JSON.parse(val)
+                  } else if (key === 'LesionType' || key === lymphNodesId || key === stateId) {
+                    val = isNaN(parseInt(val)) ? null : parseInt(val)
+                  } else if (key === 'IsCanEditPosition') {
+                    val = val === 'True' ? true : false
+                  }
+                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], key, val)
+                  if (key === lengthId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionLength', val)
+                  } else if (key === shortId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionShort', val)
+                  } else if (key === lymphNodesId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'IsLymphNodes', val)
+                  } else if (key === stateId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionState', val)
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'SaveTypeEnum', isNaN(parseInt(val)) ? 1 : 2)
+                  } else if (key === partId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionPart', val)
+                  }
+                }
+                if (index === table.TableQuestions.Answers.length - 1) {
+                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
+                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
+                }
+              })
+            })
+          })
+        }
+        loading.close()
+      } catch(e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    // 保存外层问题表单
+    async saveOuterForm() {
+      const valid = await this.$refs['outerForm'].validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        let answers = []
+        let imageQuality = null
+        for (const k in this.outerForm) {
+          answers.push({ id: k, answer: this.outerForm[k] })
+          if (k === this.imageQualityId) {
+            imageQuality = this.outerForm[k]
+          }
+        }
+        let params = {
+          visitTaskId: this.visitTaskId,
+          answers: answers
+
+        }
+        let res = await saveTaskQuestion(0, params)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          if (!this.isBaseLineTask && (this.criterionType === 1 || this.criterionType === 2 || this.criterionType === 3 || this.criterionType === 17)) {
+            if (parseInt(imageQuality) === 2) {
+              this.$confirm(this.$t('trials:reading:warnning:unableEvaluate'), '', {
+                type: 'warning'
+              }).then(() => {
+                this.changeLesionState(2)
+              }).catch(() => {
+
+              })
+            }
+          }
+        }
+        loading.close()
+      } catch(e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    // 新增病灶
+    addTarget(tableInfo, annotation) {
+      // 判断是否存在未保存的病灶，否则不允许添加
+      const obj = Object.values(this.innerFormData).find(
+        obj => !obj.RowId
+      );
+      if (obj !== undefined && typeof obj === 'object') {
+        let msg = this.$t('trials:reading:warnning:msg5')
+        msg = msg.replace('xxx', obj.LesionName)
+
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        return
+      }
+      // 判断当前病灶类型下的病灶个数是否超过最大行数，否则不允许添加
+      if (!!tableInfo.MaxQuestionCount && tableInfo.MaxQuestionCount <= tableInfo.TableQuestions.Answers.length) {
+        let msg = this.$t('trials:reading:warnning:msg14')
+        msg = msg.replace('xxx', tableInfo.MaxQuestionCount)
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        return
+      }
+      let answer = Object.assign({},this.innerFormData[tableInfo.Id])
+      answer.TableId = tableInfo.Id
+      answer.RowId = ''
+      let maxIndex = this.getMaxRowIndex(tableInfo.TableQuestions.Answers)
+      answer.RowIndex = `${maxIndex + 1}.00`
+      answer.IsDicomReading = true
+      answer.SaveTypeEnum = 0
+      answer.LesionType = tableInfo.LesionType
+      answer.LesionName = this.getLesionName(tableInfo.OrderMark, answer.RowIndex)
+      let state = null
+      if (this.isBaseLineTask && tableInfo.LesionType === 0) {
+        state = 0
+      }
+      if (this.isBaseLineTask && tableInfo.LesionType === 1) {
+        state = 0
+      }
+      let stateId = this.getQuestionId(7, tableInfo.TableQuestions.Questions)
+      answer[stateId] = state
+      tableInfo.TableQuestions.Answers.push(answer)
+      if (typeof annotation === 'object') {
+        answer.MeasureData = annotation
+        if (annotation.metadata.toolName === 'Length') {
+          let referencedImageId = annotation.metadata.referencedImageId
+          let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+          length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+          let lengthId = this.getQuestionId(0, tableInfo.TableQuestions.Questions)
+          answer.LesionLength = length
+          answer[lengthId] = length
+        } else if (annotation.metadata.toolName === 'Bidirectional') {
+          let referencedImageId = annotation.metadata.referencedImageId
+          let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+          length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+          let lengthId = this.getQuestionId(0, tableInfo.TableQuestions.Questions)
+          answer.LesionLength = length
+          answer[lengthId] = length
+
+          let short = annotation.data.cachedStats[`imageId:${referencedImageId}`].width
+          short = short ? parseFloat(short).toFixed(this.digitPlaces) : short
+          let shortId = this.getQuestionId(1, tableInfo.TableQuestions.Questions)
+          answer.LesionShort = short
+          answer[shortId] = short
+        }
+        this.$emit('setMarkName', {
+            annotationUID: annotation.annotationUID, 
+            name: answer.LesionName
+          }
+        )
+      }
+      this.innerFormData[`${tableInfo.Id}_${answer.RowIndex}`] = answer
+      this.activeName = `${tableInfo.Id}_${answer.RowIndex}`
+    },
+
+    setAnnotation(obj) {
+      let annotation = Object.assign({}, obj.annotation)
+      if (this.activeName) {
+        // 判断当前激活的病灶是否有标注信息
+        let tableId = this.activeName.split('_')[0]
+        let rowIndex = this.activeName.split('_')[1]
+        let innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+        if (innerForm.MeasureData) {
+          if (this.isBaseLineTask) {
+            const targetTable = this.tableQuestions[0].Childrens.find(
+              child => child.LesionType === 0
+            )
+            if (typeof targetTable !== 'object') return
+            if (targetTable.MaxQuestionCount && targetTable.TableQuestions.Answers.length < targetTable.MaxQuestionCount && (obj.toolName === 'Length' || obj.toolName === 'Bidirectional')) {
+              this.createTTarget(annotation)
+            } else {
+              this.createNTTarget(annotation)
+            }
+          } else {
+            this.createNLTarget(annotation)
+          }
+        } else {
+          const targetTable = this.tableQuestions[0].Childrens.find(
+            child => child.Id === tableId
+          )
+          if (typeof targetTable !== 'object') return
+          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'MeasureData', annotation)
+          if (obj.toolName === 'Length') {
+            let referencedImageId = annotation.metadata.referencedImageId
+            let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+            length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+            let lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionLength', length)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], lengthId, length)
+          } else if (obj.toolName === 'Bidirectional') {
+            let referencedImageId = annotation.metadata.referencedImageId
+            let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+            length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+            let lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionLength', length)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], lengthId, length)
+
+            let short = annotation.data.cachedStats[`imageId:${referencedImageId}`].width
+            short = short ? parseFloat(short).toFixed(this.digitPlaces) : short
+            let shortId = this.getQuestionId(1, targetTable.TableQuestions.Questions)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionShort', short)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], shortId, short)
+          }
+          let stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
+          let state = this.innerFormData[`${tableId}_${rowIndex}`][stateId]
+          // 基线时，默认状态都为存在
+          if (this.isBaseLineTask && !state) {
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0)
+          }
+          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0)
+          this.$emit('setMarkName', {
+              annotationUID: annotation.annotationUID, 
+              name: this.innerFormData[`${tableId}_${rowIndex}`].LesionName
+            }
+          )
+        }
+      } else {
+        if (this.isBaseLineTask) {
+          const targetTable = this.tableQuestions[0].Childrens.find(
+            child => child.LesionType === 0
+          )
+          if (typeof targetTable !== 'object') return
+          if (targetTable.MaxQuestionCount && targetTable.TableQuestions.Answers.length < targetTable.MaxQuestionCount && (obj.toolName === 'Length' || obj.toolName === 'Bidirectional')) {
+            this.createTTarget(annotation)
+          } else {
+            this.createNTTarget(annotation)
+          }
+        } else {
+          this.createNLTarget(annotation)
+        }
+      }
+      
+    },
+    modifyAnnotation(obj) {
+      const {annotation, toolName} = obj
+      const formData = Object.values(this.innerFormData).find(
+        i => i.LesionName === annotation.data.label
+      )
+      if (typeof formData !== 'object') return
+      let tableId = formData.TableId
+      let rowIndex = formData.RowIndex
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.Id === formData.TableId
+      )
+      if (typeof targetTable !== 'object') return
+      this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'MeasureData', annotation)
+      if (toolName === 'Length') {
+        let referencedImageId = annotation.metadata.referencedImageId
+        let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+        length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+        let lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionLength', length)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], lengthId, length)
+      } else if (toolName === 'Bidirectional') {
+        let referencedImageId = annotation.metadata.referencedImageId
+        let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+        length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+        let lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionLength', length)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], lengthId, length)
+
+        let short = annotation.data.cachedStats[`imageId:${referencedImageId}`].width
+        short = short ? parseFloat(short).toFixed(this.digitPlaces) : short
+        let shortId = this.getQuestionId(1, targetTable.TableQuestions.Questions)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionShort', short)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], shortId, short)
+      }
+      let stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
+      let state = this.innerFormData[`${tableId}_${rowIndex}`][stateId]
+      // 基线时，默认状态都为存在
+      if (this.isBaseLineTask && !state) {
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0)
+      }
+      this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', formData.RowId ? 1 : 0)
+      this.activeName = `${tableId}_${rowIndex}`
+
+    },
+    // 创建靶病灶
+    createTTarget(annotation) {
+      // 靶病灶
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.LesionType === 0
+      )
+      this.addTarget(targetTable, annotation)
+    },
+    // 创建非靶病灶
+    createNTTarget(annotation) {
+      // 非靶病灶
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.LesionType === 1
+      )
+      this.addTarget(targetTable, annotation)
+    },
+    // 创建新病灶
+    createNLTarget(annotation) {
+      // 新病灶
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.LesionType === 2
+      )
+      this.addTarget(targetTable, annotation)
+    },
+    // 清除标注
+    async clearMeasureData(table, rowIndex) {
+      //  是否确认清除标记？
+      const confirm = await this.$confirm(
+        this.$t('trials:reading:warnning:msg47'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      let innerForm = this.innerFormData[`${table.Id}_${rowIndex}`]
+      // 重置长短径 和 状态
+      let lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, null)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', null)
+      let shortId = this.getQuestionId(1, table.TableQuestions.Questions)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], shortId, null)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionShort', null)
+      let stateId = this.getQuestionId(7, table.TableQuestions.Questions)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], stateId, null)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionState', null)
+      let obj = Object.assign({}, innerForm.MeasureData)
+      // 移除标注信息
+      this.$emit('removeAnnotation', obj)
+      // 重置标注信息
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'MeasureData', null)
+      // 重置保存标志
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0)
+    },
+    // 删除病灶
+    async deleteLesion(table, rowIndex) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg48'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        let innerForm = this.innerFormData[`${table.Id}_${rowIndex}`]
+        if (innerForm.RowId) {
+          let param = {
+            visitTaskId: this.visitTaskId,
+            questionId: table.Id,
+            rowId: innerForm.RowId
+          }
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            if (innerForm.MeasureData) {
+              // 移除标注信息
+              let obj = Object.assign({}, innerForm.MeasureData)
+              this.$emit('removeAnnotation', obj)
+            }
+            // 刷新表格问题
+            this.getTableQuestions()
+            this.$emit('getAnnotations', this.visitTaskId)
+            // '删除成功！'
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+            this.activeName = ''
+          }
+        } else {
+          if (innerForm.MeasureData) {
+            // 移除标注信息
+            let obj = Object.assign({}, innerForm.MeasureData)
+            this.$emit('removeAnnotation', obj)
+          }
+          // 移除病灶
+          this.removeAnswer(table.Id, rowIndex)
+          delete this.innerFormData[`${table.Id}_${rowIndex}`]
+          this.activeName = ''
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    // 保存病灶
+    async saveLesion(table, rowIndex) {
+      const valid = await this.$refs[`${table.Id}_${rowIndex}`][0].validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      let innerForm = this.innerFormData[`${table.Id}_${rowIndex}`]
+      let measureData = innerForm.MeasureData
+      let lesionState = innerForm.LesionState
+      let lesionLength = innerForm.LesionLength
+      let lesionShort = innerForm.LesionShort
+      let lymphNodes = innerForm.IsLymphNodes
+      let lesionType = table.LesionType
+      if (this.isBaseLineTask) {
+        // 基线
+        // 靶病灶且状态为存在（0）
+        if (lesionType === 0 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            //  淋巴结靶病灶 必须使用长短径测量工具,短径大于等于15mm
+            if (!(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 15)) {
+              // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记，且短径须大于15mm！
+              this.$confirm(this.$t('trials:reading:warnning:msg19'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 直径测量工具 长径须大于等于10mm且不小于2倍层厚
+            if (!(measureData && measureData.markTool === 'Length' && lesionLength >= 10 && (measureData.thick && lesionLength >= 2 * measureData.thick || !measureData.thick))) {
+              // 评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记，长径须大于10mm且不小于2倍层厚！
+              this.$confirm(this.$t('trials:reading:warnning:msg20'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为存在（0）
+        if (lesionType === 1 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
+              this.$confirm(this.$t('trials:reading:warnning:msg21'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具或箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg22'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+      } else {
+        // 非基线
+        // 靶病灶且状态为存在（0）
+        if (lesionType === 0 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具
+            if (!(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 10)) {
+              // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg23'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 直径测量工具
+            if (!(measureData && measureData.markTool === 'Length')) {
+              // `评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg24'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+        // 靶病灶且状态为太小（1）
+        if (lesionType === 0 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用箭头工具，短径记录为5mm
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg25'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
+              let shortId = this.getQuestionId(1, table.TableQuestions.Questions)
+              this.$set(innerForm, shortId, 5)
+              lesionShort = 5
+            }
+          } else {
+            // 非淋巴结靶病灶 箭头工具，长径记录为5mm
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg26'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
+              let lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
+              this.$set(this.questionForm, lengthId, 5)
+              lesionLength = 5
+            }
+          }
+        }
+
+        // 靶病灶且状态为无法评估（2）
+        if (lesionType === 0 && lesionState === 2) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 不需要添加标记
+            if (measureData) {
+              // 评估状态为无法评估的淋巴结靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg27'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 不需要添加标记
+            if (measureData) {
+              // 状态为无法评估的非淋巴结靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg28'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 靶病灶且状态为消失（3）
+        if (lesionType === 0 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            if (!(measureData && (measureData.markTool === 'Bidirectional' && lesionShort < 10))) {
+              // `评估状态为消失的淋巴结靶病灶需使用长短径工具添加标记,且短径需小于10mm！`
+              this.$confirm(this.$t('trials:reading:warnning:msg29'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 箭头工具
+            if (!(measureData && measureData.markTool === 'ArrowAnnotate')) {
+              // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg30'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
+              let lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
+              this.$set(innerForm, lengthId, 0)
+              lesionLength = 0
+            }
+          }
+        }
+
+        // 非靶病灶且状态为存在（0）
+        if (lesionType === 1 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg31'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg32'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为显著增大（1）
+        if (lesionType === 1 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleRoi'))) {
+              // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg33'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg34'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为无法评估（2）
+        if (lesionType === 1 && lesionState === 2) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 无标记
+            if (measureData) {
+              // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg35'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 无标记
+            if (measureData) {
+              // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg36'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为消失（3）
+        if (lesionType === 1 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg37'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 箭头工具
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg38'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为存在（0）
+        if (lesionType === 2 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg39'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为存在的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg40'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为疑似（1）
+        if (lesionType === 2 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg41'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'ArrowAnnotate'))) {
+              // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg42'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为无法评估（2）
+        if (lesionType === 2 && lesionState === 2) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (measureData) {
+              // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg43'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (measureData) {
+              // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg44'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为消失（3）
+        if (lesionType === 2 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg45'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 箭头工具
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg46'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+      }
+      // 获取截图
+      let obj = Object.assign({}, measureData)
+      obj.visitTaskId = this.visitTaskId
+      obj.lesionName = innerForm.LesionName
+      let picturePath = ''
+      if (measureData) {
+        const base64Str = await this.getScreenshots(obj)
+        let pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, base64Str)
+        picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+      }
+      let answers = []
+      let reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+      for (const k in innerForm) {
+        if (reg.test(k)) {
+          if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+            answers.push({ tableQuestionId: k, answer: innerForm[k] })
+          }
+        }
+      }
+      let params = {
+        questionId: table.Id,
+        rowId: innerForm.RowId,
+        rowIndex: innerForm.RowIndex,
+        visitTaskId: this.visitTaskId,
+        trialId: this.$route.query.trialId,
+        measureData: measureData ? JSON.stringify(measureData) : '',
+        answerList: answers,
+        isCanEditPosition: innerForm.IsCanEditPosition,
+        studyId: measureData ? measureData.studyId : '',
+        seriesId: measureData ? measureData.seriesId : '',
+        instanceId: measureData ? measureData.instanceId : '',
+        numberOfFrames: measureData ? measureData.frame : 0,
+        picturePath: picturePath,
+        organInfoId: innerForm.OrganInfoId,
+        markTool: measureData ? measureData.markTool : '',
+        isDicomReading: innerForm.IsDicomReading
+      }
+      if (this.deleteTargetInfo && this.deleteTargetInfo.newLesionName === innerForm.LesionName) {
+        
+        await deleteReadingRowAnswer({
+          visitTaskId: this.visitTaskId,
+          questionId: this.deleteTargetInfo.tableId,
+          rowId: this.deleteTargetInfo.rowId
+        })
+        this.deleteTargetInfo = null
+        params.rowId = ''
+      }
+      const res = await submitTableQuestion(params)
+      if (res.IsSuccess) {
+        // 保存成功！
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.getTableQuestions()
+        this.$emit('getAnnotations', this.visitTaskId)
+      }
+      loading.close()
+    },
+    // 上传截图
+    async uploadScreenshots(fileName, file) {
+      try {
+        file = this.convertBase64ToBlob(file)
+        let trialId = this.$route.query.trialId
+        let subjectId = this.taskInfo.SubjectId
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        return { isSuccess: true, result: result }
+      } catch (e) {
+        console.log(e)
+        return { isSuccess: false, result: e }
+      }
+    },
+    convertBase64ToBlob(imageEditorBase64) {
+      let base64Arr = imageEditorBase64.split(',')
+      let imgtype = ''
+      let base64String = ''
+      if (base64Arr.length > 1) {
+        base64String = base64Arr[1]
+        imgtype = base64Arr[0].substring(
+          base64Arr[0].indexOf(':') + 1,
+          base64Arr[0].indexOf(';')
+        )
+      }
+      let bytes = atob(base64String)
+      let bytesCode = new ArrayBuffer(bytes.length)
+      let byteArray = new Uint8Array(bytesCode)
+      for (let i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
+      }
+      return new Blob([bytesCode], { type: imgtype })
+    },
+    // 获取截图
+    getScreenshots(obj) {
+      return new Promise((resolve, reject) => {
+        obj.visitTaskId = this.visitTaskId
+        this.$emit('getScreenshots', obj, resolve); // 将resolve传递给父组件
+      });
+    },
+    // 更新表格问题表单信息
+    innerFormDataUpdate(obj) {
+      let innerForm = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+      if (innerForm === undefined || typeof innerForm !== 'object') return
+      this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], obj.questionId, obj.val)
+      // QuestionMark：0--长径；1--短径；2--是否淋巴结；7--状态；8--所在部位； 
+      if (obj.questionMark === 0) {
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionLength', obj.val)
+      }
+      if (obj.questionMark === 1) {
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionShort', obj.val)
+      }
+      
+      if (obj.questionMark === 7) {
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionState', obj.val)
+      }
+      if (obj.questionMark === 8) {
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionPart', obj.val)
+      }
+      if (obj.updateArr) {
+        obj.updateArr.forEach(i=>{
+          this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], i.questionId, i.val)
+          if (i.questionMark === 2) {
+            this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'IsLymphNodes', i.val)
+          }
+        })
+      }
+      let rowId = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].RowId
+      this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'SaveTypeEnum', rowId ? 1 : 0)
+    },
+    handleCollapseChange(v) {
+      if (!v) return
+      let tableId = v.split('_')[0]
+      let rowIndex = v.split('_')[1]
+      let innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+      // if (!innerForm.MeasureData) return
+      let obj = Object.assign({visitTaskId: this.visitTaskId}, innerForm.MeasureData)
+      obj.lesionName = innerForm.LesionName
+      obj.markTool = innerForm.MarkTool ? innerForm.MarkTool : ''
+      obj.isMarked = innerForm.MeasureData ? true : false
+      if (this.visitTaskId === this.taskInfo.VisitTaskId) {
+        obj.isActiveTarget = true
+      }
+      this.$emit('imageLocation', obj)
+    },
+    collapseRightClick(e, tableId, rowIndex) {
+      let innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+      if (!innerForm.MeasureData) return
+      let obj = Object.assign({visitTaskId: this.visitTaskId}, innerForm.MeasureData)
+      obj.lesionName = innerForm.LesionName
+      this.$emit('imageLocation', obj)
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    // 病灶分裂
+    async lesionSplit(tableId, rowId) {
+      try {
+        // 判断是否有病灶未保存
+        const obj = Object.values(this.innerFormData).find(
+          obj => !obj.RowId
+        );
+        if (obj !== undefined && typeof obj === 'object') {
+          let msg = this.$t('trials:reading:warnning:msg5')
+          msg = msg.replace('xxx', obj.LesionName)
+
+          this.$confirm(msg, {
+            type: 'warning',
+            showCancelButton: false,
+            callback: action => {}
+          })
+          return
+        }
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg4'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        console.log(confirm)
+        if (confirm !== 'confirm') return
+        this.split(tableId, rowId)
+      } catch(e) {
+        console.log(e)
+      }
+
+    },
+    async split(tableId, rowId) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: tableId,
+          rowId: rowId
+        }
+        await splitLesion(params)
+        await this.getTableQuestions()
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    // 重置表单
+    async resetForm() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        if (res.IsSuccess) {
+          // 刷新标注、表单、报告页信息
+          this.activeName = ''
+          this.getOuterQuestions()
+          this.getTableQuestions()
+          this.$emit('resetAnnotations', this.visitTaskId)
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    getMaxRowIndex(answers) {
+      if (answers.length > 0) {
+        let arr = []
+        answers.forEach(item => {
+          var rowIndex = item.RowIndex
+          arr.push(parseInt(rowIndex))
+        })
+        let max = Math.max.apply(null, arr)
+        return max
+      } else {
+        return 0
+      }
+    },
+    getQuestionId(questionMark, tableQuestions) {
+      let idx = tableQuestions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        return tableQuestions[idx].Id
+      } else {
+        return ''
+      }
+    },
+    // 获取病灶名称
+    getLesionName(orderMark, rowIndex) {
+      let lessionName = ''
+      let rowIndexArr = rowIndex.split('.')
+      let x = parseInt(rowIndexArr[0])
+      let y = parseInt(rowIndexArr[1])
+      if (y > 0) {
+        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
+      } else {
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
+      }
+
+      return lessionName
+    },
+    // 查看反馈记录
+    openFeedBackTable() {
+      this.$FB({
+        type: 'imgfail',
+        trialId: this.$route.query.trialId,
+        visitTaskId: this.visitTaskId,
+        callBack: async() => {
+          const confirm = await this.$confirm(
+            this.$t('trials:reading:confirm:feedbackmsg'),
+            {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            }
+          )
+          if (confirm !== 'confirm') return
+          this.loading = true
+          try {
+            const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
+            this.loading = false
+            if (res.IsSuccess) {
+              window.location.reload()
+            }
+          } catch (e) {
+            this.loading = false
+            console.log(e)
+          }
+        }
+      })
+    },
+    // 病灶类型切换
+    lesionTypeChange(obj) {
+      let innerForm = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+      // 判断是否存在未保存的病灶，否则不允许添加
+      const formData = Object.values(this.innerFormData).find(
+        obj => !obj.RowId && obj.LesionName !== innerForm.LesionName
+      );
+      if (formData !== undefined && typeof formData === 'object') {
+        let msg = this.$t('trials:reading:warnning:msg5')
+        msg = msg.replace('xxx', formData.LesionName)
+
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
+        return
+      }
+      
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.LesionType === obj.newLesionType
+      );
+      if (typeof targetTable !== 'object') return
+      // 判断当前病灶类型下的病灶个数是否超过最大行数，否则不允许添加
+      if (!!targetTable.MaxQuestionCount && targetTable.MaxQuestionCount <= targetTable.TableQuestions.Answers.length) {
+        let msg = this.$t('trials:reading:warnning:msg14')
+        msg = msg.replace('xxx', targetTable.MaxQuestionCount)
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
+        return
+      }
+      // 基线时，切换为靶病灶时：1.如果存在标注，标注只能是用直径和长短径标注；2.非dicom文件的标注不能作为靶病灶。提示：当前病灶不允许设置为靶病灶
+      if ((this.isBaseLineTask || innerForm.IsDicomReading === false) && innerForm.MeasureData && innerForm.MeasureData.markTool === 'ArrowAnnotate' && obj.newLesionType === 0) {
+        // 当前病灶不允许设置为靶病灶
+        this.$confirm(this.$t(' trials:reading:warnning:msg15'), {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
+        return
+      }
+      //移除当前病灶
+      this.removeAnswer(obj.tableId, obj.rowIndex)
+      delete this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+      // 添加新病灶
+      let answer = Object.assign({},this.innerFormData[targetTable.Id])
+      answer.RowId = ''
+      let maxIndex = this.getMaxRowIndex(targetTable.TableQuestions.Answers)
+      answer.RowIndex = `${maxIndex + 1}.00`
+      answer.IsDicomReading = true
+      answer.SaveTypeEnum = 0
+      answer.LesionType = targetTable.LesionType
+      answer.LesionName = this.getLesionName(targetTable.OrderMark, answer.RowIndex)
+      answer.TableId = targetTable.Id
+      let state = null
+      if (this.isBaseLineTask && targetTable.LesionType === 0) {
+        state = 0
+      }
+      if (this.isBaseLineTask && targetTable.LesionType === 1) {
+        state = 0
+      }
+      let lesionLength = null
+      let lesionShort = null
+      if (innerForm.MeasureData) {
+        // 有标记时保留标记（标记需要修改标注名称）、短径、长径的值
+        lesionLength = innerForm.LesionLength ? innerForm.LesionLength :  null
+        lesionShort = innerForm.LesionShort ? innerForm.LesionShort :  null
+        this.$emit('setMarkName', {
+          annotationUID: innerForm.MeasureData.annotationUID, 
+          name: answer.LesionName
+        })
+        answer.MeasureData = innerForm.MeasureData
+        
+      }
+      let lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+      answer[lengthId] = lesionLength
+      let shortId = this.getQuestionId(1, targetTable.TableQuestions.Questions)
+      answer[shortId] = lesionShort
+      let stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
+      answer[stateId] = state
+      targetTable.TableQuestions.Answers.push(answer)
+      this.innerFormData[`${targetTable.Id}_${answer.RowIndex}`] = answer
+      this.activeName = `${targetTable.Id}_${answer.RowIndex}`
+      
+      if (innerForm.RowId) {
+        this.deleteTargetInfo = { rowId: innerForm.RowId, tableId: obj.tableId, newLesionName: answer.LesionName }
+      }
+    },
+    async closeInnerForm(obj) {
+      let innerForm = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+      if (innerForm === undefined || typeof innerForm !== 'object') return
+      if (!innerForm.RowId) {
+        // 当前病灶为新建病灶，未保存。如果关闭窗口，将会删除病灶信息，是否继续？
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg49'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        // 移除病灶信息
+        this.removeAnswer(obj.tableId, obj.rowIndex)
+        delete this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+        // 移除标注信息
+        if (innerForm.MeasureData) {
+          let obj = Object.assign({}, innerForm.MeasureData)
+          this.$emit('removeAnnotation', obj)
+        }
+        // 关闭窗口
+        this.activeName = ''
+      } else {
+        // 关闭窗口
+        this.activeName = ''
+      }
+    },
+    changeLesionState(state) {
+      Object.values(this.innerFormData).forEach(i=>{
+        console.log(i)
+      })
+    },
+    removeAnswer(tableId, rowIndex) {
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.Id === tableId
+      );
+      if (targetTable?.TableQuestions?.Answers) {
+        const originalAnswers = targetTable.TableQuestions.Answers;
+        const index = originalAnswers.findIndex(item => item.RowIndex === rowIndex);
+        if (index > -1) {
+          targetTable.TableQuestions.Answers.splice(index, 1);
+        }
+      }
+    },
+    validTool(toolName) {
+      const obj = Object.values(this.innerFormData).find(
+        obj => !obj.RowId
+      )
+      if (typeof obj === 'object') {
+        if (this.activeName) {
+          let tableId = this.activeName.split('_')[0]
+          let rowIndex = this.activeName.split('_')[1]
+          let innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+          if (!innerForm.MeasureData) {
+            return this.checkToolCanActive(toolName)
+          } else {
+            let msg = this.$t('trials:reading:warnning:msg5')
+            msg = msg.replace('xxx', innerForm.LesionName)
+            // `病灶xxx信息未保存，不允许继续添加！`
+            return { isCanActiveTool: false, reason: msg }
+          }
+        } else {
+          let msg = this.$t('trials:reading:warnning:msg5')
+            msg = msg.replace('xxx', obj.LesionName)
+            // `病灶xxx信息未保存，不允许继续添加！`
+            return { isCanActiveTool: false, reason: msg }
+        }
+      } else {
+        if (this.activeName) {
+          return this.checkToolCanActive(toolName)
+        } else {
+          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) {
+            return { isCanActiveTool: true, reason: '' }
+          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) {
+            return { isCanActiveTool: true, reason: '' }
+          } else if (this.isBaseLineTask && toolName === 'ArrowAnnotate') {
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
+          } else {
+            return { isCanActiveTool: false, reason: '' }
+          }
+        }
+      }
+    },
+    checkToolCanActive(toolName) {
+      let tableId = this.activeName.split('_')[0]
+      let rowIndex = this.activeName.split('_')[1]
+      let innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+      let isLymphNodes = innerForm.IsLymphNodes
+      if (!innerForm.MeasureData) {
+        if (this.isBaseLineTask) {
+          if (innerForm.LesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
+            // '淋巴结靶病灶需使用长短径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg6') }
+          } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length') {
+            // '非淋巴结靶病灶需使用直径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg7') }
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi') {
+            // '淋巴结非靶病灶需使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg8') }
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleRoi') {
+            // '非淋巴结非靶病灶需使用直径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg9') }
+          } else if (toolName === 'ArrowAnnotate') {
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
+          } else {
+            return { isCanActiveTool: true, reason: '' }
+          }
+        } else {
+          if (innerForm.LesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 淋巴结靶病灶需使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg10') }
+          } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') {
+            // 非淋巴结靶病灶需使用直径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg11') }
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // 淋巴结非靶病灶需使用长短径测量工具或矩形工具或矩形工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg52') }
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // 非淋巴结非靶病灶需使用直径测量工具或矩形工具或矩形工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg53') }
+          } else if (innerForm.LesionType === 2 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 淋巴结新病灶需使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg12') }
+          } else if (innerForm.LesionType === 2 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') {
+            // 非淋巴结新病灶需使用直径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg13') }
+          } else if (innerForm.LesionType === 2 && toolName !== 'Length' && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 新病灶需使用直径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg51') }
+          } else {
+            return { isCanActiveTool: true, reason: '' }
+          }
+        }
+      } else {
+        return { isCanActiveTool: true, reason: '' }
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.questionList-wrapper{
+  height: 100%;
+  overflow-y: auto;
+  // overflow: hidden;
+
+  .container{
+    padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
+  }
+  .outer_form_wrapper{
+    ::v-deep .el-form-item__label{
+      color: #c3c3c3;
+      text-align: left;
+    }
+    ::v-deep .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    ::v-deep .el-textarea__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+
+    ::v-deep .el-form-item{
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+    }
+    ::v-deep .el-form-item__content{
+      flex: 1;
+    }
+    ::v-deep .el-button--mini, .el-button--mini.is-round {
+      padding: 7px 10px;
+    }
+    ::v-deep .el-form-item__content
+    .el-select{
+      width: 100%;
+    }
+    .outer_form-footer{
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-end;
+      align-items: center;
+      .feedback-icon{
+        padding: 0 10px;
+        color: #fff;
+        font-weight: 400;
+        font-size: 22px;
+        cursor: pointer;
+        &:hover{
+          color: #68a2d5;
+        }
+      }
+    }
+
+  }
+  .title{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+
+  }
+  .add-icon{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+    border: 1px solid #938b8b;
+    margin-bottom: 2px;
+    cursor: pointer;
+  }
+  .add-icon:hover{
+    background-color: #607d8b;
+  }
+
+  .flex-row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #424242;
+
+  }
+  .lesion_list{
+    position: relative;
+  }
+  .el-collapse{
+    border-bottom:none;
+    border-top:none;
+    ::v-deep .el-collapse-item{
+      background-color: #000!important;
+      color: #ddd;
+
+    }
+    ::v-deep .el-collapse-item__header{
+      background-color: #000!important;
+      color: #ddd;
+      border-bottom-color:#5a5a5a;
+      padding-left: 5px;
+      height: 35px;
+      line-height: 35px;
+    }
+    ::v-deep .el-collapse-item__wrap{
+      background-color: #000!important;
+      color: #ddd;
+    }
+    ::v-deep .el-collapse-item__content{
+      width:260px;
+      position: absolute;
+      top: 0px;
+      right: 0px;
+      // border: 1px solid #ffeb3b;
+      border: 1px solid #fff;
+      z-index: 1;
+      color: #ddd;
+      padding: 5px;
+      background-color:#1e1e1e;
+    }
+
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
new file mode 100644
index 00000000..500d994c
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -0,0 +1,352 @@
+<template>
+  <div class="table-question-form">
+    <div style="display: flex;justify-content: space-between;">
+        <h3 v-if="questionForm.LesionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
+          {{ questionForm.LesionName }}
+        </h3>
+        <!-- 关闭 -->
+        <div>
+          <i class="el-icon-circle-close" style="font-size: 25px;cursor: pointer;" @click="close" />
+        </div>
+      </div>
+    <el-form-item
+      :label="$t('trials:reading:title:lesionType')"
+      prop="LesionType"
+      :rules="[
+        { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
+      ]"
+    >
+      <!-- 下拉框 -->
+      <el-select
+        v-model="questionForm.LesionType"
+        filterable
+        :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask"
+        @change="((val)=>{lesionTypeChange(val)})"
+      >
+
+        <el-option
+          v-for="item of $d.LesionType"
+          v-show="!(isBaseLineTask && item.value === 2)"
+          :key="item.id"
+          :value="item.value"
+          :label="item.label"
+        />
+
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      v-for="qs in questions"
+      v-show="qs.ShowQuestion!==2"
+      :key="qs.Id"
+      :label="`${qs.QuestionName}`"
+      :prop="qs.Id"
+      :rules="[
+        { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10)) && qs.Type!=='group' && qs.Type!=='summary',
+          message:['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
+      ]"
+    >
+      <!-- 输入框 -->
+      <template v-if="qs.Type==='input' || qs.Type==='number'">
+        <el-input
+          v-if="qs.Type==='input' || qs.Type==='number'"
+          v-model="questionForm[qs.Id]"
+          :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName))"
+          @change="((val)=>{formItemChange(val, qs)})"
+        >
+          <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+          </template>
+        </el-input>
+      </template>
+      <!-- 多行文本输入框 -->
+      <el-input
+        v-if="qs.Type==='textarea'"
+        v-model="questionForm[qs.Id]"
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4}"
+        :disabled="!isCurrentTask || readingTaskState>=2"
+        @change="((val)=>{formItemChange(val, qs)})"
+      />
+      <!-- 下拉框 -->
+      <el-select
+        v-if="qs.Type==='select'"
+        v-model="questionForm[qs.Id]"
+        filterable
+        :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : qs.QuestionMark === 2 ? '' : $t('common:placeholder:select')"
+        :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName))"
+        @change="((val)=>{formItemChange(val, qs)})"
+      >
+        <template v-if="qs.QuestionMark === 8" #prefix>
+          <span style="padding-left: 5px;">
+            <i class="el-icon-search" />
+          </span>
+        </template>
+        <template v-if="qs.TableQuestionType === 1">
+          <el-option
+            v-for="item in organList"
+            :key="item.Id"
+            :label="item[qs.DataTableColumn]"
+            :value="item[qs.DataTableColumn]"
+          />
+        </template>
+        <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && isBaseLineTask">
+          <el-option
+            v-for="item of $d[qs.DictionaryCode]"
+            v-show="(lesionType === 0 && item.value ===0) || (lesionType === 1 && (item.value ===0))"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
+        </template>
+        <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && !isBaseLineTask">
+          <el-option-group
+            :label="!isNaN(parseFloat(answer.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode,parseFloat(answer.LastTaskState))}` : ''"
+          >
+            <!-- 首次分裂的病灶只能选择存在 -->
+            <template v-if="answer.IsFristAdd=== 'True' && answer.SplitOrMergeType === '0'">
+
+              <el-option
+                v-for="item of $d[qs.DictionaryCode]"
+                v-show="item.value === 0"
+                :key="item.id"
+                :value="item.value"
+                :label="item.label"
+              />
+            </template>
+            <!-- 首次添加的新病灶不能为无法评估和消失 -->
+            <template v-else-if="isCurrentTaskAdd=== 'True' && lesionType === 2">
+              <el-option
+                v-for="item of $d[qs.DictionaryCode]"
+                v-show="item.value === 0 || item.value === 1"
+                :key="item.id"
+                :value="item.value"
+                :label="item.label"
+              />
+            </template>
+            <template v-else>
+              <el-option
+                v-for="item of filterState($d[qs.DictionaryCode])"
+                :key="item.id"
+                :value="item.value"
+                :label="item.label"
+              />
+            </template>
+          </el-option-group>
+        </template>
+        <template v-else-if="qs.DictionaryCode && qs.QuestionMark !== 7">
+          <el-option
+            v-for="item of $d[qs.DictionaryCode]"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
+        </template>
+        <template v-else>
+          <el-option
+            v-for="val in qs.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+            :value="val"
+          />
+        </template>
+
+      </el-select>
+      <!-- 单选 -->
+      <el-radio-group
+        v-if="qs.Type==='radio'"
+        v-model="questionForm[qs.id]"
+        :disabled="!isCurrentTask || readingTaskState>=2"
+      >
+        <el-radio
+          v-for="val in qs.options.split('|')"
+          :key="val"
+          :label="val"
+        >
+          {{ val }}
+        </el-radio>
+      </el-radio-group>
+    </el-form-item>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TableQuestionFormItem',
+  props: {
+    tableInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    answer: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    questionForm: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    organs: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    isBaseLineTask: {
+      type: Boolean,
+      required: true
+    },
+    isCurrentTask: {
+      type: Boolean,
+      required: true
+    }
+  },
+  watch: {
+    questionForm: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+        if (v.MeasureData) {
+          const {markTool} = v.MeasureData
+          if (markTool === 'Bidirectional') {
+            this.getOrganList(1)
+          } else if (markTool === 'Length') {
+            this.getOrganList(0)
+          } else {
+            this.getOrganList()
+          }
+        } else {
+          this.getOrganList()
+        }
+        this.isCurrentTaskAdd = v.IsCurrentTaskAdd
+      }
+    },
+    tableInfo: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+        if (v) {
+          this.lesionType = v.LesionType
+          this.questions = v.TableQuestions.Questions
+        }
+      }
+    },
+  },
+  data(){
+    return{
+      isCurrentTaskAdd: null,
+      lesionType: null,
+      questions: [],
+      organList: []
+    }
+  },
+  methods: {
+    lesionTypeChange(v) {
+      this.$emit('lesionTypeChange', {tableId: this.tableInfo.Id, rowIndex: this.answer.RowIndex, newLesionType: v})
+    },
+    formItemChange(v, qs) {
+      let updateArr = []
+      if (qs.QuestionMark === 8 && qs.RelationQuestions.length > 0) {
+        // 当选择部位时，联动器官、位置、是否淋巴结问题答案
+        let index = this.organList.findIndex(item => item[qs.DataTableColumn] === v)
+        if (index > -1) {
+          let selected = this.organList[index]
+          qs.RelationQuestions.map(q => {
+            let val = selected[q.DataTableColumn]
+            updateArr.push({questionId: q.Id, val: val, questionMark: q.QuestionMark})
+          })
+          updateArr.push({questionId: 'OrganInfoId', val: selected.OrganInfoId})
+          updateArr.push({questionId: 'IsCanEditPosition', val: selected.IsCanEditPosition})
+        } else {
+          question.RelationQuestions.map(q => {
+            updateArr.push({questionId: q.Id, val: '', questionMark: q.QuestionMark})
+          })
+        }
+      }
+      this.$emit('update', {tableId: this.tableInfo.Id, rowIndex: this.answer.RowIndex, questionMark: qs.QuestionMark,  questionId: qs.Id, val: v, updateArr})
+    },
+    getOrganList(isLymphNodes = null) {
+      let idx = this.organs.findIndex(i => i.LesionType === this.questionForm.LesionType)
+      if (idx > -1) {
+        let arr = this.organs[idx].OrganList
+
+        if (!isNaN(parseInt(isLymphNodes))) {
+          this.organList = arr.filter((item) => item.IsLymphNodes === parseInt(isLymphNodes))
+        } else {
+          this.organList = arr
+        }
+      }
+    },
+    filterState(arr) {
+      if (!this.isBaseLineTask) {
+        const isLymphLesion = this.questionForm.IsLymphNodes
+        const lesionLength = this.questionForm.LesionLength
+        const lesionShort = this.questionForm.LesionShort
+        const bLesionL = !isNaN(parseFloat(this.questionForm.BaseLineMajorAxis)) ? parseFloat(this.questionForm.BaseLineMajorAxis) : 0
+        const bLesionS = !isNaN(parseFloat(this.questionForm.BaseLineShortAxis)) ? parseFloat(this.questionForm.BaseLineShortAxis) : 0
+        if (this.lesionType === 1 && isLymphLesion === 1 && this.questionForm.MeasureData && this.questionForm.MeasureData.markTool === 'Bidirectional' && lesionShort < bLesionS) {
+          arr = arr.filter(i => i.value !== 1)
+        } else if (this.lesionType === 1 && isLymphLesion === 1 && this.questionForm.MeasureData && this.questionForm.MeasureData.markTool === 'Bidirectional' && lesionShort >= 10 && lesionShort > bLesionS) {
+          arr = arr.filter(i => i.value === 0 || i.value === 1)
+        } else if (this.lesionType === 1 && isLymphLesion === 0 && this.questionForm.MeasureData && (this.questionForm.MeasureData.markTool === 'Length' || this.questionForm.MeasureData.markTool === 'Bidirectional') && lesionLength < bLesionL) {
+          arr = arr.filter(i => i.value !== 1)
+        }
+        return arr
+      } else {
+        return arr
+      }
+    },
+    close() {
+      this.$emit('close', {tableId: this.tableInfo.Id, rowIndex: this.answer.RowIndex})
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.table-question-form{
+  ::v-deep .el-form-item__label{
+    color: #c3c3c3;
+  }
+  ::v-deep .el-input .el-input__inner{
+    background-color: transparent;
+    color: #ddd;
+    border: 1px solid #5e5e5e;
+  }
+  ::v-deep .el-form-item{
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+  }
+  ::v-deep .el-form-item__content{
+    flex: 1;
+  }
+  ::v-deep .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  ::v-deep .el-select.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  ::v-deep .el-button--mini, .el-button--mini.is-round {
+    padding: 7px 10px;
+  }
+  .el-form-item__content
+  .el-select{
+    width: 100%;
+  }
+  .input-width1{
+    width: calc(100% - 60px)!important;
+  }
+  .input-width2{
+    width: 100% !important;
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
index e69de29b..14ced706 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -0,0 +1,915 @@
+<template>
+  <div class="report-wrapper">
+    <el-card v-loading="loading" shadow="never">
+      <div slot="header" class="clearfix report-header">
+        <!-- 电子影像病例报告表（eICRF） -->
+        <h3 style="margin:0;padding:0;">{{ $t('trials:readingReport:title:eicrf') }}</h3>
+        <div style="margin-left:auto">
+          <el-switch
+            v-model="isShowDetail"
+            :active-text="$t('trials:readingReport:title:expandDetails')"
+            :inactive-text="$t('trials:readingReport:title:collapseDetails')"
+            style="margin-right:5px;"
+            @change="handleShowDetail"
+          />
+          <el-button
+            v-if="readingTaskState<2"
+            type="primary"
+            size="small"
+            @click="skipTask"
+          >
+            <!-- 跳过 -->
+            {{ $t('trials:readingReport:button:skip') }}
+          </el-button>
+          <el-button
+            v-if="readingTaskState<2"
+            type="primary"
+            size="small"
+            @click="getReportInfo(false)"
+          >
+            <!-- 刷新 -->
+            {{ $t('trials:readingReport:button:refresh') }}
+          </el-button>
+          <el-button
+            v-if="readingTaskState<2 && criterionType !== 10"
+            type="primary"
+            size="small"
+            @click="handleSave(true)"
+          >
+            <!-- 保存 -->
+            {{ $t('common:button:save') }}
+          </el-button>
+          <el-button
+            v-if="readingTaskState<2"
+            type="primary"
+            size="small"
+            @click="beforeLeave"
+          >
+            <!-- 提交 -->
+            {{ $t('common:button:submit') }}
+          </el-button>
+        </div>
+      </div>
+      <div ref="tableWrapper" style="height:100%;overflow-y: auto;">
+        <el-table
+          v-if="height"
+          ref="reportList"
+          :data="taskQuestions"
+          row-key="Id"
+          border
+          :expand-row-keys="expandedRows"
+          :height="height"
+          :tree-props="{children: 'Childrens', hasChildren: 'hasChildren'}"
+          size="mini"
+        >
+          <el-table-column
+            prop=""
+            label=""
+            show-overflow-tooltip
+            width="350px"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.QuestionName" :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff'}">{{ scope.row.QuestionName }}</span>
+              <span
+                v-else
+                style="font-weight: bold;font-size: 16px;color: #f44336;"
+              >
+                {{ language==='en'?scope.row.GroupEnName:scope.row.GroupName }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-for="task in visitTaskList"
+            :key="task.VisitTaskId"
+            prop="date"
+
+            show-overflow-tooltip
+            width="150px"
+          >
+            <template slot="header">
+              <div v-if="task.IsCurrentTask">
+                <div>
+                  {{ task.BlindName }}
+                </div>
+              </div>
+              <div v-else>
+                <div>
+                  {{ task.BlindName }}
+                  <el-button type="text" size="small" @click="previewDicoms(task)">
+                    <span class="el-icon-view" />
+                  </el-button>
+                </div>
+              </div>
+            </template>
+            <template slot-scope="scope">
+              <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) || scope.row.HighlightAnswerList.includes(`${scope.row.Answers[task.VisitTaskId]}`) ? '#f66' : '#fff'}">
+                <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,42].includes(scope.row.QuestionType)">
+                  <!-- 是否存在疾病（基线时可修改） -->
+                  <template v-if="task.IsBaseLine && scope.row.QuestionType=== 15">
+                    <el-select
+                      v-if="scope.row.Type==='select' && scope.row.DictionaryCode"
+                      v-model="currentExistDisease"
+                      size="mini"
+                      @change="handleExistDiseaseChange"
+                    >
+                      <el-option
+                        v-for="item of $d[ scope.row.DictionaryCode]"
+                        :key="item.id"
+                        :value="item.value"
+                        :label="item.label"
+                      />
+                    </el-select>
+                  </template>
+                  <!-- 整体肿瘤评估（非基线可修改） -->
+                  <template v-else-if="!task.IsBaseLine && (scope.row.QuestionType=== 13 || scope.row.QuestionType=== 42)">
+                    <el-select
+                      v-if="scope.row.Type==='select' && scope.row.DictionaryCode"
+                      v-model="currentEvaluateResult"
+                      size="mini"
+                      @change="handleEvaluateResultChange"
+                    >
+                      <template v-if="criterionType === 1 && tLesionCount">
+                        <el-option
+                          v-for="item of $d[ scope.row.DictionaryCode]"
+                          v-show="(!task.IsBaseLine && item.value > -1) && (task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1) && (item.value !== 1 && item.value !== 3)"
+                          :key="item.id"
+                          :value="item.value"
+                          :label="item.label"
+                        />
+                      </template>
+                      <template v-else-if="criterionType === 1 && ntLesionCount">
+                        <el-option
+                          v-for="item of $d[ scope.row.DictionaryCode]"
+                          v-show="(!task.IsBaseLine && item.value > -1) && (task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1) && (item.value !== 1)"
+                          :key="item.id"
+                          :value="item.value"
+                          :label="item.label"
+                        />
+                      </template>
+                      <template v-else>
+                        <el-option
+                          v-for="item of $d[ scope.row.DictionaryCode]"
+                          v-show="(!task.IsBaseLine && item.value > -1) && (task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
+                          :key="item.id"
+                          :value="item.value"
+                          :label="item.label"
+                        />
+                      </template>
+                    </el-select>
+                  </template>
+                  <!-- <template v-else-if="task.IsBaseLine && scope.row.QuestionType=== 13">
+                    {{ $fd(scope.row.DictionaryCode, currentEvaluateResult) }}
+                  </template> -->
+                  <!-- 访视点备注（是否存在疾病与系统不一致或者整体肿瘤评估与系统不一致时，必填） -->
+                  <!-- tumorEvaluate && task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 && (currentEvaluateResult !== tumorEvaluate || currentExistDisease !== isExistDisease) -->
+                  <template v-else-if="task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 ">
+                    <!-- v-if="tumorEvaluate && (currentEvaluateResult !== tumorEvaluate || currentExistDisease !== isExistDisease)" -->
+                    <template>
+                      <!-- 输入框 -->
+                      <el-input
+                        v-if="scope.row.Type==='input'"
+                        v-model="currentTaskReason"
+                        size="mini"
+                        @change="evaluateReasonChange"
+                      />
+                      <el-input
+                        v-else-if="scope.row.Type==='textarea'"
+                        v-model="currentTaskReason"
+                        :autosize="{ minRows: 2, maxRows: 4}"
+                        size="mini"
+                        maxlength="500"
+                        @change="evaluateReasonChange"
+                      />
+                      <!-- 系统评估结果为：xxx,与当前调整的结果不一致，请填写调整原因 -->
+                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" v-html="getWarningText()" />
+                      <p v-else-if="currentExistDisease !== isExistDisease" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{ $fd('ExistDisease',isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}
+                      </p>
+                    </template>
+                    <!-- <template v-else>
+                      <span>{{ currentTaskReason }}</span>
+                    </template> -->
+
+                  </template>
+                  <template v-else-if="scope.row.DictionaryCode">
+                    {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}
+                  </template>
+                  <template v-else>
+                    {{ scope.row.Answers[task.VisitTaskId] }}
+                  </template>
+                </template>
+
+                <template v-else-if="scope.row.QuestionType=== 15">
+                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer,task.VisitTaskId,'IsGlobalChange')" :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer,task.VisitTaskId,'GlobalChangeAnswer'))}`" placement="top" effect="light">
+                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
+                  </el-tooltip>
+                  <span v-else>{{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
+                </template>
+
+                <template v-else-if="scope.row.QuestionType=== 13 || scope.row.QuestionType=== 42">
+                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer,task.VisitTaskId,'IsGlobalChange')" :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer,task.VisitTaskId,'GlobalChangeAnswer'))}`" placement="top" effect="light">
+                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
+                  </el-tooltip>
+                  <span v-else>{{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
+                </template>
+                <template v-else-if="scope.row.QuestionType=== 22">
+                  {{ scope.row.Answers[task.VisitTaskId] === '-1' ? $t('trials:readingReport:title:unknow') : scope.row.Answers[task.VisitTaskId] }}
+                </template>
+
+                <template v-else-if="scope.row.DictionaryCode">
+                  {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}
+                </template>
+                <template v-else-if="criterionType === 10">
+                  {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]}` }}
+                </template>
+                <template v-else-if="(scope.row.ValueType === 0 || scope.row.ValueType === 1) && scope.row.Unit">
+                  {{ `${scope.row.Answers[task.VisitTaskId]}` }}
+                  <span v-if="scope.row.Answers[task.VisitTaskId] !== 'NA' && !isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))">{{ `${$fd('ValueUnit',scope.row.Unit)}` }}</span>
+                </template>
+                <template v-else-if="scope.row.ValueType === 2">
+                  {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]}%` }}
+                </template>
+                <template v-else-if="scope.row.Answers && scope.row.Answers.hasOwnProperty(task.VisitTaskId)">
+                  {{ scope.row.Answers[task.VisitTaskId] }}
+                </template>
+              </span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+    <!-- 附加评估 -->
+    <el-dialog
+      v-if="additionalAssessmentsDig.visible"
+      :visible.sync="additionalAssessmentsDig.visible"
+      :close-on-click-modal="false"
+      :title="additionalAssessmentsDig.title"
+      width="600px"
+    >
+      <AdditionalAssessment
+        :questions="assessmentQuestions"
+        :visit-task-id="visitTaskId"
+        @close="additionalAssessmentsDig.visible = false"
+        @sign="sign"
+      />
+    </el-dialog>
+    <!-- 签名框 -->
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+    >
+      <div slot="title">
+        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
+        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+      </div>
+      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getReadingReportEvaluation, changeDicomReadingQuestionAnswer, submitDicomVisitTask, verifyVisitTaskQuestions, getTaskAdditionalQuestion } from '@/api/trials'
+import { setSkipReadingCache } from '@/api/reading'
+import { getAutoCutNextTask } from '@/api/user'
+import const_ from '@/const/sign-code'
+import SignForm from '@/views/trials/components/newSignForm'
+import { getToken } from '@/utils/auth'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+import { changeURLStatic } from '@/utils/history.js'
+import AdditionalAssessment from '@/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment'
+export default {
+  name: 'ReportPage',
+  components: { SignForm, AdditionalAssessment },
+  data() {
+    return {
+      currentUser: zzSessionStorage.getItem('userName'),
+      signVisible: false,
+      signCode: null,
+      visitTaskList: [],
+      taskQuestions: [],
+      loading: false,
+      answers: [],
+      readingTaskState: 2,
+      tumorEvaluate: null,
+      currentEvaluateResult: null,
+      isExistDisease: null,
+      currentExistDisease: null,
+      currentTaskReason: '',
+      answerArr: [],
+      questions: [],
+      isShowDetail: false,
+      criterionType: 0,
+      height: 0,
+      additionalAssessmentsDig: { visible: false, title: this.$t('trials:trials-panel:setting:reading-unit:TrialCriterionAdditionalAssessmentTypeList') },
+      assessmentQuestions: [],
+      tLesionCount: null,
+      ntLesionCount: null,
+      openWindow: null,
+      expandedRows: [],
+      taskInfo: {},
+      visitTaskId: '',
+      isBaselineTask: false
+    }
+  },
+  computed: {
+    ...mapGetters(['language'])
+  },
+  watch: {
+    taskQuestions() {
+      this.$nextTick(() => {
+        this.getTableHeight()
+        this.$refs.reportList && this.$refs.reportList.doLayout()
+        this.setScrollTop()
+      })
+    }
+  },
+  created() { this.getTableHeight() },
+  mounted() {
+    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.criterionType = this.taskInfo.CriterionType
+    this.visitTaskId = this.taskInfo.VisitTaskId
+    this.isBaselineTask = this.taskInfo.IsBaseLine
+    window.addEventListener('resize', () => {
+      this.handleResize()
+      this.setScrollTop()
+    })
+    this.getReportInfo()
+  },
+  beforeDestroy() {
+    if (this.openWindow) {
+      this.openWindow.close()
+    }
+  },
+  methods: {
+    myConfirm(msg) {
+      return new Promise(resolve => {
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: true
+        }).then(() => {
+          resolve(true)
+        }).catch(() => {
+          resolve(false)
+        })
+      })
+    },
+    async beforeLeave() {
+      this.handleConfirm()
+    },
+    getAnswerInfo(answerArr, visitTaskId, prop) {
+      var i = answerArr.findIndex(i => i.VisitTaskId === visitTaskId)
+      if (i === -1) return ''
+      var val = answerArr[i][prop]
+      return isNaN(parseInt(val)) ? val : parseInt(val)
+    },
+    getTableHeight() {
+      this.height = window.innerHeight - 170
+    },
+    async getReportInfo(IsCalculate) {
+      this.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          trialId: this.$router.currentRoute.query.trialId,
+          IsCalculate: IsCalculate !== false
+        }
+        const res = await getReadingReportEvaluation(params)
+        if (res.IsSuccess) {
+          this.readingTaskState = res.Result.ReadingTaskState
+          this.tumorEvaluate = res.Result.CalculateResult && res.Result.CalculateResult.TumorEvaluate ? parseInt(res.Result.CalculateResult.TumorEvaluate) : null
+          this.isExistDisease = res.Result.CalculateResult && res.Result.CalculateResult.IsExistDisease ? parseInt(res.Result.CalculateResult.IsExistDisease) : null
+          this.answerArr = []
+          this.questions = res.Result.TaskQuestions.concat()
+          this.visitTaskList = res.Result.VisitTaskList
+          var taskQuestions = this.getQuestions(res.Result.TaskQuestions, !this.isShowDetail, null, null)
+          this.taskQuestions = []
+          taskQuestions.forEach(item => {
+            this.$set(this.taskQuestions, this.taskQuestions.length, item)
+          })
+          const tLesion = res.Result.LesionCountList.find(i => i.LesionType === 0)
+          this.tLesionCount = tLesion ? tLesion.Count : 0
+          const ntLesion = res.Result.LesionCountList.find(i => i.LesionType === 1)
+          this.ntLesionCount = ntLesion ? ntLesion.Count : 0
+          this.setScrollTop()
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    setScrollTop(a) {
+      setTimeout(() => {
+        this.$nextTick(() => {
+          if (this.$refs.reportList) {
+            this.getTableHeight()
+            this.$refs.reportList.bodyWrapper.scrollTop = this.$refs.reportList.bodyWrapper.scrollHeight
+          }
+        })
+      }, 50)
+    },
+    getQuestions(questions, isNTFilterLength, lesionType, isLymphNodes) {
+      const arr = []
+      if (questions.length !== 0) {
+        questions.forEach((item) => {
+          if (this.criterionType === 21) {
+            if (!this.isShowDetail) {
+              if (!item.RowId) {
+                this.expandedRows.push(item.Id)
+              }
+            } else {
+              this.expandedRows.push(item.Id)
+            }
+            
+          } else {
+            this.expandedRows.push(item.Id)
+          }
+          // 过滤病灶标识  病灶名称  部位  器官  位置  是否淋巴结
+          // 非靶病灶和新病灶 过滤长径和短径信息
+          // 非淋巴结靶病灶 过滤短径
+
+          lesionType = item.LesionType
+          var filterArr = [7]
+          // 0：靶病灶、 5：新靶病灶
+          // 1：非靶病灶、2：新病灶、6：新非靶病灶、7：其它既往新病灶、8：触发irecisit后的新病灶
+          // 0：长径，1：短径，2：是否淋巴结，3：自增ID，4：病灶名称，5：所在器官，6：所在位置，7：状态，8：所在部位，10：部位描述
+          // 1105：是否可测量，1106：肝脏分段
+          if ((item.LesionType === 1 || item.LesionType === 2 || item.LesionType === 6 || item.LesionType === 7 || item.LesionType === 8) && isNTFilterLength) {
+            filterArr = [0, 1, 3, 4, 5, 6, 2, 8, 10, 7, 1105]
+          } else {
+            filterArr = [3, 4, 5, 6, 2, 8, 10, 7, 1106, 1105]
+          }
+          if ((lesionType === 0 || lesionType === 5) && isLymphNodes === 0 && !this.isShowDetail && (this.criterionType === 1 || this.criterionType === 3 || this.criterionType === 17)) {
+            filterArr.push(1)
+          }
+
+          if (isLymphNodes === 0) {
+            filterArr.push(1)
+          }
+          if (!(filterArr.includes(item.QuestionMark))) {
+            const obj = item
+            obj.Answers = {}
+            if (item.RowIndex > 0) {
+              try {
+                var idx = item.Childrens.findIndex(i => i.QuestionMark === 8)
+                var idxLoc = item.Childrens.findIndex(i => i.QuestionMark === 10)
+                var state = item.Childrens.findIndex(i => i.QuestionMark === 7)
+                if (idx > -1) {
+                  if (item.Childrens[idx].Answer.length > 0) {
+                    var k = item.Childrens[idx].Answer.findIndex(v => v.Answer !== '')
+                    var part = ''
+                    if (obj.IsCanEditPosition) {
+                      part = `${item.Childrens[idx].Answer[k].Answer}--${item.Childrens[idxLoc].Answer[k].Answer}`
+                    } else {
+                      part = `${item.Childrens[idx].Answer[k].Answer}`
+                    }
+                    if (item.SplitOrMergeLesionName && k > -1) {
+                      // obj.QuestionName = `${obj.QuestionName} --${part} (Split from ${item.SplitOrMergeLesionName})`
+                      obj.QuestionName = `${obj.QuestionName} --${part}`
+                      var Answers = {}
+                      if (state >= 0) {
+                        this.visitTaskList.forEach(v => {
+                          const o = item.Childrens[state].Answer.find(v1 => {
+                            return v1.VisitTaskId === v.VisitTaskId
+                          })
+                          if (o) {
+                            Answers[o.VisitTaskId] = this.$fd(item.Childrens[state].DictionaryCode, parseInt(o.Answer))
+                          }
+                        })
+                      }
+                      this.$set(obj, 'Answers', Answers)
+                      // obj.QuestionName = `${obj.QuestionName} `
+                    } else if (!item.SplitOrMergeLesionName && k > -1) {
+                      obj.QuestionName = `${obj.QuestionName}--${part}`
+                      const Answers = {}
+                      if (state >= 0) {
+                        this.visitTaskList.forEach(v => {
+                          const o = item.Childrens[state].Answer.find(v1 => {
+                            return v1.VisitTaskId === v.VisitTaskId
+                          })
+                          if (o) {
+                            Answers[o.VisitTaskId] = this.$fd(item.Childrens[state].DictionaryCode, parseInt(o.Answer))
+                          }
+                        })
+                      }
+                      this.$set(obj, 'Answers', Answers)
+                      // obj.QuestionName = `${obj.QuestionName} `
+                    } else {
+                      obj.QuestionName = `${obj.QuestionName} `
+                    }
+                    if (item.ReportMark) {
+                      obj.QuestionName = `${obj.QuestionName} (${item.ReportMark})`
+                    }
+
+                    if (this.criterionType === 1 || this.criterionType === 3 || this.criterionType === 17) {
+                      var idxLymphNode = item.Childrens.findIndex(i => i.QuestionMark === 2)
+                      if (idxLymphNode > -1) {
+                        isLymphNodes = item.Childrens[idxLymphNode].Answer[k].Answer ? parseInt(item.Childrens[idxLymphNode].Answer[k].Answer) : null
+                        item.Childrens.forEach(v => {
+                          this.$set(v, 'isLymphNodes', isLymphNodes)
+                        })
+                      }
+                    }
+                  }
+                }
+                if (this.criterionType === 21) {
+                  var liverSegmentIdx = item.Childrens.findIndex(i => i.QuestionMark === 1106)
+                  if (liverSegmentIdx > -1) {
+                    if (item.Childrens[liverSegmentIdx].Answer.length > 0) {
+                      let v = item.Childrens[liverSegmentIdx].Answer[0].Answer
+                      obj.QuestionName = this.$fd(item.Childrens[liverSegmentIdx].DictionaryCode, parseInt(v))
+                      let Answers = {}
+                      let mean = item.Childrens.findIndex(i => i.QuestionMark === 1104)
+                      if (mean > -1) {
+                        this.visitTaskList.forEach(v => {
+                          const o = item.Childrens[mean].Answer.find(v1 => {
+                            return v1.VisitTaskId === v.VisitTaskId
+                          })
+                          if (o) {
+                            Answers[o.VisitTaskId] = isNaN(parseFloat(o.Answer)) ? o.Answer : `${o.Answer}%`
+                          }
+                        })
+                      }
+                      this.$set(obj, 'Answers', Answers)
+                    }
+                  }
+                }
+              } catch (e) {
+                console.log(e)
+              }
+            }
+            item.Answer.forEach(i => {
+              if (item.DictionaryCode) {
+                obj.Answers[i.VisitTaskId] = i.Answer ? parseInt(i.Answer) : null
+              } else {
+                obj.Answers[i.VisitTaskId] = i.Answer
+              }
+            })
+            if (item.QuestionType === 15) {
+              this.currentExistDisease = obj.Answers[this.visitTaskId]
+              this.answerArr.push({ id: item.QuestionId, answer: obj.Answers[this.visitTaskId], questionType: 15 })
+            }
+            if (item.QuestionType === 13 || item.QuestionType === 42) {
+              this.currentEvaluateResult = obj.Answers[this.visitTaskId]
+              this.answerArr.push({ id: item.QuestionId, answer: obj.Answers[this.visitTaskId], questionType: item.QuestionType })
+            }
+            if (item.QuestionType === 14) {
+              this.currentTaskReason = obj.Answers[this.visitTaskId]
+              this.answerArr.push({ id: item.QuestionId, answer: obj.Answers[this.visitTaskId], questionType: 14 })
+            }
+            if (item.Childrens.length >= 1) {
+              obj.Childrens = this.getQuestions(item.Childrens, isNTFilterLength, lesionType, isLymphNodes)
+            }
+            arr.push(obj)
+          }
+        })
+      }
+      return arr
+    },
+    handleShowDetail(val) {
+      this.getReportInfo()
+      // this.taskQuestions = this.getQuestions(res.Result.TaskQuestions, !this.isShowDetail, null)
+    },
+    handleExistDiseaseChange(val) {
+      // this.currentExistDisease = parseInt(val)
+      if (val === this.isExistDisease && this.tumorEvaluate === this.currentEvaluateResult) {
+        this.currentTaskReason = ''
+        this.evaluateReasonChange('')
+      }
+      this.currentTaskReason = ''
+      this.evaluateReasonChange('')
+      var idx = this.answerArr.findIndex(i => i.questionType === 15)
+      if (idx > -1) {
+        this.answerArr[idx].answer = val
+      }
+    },
+    handleEvaluateResultChange(val) {
+      // this.currentEvaluateResult = parseInt(val)
+      if (val === this.tumorEvaluate && this.isExistDisease === this.currentExistDisease) {
+        this.currentTaskReason = ''
+        this.evaluateReasonChange('')
+      }
+      this.currentTaskReason = ''
+      this.evaluateReasonChange('')
+      var idx = this.answerArr.findIndex(i => i.questionType === 13 || i.questionType === 42)
+      if (idx > -1) {
+        this.answerArr[idx].answer = val
+      }
+      this.setScrollTop()
+    },
+
+    evaluateReasonChange(val) {
+      var idx = this.answerArr.findIndex(i => i.questionType === 14)
+      if (idx > -1) {
+        this.answerArr[idx].answer = val
+      }
+    },
+    async handleConfirm() {
+      this.loading = true
+      try {
+        await this.handleSave(false)
+        await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
+        var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+        var isBaseline = this.visitTaskList[i].IsBaseLine
+        if (isBaseline) {
+          const res = await getTaskAdditionalQuestion({ visitTaskId: this.visitTaskId })
+          this.assessmentQuestions = res.Result
+          if (this.assessmentQuestions.length > 0) {
+          // 打开附加评估框
+            this.additionalAssessmentsDig.visible = true
+          } else {
+            const { ImageAssessmentReportConfirmation } = const_.processSignature
+            this.signCode = ImageAssessmentReportConfirmation
+            this.signVisible = true
+          }
+        } else {
+          const { ImageAssessmentReportConfirmation } = const_.processSignature
+          this.signCode = ImageAssessmentReportConfirmation
+          this.signVisible = true
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    sign() {
+      this.additionalAssessmentsDig.visible = false
+      this.$nextTick(() => {
+        const { ImageAssessmentReportConfirmation } = const_.processSignature
+        this.signCode = ImageAssessmentReportConfirmation
+        this.signVisible = true
+      })
+    },
+    handleResize() {
+      this.$nextTick(() => {
+        this.$refs.reportList && this.$refs.reportList.doLayout()
+      })
+    },
+    // 关闭签名框
+    closeSignDialog(isSign, signInfo) {
+      if (isSign) {
+        this.signConfirm(signInfo)
+      } else {
+        this.signVisible = false
+      }
+    },
+    // 签名并确认
+    async signConfirm(signInfo) {
+      this.loading = true
+      try {
+        var params = {
+          data: {
+            visitTaskId: this.visitTaskId
+          },
+          signInfo: signInfo
+        }
+        const res = await submitDicomVisitTask(params)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          if (this.$refs['signForm']) {
+            this.$refs['signForm'].btnLoading = false
+          }
+
+          this.signVisible = false
+          // window.location.reload()
+          // window.opener.postMessage('refreshTaskList', window.location)
+
+          // 设置当前任务阅片状态为已读
+          this.readingTaskState = 2
+          this.$emit('setReadingTaskState', 2)
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
+          if (isAutoTask) {
+            window.location.reload()
+          } else {
+            // '当前阅片任务已完成，是否进入下一个阅片任务？'
+            this.$confirm(this.$t('trials:readingReport:message:msg4'), {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            })
+              .then(() => {
+                window.location.reload()
+              })
+              .catch(action => {
+                changeURLStatic('visitTaskId', this.visitTaskId)
+              })
+          }
+
+          window.opener.postMessage('refreshTaskList', window.location)
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+        if (this.$refs['signForm'] && this.$refs['signForm'].btnLoading) {
+          this.$refs['signForm'].btnLoading = false
+        }
+      }
+    },
+    previewDicoms(task) {
+      if (this.openWindow) {
+        this.openWindow.close()
+      }
+      var token = getToken()
+      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
+      // var subjectCode = this.$router.currentRoute.query.subjectCode
+      var subjectCode = localStorage.getItem('subjectCode')
+      var subjectId = this.$router.currentRoute.query.subjectId
+      var trialId = this.$router.currentRoute.query.trialId
+      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
+      var criterionType = this.$router.currentRoute.query.criterionType
+      var readingTool = this.$router.currentRoute.query.readingTool
+      var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+      const routeData = this.$router.resolve({ path })
+      this.openWindow = window.open(routeData.href, '_blank')
+    },
+    handleSave(isPrompt) {
+      return new Promise(async(resolve, reject) => {
+        var isBeill
+        var evaluateResult = ''
+        var evaluateAjustReason = ''
+        this.answers = []
+        var isExistEvaluateResult = false
+        this.answerArr.map(item => {
+          if (item.questionType === 13 || item.questionType === 42) {
+            evaluateResult = item.answer
+            isExistEvaluateResult = true
+          }
+          if (item.questionType === 14) {
+            evaluateAjustReason = item.answer
+          }
+          if (item.questionType === 15) {
+            isBeill = item.answer
+          }
+          this.answers.push({ id: item.id, answer: item.answer })
+        })
+        console.log(this.currentExistDisease, this.isExistDisease, evaluateAjustReason, isBeill)
+        if (this.currentExistDisease !== this.isExistDisease && !evaluateAjustReason) {
+          this.$confirm(this.$t('trials:readingReport:message:msg2'), {
+            type: 'warning',
+            showCancelButton: false,
+            callback: action => {}
+          })
+          resolve()
+          return
+        }
+        if (isExistEvaluateResult && (evaluateResult === null && !this.isBaselineTask)) {
+          // 请将疗效评估信息填写完整
+          this.$confirm(this.$t('trials:readingReport:message:msg2'), {
+            type: 'warning',
+            showCancelButton: false,
+            callback: action => {}
+          })
+          resolve()
+          return
+        }
+        if (isExistEvaluateResult && (evaluateResult !== this.tumorEvaluate) && !evaluateAjustReason) {
+          // 请填写整体评估调整原因
+          this.$confirm(this.$t('trials:readingReport:message:msg3'), {
+            type: 'warning',
+            showCancelButton: false,
+            callback: action => {}
+          })
+          resolve()
+          return
+        }
+        this.loading = true
+        try {
+          var params = {
+            visitTaskId: this.visitTaskId,
+            answers: this.answers
+          }
+          const res = await changeDicomReadingQuestionAnswer(params)
+          if (res.IsSuccess && isPrompt) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          }
+          this.loading = false
+          resolve()
+        } catch (e) {
+          this.loading = false
+          reject()
+        }
+      })
+    },
+    getWarningText() {
+      var sysRes = ''
+      var curRes = ''
+      if (this.CriterionType === 2) {
+        sysRes = this.$fd('ImagingOverallAssessment_Lugano', this.tumorEvaluate)
+        curRes = this.$fd('ImagingOverallAssessment_Lugano', this.currentEvaluateResult)
+      } else {
+        sysRes = this.$fd('OverallAssessment', this.tumorEvaluate)
+        curRes = this.$fd('OverallAssessment', this.currentEvaluateResult)
+      }
+      if (!curRes) {
+        return ''
+      }
+      const msg = this.$t('trials:readingReport:message:msg9').replace('xxx', '<font color="red">' + sysRes + '</font>').replace('yyy', '<font color="red">' + curRes + '</font>')
+      return msg
+    },
+    async skipTask() {
+      try {
+        // 是否确认跳过？
+        const confirm = await this.$confirm(
+          this.$t('trials:readingReport:message:skipConfirm'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          window.location.reload()
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.report-wrapper{
+
+  height: 100%;
+  padding: 10px 0px;
+  // background-color: #fff;
+  background-color: #000;
+  ::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+  .report-header{
+    display: flex;
+  }
+  .el-card{
+    display:flex;flex-direction: column;height: 100%;
+    background-color: #000;
+    color: #ffffff;
+    border:none;
+    ::v-deep .el-card__body{
+      flex: 1;
+    }
+  }
+
+  // ::v-deep .el-table__cell{
+  //   background-color: #000;
+  //   color: #ffffff;
+  // }
+  // ::v-deep .el-table{
+  //   background-color: #000;
+  //   color: #ffffff;
+  // }
+  // ::v-deep .el-table__cell{
+  //   background-color: #000;
+  //   color: #ffffff;
+  // }
+
+  ::v-deep .el-table, .el-table__expanded-cell {
+    background-color: #000;
+    color: #fff;
+    border-color:#444444;
+  }
+
+  ::v-deep .el-table th, .el-table tr {
+    background-color: #000;
+    color: #fff;
+    border-color:#444444;
+  }
+  ::v-deep .el-table__body tr > td{
+    background-color:#000 !important;
+    color: #fff;
+    border-color:#444444;
+  }
+  ::v-deep .el-table__body tr:hover > td{
+    background-color:#858282 !important;
+    color: #fff;
+    border-color:#444444;
+  }
+  ::v-deep .el-table--border th.gutter:last-of-type{
+    border: none;
+  }
+  ::v-deep .el-card__header{
+    border: none;
+    padding: 10px;
+  }
+}
+::v-deep .el-switch__label{
+  color:#fff;
+}
+::v-deep .el-switch__label.is-active{
+  color: #428bca;
+}
+.colorOfRed{
+  color: #f66;
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue
index 670db458..fc97cde7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue
@@ -22,13 +22,13 @@
               v-if="!study.IsCriticalSequence"
               class="dicom-desc"
             >
-              <template  v-if="taskInfo && taskInfo.IsShowStudyName">
+              <template v-if="taskInfo && taskInfo.IsShowStudyName">
                 <div style="text-overflow: ellipsis;overflow: hidden;">
                   <span :title="study.StudyCode">{{ study.StudyCode }}</span>
                   <span v-if="study.StudyName" :title="study.StudyName" style="margin-left: 5px;">{{ study.StudyName }}</span>
                   <span v-else :title="study.Modalities" style="margin-left: 5px;">{{ `${study.Modalities} (${study.SeriesCount})` }}</span>
                 </div>
-                <div style="text-overflow: ellipsis;overflow: hidden;" v-if="study.StudyName" >
+                <div v-if="study.StudyName" style="text-overflow: ellipsis;overflow: hidden;">
                   <span :title="study.Modalities">{{ `${study.Modalities} (${study.SeriesCount})` }}</span>
                 </div>
               </template>
@@ -38,7 +38,7 @@
                   <span :title="study.Modalities">{{ `${study.Modalities} (${study.SeriesCount})` }}</span>
                 </div>
               </template>
-             
+
             </div>
             <div v-else>
               <!-- 关键序列 -->
@@ -64,14 +64,14 @@
                     crossorigin="anonymous"
                   />
                 </div>
-                <div class="series-text" >
-                  <div class="text-desc" v-if="!study.IsCriticalSequence" :title="series.SeriesNumber">
+                <div class="series-text">
+                  <div v-if="!study.IsCriticalSequence" class="text-desc" :title="series.SeriesNumber">
                     #{{ series.SeriesNumber }}
                   </div>
-                  <div class="text-desc" v-if="series.Description" :title="series.Description">
+                  <div v-if="series.Description" class="text-desc" :title="series.Description">
                     {{ series.Description }}
                   </div>
-                  <div class="text-desc" v-if="series.SliceThickness && !study.IsCriticalSequence">
+                  <div v-if="series.SliceThickness && !study.IsCriticalSequence" class="text-desc">
                     T: {{ parseFloat(series.SliceThickness).toFixed(digitPlaces) }}
                   </div>
                   <div class="text-desc">
@@ -80,7 +80,7 @@
                     </span>
                     <span v-show="series.LoadedImageCount >= series.InstanceCount">{{ series.Modality }}: {{ series.InstanceCount }} image</span>
                   </div>
-                  <div v-show="series.IsBeMark">
+                  <div v-show="annotations.findIndex(v=>v.seriesId === series.Id && v.MeasureData) > -1">
                     <i class="el-icon-star-on" style="font-size: 16px;color: #ff5722;" />
                   </div>
                 </div>
@@ -116,14 +116,16 @@ export default {
       activeSeriesIndex: -1,
       taskInfo: null,
       studyList: [],
+      annotations: [],
       digitPlaces: 2
     }
   },
   mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
-    let digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    const digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.studyList = this.visitTaskInfo.StudyList
+    this.annotations = this.visitTaskInfo.Annotations
     if (this.studyList.length === 0) return
     this.$nextTick(() => {
       this.activeStudy(this.studyList[0].StudyId)
@@ -142,22 +144,22 @@ export default {
     setSeriesActive(studyIndex, seriesIndex) {
       this.activeStudyIndex = studyIndex
       this.activeSeriesIndex = seriesIndex
-      let studyId = this.studyList[studyIndex].StudyId
+      const studyId = this.studyList[studyIndex].StudyId
       if (!studyId) return
       this.activeStudy(studyId)
     },
     getPreviousOrNextSeries(type, series) {
-      let seriseList = this.studyList.map(s => s.SeriesList).flat()
-      let i = seriseList.findIndex(i => i.Id === series.Id && i.StudyId === series.StudyId)
+      const seriseList = this.studyList.map(s => s.SeriesList).flat()
+      const i = seriseList.findIndex(i => i.Id === series.Id && i.StudyId === series.StudyId)
       if (i === -1) return
       let newIndex = null
       if (type === -1) {
         newIndex = i === 0 ? i : i - 1
       } else {
-        newIndex = i >= seriseList.length - 1 ? i : i +1
+        newIndex = i >= seriseList.length - 1 ? i : i + 1
       }
-      let studyIndex = seriseList[newIndex].StudyIndex
-      let seriesIndex = seriseList[newIndex].SeriesIndex
+      const studyIndex = seriseList[newIndex].StudyIndex
+      const seriesIndex = seriseList[newIndex].SeriesIndex
       this.setSeriesActive(studyIndex, seriesIndex)
       this.activeSeries(seriseList[newIndex], seriesIndex, studyIndex)
     }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
index 3256127a..637207a9 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
@@ -1,22 +1,23 @@
 <template>
-  <div 
+  <div
     ref="viewport"
     class="viewport-wrapper"
     @mouseup="sliderMouseup"
     @mousemove="sliderMousemove"
     @mouseleave="sliderMouseleave"
   >
-    <div class="left-top-text" v-if="series && taskInfo">
+    <div v-if="series && taskInfo" class="left-top-text">
       <div
         v-if="taskInfo.IsExistsClinicalData"
         class="cd-info"
         :title="$t('trials:reading:button:clinicalData')"
       >
-        <svg-icon 
-          style="cursor: pointer;" 
-          icon-class="documentation" 
-          class="svg-icon" 
-          @click.stop="viewCD(series.TaskInfo.VisitTaskId)" />
+        <svg-icon
+          style="cursor: pointer;"
+          icon-class="documentation"
+          class="svg-icon"
+          @click.stop="viewCD(series.TaskInfo.VisitTaskId)"
+        />
       </div>
       <h2
         v-if="taskInfo.IsReadingShowSubjectInfo"
@@ -26,7 +27,7 @@
       </h2>
       <div>Series: #{{ series.SeriesNumber }}</div>
       <div>Image: #{{ `${series.SliceIndex + 1}/${series.ImageIds.length}` }}</div>
-      <div>{{series.Modality}}</div>
+      <div>{{ series.Modality }}</div>
     </div>
     <div
       v-if="series && taskInfo && taskInfo.IsReadingTaskViewInOrder === 1"
@@ -54,10 +55,10 @@
         </div>
       </div>
     </div>
-    <div class="right-top-text" v-if="series">
+    <div v-if="series" class="right-top-text">
       <div>{{ series.Description }}</div>
     </div>
-    <div class="left-bottom-text" v-if="series">
+    <div v-if="series" class="left-bottom-text">
       <div v-show="mousePosition.index.length > 0">
         Pos: {{ mousePosition.index[0] }}, {{ mousePosition.index[1] }}, {{ mousePosition.index[2] }}
       </div>
@@ -74,7 +75,7 @@
         W*H: {{ imageInfo.size }}
       </div>
     </div>
-    <div class="right-bottom-text" v-if="series">
+    <div v-if="series" class="right-bottom-text">
       <div v-show="imageInfo.location">Location: {{ `${Number(imageInfo.location).toFixed(digitPlaces)} mm` }}</div>
       <div v-show="series.SliceThickness">Slice Thickness: {{ `${Number(series.SliceThickness).toFixed(digitPlaces)} mm` }}</div>
       <div v-show="imageInfo.wwwc ">WW/WL: {{ imageInfo.wwwc }}</div>
@@ -98,20 +99,20 @@
   </div>
 </template>
 <script>
-import * as cornerstonejs from '@cornerstonejs/core'
+// import * as cornerstonejs from '@cornerstonejs/core'
 import {
-  RenderingEngine,
-  Enums,
-  imageLoader,
+  // RenderingEngine,
+  // Enums,
+  // imageLoader,
   metaData,
   getRenderingEngine,
-  eventTarget,
+  // eventTarget,
   utilities as csUtils
 } from '@cornerstonejs/core'
 import * as cornerstoneTools from '@cornerstonejs/tools'
-import { vec3, mat4 } from 'gl-matrix'
+import { vec3 } from 'gl-matrix'
 export default {
-  name: 'Viewport',
+  name: 'ImageViewport',
   props: {
     renderingEngineId: {
       type: String,
@@ -126,7 +127,7 @@ export default {
       required: true
     }
   },
-  data(){
+  data() {
     return {
       element: '',
       series: null,
@@ -137,10 +138,10 @@ export default {
         isMove: false,
         height: 0
       },
-      mousePosition: { 
-        index: [], 
-        value: null, 
-        modalityUnit: '', 
+      mousePosition: {
+        index: [],
+        value: null,
+        modalityUnit: '',
         world: []
       },
       imageInfo: {
@@ -160,12 +161,11 @@ export default {
   },
   mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
-    let digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    const digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-    this.$nextTick(()=>{
+    this.$nextTick(() => {
       this.initViewport()
     })
-    console.log(cornerstonejs)
   },
   methods: {
     initViewport() {
@@ -180,12 +180,12 @@ export default {
       resizeObserver.observe(this.element)
       this.element.addEventListener('CORNERSTONE_STACK_NEW_IMAGE', this.stackNewImage)
       this.element.addEventListener('CORNERSTONE_VOI_MODIFIED', this.voiModified)
-      
+
       this.element.addEventListener('CORNERSTONE_TOOLS_MOUSE_MOVE', this.cornerstoneToolsMouseMove)
       this.element.addEventListener('mouseleave', () => {
-      this.mousePosition.index = []
-    })
-      // console.log(cornerstonejs,cornerstoneTools)
+        this.mousePosition.index = []
+      })
+      // console.log(cornerstoneTools)
       // element.addEventListener('CORNERSTONE_STACK_NEW_IMAGE', this.stackNewImage)
     },
     stackNewImage(e) {
@@ -194,13 +194,14 @@ export default {
       this.sliderInfo.height = detail.imageIdIndex * 100 / (this.series.ImageIds.length - 1)
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
       const viewport = renderingEngine.getViewport(this.viewportId)
-      let zoom = viewport.getZoom()
+      const zoom = viewport.getZoom()
       this.imageInfo.zoom = zoom.toFixed(4)
       this.imageInfo.size = `${detail.image.columns}*${detail.image.rows}`
       const imagePlaneModule = metaData.get('imagePlaneModule', detail.imageId)
       this.imageInfo.location = imagePlaneModule.sliceLocation
       // this.imageInfo.wwwc = `${Math.round(detail.image.windowWidth)}/${Math.round(detail.image.windowCenter)}`
       this.getOrientationMarker()
+      this.$emit('renderAnnotations', this.series)
     },
     voiModified(e) {
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
@@ -239,9 +240,9 @@ export default {
       }
     },
     setMarkers() {
-      let markers = [...this.orientationMarkers]
+      const markers = [...this.orientationMarkers]
       for (const key in this.markers) {
-        let v = markers.shift(0)
+        const v = markers.shift(0)
         this.markers[key] = v
       }
     },
@@ -258,7 +259,7 @@ export default {
           this.resetOrientationMarkers()
           return
         }
-        let markers = [...this.orientationMarkers]
+        const markers = [...this.orientationMarkers]
         if (type === 2) {
           // 垂直翻转
           this.orientationMarkers[0] = markers[2]
@@ -281,7 +282,7 @@ export default {
       this.playClipState = isPlay
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
       const viewport = renderingEngine.getViewport(this.viewportId)
-      
+
       if (isPlay) {
         cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond })
       } else {
@@ -291,9 +292,9 @@ export default {
     scrollPage(type) {
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
       const viewport = renderingEngine.getViewport(this.viewportId)
-      const currentImageIdIndex = viewport.getCurrentImageIdIndex();
-      const numImages = viewport.getImageIds().length;
-      let newImageIdIndex = null;
+      const currentImageIdIndex = viewport.getCurrentImageIdIndex()
+      const numImages = viewport.getImageIds().length
+      let newImageIdIndex = null
       if (type === 0) {
         newImageIdIndex = 0
       } else if (type === -1) {
@@ -301,34 +302,36 @@ export default {
       } else if (type === 1) {
         newImageIdIndex = currentImageIdIndex === numImages - 1 ? currentImageIdIndex : currentImageIdIndex + 1
       } else if (type === 99999) {
-        newImageIdIndex = numImages -1
+        newImageIdIndex = numImages - 1
       }
-      viewport.setImageIdIndex(newImageIdIndex);
+      viewport.setImageIdIndex(newImageIdIndex)
     },
     setZoom(ratio) {
-      const renderingEngine = getRenderingEngine(this.renderingEngineId);
-      const viewport = renderingEngine.getViewport(this.viewportId);
+      const renderingEngine = getRenderingEngine(this.renderingEngineId)
+      const viewport = renderingEngine.getViewport(this.viewportId)
 
-      const zoom = viewport.getZoom();
+      const zoom = viewport.getZoom()
       if (ratio > 0) {
-        viewport.setZoom(zoom * 1.05);
+        viewport.setZoom(zoom * 1.05)
       } else {
-        viewport.setZoom(zoom / 1.05);
+        viewport.setZoom(zoom / 1.05)
       }
-      viewport.render();
+      viewport.render()
     },
     resize(forceFitToWindow) {
       console.log('resize: ', forceFitToWindow)
-      const renderingEngine = getRenderingEngine(this.renderingEngineId);
+      const renderingEngine = getRenderingEngine(this.renderingEngineId)
       renderingEngine.resize(true, forceFitToWindow)
     },
-    async setSeriesInfo(obj){
-      if (this.series && obj.Id === this.series.Id && obj.Description === this.series.Description) return
-      this.series = {...obj}
+    async setSeriesInfo(obj, isLocate = false) {
+      if (this.series && obj.Id === this.series.Id && obj.Description === this.series.Description && !isLocate) {
+        obj.SliceIndex = this.series.SliceIndex
+      }
+      this.series = { ...obj }
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
       const viewport = renderingEngine.getViewport(this.viewportId)
       await viewport.setStack(obj.ImageIds, obj.SliceIndex)
-      cornerstoneTools.utilities.stackPrefetch.enable(viewport.element);
+      cornerstoneTools.utilities.stackPrefetch.enable(viewport.element)
       viewport.render()
     },
     cornerstoneToolsMouseMove(e) {
@@ -348,7 +351,7 @@ export default {
       this.$emit('activeViewport', this.viewportIndex)
       const num = visitTaskNum + i
       if (num >= 0 && num <= this.taskInfo.VisitNum) {
-        this.$emit('toggleTaskByViewport', {series: this.series, visitTaskNum: num})
+        this.$emit('toggleTaskByViewport', { series: this.series, visitTaskNum: num })
       }
 
       evt.stopImmediatePropagation()
@@ -410,7 +413,7 @@ export default {
       e.stopImmediatePropagation()
       e.stopPropagation()
       e.preventDefault()
-    },
+    }
   }
 }
 </script>
@@ -548,4 +551,4 @@ export default {
     z-index: 1;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue
index f9908be8..51e69110 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue
@@ -6,6 +6,7 @@
       <!-- 阅片 -->
       <el-tab-pane
         v-if="taskInfo"
+        ref="readPage"
         :label="$t('trials:reading:tabTitle:review')"
         name="read"
       >
@@ -17,7 +18,10 @@
         :label="$t('trials:reading:tabTitle:report')"
         name="report"
       >
-        <report-page v-if="activeName === 'report'" />
+        <report-page 
+          v-if="activeName === 'report'" 
+          @setReadingTaskState="setReadingTaskState"
+        />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -39,6 +43,11 @@ export default {
   },
   mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+  },
+  methods: {
+    setReadingTaskState(state) {
+      this.$refs['readPage'].setReadingTaskState(state)
+    }
   }
 }
 </script>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
new file mode 100644
index 00000000..2c3211c5
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
@@ -0,0 +1,318 @@
+<template>
+  <div>
+    <div
+      v-if="!!question.GroupName && question.Type==='group'"
+    >
+      <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        {{ language==='en'?question.GroupEnName:question.GroupName }}
+      </h4>
+    </div>
+    <template v-else>
+      <el-form-item
+        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0 "
+        :label="`${question.QuestionName}`"
+        :prop="question.Id"
+        :rules="[
+          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (questionForm[question.RelevanceId] === question.RelevanceValue))) && question.Type!=='group' && question.Type!=='summary',
+            message: ['radio', 'select', 'checkbox'].includes(question.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+        :class="[question.Type==='group' ? 'mb' : (question.Type==='upload' || question.QuestionName.length > 15) ?'uploadWrapper' : '']"
+      >
+
+        <!-- 输入框 -->
+        <el-input
+          v-if="question.Type==='input'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 多行文本输入框 -->
+        <el-input
+          v-else-if="question.Type==='textarea'"
+          v-model="questionForm[question.Id]"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 下拉框 -->
+        <el-select
+          v-else-if="question.Type==='select'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode)"
+          clearable
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.TableQuestionType === 1">
+            <el-option
+              v-for="item in organList"
+              :key="item.Id"
+              :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]"
+            />
+          </template>
+          <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </template>
+          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </template>
+          <template v-else>
+            <el-option
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+              :value="val"
+            />
+          </template>
+        </el-select>
+        <!-- 单选 -->
+        <el-radio-group
+          v-else-if="question.Type==='radio'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.DictionaryCode">
+            <el-radio
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :label="String(item.value)"
+            >
+              {{ item.label }}
+            </el-radio>
+          </template>
+          <template v-else-if="question.TypeValue">
+            <el-radio
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+            >
+              {{ val }}
+            </el-radio>
+          </template>
+        </el-radio-group>
+        <!-- 复选框 -->
+        <el-checkbox-group
+          v-else-if="question.Type==='checkbox'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+        >
+          <el-checkbox
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+          >
+            {{ val }}
+          </el-checkbox>
+        </el-checkbox-group>
+        <!-- 数值 -->
+        <template v-else-if="question.Type==='number'">
+          <el-input-number
+            v-if="question.ValueType === 0"
+            v-model="questionForm[question.Id]"
+            :precision="0"
+            :disabled="readingTaskState >= 2"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 3"
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 1 || question.ValueType === 2"
+            v-model="questionForm[question.Id]"
+            :precision="digitPlaces"
+            :disabled="readingTaskState >= 2"
+          />
+        </template>
+        <el-input
+          v-else-if="question.Type==='calculation'"
+          v-model="questionForm[question.Id]"
+          disabled
+        >
+          <template v-if="question.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+          </template>
+        </el-input>
+        <!-- 上传图像 -->
+        <el-upload
+          v-else-if="question.Type==='upload'"
+          action
+          :accept="accept"
+          :limit="question.ImageCount"
+          :on-preview="handlePictureCardPreview"
+          :before-upload="handleBeforeUpload"
+          :http-request="uploadScreenshot"
+          list-type="picture-card"
+          :on-remove="handleRemove"
+          :file-list="fileList"
+          :class="{disabled:fileList.length >= question.ImageCount}"
+          :disabled="readingTaskState >= 2"
+        >
+          <i slot="default" class="el-icon-plus" />
+          <div slot="file" slot-scope="{file}">
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="OSSclientConfig.basePath + file.url"
+              alt=""
+            >
+            <span class="el-upload-list__item-actions">
+              <span
+                class="el-upload-list__item-preview"
+                @click="handlePictureCardPreview(file)"
+              >
+                <i class="el-icon-zoom-in" />
+              </span>
+
+              <span
+                v-if="readingTaskState < 2"
+                class="el-upload-list__item-delete"
+                @click="handleRemove(file)"
+              >
+                <i class="el-icon-delete" />
+              </span>
+            </span>
+          </div>
+        </el-upload>
+        <el-dialog
+          v-if="question.Type==='upload'"
+          append-to-body
+          :visible.sync="imgVisible"
+          width="600px"
+        >
+          <el-image :src="imageUrl" width="100%">
+            <div slot="placeholder" class="image-slot">
+              加载中<span class="dot">...</span>
+            </div>
+          </el-image>
+        </el-dialog>
+      </el-form-item>
+    </template>
+
+    <question-form-item
+      v-for="(item) in question.Childrens"
+      :key="item.Id"
+      :question="item"
+      :question-form="questionForm"
+      :reading-task-state="readingTaskState"
+      :visitTaskId="visitTaskId"
+    />
+  </div>
+</template>
+<script>
+// import { uploadReadingAnswerImage } from '@/api/trials'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'QuestionFormItem',
+  props: {
+    questionForm: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    question: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    visitTaskId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      fileList: [],
+      accept: '.png,.jpg,.jpeg',
+      imgVisible: false,
+      imageUrl: '',
+      urls: [],
+      digitPlaces: 2
+    }
+  },
+  computed: {
+    ...mapGetters(['language'])
+  },
+  watch: {
+    questionForm: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+        // console.log(v)
+      }
+    }
+  },
+  mounted() {
+    let digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+  },
+  methods: {
+    formItemChange(v, question) {
+      if (question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      } else {
+        this.$emit('setFormItemData', { key: question.Id, val: v })
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.$emit('resetFormItemData', i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
+    },
+    resetFormItemData(v) {
+      this.$emit('resetFormItemData', v)
+    },
+    setFormItemData(obj) {
+      this.$emit('setFormItemData', obj)
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.mb{
+  margin-bottom: 0px;
+}
+.disabled{
+  ::v-deep .el-upload--picture-card {
+    display: none;
+  }
+}
+.uploadWrapper{
+  display: flex;
+  flex-direction: column !important;
+  align-items: flex-start;
+}
+::v-deep .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+::v-deep .el-input-group__append, .el-input-group__prepend{
+  padding: 0 10px;
+}
+::v-deep .el-form-item__content {
+  width: 100%;
+}
+::v-deep .el-select.is-disabled .el-input__inner{
+  background-color: #646464a1;
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
new file mode 100644
index 00000000..6519e8ce
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -0,0 +1,1914 @@
+<template>
+  <div class="questionList-wrapper">
+
+    <div class="container">
+      <div class="basic-info">
+        <h3 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo">
+          <span v-if="visitInfo.SubjectCode">{{ visitInfo.SubjectCode }} </span>
+          <span style="margin-left:5px;">{{ visitInfo.TaskBlindName }}</span>
+        </h3>
+        <div v-if="readingTaskState < 2">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetForm"
+            />
+          </el-tooltip>
+        </div>
+      </div>
+
+      <!-- 影像质量评估 -->
+      <div v-if="outerQuestions.length > 0" class="outer_form_wrapper">
+        <el-form
+          ref="outerForm"
+          size="small"
+          :model="outerForm"
+        >
+          <question-form-item
+            v-for="outerQs in outerQuestions"
+            :key="outerQs.Id"
+            :question="outerQs"
+            :question-form="outerForm"
+            :reading-task-state="readingTaskState"
+            :visit-task-id="visitTaskId"
+          />
+          <el-form-item v-if="readingTaskState < 2">
+            <div class="outer_form-footer">
+              <i class="el-icon-warning feedback-icon" :style="{color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff'}" @click="openFeedBackTable" />
+              <el-button size="mini" @click="saveOuterForm">{{ $t('common:button:save') }}</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <!-- 病灶评估 -->
+      <template v-if="tableQuestions.length > 0 && criterionType !== 10">
+        <div
+          v-for="(qs,index) in tableQuestions"
+          :key="index"
+          class="lesions lesions_wrapper"
+        >
+          <h4
+            v-if="qs.Type === 'group'"
+            style="color: #ddd;padding: 5px 0px;margin: 0;"
+          >
+            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+          </h4>
+          <div class="lesion_list">
+            <div
+              v-for="table in qs.Childrens"
+              v-show="!(isBaseLineTask && table.LesionType === 2)"
+              :key="table.Id"
+            >
+              <div
+                v-if="table.Type === 'table'"
+                class="flex-row"
+                style="margin:3px 0;"
+              >
+                <div class="title">{{ table.QuestionName }}</div>
+                <div
+                  v-if="readingTaskState<2 && (isBaseLineTask || table.LesionType === 2)"
+                  class="add-icon"
+                  @click.prevent="addTarget(table)"
+                >
+                  <i class="el-icon-plus" />
+                </div>
+              </div>
+              <el-collapse
+                v-if="table.Type === 'table' && table.TableQuestions"
+                v-model="activeName"
+                accordion
+                @change="handleCollapseChange"
+              >
+                <el-collapse-item
+                  v-for="(answer,i) in table.TableQuestions.Answers"
+                  :key="`${table.Id}_${answer.RowIndex}`"
+                  :name="`${table.Id}_${answer.RowIndex}`"
+                  @contextmenu.prevent.native="collapseRightClick($event, table.Id, answer.RowIndex)"
+                >
+                  <template slot="title">
+                    <div
+                      style="width:340px;position: relative;"
+                      :style="{color:(activeName===table.Id+answer.RowIndex?'#ffeb3b':'#fff')}"
+                    >
+                      {{ getLesionName(table.OrderMark,answer.RowIndex) }}
+                      <!-- 未保存 -->
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                        <i class="el-icon-warning" style="color:red" />
+                      </el-tooltip>
+                      <!-- 信息不完整 -->
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                        <i class="el-icon-warning" style="color:#ff9800" />
+                      </el-tooltip>
+                      <div style="position: absolute;left: 50px;top: 2px;">
+                        <div style="font-size: 11px;width:220px;height: 30px;">
+                          <div
+                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
+                            :title="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                          >
+                            {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart }}
+                          </div>
+                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                            <span v-if="table.LesionType === 0">
+                              {{ $fd('TargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                            </span>
+                            <span v-else-if="table.LesionType === 1">
+                              {{ $fd('NoTargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                            </span>
+                            <span v-else>
+                              {{ $fd('NewLesionState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                            </span>
+                          </div>
+                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                            <template v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
+                              {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm
+                            </template>
+                            <template v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                              {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
+                            </template>
+                          </div>
+                        </div>
+                      </div>
+                      <!-- 分裂 -->
+                      <div v-if="((table.LesionType === 0 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0) || (table.LesionType === 1 && [0,1].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (table.LesionType === 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0)) && innerFormData[`${table.Id}_${answer.RowIndex}`].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        <el-tooltip v-show="readingTaskState<2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false" class="table" :content="$t('trials:reading:button:split')" placement="left">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="lesionSplit(table.Id, innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)" />
+                        </el-tooltip>
+                      </div>
+
+                    </div>
+
+                  </template>
+                  <el-form
+                    :ref="`${table.Id}_${answer.RowIndex}`"
+                    size="small"
+                    :model="innerFormData[`${table.Id}_${answer.RowIndex}`]"
+                  >
+                    <table-question-form-item
+                      :table-info="table"
+                      :answer="answer"
+                      :question-form="innerFormData[`${table.Id}_${answer.RowIndex}`]"
+                      :reading-task-state="readingTaskState"
+                      :organs="organs"
+                      :is-base-line-task="isBaseLineTask"
+                      :is-current-task="isCurrentTask"
+                      @update="innerFormDataUpdate"
+                      @close="closeInnerForm"
+                      @lesionTypeChange="lesionTypeChange"
+                    />
+                    <div
+                      v-if="readingTaskState<2"
+                      style="text-align:right;margin-top:10px;"
+                    >
+                      <!-- 清除标记 -->
+                      <el-button
+                        v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData"
+                        size="mini"
+                        @click="clearMeasureData(table, answer.RowIndex)"
+                      >
+                        {{ $t('trials:reading:button:removeMark') }}
+                      </el-button>
+                      <!-- 删除 -->
+                      <el-button
+                        v-if="table.TableQuestions.Answers[i].IsCurrentTaskAdd !== 'False'"
+                        size="mini"
+                        @click="deleteLesion(table, answer.RowIndex)"
+                      >
+                        {{ $t('common:button:delete') }}
+                      </el-button>
+                      <!-- 保存 -->
+                      <el-button
+                        size="mini"
+                        @click="saveLesion(table, answer.RowIndex)"
+                      >
+                        {{ $t('common:button:save') }}
+                      </el-button>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+
+              </el-collapse>
+            </div>
+          </div>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getDicomReadingQuestionAnswer,
+  getReadingQuestionAndAnswer,
+  getReadingOrganList,
+  saveTaskQuestion,
+  submitTableQuestion,
+  deleteReadingRowAnswer,
+  splitLesion
+} from '@/api/trials'
+import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
+import { mapGetters } from 'vuex'
+import QuestionFormItem from './QuestionFormItem'
+import TableQuestionFormItem from './TableQuestionFormItem'
+export default {
+  name: 'QuestionList',
+  components: {
+    QuestionFormItem,
+    TableQuestionFormItem
+  },
+  props: {
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    lastViewportTaskId: {
+      type: String,
+      required: true
+    },
+    visitInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      isBaseLineTask: false,
+      isCurrentTask: false,
+      criterionType: null,
+      taskInfo: null,
+      outerQuestions: [],
+      outerForm: {},
+      tableQuestions: [],
+      trialId: '',
+      visitTaskId: '',
+      loading: false,
+      activeName: '',
+      innerFormData: {},
+      organs: [],
+      deleteTargetInfo: null,
+      digitPlaces: 2,
+      imageQualityId: '',
+      imageQualityIssuesId: ''
+    }
+  },
+  computed: {
+    ...mapGetters(['language'])
+  },
+  watch: {
+    lastViewportTaskId: {
+      immediate: true,
+      handler(id) {
+        if (!id) return
+        this.visitTaskId = id
+        this.$nextTick(() => {
+          this.activeName = ''
+          this.getOuterQuestions()
+          this.getTableQuestions()
+        })
+      }
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.isBaseLineTask = this.taskInfo.IsBaseLine
+    this.criterionType = this.taskInfo.CriterionType
+    const digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+    this.getOrganList()
+  },
+  methods: {
+    // 获取器官信息
+    async getOrganList() {
+      try {
+        const params = {
+          visitTaskId: this.visitTaskId
+        }
+        const res = await getReadingOrganList(params)
+        if (res.IsSuccess) {
+          this.organs = res.Result
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    // 获取外层问题
+    async getOuterQuestions() {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const params = {
+          trialId: this.$route.query.trialId,
+          visitTaskId: this.visitTaskId
+        }
+        const res = await getDicomReadingQuestionAnswer(params)
+        if (res.IsSuccess) {
+          this.outerQuestions = res.Result
+          this.outerForm = this.getOuterFormData(this.outerQuestions)
+        }
+        loading.close()
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    // 初始化外层问题表单
+    getOuterFormData(childrens, formData = {}) {
+      childrens.forEach(item => {
+        if (item.Type !== 'group' && item.Type !== 'summary') {
+          formData[item.Id] = item.Answer || ''
+          if (item.QuestionType === 44) {
+            // 影像质量评估
+            this.imageQualityId = item.Id
+          }
+          if (item.QuestionType === 67) {
+            // 影像质量问题
+            this.imageQualityIssuesId = item.Id
+          }
+          if (item.Childrens?.length) {
+            this.getOuterFormData(item.Childrens, formData)
+          }
+        } else {
+          this.getOuterFormData(item.Childrens, formData)
+        }
+      })
+      return formData
+    },
+    // 获取表格问题
+    async getTableQuestions() {
+      this.isCurrentTask = this.taskInfo.VisitTaskId === this.visitTaskId
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const params = {
+          trialId: this.$route.query.trialId,
+          visitTaskId: this.visitTaskId
+        }
+        const res = await getReadingQuestionAndAnswer(params)
+        if (res.IsSuccess) {
+          this.tableQuestions = res.Result.SinglePage
+          res.Result.SinglePage.forEach(group => {
+            group.Childrens.forEach(table => {
+              const tableKey = table.Id
+              this.$set(this.innerFormData, tableKey, {})
+              table.TableQuestions.Questions.forEach(question => {
+                if (question.Type !== 'summary') {
+                  this.$set(this.innerFormData[tableKey], question.Id, null)
+                }
+              })
+              this.$set(this.innerFormData[tableKey], 'RowId', '00000000-0000-0000-0000-000000000000')
+              this.$set(this.innerFormData[tableKey], 'LesionLength', null)
+              this.$set(this.innerFormData[tableKey], 'LesionShort', null)
+              this.$set(this.innerFormData[tableKey], 'IsLymphNodes', null)
+              this.$set(this.innerFormData[tableKey], 'LesionState', null)
+              this.$set(this.innerFormData[tableKey], 'LesionPart', null)
+              this.$set(this.innerFormData[tableKey], 'LesionOrgan', null)
+              this.$set(this.innerFormData[tableKey], 'IntrahepaticLesion', null)
+              this.$set(this.innerFormData[tableKey], 'LesionName', null)
+              this.$set(this.innerFormData[tableKey], 'MeasureData', null)
+              this.$set(this.innerFormData[tableKey], 'TableId', tableKey)
+              this.$set(this.innerFormData[tableKey], 'IsCurrentTaskAdd', 'True')
+
+              // QuestionMark：0--长径；1--短径；2--是否淋巴结；5--所在器官；7--状态；8--所在部位；21--典型肝内病灶
+              const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
+              const shortId = this.getQuestionId(1, table.TableQuestions.Questions)
+              const lymphNodesId = this.getQuestionId(2, table.TableQuestions.Questions)
+              const organId = this.getQuestionId(5, table.TableQuestions.Questions)
+              const stateId = this.getQuestionId(7, table.TableQuestions.Questions)
+              const partId = this.getQuestionId(8, table.TableQuestions.Questions)
+              const intrahepaticLesionId = this.getQuestionId(21, table.TableQuestions.Questions)
+              table.TableQuestions.Answers.forEach((answer, index) => {
+                this.$set(this.innerFormData, `${tableKey}_${answer.RowIndex}`, {})
+                this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionName', this.getLesionName(table.OrderMark, answer.RowIndex))
+                for (const key in answer) {
+                  let val = answer[key]
+                  if (key === 'MeasureData' && val) {
+                    val = JSON.parse(val)
+                  } else if (key === 'LesionType' || key === lymphNodesId || key === stateId || key === intrahepaticLesionId) {
+                    val = isNaN(parseInt(val)) ? null : parseInt(val)
+                  } else if (key === 'IsCanEditPosition') {
+                    val = val === 'True'
+                  }
+                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], key, val)
+                  if (key === lengthId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionLength', val)
+                  } else if (key === shortId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionShort', val)
+                  } else if (key === lymphNodesId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'IsLymphNodes', val)
+                  } else if (key === stateId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionState', val)
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'SaveTypeEnum', isNaN(parseInt(val)) ? 1 : 2)
+                  } else if (key === partId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionPart', val)
+                  } else if (key === organId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionOrgan', val)
+                  } else if (key === intrahepaticLesionId) {
+                    this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'IntrahepaticLesion', val)
+                  }
+                }
+                if (index === table.TableQuestions.Answers.length - 1) {
+                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
+                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
+                }
+              })
+            })
+          })
+        }
+        loading.close()
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    // 保存外层问题表单
+    async saveOuterForm() {
+      const valid = await this.$refs['outerForm'].validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const answers = []
+        let imageQuality = null
+        for (const k in this.outerForm) {
+          answers.push({ id: k, answer: this.outerForm[k] })
+          if (k === this.imageQualityId) {
+            imageQuality = this.outerForm[k]
+          }
+        }
+        const params = {
+          visitTaskId: this.visitTaskId,
+          answers: answers
+
+        }
+        const res = await saveTaskQuestion(0, params)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          if (!this.isBaseLineTask && (this.criterionType === 1 || this.criterionType === 2 || this.criterionType === 3 || this.criterionType === 17)) {
+            if (parseInt(imageQuality) === 2) {
+              this.$confirm(this.$t('trials:reading:warnning:unableEvaluate'), '', {
+                type: 'warning'
+              }).then(() => {
+                this.changeLesionState(2)
+              }).catch(() => {
+
+              })
+            }
+          }
+        }
+        loading.close()
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    setAnnotation(obj) {
+      const annotation = Object.assign({}, obj.annotation)
+      if (this.activeName) {
+        // 判断当前激活的病灶是否有标注信息
+        const tableId = this.activeName.split('_')[0]
+        const rowIndex = this.activeName.split('_')[1]
+        const innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+        if (innerForm.MeasureData) {
+          if (this.isBaseLineTask) {
+            const targetTable = this.tableQuestions[0].Childrens.find(
+              child => child.LesionType === 0
+            )
+            if (typeof targetTable !== 'object') return
+            if (targetTable.MaxQuestionCount && targetTable.TableQuestions.Answers.length < targetTable.MaxQuestionCount && (obj.toolName === 'Length' || obj.toolName === 'Bidirectional')) {
+              this.createTTarget(annotation)
+            } else {
+              this.createNTTarget(annotation)
+            }
+          } else {
+            this.createNLTarget(annotation)
+          }
+        } else {
+          const targetTable = this.tableQuestions[0].Childrens.find(
+            child => child.Id === tableId
+          )
+          if (typeof targetTable !== 'object') return
+          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'MeasureData', annotation)
+          if (obj.toolName === 'Length') {
+            const referencedImageId = annotation.metadata.referencedImageId
+            let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+            length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+            const lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionLength', length)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], lengthId, length)
+          } else if (obj.toolName === 'Bidirectional') {
+            const referencedImageId = annotation.metadata.referencedImageId
+            let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+            length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+            const lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionLength', length)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], lengthId, length)
+
+            let short = annotation.data.cachedStats[`imageId:${referencedImageId}`].width
+            short = short ? parseFloat(short).toFixed(this.digitPlaces) : short
+            const shortId = this.getQuestionId(1, targetTable.TableQuestions.Questions)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionShort', short)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], shortId, short)
+          }
+
+          const lesionType = this.innerFormData[`${tableId}_${rowIndex}`].LesionType
+          if (lesionType === 2) {
+            this.setNewTargetState(tableId, rowIndex)
+          }
+          const stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
+          const state = this.innerFormData[`${tableId}_${rowIndex}`][stateId]
+          // 基线时，默认状态都为存在
+          if (this.isBaseLineTask && !state) {
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0)
+          }
+          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0)
+          this.$emit('setMarkName', {
+            annotationUID: annotation.annotationUID,
+            name: this.innerFormData[`${tableId}_${rowIndex}`].LesionName
+          }
+          )
+        }
+      } else {
+        if (this.isBaseLineTask) {
+          const targetTable = this.tableQuestions[0].Childrens.find(
+            child => child.LesionType === 0
+          )
+          if (typeof targetTable !== 'object') return
+          if (targetTable.MaxQuestionCount && targetTable.TableQuestions.Answers.length < targetTable.MaxQuestionCount && (obj.toolName === 'Length' || obj.toolName === 'Bidirectional')) {
+            this.createTTarget(annotation)
+          } else {
+            this.createNTTarget(annotation)
+          }
+        } else {
+          this.createNLTarget(annotation)
+        }
+      }
+    },
+    modifyAnnotation(obj) {
+      const { annotation, toolName } = obj
+      const formData = Object.values(this.innerFormData).find(
+        i => i.LesionName === annotation.data.label
+      )
+      if (typeof formData !== 'object') return
+      const tableId = formData.TableId
+      const rowIndex = formData.RowIndex
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.Id === formData.TableId
+      )
+      if (typeof targetTable !== 'object') return
+      this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'MeasureData', annotation)
+      if (toolName === 'Length') {
+        const referencedImageId = annotation.metadata.referencedImageId
+        let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+        length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+        const lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionLength', length)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], lengthId, length)
+      } else if (toolName === 'Bidirectional') {
+        const referencedImageId = annotation.metadata.referencedImageId
+        let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+        length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+        const lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionLength', length)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], lengthId, length)
+
+        let short = annotation.data.cachedStats[`imageId:${referencedImageId}`].width
+        short = short ? parseFloat(short).toFixed(this.digitPlaces) : short
+        const shortId = this.getQuestionId(1, targetTable.TableQuestions.Questions)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionShort', short)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], shortId, short)
+      }
+      const lesionType = this.innerFormData[`${tableId}_${rowIndex}`].LesionType
+      if (lesionType === 2) {
+        this.setNewTargetState(tableId, rowIndex)
+      }
+      const stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
+      const state = this.innerFormData[`${tableId}_${rowIndex}`][stateId]
+      // 基线时，默认状态都为存在
+      if (this.isBaseLineTask && !state) {
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)
+        this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0)
+      }
+      this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', formData.RowId ? 1 : 0)
+      this.activeName = `${tableId}_${rowIndex}`
+    },
+    // 新增病灶
+    addTarget(tableInfo, annotation) {
+      // 判断是否存在未保存的病灶，否则不允许添加
+      const obj = Object.values(this.innerFormData).find(
+        obj => !obj.RowId
+      )
+      if (obj !== undefined && typeof obj === 'object') {
+        let msg = this.$t('trials:reading:warnning:msg5')
+        msg = msg.replace('xxx', obj.LesionName)
+
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        return
+      }
+      // 判断当前病灶类型下的病灶个数是否超过最大行数，否则不允许添加
+      if (!!tableInfo.MaxQuestionCount && tableInfo.MaxQuestionCount <= tableInfo.TableQuestions.Answers.length) {
+        let msg = this.$t('trials:reading:warnning:msg14')
+        msg = msg.replace('xxx', tableInfo.MaxQuestionCount)
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        return
+      }
+      const answer = Object.assign({}, this.innerFormData[tableInfo.Id])
+      answer.TableId = tableInfo.Id
+      answer.RowId = ''
+      const maxIndex = this.getMaxRowIndex(tableInfo.TableQuestions.Answers)
+      answer.RowIndex = `${maxIndex + 1}.00`
+      answer.IsDicomReading = true
+      answer.SaveTypeEnum = 0
+      answer.LesionType = tableInfo.LesionType
+      answer.LesionName = this.getLesionName(tableInfo.OrderMark, answer.RowIndex)
+      let state = null
+      if (this.isBaseLineTask && tableInfo.LesionType === 0) {
+        state = 0
+      }
+      if (this.isBaseLineTask && tableInfo.LesionType === 1) {
+        state = 0
+      }
+      const stateId = this.getQuestionId(7, tableInfo.TableQuestions.Questions)
+      answer[stateId] = state
+      tableInfo.TableQuestions.Answers.push(answer)
+      if (typeof annotation === 'object') {
+        answer.MeasureData = annotation
+        if (annotation.metadata.toolName === 'Length') {
+          const referencedImageId = annotation.metadata.referencedImageId
+          let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+          length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+          const lengthId = this.getQuestionId(0, tableInfo.TableQuestions.Questions)
+          answer.LesionLength = length
+          answer[lengthId] = length
+        } else if (annotation.metadata.toolName === 'Bidirectional') {
+          const referencedImageId = annotation.metadata.referencedImageId
+          let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
+          length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
+          const lengthId = this.getQuestionId(0, tableInfo.TableQuestions.Questions)
+          answer.LesionLength = length
+          answer[lengthId] = length
+
+          let short = annotation.data.cachedStats[`imageId:${referencedImageId}`].width
+          short = short ? parseFloat(short).toFixed(this.digitPlaces) : short
+          const shortId = this.getQuestionId(1, tableInfo.TableQuestions.Questions)
+          answer.LesionShort = short
+          answer[shortId] = short
+        }
+        this.$emit('setMarkName', {
+          annotationUID: annotation.annotationUID,
+          name: answer.LesionName
+        }
+        )
+      }
+      this.innerFormData[`${tableInfo.Id}_${answer.RowIndex}`] = answer
+      this.activeName = `${tableInfo.Id}_${answer.RowIndex}`
+    },
+    // 创建靶病灶
+    createTTarget(annotation) {
+      // 靶病灶
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.LesionType === 0
+      )
+      this.addTarget(targetTable, annotation)
+    },
+    // 创建非靶病灶
+    createNTTarget(annotation) {
+      // 非靶病灶
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.LesionType === 1
+      )
+      this.addTarget(targetTable, annotation)
+    },
+    // 创建新病灶
+    createNLTarget(annotation) {
+      // 新病灶
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.LesionType === 2
+      )
+      this.addTarget(targetTable, annotation)
+    },
+    // 清除标注
+    async clearMeasureData(table, rowIndex) {
+      //  是否确认清除标记？
+      const confirm = await this.$confirm(
+        this.$t('trials:reading:warnning:msg47'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const innerForm = this.innerFormData[`${table.Id}_${rowIndex}`]
+      // 重置长短径 和 状态
+      const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, null)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', null)
+      const shortId = this.getQuestionId(1, table.TableQuestions.Questions)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], shortId, null)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionShort', null)
+      const stateId = this.getQuestionId(7, table.TableQuestions.Questions)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], stateId, null)
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionState', null)
+      const obj = Object.assign({}, innerForm.MeasureData)
+      // 移除标注信息
+      this.$emit('removeAnnotation', obj)
+      // 重置标注信息
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'MeasureData', null)
+      // 重置保存标志
+      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0)
+    },
+    // 删除病灶
+    async deleteLesion(table, rowIndex) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg48'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        const innerForm = this.innerFormData[`${table.Id}_${rowIndex}`]
+        if (innerForm.RowId) {
+          const param = {
+            visitTaskId: this.visitTaskId,
+            questionId: table.Id,
+            rowId: innerForm.RowId
+          }
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            if (innerForm.MeasureData) {
+              // 移除标注信息
+              const obj = Object.assign({}, innerForm.MeasureData)
+              this.$emit('removeAnnotation', obj)
+            }
+            // 刷新表格问题
+            this.getTableQuestions()
+            this.$emit('getAnnotations', this.visitTaskId)
+            // '删除成功！'
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+            this.activeName = ''
+          }
+        } else {
+          if (innerForm.MeasureData) {
+            // 移除标注信息
+            const obj = Object.assign({}, innerForm.MeasureData)
+            this.$emit('removeAnnotation', obj)
+          }
+          // 移除病灶
+          this.removeAnswer(table.Id, rowIndex)
+          delete this.innerFormData[`${table.Id}_${rowIndex}`]
+          this.activeName = ''
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    // 保存病灶
+    async saveLesion(table, rowIndex) {
+      const valid = await this.$refs[`${table.Id}_${rowIndex}`][0].validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      const innerForm = this.innerFormData[`${table.Id}_${rowIndex}`]
+      const measureData = innerForm.MeasureData
+      const lesionState = innerForm.LesionState
+      let lesionLength = innerForm.LesionLength
+      let lesionShort = innerForm.LesionShort
+      const lymphNodes = innerForm.IsLymphNodes
+      const lesionType = table.LesionType
+      const lesionPart = innerForm.LesionPart
+      if (this.isBaseLineTask) {
+        // 基线
+        // 靶病灶且状态为存在（0）
+        if (lesionType === 0 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            if ((lesionPart === '肝门淋巴结' || lesionPart === 'Lymph node-hilum of liver') && !(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 20)) {
+              // 靶病灶部位为肝门淋巴结时，选择要求时短轴≥2cm
+              this.$confirm(this.$t('trials:mRecist:warnning:msg2'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+            //  淋巴结靶病灶 必须使用长短径测量工具,短径大于等于15mm
+            if (!(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 15)) {
+              // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记，且短径须大于15mm！
+              this.$confirm(this.$t('trials:reading:warnning:msg19'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 直径测量工具 长径须大于等于10mm且不小于2倍层厚
+            if (!(measureData && measureData.markTool === 'Length' && lesionLength >= 10 && (measureData.thick && lesionLength >= 2 * measureData.thick || !measureData.thick))) {
+              // 评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记，长径须大于10mm且不小于2倍层厚！
+              this.$confirm(this.$t('trials:reading:warnning:msg20'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为存在（0）
+        if (lesionType === 1 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
+              this.$confirm(this.$t('trials:reading:warnning:msg21'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具或箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg22'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+      } else {
+        // 非基线
+        // 靶病灶且状态为存在（0）
+        if (lesionType === 0 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具
+            if (!(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 10)) {
+              // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg23'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 直径测量工具
+            if (!(measureData && measureData.markTool === 'Length')) {
+              // `评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg24'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+        // 靶病灶且状态为太小（1）
+        if (lesionType === 0 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用箭头工具，短径记录为5mm
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg25'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
+              const shortId = this.getQuestionId(1, table.TableQuestions.Questions)
+              this.$set(innerForm, shortId, 5)
+              lesionShort = 5
+            }
+          } else {
+            // 非淋巴结靶病灶 箭头工具，长径记录为5mm
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg26'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
+              const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
+              this.$set(this.questionForm, lengthId, 5)
+              lesionLength = 5
+            }
+          }
+        }
+
+        // 靶病灶且状态为无法评估（2）
+        if (lesionType === 0 && lesionState === 2) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 不需要添加标记
+            if (measureData) {
+              // 评估状态为无法评估的淋巴结靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg27'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 不需要添加标记
+            if (measureData) {
+              // 状态为无法评估的非淋巴结靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg28'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 靶病灶且状态为消失（3）
+        if (lesionType === 0 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            if (!(measureData && (measureData.markTool === 'Bidirectional' && lesionShort < 10))) {
+              // `评估状态为消失的淋巴结靶病灶需使用长短径工具添加标记,且短径需小于10mm！`
+              this.$confirm(this.$t('trials:reading:warnning:msg29'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 箭头工具
+            if (!(measureData && measureData.markTool === 'ArrowAnnotate')) {
+              // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg30'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
+              const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
+              this.$set(innerForm, lengthId, 0)
+              lesionLength = 0
+            }
+          }
+        }
+
+        // 非靶病灶且状态为存在（0）
+        if (lesionType === 1 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg31'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg32'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为显著增大（1）
+        if (lesionType === 1 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleRoi'))) {
+              // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg33'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleRoi'))) {
+              // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg34'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为无法评估（2）
+        if (lesionType === 1 && lesionState === 2) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 无标记
+            if (measureData) {
+              // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg35'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 无标记
+            if (measureData) {
+              // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg36'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为消失（3）
+        if (lesionType === 1 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg37'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 箭头工具
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg38'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为存在（0）
+        if (lesionType === 2 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg39'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为存在的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg40'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为疑似（1）
+        if (lesionType === 2 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg41'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'ArrowAnnotate'))) {
+              // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg42'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为无法评估（2）
+        if (lesionType === 2 && lesionState === 2) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (measureData) {
+              // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg43'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (measureData) {
+              // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg44'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为消失（3）
+        if (lesionType === 2 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg45'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 箭头工具
+            if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg46'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+      }
+      // 获取截图
+      const obj = Object.assign({}, measureData)
+      obj.visitTaskId = this.visitTaskId
+      obj.lesionName = innerForm.LesionName
+      let picturePath = ''
+      if (measureData) {
+        const base64Str = await this.getScreenshots(obj)
+        const pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, base64Str)
+        picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+      }
+      const answers = []
+      const reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+      for (const k in innerForm) {
+        if (reg.test(k)) {
+          if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+            answers.push({ tableQuestionId: k, answer: innerForm[k] })
+          }
+        }
+      }
+      const params = {
+        questionId: table.Id,
+        rowId: innerForm.RowId,
+        rowIndex: innerForm.RowIndex,
+        visitTaskId: this.visitTaskId,
+        trialId: this.$route.query.trialId,
+        measureData: measureData ? JSON.stringify(measureData) : '',
+        answerList: answers,
+        isCanEditPosition: innerForm.IsCanEditPosition,
+        studyId: measureData ? measureData.studyId : '',
+        seriesId: measureData ? measureData.seriesId : '',
+        instanceId: measureData ? measureData.instanceId : '',
+        numberOfFrames: measureData ? measureData.frame : 0,
+        picturePath: picturePath,
+        organInfoId: innerForm.OrganInfoId,
+        markTool: measureData ? measureData.markTool : '',
+        isDicomReading: innerForm.IsDicomReading
+      }
+      if (this.deleteTargetInfo && this.deleteTargetInfo.newLesionName === innerForm.LesionName) {
+        await deleteReadingRowAnswer({
+          visitTaskId: this.visitTaskId,
+          questionId: this.deleteTargetInfo.tableId,
+          rowId: this.deleteTargetInfo.rowId
+        })
+        this.deleteTargetInfo = null
+        params.rowId = ''
+      }
+      const res = await submitTableQuestion(params)
+      if (res.IsSuccess) {
+        // 保存成功！
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.getTableQuestions()
+        this.$emit('getAnnotations', this.visitTaskId)
+      }
+      loading.close()
+    },
+    // 上传截图
+    async uploadScreenshots(fileName, file) {
+      try {
+        file = this.convertBase64ToBlob(file)
+        const trialId = this.$route.query.trialId
+        const subjectId = this.taskInfo.SubjectId
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        return { isSuccess: true, result: result }
+      } catch (e) {
+        console.log(e)
+        return { isSuccess: false, result: e }
+      }
+    },
+    convertBase64ToBlob(imageEditorBase64) {
+      const base64Arr = imageEditorBase64.split(',')
+      let imgtype = ''
+      let base64String = ''
+      if (base64Arr.length > 1) {
+        base64String = base64Arr[1]
+        imgtype = base64Arr[0].substring(
+          base64Arr[0].indexOf(':') + 1,
+          base64Arr[0].indexOf(';')
+        )
+      }
+      const bytes = atob(base64String)
+      const bytesCode = new ArrayBuffer(bytes.length)
+      const byteArray = new Uint8Array(bytesCode)
+      for (let i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
+      }
+      return new Blob([bytesCode], { type: imgtype })
+    },
+    // 获取截图
+    getScreenshots(obj) {
+      return new Promise((resolve, reject) => {
+        obj.visitTaskId = this.visitTaskId
+        this.$emit('getScreenshots', obj, resolve) // 将resolve传递给父组件
+      })
+    },
+    // 更新表格问题表单信息
+    innerFormDataUpdate(obj) {
+      const innerForm = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+      if (innerForm === undefined || typeof innerForm !== 'object') return
+      this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], obj.questionId, obj.val)
+      // QuestionMark：0--长径；1--短径；2--是否淋巴结；5--所在器官；7--状态；8--所在部位；21--典型肝内病灶
+      if (obj.questionMark === 0) {
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionLength', obj.val)
+      }
+      if (obj.questionMark === 1) {
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionShort', obj.val)
+      }
+
+      if (obj.questionMark === 7) {
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionState', obj.val)
+      }
+      if (obj.questionMark === 8) {
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionPart', obj.val)
+      }
+      if (obj.questionMark === 21) {
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'IntrahepaticLesion', obj.val)
+        if (innerForm.LesionType === 2) {
+          this.setNewTargetState(obj.tableId, obj.rowIndex)
+        }
+      }
+      if (obj.updateArr) {
+        obj.updateArr.forEach(i => {
+          this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], i.questionId, i.val)
+          if (i.questionMark === 2) {
+            this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'IsLymphNodes', i.val)
+          } else if (i.questionMark === 5) {
+            this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionOrgan', i.val)
+            if (innerForm.LesionType === 2) {
+              this.setNewTargetState(obj.tableId, obj.rowIndex)
+            }
+          }
+        })
+      }
+
+      const rowId = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].RowId
+      this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'SaveTypeEnum', rowId ? 1 : 0)
+    },
+    setNewTargetState(tableId, rowIndex) {
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.Id === tableId
+      )
+      if (typeof targetTable !== 'object') return
+      // 新病灶的器官为肝脏时,如果是典型肝内病灶，当直径≥1cm时自动设置病灶状态为“明确”（0），当直径<1cm时，自动设置病灶状态为“疑似”（1）；
+      const lesionOrgan = this.innerFormData[`${tableId}_${rowIndex}`].LesionOrgan
+      const lesionLength = this.innerFormData[`${tableId}_${rowIndex}`].LesionLength
+      const intrahepaticLesion = this.innerFormData[`${tableId}_${rowIndex}`].IntrahepaticLesion
+      const stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
+      if ((lesionOrgan === '肝脏' || lesionOrgan === 'Liver') && intrahepaticLesion) {
+        if (lesionLength >= 10) {
+          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0)
+          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)
+        } else {
+          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 1)
+          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 1)
+        }
+      }
+    },
+    handleCollapseChange(v) {
+      if (!v) return
+      const tableId = v.split('_')[0]
+      const rowIndex = v.split('_')[1]
+      const innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+      // if (!innerForm.MeasureData) return
+      const obj = Object.assign({ visitTaskId: this.visitTaskId }, innerForm.MeasureData)
+      obj.lesionName = innerForm.LesionName
+      obj.markTool = innerForm.MarkTool ? innerForm.MarkTool : ''
+      obj.isMarked = !!innerForm.MeasureData
+      if (this.visitTaskId === this.taskInfo.VisitTaskId) {
+        obj.isActiveTarget = true
+      }
+      this.$emit('imageLocation', obj)
+    },
+    collapseRightClick(e, tableId, rowIndex) {
+      const innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+      if (!innerForm.MeasureData) return
+      const obj = Object.assign({ visitTaskId: this.visitTaskId }, innerForm.MeasureData)
+      obj.lesionName = innerForm.LesionName
+      this.$emit('imageLocation', obj)
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    // 病灶分裂
+    async lesionSplit(tableId, rowId) {
+      try {
+        // 判断是否有病灶未保存
+        const obj = Object.values(this.innerFormData).find(
+          obj => !obj.RowId
+        )
+        if (obj !== undefined && typeof obj === 'object') {
+          let msg = this.$t('trials:reading:warnning:msg5')
+          msg = msg.replace('xxx', obj.LesionName)
+
+          this.$confirm(msg, {
+            type: 'warning',
+            showCancelButton: false,
+            callback: action => {}
+          })
+          return
+        }
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg4'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        console.log(confirm)
+        if (confirm !== 'confirm') return
+        this.split(tableId, rowId)
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    async split(tableId, rowId) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: tableId,
+          rowId: rowId
+        }
+        await splitLesion(params)
+        await this.getTableQuestions()
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    // 重置表单
+    async resetForm() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        if (res.IsSuccess) {
+          // 刷新标注、表单、报告页信息
+          this.activeName = ''
+          this.getOuterQuestions()
+          this.getTableQuestions()
+          this.$emit('resetAnnotations', this.visitTaskId)
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    getMaxRowIndex(answers) {
+      if (answers.length > 0) {
+        const arr = []
+        answers.forEach(item => {
+          var rowIndex = item.RowIndex
+          arr.push(parseInt(rowIndex))
+        })
+        const max = Math.max.apply(null, arr)
+        return max
+      } else {
+        return 0
+      }
+    },
+    getQuestionId(questionMark, tableQuestions) {
+      const idx = tableQuestions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        return tableQuestions[idx].Id
+      } else {
+        return ''
+      }
+    },
+    // 获取病灶名称
+    getLesionName(orderMark, rowIndex) {
+      let lessionName = ''
+      const rowIndexArr = rowIndex.split('.')
+      const x = parseInt(rowIndexArr[0])
+      let y = parseInt(rowIndexArr[1])
+      if (y > 0) {
+        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
+      } else {
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
+      }
+
+      return lessionName
+    },
+    // 查看反馈记录
+    openFeedBackTable() {
+      this.$FB({
+        type: 'imgfail',
+        trialId: this.$route.query.trialId,
+        visitTaskId: this.visitTaskId,
+        callBack: async() => {
+          const confirm = await this.$confirm(
+            this.$t('trials:reading:confirm:feedbackmsg'),
+            {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            }
+          )
+          if (confirm !== 'confirm') return
+          this.loading = true
+          try {
+            const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
+            this.loading = false
+            if (res.IsSuccess) {
+              window.location.reload()
+            }
+          } catch (e) {
+            this.loading = false
+            console.log(e)
+          }
+        }
+      })
+    },
+    // 病灶类型切换
+    lesionTypeChange(obj) {
+      const innerForm = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+      // 判断是否存在未保存的病灶，否则不允许添加
+      const formData = Object.values(this.innerFormData).find(
+        obj => !obj.RowId && obj.LesionName !== innerForm.LesionName
+      )
+      if (formData !== undefined && typeof formData === 'object') {
+        let msg = this.$t('trials:reading:warnning:msg5')
+        msg = msg.replace('xxx', formData.LesionName)
+
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
+        return
+      }
+
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.LesionType === obj.newLesionType
+      )
+      if (typeof targetTable !== 'object') return
+      // 判断当前病灶类型下的病灶个数是否超过最大行数，否则不允许添加
+      if (!!targetTable.MaxQuestionCount && targetTable.MaxQuestionCount <= targetTable.TableQuestions.Answers.length) {
+        let msg = this.$t('trials:reading:warnning:msg14')
+        msg = msg.replace('xxx', targetTable.MaxQuestionCount)
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
+        return
+      }
+      // 基线时，切换为靶病灶时：1.如果存在标注，标注只能是用直径和长短径标注；2.非dicom文件的标注不能作为靶病灶。提示：当前病灶不允许设置为靶病灶
+      if ((this.isBaseLineTask || innerForm.IsDicomReading === false) && innerForm.MeasureData && innerForm.MeasureData.markTool === 'ArrowAnnotate' && obj.newLesionType === 0) {
+        // 当前病灶不允许设置为靶病灶
+        this.$confirm(this.$t(' trials:reading:warnning:msg15'), {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
+        return
+      }
+      // 移除当前病灶
+      this.removeAnswer(obj.tableId, obj.rowIndex)
+      delete this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+      // 添加新病灶
+      const answer = Object.assign({}, this.innerFormData[targetTable.Id])
+      answer.RowId = ''
+      const maxIndex = this.getMaxRowIndex(targetTable.TableQuestions.Answers)
+      answer.RowIndex = `${maxIndex + 1}.00`
+      answer.IsDicomReading = true
+      answer.SaveTypeEnum = 0
+      answer.LesionType = targetTable.LesionType
+      answer.LesionName = this.getLesionName(targetTable.OrderMark, answer.RowIndex)
+      answer.TableId = targetTable.Id
+      let state = null
+      if (this.isBaseLineTask && targetTable.LesionType === 0) {
+        state = 0
+      }
+      if (this.isBaseLineTask && targetTable.LesionType === 1) {
+        state = 0
+      }
+      let lesionLength = null
+      let lesionShort = null
+      if (innerForm.MeasureData) {
+        // 有标记时保留标记（标记需要修改标注名称）、短径、长径的值
+        lesionLength = innerForm.LesionLength ? innerForm.LesionLength : null
+        lesionShort = innerForm.LesionShort ? innerForm.LesionShort : null
+        this.$emit('setMarkName', {
+          annotationUID: innerForm.MeasureData.annotationUID,
+          name: answer.LesionName
+        })
+        answer.MeasureData = innerForm.MeasureData
+      }
+      const lengthId = this.getQuestionId(0, targetTable.TableQuestions.Questions)
+      answer[lengthId] = lesionLength
+      const shortId = this.getQuestionId(1, targetTable.TableQuestions.Questions)
+      answer[shortId] = lesionShort
+      const stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
+      answer[stateId] = state
+      targetTable.TableQuestions.Answers.push(answer)
+      this.innerFormData[`${targetTable.Id}_${answer.RowIndex}`] = answer
+      this.activeName = `${targetTable.Id}_${answer.RowIndex}`
+
+      if (innerForm.RowId) {
+        this.deleteTargetInfo = { rowId: innerForm.RowId, tableId: obj.tableId, newLesionName: answer.LesionName }
+      }
+    },
+    async closeInnerForm(obj) {
+      const innerForm = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+      if (innerForm === undefined || typeof innerForm !== 'object') return
+      if (!innerForm.RowId) {
+        // 当前病灶为新建病灶，未保存。如果关闭窗口，将会删除病灶信息，是否继续？
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg49'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        // 移除病灶信息
+        this.removeAnswer(obj.tableId, obj.rowIndex)
+        delete this.innerFormData[`${obj.tableId}_${obj.rowIndex}`]
+        // 移除标注信息
+        if (innerForm.MeasureData) {
+          const obj = Object.assign({}, innerForm.MeasureData)
+          this.$emit('removeAnnotation', obj)
+        }
+        // 关闭窗口
+        this.activeName = ''
+      } else {
+        // 关闭窗口
+        this.activeName = ''
+      }
+    },
+    changeLesionState(state) {
+      Object.values(this.innerFormData).forEach(i => {
+        console.log(i)
+      })
+    },
+    removeAnswer(tableId, rowIndex) {
+      const targetTable = this.tableQuestions[0].Childrens.find(
+        child => child.Id === tableId
+      )
+      if (targetTable?.TableQuestions?.Answers) {
+        const originalAnswers = targetTable.TableQuestions.Answers
+        const index = originalAnswers.findIndex(item => item.RowIndex === rowIndex)
+        if (index > -1) {
+          targetTable.TableQuestions.Answers.splice(index, 1)
+        }
+      }
+    },
+    validTool(toolName) {
+      const obj = Object.values(this.innerFormData).find(
+        obj => !obj.RowId
+      )
+      if (typeof obj === 'object') {
+        if (this.activeName) {
+          const tableId = this.activeName.split('_')[0]
+          const rowIndex = this.activeName.split('_')[1]
+          const innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+          if (!innerForm.MeasureData) {
+            return this.checkToolCanActive(toolName)
+          } else {
+            let msg = this.$t('trials:reading:warnning:msg5')
+            msg = msg.replace('xxx', innerForm.LesionName)
+            // `病灶xxx信息未保存，不允许继续添加！`
+            return { isCanActiveTool: false, reason: msg }
+          }
+        } else {
+          let msg = this.$t('trials:reading:warnning:msg5')
+          msg = msg.replace('xxx', obj.LesionName)
+          // `病灶xxx信息未保存，不允许继续添加！`
+          return { isCanActiveTool: false, reason: msg }
+        }
+      } else {
+        if (this.activeName) {
+          return this.checkToolCanActive(toolName)
+        } else {
+          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) {
+            return { isCanActiveTool: true, reason: '' }
+          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) {
+            return { isCanActiveTool: true, reason: '' }
+          } else if (this.isBaseLineTask && toolName === 'ArrowAnnotate') {
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
+          } else {
+            return { isCanActiveTool: false, reason: '' }
+          }
+        }
+      }
+    },
+    checkToolCanActive(toolName) {
+      const tableId = this.activeName.split('_')[0]
+      const rowIndex = this.activeName.split('_')[1]
+      const innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+      const isLymphNodes = innerForm.IsLymphNodes
+      if (!innerForm.MeasureData) {
+        if (this.isBaseLineTask) {
+          if (innerForm.LesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
+            // '淋巴结靶病灶需使用长短径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg6') }
+          } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length') {
+            // '非淋巴结靶病灶需使用直径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg7') }
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi') {
+            // '淋巴结非靶病灶需使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg8') }
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleRoi') {
+            // '非淋巴结非靶病灶需使用直径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg9') }
+          } else if (toolName === 'ArrowAnnotate') {
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
+          } else {
+            return { isCanActiveTool: true, reason: '' }
+          }
+        } else {
+          if (innerForm.LesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 淋巴结靶病灶需使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg10') }
+          } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') {
+            // 非淋巴结靶病灶需使用直径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg11') }
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // 淋巴结非靶病灶需使用长短径测量工具或矩形工具或矩形工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg52') }
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // 非淋巴结非靶病灶需使用直径测量工具或矩形工具或矩形工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg53') }
+          } else if (innerForm.LesionType === 2 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 淋巴结新病灶需使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg12') }
+          } else if (innerForm.LesionType === 2 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') {
+            // 非淋巴结新病灶需使用直径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg13') }
+          } else if (innerForm.LesionType === 2 && toolName !== 'Length' && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 新病灶需使用直径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg51') }
+          } else {
+            return { isCanActiveTool: true, reason: '' }
+          }
+        }
+      } else {
+        return { isCanActiveTool: true, reason: '' }
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.questionList-wrapper{
+  height: 100%;
+  overflow-y: auto;
+  // overflow: hidden;
+
+  .container{
+    padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
+  }
+  .outer_form_wrapper{
+    ::v-deep .el-form-item__label{
+      color: #c3c3c3;
+      text-align: left;
+    }
+    ::v-deep .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    ::v-deep .el-textarea__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+
+    ::v-deep .el-form-item{
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+    }
+    ::v-deep .el-form-item__content{
+      flex: 1;
+    }
+    ::v-deep .el-button--mini, .el-button--mini.is-round {
+      padding: 7px 10px;
+    }
+    ::v-deep .el-form-item__content
+    .el-select{
+      width: 100%;
+    }
+    .outer_form-footer{
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-end;
+      align-items: center;
+      .feedback-icon{
+        padding: 0 10px;
+        color: #fff;
+        font-weight: 400;
+        font-size: 22px;
+        cursor: pointer;
+        &:hover{
+          color: #68a2d5;
+        }
+      }
+    }
+
+  }
+  .title{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+
+  }
+  .add-icon{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+    border: 1px solid #938b8b;
+    margin-bottom: 2px;
+    cursor: pointer;
+  }
+  .add-icon:hover{
+    background-color: #607d8b;
+  }
+
+  .flex-row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #424242;
+
+  }
+  .lesion_list{
+    position: relative;
+  }
+  .el-collapse{
+    border-bottom:none;
+    border-top:none;
+    ::v-deep .el-collapse-item{
+      background-color: #000!important;
+      color: #ddd;
+
+    }
+    ::v-deep .el-collapse-item__header{
+      background-color: #000!important;
+      color: #ddd;
+      border-bottom-color:#5a5a5a;
+      padding-left: 5px;
+      height: 35px;
+      line-height: 35px;
+    }
+    ::v-deep .el-collapse-item__wrap{
+      background-color: #000!important;
+      color: #ddd;
+    }
+    ::v-deep .el-collapse-item__content{
+      width:260px;
+      position: absolute;
+      top: 0px;
+      right: 0px;
+      // border: 1px solid #ffeb3b;
+      border: 1px solid #fff;
+      z-index: 1;
+      color: #ddd;
+      padding: 5px;
+      background-color:#1e1e1e;
+    }
+
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
new file mode 100644
index 00000000..6f151adf
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
@@ -0,0 +1,360 @@
+<template>
+  <div class="table-question-form">
+    <div style="display: flex;justify-content: space-between;">
+      <h3 v-if="qsForm.LesionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
+        {{ qsForm.LesionName }}
+      </h3>
+      <!-- 关闭 -->
+      <div>
+        <i class="el-icon-circle-close" style="font-size: 25px;cursor: pointer;" @click="close" />
+      </div>
+    </div>
+    <el-form-item
+      :label="$t('trials:reading:title:lesionType')"
+      prop="LesionType"
+      :rules="[
+        { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
+      ]"
+    >
+      <!-- 下拉框 -->
+      <el-select
+        v-model="qsForm.LesionType"
+        filterable
+        :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask"
+        @change="((val)=>{lesionTypeChange(val)})"
+      >
+
+        <el-option
+          v-for="item of $d.LesionType"
+          v-show="!(isBaseLineTask && item.value === 2)"
+          :key="item.id"
+          :value="item.value"
+          :label="item.label"
+        />
+
+      </el-select>
+    </el-form-item>
+    <!-- 靶病灶、非靶病灶的器官为肝脏/Liver时,需要选择典型肝内病灶。该值默认为否；如果选择是，对于靶病灶需要提示“按照《独立影像评估章程》的相关规则，对于典型肝内靶病灶请测量肿瘤活性部分最长径。”，提示方式为在“长径”属性上，显示浮框或者增加！
+ -->
+    <el-form-item
+      v-for="qs in questions"
+      v-show="qs.ShowQuestion!==2"
+      :key="qs.Id"
+      :label="`${qs.QuestionName}`"
+      :prop="qs.Id"
+      :title="(qs.QuestionMark === 0 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1) && questionForm.IntrahepaticLesion) ? $t('trials:mRecist:warnning:msg1') : ''"
+      :rules="[
+        { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10) || (qs.QuestionMark === 21 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2)) || (qs.QuestionMark === 0 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2))) && qs.Type!=='group' && qs.Type!=='summary',
+          message:['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
+      ]"
+    >
+      <!-- 输入框 -->
+      <template v-if="qs.Type==='input' || qs.Type==='number'">
+
+        <el-input
+          v-if="qs.Type==='input' || qs.Type==='number'"
+          v-model="qsForm[qs.Id]"
+          :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName))"
+          @change="((val)=>{formItemChange(val, qs)})"
+        >
+          <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+          </template>
+        </el-input>
+      </template>
+      <!-- 多行文本输入框 -->
+      <el-input
+        v-if="qs.Type==='textarea'"
+        v-model="qsForm[qs.Id]"
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4}"
+        :disabled="!isCurrentTask || readingTaskState>=2"
+        @change="((val)=>{formItemChange(val, qs)})"
+      />
+      <!-- 下拉框 -->
+      <el-select
+        v-if="qs.Type==='select'"
+        v-model="qsForm[qs.Id]"
+        filterable
+        :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : qs.QuestionMark === 2 ? '' : $t('common:placeholder:select')"
+        :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName))"
+        @change="((val)=>{formItemChange(val, qs)})"
+      >
+        <template v-if="qs.QuestionMark === 8" #prefix>
+          <span style="padding-left: 5px;">
+            <i class="el-icon-search" />
+          </span>
+        </template>
+        <template v-if="qs.TableQuestionType === 1">
+          <el-option
+            v-for="item in organList"
+            :key="item.Id"
+            :label="item[qs.DataTableColumn]"
+            :value="item[qs.DataTableColumn]"
+          />
+        </template>
+        <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && isBaseLineTask">
+          <el-option
+            v-for="item of $d[qs.DictionaryCode]"
+            v-show="(lesionType === 0 && item.value ===0) || (lesionType === 1 && (item.value ===0))"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
+        </template>
+        <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && !isBaseLineTask">
+          <el-option-group
+            :label="!isNaN(parseFloat(answer.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode,parseFloat(answer.LastTaskState))}` : ''"
+          >
+            <!-- 首次分裂的病灶只能选择存在 -->
+            <template v-if="answer.IsFristAdd=== 'True' && answer.SplitOrMergeType === '0'">
+
+              <el-option
+                v-for="item of $d[qs.DictionaryCode]"
+                v-show="item.value === 0"
+                :key="item.id"
+                :value="item.value"
+                :label="item.label"
+              />
+            </template>
+            <!-- 首次添加的新病灶不能为无法评估和消失 -->
+            <template v-else-if="isCurrentTaskAdd=== 'True' && lesionType === 2">
+              <el-option
+                v-for="item of $d[qs.DictionaryCode]"
+                v-show="item.value === 0 || item.value === 1"
+                :key="item.id"
+                :value="item.value"
+                :label="item.label"
+              />
+            </template>
+            <template v-else>
+              <el-option
+                v-for="item of filterState($d[qs.DictionaryCode])"
+                :key="item.id"
+                :value="item.value"
+                :label="item.label"
+              />
+            </template>
+          </el-option-group>
+        </template>
+        <template v-else-if="qs.DictionaryCode && qs.QuestionMark !== 7">
+          <el-option
+            v-for="item of $d[qs.DictionaryCode]"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
+        </template>
+        <template v-else>
+          <el-option
+            v-for="val in qs.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+            :value="val"
+          />
+        </template>
+
+      </el-select>
+      <!-- 单选 -->
+      <el-radio-group
+        v-if="qs.Type==='radio'"
+        v-model="qsForm[qs.id]"
+        :disabled="!isCurrentTask || readingTaskState>=2"
+      >
+        <el-radio
+          v-for="val in qs.options.split('|')"
+          :key="val"
+          :label="val"
+        >
+          {{ val }}
+        </el-radio>
+      </el-radio-group>
+    </el-form-item>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TableQuestionFormItem',
+  props: {
+    tableInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    answer: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    questionForm: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    organs: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    isBaseLineTask: {
+      type: Boolean,
+      required: true
+    },
+    isCurrentTask: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      isCurrentTaskAdd: null,
+      lesionType: null,
+      questions: [],
+      organList: [],
+      qsForm: {}
+    }
+  },
+  watch: {
+    questionForm: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+        if (v.MeasureData) {
+          const { markTool } = v.MeasureData
+          if (markTool === 'Bidirectional') {
+            this.getOrganList(1)
+          } else if (markTool === 'Length') {
+            this.getOrganList(0)
+          } else {
+            this.getOrganList()
+          }
+        } else {
+          this.getOrganList()
+        }
+        for (const key in v) {
+          this.$set(this.qsForm, key, v[key])
+        }
+        this.isCurrentTaskAdd = v.IsCurrentTaskAdd
+      }
+    },
+    tableInfo: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+        if (v) {
+          this.lesionType = v.LesionType
+          this.questions = v.TableQuestions.Questions
+        }
+      }
+    }
+  },
+  methods: {
+    lesionTypeChange(v) {
+      this.$emit('lesionTypeChange', { tableId: this.tableInfo.Id, rowIndex: this.answer.RowIndex, newLesionType: v })
+    },
+    formItemChange(v, qs) {
+      const updateArr = []
+      if (qs.QuestionMark === 8 && qs.RelationQuestions.length > 0) {
+        // 当选择部位时，联动器官、位置、是否淋巴结问题答案
+        const index = this.organList.findIndex(item => item[qs.DataTableColumn] === v)
+        if (index > -1) {
+          const selected = this.organList[index]
+          qs.RelationQuestions.map(q => {
+            const val = selected[q.DataTableColumn]
+            updateArr.push({ questionId: q.Id, val: val, questionMark: q.QuestionMark })
+          })
+          updateArr.push({ questionId: 'OrganInfoId', val: selected.OrganInfoId })
+          updateArr.push({ questionId: 'IsCanEditPosition', val: selected.IsCanEditPosition })
+        } else {
+          qs.RelationQuestions.map(q => {
+            updateArr.push({ questionId: q.Id, val: '', questionMark: q.QuestionMark })
+          })
+        }
+      }
+      this.$emit('update', { tableId: this.tableInfo.Id, rowIndex: this.answer.RowIndex, questionMark: qs.QuestionMark, questionId: qs.Id, val: v, updateArr })
+    },
+    getOrganList(isLymphNodes = null) {
+      const idx = this.organs.findIndex(i => i.LesionType === this.questionForm.LesionType)
+      if (idx > -1) {
+        const arr = this.organs[idx].OrganList
+
+        if (!isNaN(parseInt(isLymphNodes))) {
+          this.organList = arr.filter((item) => item.IsLymphNodes === parseInt(isLymphNodes))
+        } else {
+          this.organList = arr
+        }
+      }
+    },
+    filterState(arr) {
+      if (!this.isBaseLineTask) {
+        const isLymphLesion = this.questionForm.IsLymphNodes
+        const lesionLength = this.questionForm.LesionLength
+        const lesionShort = this.questionForm.LesionShort
+        const bLesionL = !isNaN(parseFloat(this.questionForm.BaseLineMajorAxis)) ? parseFloat(this.questionForm.BaseLineMajorAxis) : 0
+        const bLesionS = !isNaN(parseFloat(this.questionForm.BaseLineShortAxis)) ? parseFloat(this.questionForm.BaseLineShortAxis) : 0
+        if (this.lesionType === 1 && isLymphLesion === 1 && this.questionForm.MeasureData && this.questionForm.MeasureData.markTool === 'Bidirectional' && lesionShort < bLesionS) {
+          arr = arr.filter(i => i.value !== 1)
+        } else if (this.lesionType === 1 && isLymphLesion === 1 && this.questionForm.MeasureData && this.questionForm.MeasureData.markTool === 'Bidirectional' && lesionShort >= 10 && lesionShort > bLesionS) {
+          arr = arr.filter(i => i.value === 0 || i.value === 1)
+        } else if (this.lesionType === 1 && isLymphLesion === 0 && this.questionForm.MeasureData && (this.questionForm.MeasureData.markTool === 'Length' || this.questionForm.MeasureData.markTool === 'Bidirectional') && lesionLength < bLesionL) {
+          arr = arr.filter(i => i.value !== 1)
+        }
+        return arr
+      } else {
+        return arr
+      }
+    },
+    close() {
+      this.$emit('close', { tableId: this.tableInfo.Id, rowIndex: this.answer.RowIndex })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.table-question-form{
+  ::v-deep .el-form-item__label{
+    color: #c3c3c3;
+  }
+  ::v-deep .el-input .el-input__inner{
+    background-color: transparent;
+    color: #ddd;
+    border: 1px solid #5e5e5e;
+  }
+  ::v-deep .el-form-item{
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+  }
+  ::v-deep .el-form-item__content{
+    flex: 1;
+  }
+  ::v-deep .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  ::v-deep .el-select.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  ::v-deep .el-button--mini, .el-button--mini.is-round {
+    padding: 7px 10px;
+  }
+  .el-form-item__content
+  .el-select{
+    width: 100%;
+  }
+  .input-width1{
+    width: calc(100% - 60px)!important;
+  }
+  .input-width2{
+    width: 100% !important;
+  }
+}
+
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
index 9427deb2..cb3461dd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
@@ -8,25 +8,33 @@ const config = {
           "name": "直径测量工具", 
           "icon": "length", 
           "toolName": "Length",
-          "i18nKey": "trials:reading:button:length"
+          "i18nKey": "trials:reading:button:length",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "长短径测量工具", 
           "icon": "bidirection", 
           "toolName": "Bidirectional",
-          "i18nKey": "trials:reading:button:bidirectional"
+          "i18nKey": "trials:reading:button:bidirectional",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "矩形工具", 
           "icon": "rectangle", 
           "toolName": "RectangleRoi",
-          "i18nKey": "trials:reading:button:rectangle"
+          "i18nKey": "trials:reading:button:rectangle",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "箭头工具", 
           "icon": "arrow", 
           "toolName": "ArrowAnnotate",
-          "i18nKey": "trials:reading:button:arrowAnnotate"
+          "i18nKey": "trials:reading:button:arrowAnnotate",
+          "isDisabled": false,
+          "disabledReason": ''
         }
       ]
     },
@@ -38,25 +46,33 @@ const config = {
           "name": "直径测量工具", 
           "icon": "length", 
           "toolName": "Length",
-          "i18nKey": "trials:reading:button:length"
+          "i18nKey": "trials:reading:button:length",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "长短径测量工具", 
           "icon": "bidirection", 
           "toolName": "Bidirectional",
-          "i18nKey": "trials:reading:button:bidirectional"
+          "i18nKey": "trials:reading:button:bidirectional",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "矩形工具", 
           "icon": "rectangle", 
           "toolName": "RectangleRoi",
-          "i18nKey": "trials:reading:button:rectangle"
+          "i18nKey": "trials:reading:button:rectangle",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "箭头工具", 
           "icon": "arrow", 
           "toolName": "ArrowAnnotate",
-          "i18nKey": "trials:reading:button:arrowAnnotate"
+          "i18nKey": "trials:reading:button:arrowAnnotate",
+          "isDisabled": false,
+          "disabledReason": ''
         }
       ]
     },
@@ -68,25 +84,33 @@ const config = {
           "name": "直径测量工具", 
           "icon": "length", 
           "toolName": "Length",
-          "i18nKey": "trials:reading:button:length"
+          "i18nKey": "trials:reading:button:length",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "长短径测量工具", 
           "icon": "bidirection", 
           "toolName": "Bidirectional",
-          "i18nKey": "trials:reading:button:bidirectional"
+          "i18nKey": "trials:reading:button:bidirectional",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "矩形工具", 
           "icon": "rectangle", 
           "toolName": "RectangleRoi",
-          "i18nKey": "trials:reading:button:rectangle"
+          "i18nKey": "trials:reading:button:rectangle",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "箭头工具", 
           "icon": "arrow", 
           "toolName": "ArrowAnnotate",
-          "i18nKey": "trials:reading:button:arrowAnnotate"
+          "i18nKey": "trials:reading:button:arrowAnnotate",
+          "isDisabled": false,
+          "disabledReason": ''
         }
       ]
     },
@@ -98,25 +122,33 @@ const config = {
           "name": "直径测量工具", 
           "icon": "length", 
           "toolName": "Length",
-          "i18nKey": "trials:reading:button:length"
+          "i18nKey": "trials:reading:button:length",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "长短径测量工具", 
           "icon": "bidirection", 
           "toolName": "Bidirectional",
-          "i18nKey": "trials:reading:button:bidirectional"
+          "i18nKey": "trials:reading:button:bidirectional",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "矩形工具", 
           "icon": "rectangle", 
           "toolName": "RectangleRoi",
-          "i18nKey": "trials:reading:button:rectangle"
+          "i18nKey": "trials:reading:button:rectangle",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "箭头工具", 
           "icon": "arrow", 
           "toolName": "ArrowAnnotate",
-          "i18nKey": "trials:reading:button:arrowAnnotate"
+          "i18nKey": "trials:reading:button:arrowAnnotate",
+          "isDisabled": false,
+          "disabledReason": ''
         }
       ]
     },
@@ -128,13 +160,17 @@ const config = {
           "name": "矩形工具", 
           "icon": "rectangle", 
           "toolName": "RectangleRoi",
-          "i18nKey": "trials:reading:button:rectangle"
+          "i18nKey": "trials:reading:button:rectangle",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "箭头工具", 
           "icon": "arrow", 
           "toolName": "ArrowAnnotate",
-          "i18nKey": "trials:reading:button:arrowAnnotate"
+          "i18nKey": "trials:reading:button:arrowAnnotate",
+          "isDisabled": false,
+          "disabledReason": ''
         }
       ]
     },
@@ -146,19 +182,25 @@ const config = {
           "name": "直径测量工具", 
           "icon": "length", 
           "toolName": "Length",
-          "i18nKey": "trials:reading:button:length"
+          "i18nKey": "trials:reading:button:length",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "矩形工具", 
           "icon": "rectangle", 
           "toolName": "RectangleRoi",
-          "i18nKey": "trials:reading:button:rectangle"
+          "i18nKey": "trials:reading:button:rectangle",
+          "isDisabled": false,
+          "disabledReason": ''
         },
         { 
           "name": "箭头工具", 
           "icon": "arrow", 
           "toolName": "ArrowAnnotate",
-          "i18nKey": "trials:reading:button:arrowAnnotate"
+          "i18nKey": "trials:reading:button:arrowAnnotate",
+          "isDisabled": false,
+          "disabledReason": ''
         }
       ]
     },
@@ -180,7 +222,9 @@ const config = {
           "name": "圆形测量", 
           "icon": "oval", 
           "toolName": "Probe",
-          "i18nKey": "trials:reading:button:circle"
+          "i18nKey": "trials:reading:button:circle",
+          "isDisabled": false,
+          "disabledReason": ''
         }
       ]
     }