From b2e7eeaeb4bbad564c8eb3257dba8c4f510bd832 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 10 Oct 2025 11:05:29 +0800
Subject: [PATCH 001/333] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=97=E8=AF=95?=
 =?UTF-8?q?=E8=80=85=E4=B8=AD=E6=AD=A2=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/visit/crc-upload/index.vue | 7 +++++++
 src/views/trials/trials-panel/visit/qc-check/index.vue   | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 32801c55..becf5cee 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -37,6 +37,12 @@
             <el-option v-for="item of $d.SubmitState" :value="item.value" :label="item.label" :key="item.label" />
           </el-select>
         </el-form-item>
+        <!-- 受试者中止状态 -->
+        <el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:IsSubjectQuit')">
+          <el-select v-model="searchData.IsSubjectQuit" clearable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 审核状态 -->
         <el-form-item style="margin-bottom: 10px" v-if="otherInfo.QCProcessEnum !== 0"
           :label="$t('trials:crcUpload:table:auditState')">
@@ -868,6 +874,7 @@ const searchDataDefault = () => {
     AuditStateArray: [],
     SubmitState: null,
     ChallengeState: null,
+    IsSubjectQuit: "",
     // SortField: '',
     // Asc: false
   }
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index e6b389fa..2de0864b 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -31,7 +31,12 @@
             <el-option key="Other" label="Out of Plan" value="1.11" />
           </el-select>
         </el-form-item>
-
+        <!-- 受试者中止状态 -->
+        <el-form-item style="margin-bottom: 10px" :label="$t('trials:qcCheck:table:IsSubjectQuit')">
+          <el-select v-model="searchData.IsSubjectQuit" clearable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 审核状态 -->
         <el-form-item v-if="OtherInfo.QCProcessEnum !== 0" :label="$t('trials:qcCheck:table:auditState')"
           class="my_multiple">
@@ -652,6 +657,7 @@ const searchDataDefault = () => {
     EndAuditTime: null,
     PageIndex: 1,
     PageSize: 20,
+    IsSubjectQuit: ''
     // SortField: '',
     // Asc: false
   }

From d64d5a523d09237b895c4e5462df58effcc93f59 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 10 Oct 2025 11:26:18 +0800
Subject: [PATCH 002/333] =?UTF-8?q?=E5=9C=A8=E6=8A=A5=E5=91=8A=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E9=99=84=E4=BB=B6=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=AF=84=E4=BC=B0=E5=92=8C=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AdditionalAssessment.vue       |  28 +-
 .../dicoms/components/AssessmentFormItem.vue  |  80 ++---
 .../reading/dicoms/components/ReportPage.vue  | 338 ++++++++----------
 .../dicoms3D/components/ReportPage.vue        | 336 ++++++++---------
 4 files changed, 349 insertions(+), 433 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue b/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
index e342b6f4..c5fb4570 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
@@ -1,10 +1,5 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="assessmentForm"
-    :model="form"
-    size="small"
-  >
+  <el-form v-if="isRender" ref="assessmentForm" :model="form" size="small">
     <div class="base-dialog-body">
       <!-- <div v-for="qs in questions" :key="qs.Id">
         <h4 v-if="qs.Type === 'group'">{{ qs.GroupName }}</h4>
@@ -42,14 +37,9 @@
           </el-select>
         </el-form-item>
       </div> -->
-      <AssessmentFormItem
-        v-for="question of questions"
-        :key="question.Id"
-        :question="question"
-        :question-form="form"
-        @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData"
-      />
+      <AssessmentFormItem v-for="question of questions" :key="question.Id" :question="question" :question-form="form"
+        :readingTaskState="readingTaskState" @setFormItemData="setFormItemData"
+        @resetFormItemData="resetFormItemData" />
 
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@@ -57,11 +47,7 @@
         <el-button size="small" @click="handleCancel">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button
-          size="small"
-          type="primary"
-          @click="handleSave"
-        >
+        <el-button size="small" type="primary" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -85,6 +71,10 @@ export default {
       default() {
         return []
       }
+    },
+    readingTaskState: {
+      type: Number,
+      default: 0
     }
   },
   data() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
index 36420049..19d5910b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
@@ -1,67 +1,39 @@
 <template>
   <div>
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;font-size: 15px;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ language === 'en' ? question.GroupEnName : question.GroupName }}
       </h4>
     </div>
     <template v-else>
-      <el-form-item
-        :label="`${language==='en'?question.QuestionEnName:question.QuestionName}`"
-        :prop="question.Id"
-        :rules="[
-          { required: true,
-            message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']},
-        ]"
-        :class="[question.Type==='group'?'mb':'']"
-      >
+      <el-form-item :label="`${language === 'en' ? question.QuestionEnName : question.QuestionName}`"
+        :prop="question.Id" :rules="[
+          {
+            required: true,
+            message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']
+          },
+        ]" :class="[question.Type === 'group' ? 'mb' : '']">
         <!-- 下拉框 -->
-        <el-select
-          v-if="question.Type==='select'"
-          v-model="questionForm[question.Id]"
-          clearable
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+        <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState > 2">
           <template v-if="question.DictionaryCode">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :value="String(item.value)"
-              :label="item.label"
-            />
+            <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"
-            />
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
           </template>
         </el-select>
         <!-- 单选 -->
-        <el-radio-group
-          v-if="question.Type==='radio'"
-          v-model="questionForm[question.Id]"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+        <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState > 2">
           <template v-if="question.DictionaryCode">
-            <el-radio
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :label="String(item.value)"
-            >
+            <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"
-            >
+            <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
               {{ val }}
             </el-radio>
           </template>
@@ -69,14 +41,8 @@
       </el-form-item>
     </template>
 
-    <AssessmentFormItem
-      v-for="(item) in question.Childrens"
-      :key="item.Id"
-      :question="item"
-      :question-form="questionForm"
-      @setFormItemData="setFormItemData"
-      @resetFormItemData="resetFormItemData"
-    />
+    <AssessmentFormItem v-for="(item) in question.Childrens" :key="item.Id" :question="item"
+      :question-form="questionForm" @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
   </div>
 </template>
 <script>
@@ -95,6 +61,10 @@ export default {
       default() {
         return []
       }
+    },
+    readingTaskState: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -139,7 +109,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index c5cb3365..df82f47b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -5,87 +5,49 @@
         <!-- 电子影像病例报告表（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"
-          >
+          <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 type="primary" size="small" v-if="isBaseline && assessmentQuestions.length > 0"
+            @click="openAssessment">
+            <!-- 附加评估 -->
+            {{ $t('trials:readingReport:button:assessment') }}
+          </el-button>
+          <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)"
-          >
+          <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)"
-          >
+          <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"
-          >
+          <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"
-          >
+        <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 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"
-          >
+          <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>
@@ -102,58 +64,37 @@
               </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)">
+              <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"
-                      />
+                  <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-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]"
+                        <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"
-                        />
+                          :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]"
+                        <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"
-                        />
+                          :key="item.id" :value="item.value" :label="item.label" />
                       </template>
                       <template v-else>
-                        <el-option
-                          v-for="item of $d[ scope.row.DictionaryCode]"
+                        <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"
-                        />
+                          :key="item.id" :value="item.value" :label="item.label" />
                       </template>
                     </el-select>
                   </template>
@@ -162,27 +103,23 @@
                   </template> -->
                   <!-- 访视点备注（是否存在疾病与系统不一致或者整体肿瘤评估与系统不一致时，必填） -->
                   <!-- tumorEvaluate && task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 && (currentEvaluateResult !== tumorEvaluate || currentExistDisease !== isExistDisease) -->
-                  <template v-else-if="task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 ">
+                  <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"
-                      />
+                      <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 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>
@@ -198,35 +135,50 @@
                   </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>
+                <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>
+                <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 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]}` }}
+                  {{
+                    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>
+                  <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]}%` }}
+                  {{
+                    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] }}
@@ -238,31 +190,17 @@
       </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 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"
-    >
+    <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>
+        <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>
@@ -324,7 +262,11 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['language'])
+    ...mapGetters(['language']),
+    isBaseline() {
+      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+      return this.visitTaskList[i].IsBaseLine
+    }
   },
   watch: {
     taskQuestions() {
@@ -440,6 +382,7 @@ export default {
           this.setScrollTop()
         }
         this.loading = false
+        await this.getTaskAdditionalQuestion()
       } catch (e) {
         this.loading = false
         console.log(e)
@@ -467,7 +410,7 @@ export default {
             } else {
               this.expandedRows.push(item.Id)
             }
-            
+
           } else {
             this.expandedRows.push(item.Id)
           }
@@ -651,6 +594,25 @@ export default {
         this.answerArr[idx].answer = val
       }
     },
+    async getTaskAdditionalQuestion() {
+      try {
+        const res = await getTaskAdditionalQuestion({ visitTaskId: this.visitTaskId })
+        this.assessmentQuestions = res.Result
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async openAssessment() {
+      try {
+        await this.getTaskAdditionalQuestion()
+        if (this.assessmentQuestions.length > 0) {
+          // 打开附加评估框
+          this.additionalAssessmentsDig.visible = true
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     async handleConfirm() {
       this.loading = true
       try {
@@ -662,7 +624,7 @@ export default {
           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
@@ -776,7 +738,7 @@ export default {
       this.openWindow = window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         var isBeill
         var evaluateResult = ''
         var evaluateAjustReason = ''
@@ -800,7 +762,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg2'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           reject()
           return
@@ -810,7 +772,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg2'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           reject()
           return
@@ -820,7 +782,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg3'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           reject()
           return
@@ -882,29 +844,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.report-wrapper{
+.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{
+
+  .report-header {
     display: flex;
   }
-  .el-card{
-    display:flex;flex-direction: column;height: 100%;
+
+  .el-card {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
     background-color: #000;
     color: #ffffff;
-    border:none;
-    ::v-deep .el-card__body{
+    border: none;
+
+    ::v-deep .el-card__body {
       flex: 1;
     }
   }
@@ -922,42 +891,51 @@ export default {
   //   color: #ffffff;
   // }
 
-  ::v-deep .el-table, .el-table__expanded-cell {
+  ::v-deep .el-table,
+  .el-table__expanded-cell {
     background-color: #000;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
 
-  ::v-deep .el-table th, .el-table tr {
+  ::v-deep .el-table th,
+  .el-table tr {
     background-color: #000;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table__body tr > td{
-    background-color:#000 !important;
+
+  ::v-deep .el-table__body tr>td {
+    background-color: #000 !important;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table__body tr:hover > td{
-    background-color:#858282 !important;
+
+  ::v-deep .el-table__body tr:hover>td {
+    background-color: #858282 !important;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table--border th.gutter:last-of-type{
+
+  ::v-deep .el-table--border th.gutter:last-of-type {
     border: none;
   }
-  ::v-deep .el-card__header{
+
+  ::v-deep .el-card__header {
     border: none;
     padding: 10px;
   }
 }
-::v-deep .el-switch__label{
-  color:#fff;
+
+::v-deep .el-switch__label {
+  color: #fff;
 }
-::v-deep .el-switch__label.is-active{
+
+::v-deep .el-switch__label.is-active {
   color: #428bca;
 }
-.colorOfRed{
+
+.colorOfRed {
   color: #f66;
 }
 </style>
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 ea6cb647..4adf0b6e 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -5,87 +5,49 @@
         <!-- 电子影像病例报告表（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"
-          >
+          <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 type="primary" size="small" v-if="isBaseline && assessmentQuestions.length > 0"
+            @click="openAssessment">
+            <!-- 附加评估 -->
+            {{ $t('trials:readingReport:button:assessment') }}
+          </el-button>
+          <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)"
-          >
+          <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)"
-          >
+          <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"
-          >
+          <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"
-          >
+        <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 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"
-          >
+          <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>
@@ -102,58 +64,37 @@
               </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)">
+              <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"
-                      />
+                  <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-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]"
+                        <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"
-                        />
+                          :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]"
+                        <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"
-                        />
+                          :key="item.id" :value="item.value" :label="item.label" />
                       </template>
                       <template v-else>
-                        <el-option
-                          v-for="item of $d[ scope.row.DictionaryCode]"
+                        <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"
-                        />
+                          :key="item.id" :value="item.value" :label="item.label" />
                       </template>
                     </el-select>
                   </template>
@@ -162,27 +103,23 @@
                   </template> -->
                   <!-- 访视点备注（是否存在疾病与系统不一致或者整体肿瘤评估与系统不一致时，必填） -->
                   <!-- tumorEvaluate && task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 && (currentEvaluateResult !== tumorEvaluate || currentExistDisease !== isExistDisease) -->
-                  <template v-else-if="task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 ">
+                  <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"
-                      />
+                      <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 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>
@@ -198,35 +135,50 @@
                   </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>
+                <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>
+                <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 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]}` }}
+                  {{
+                    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>
+                  <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]}%` }}
+                  {{
+                    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] }}
@@ -238,31 +190,17 @@
       </div>
     </el-card>
     <!-- 附加评估 -->
-    <el-dialog
-      v-if="additionalAssessmentsDig.visible"
-      :visible.sync="additionalAssessmentsDig.visible"
-      :close-on-click-modal="false"
-      :title="additionalAssessmentsDig.title"
-      width="600px"
-    >
-      <additional-assessment
-        :questions="assessmentQuestions"
-        :visit-task-id="visitTaskId"
-        @close="additionalAssessmentsDig.visible = false"
-        @sign="sign"
-      />
+    <el-dialog v-if="additionalAssessmentsDig.visible" :visible.sync="additionalAssessmentsDig.visible"
+      :close-on-click-modal="false" :title="additionalAssessmentsDig.title" width="600px">
+      <additional-assessment :questions="assessmentQuestions" :visit-task-id="visitTaskId"
+        :readingTaskState="readingTaskState" @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"
-    >
+    <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>
+        <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>
@@ -314,7 +252,11 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['language'])
+    ...mapGetters(['language']),
+    isBaseline() {
+      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+      return this.visitTaskList[i].IsBaseLine
+    }
   },
   watch: {
     taskQuestions() {
@@ -395,6 +337,7 @@ export default {
           this.setScrollTop()
         }
         this.loading = false
+        await this.getTaskAdditionalQuestion()
       } catch (e) {
         this.loading = false
         console.log(e)
@@ -605,6 +548,25 @@ export default {
         this.answerArr[idx].answer = val
       }
     },
+    async getTaskAdditionalQuestion() {
+      try {
+        const res = await getTaskAdditionalQuestion({ visitTaskId: this.visitTaskId })
+        this.assessmentQuestions = res.Result
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async openAssessment() {
+      try {
+        await this.getTaskAdditionalQuestion()
+        if (this.assessmentQuestions.length > 0) {
+          // 打开附加评估框
+          this.additionalAssessmentsDig.visible = true
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     async handleConfirm() {
       this.loading = true
       try {
@@ -616,7 +578,7 @@ export default {
           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
@@ -724,7 +686,7 @@ export default {
       this.openWindow = window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         var isBeill
         var evaluateResult = ''
         var evaluateAjustReason = ''
@@ -748,7 +710,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg2'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           resolve()
           return
@@ -758,7 +720,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg2'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           resolve()
           return
@@ -768,7 +730,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg3'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           resolve()
           return
@@ -833,29 +795,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.report-wrapper{
+.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{
+
+  .report-header {
     display: flex;
   }
-  .el-card{
-    display:flex;flex-direction: column;height: 100%;
+
+  .el-card {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
     background-color: #000;
     color: #ffffff;
-    border:none;
-    ::v-deep .el-card__body{
+    border: none;
+
+    ::v-deep .el-card__body {
       flex: 1;
     }
   }
@@ -873,42 +842,51 @@ export default {
   //   color: #ffffff;
   // }
 
-  ::v-deep .el-table, .el-table__expanded-cell {
+  ::v-deep .el-table,
+  .el-table__expanded-cell {
     background-color: #000;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
 
-  ::v-deep .el-table th, .el-table tr {
+  ::v-deep .el-table th,
+  .el-table tr {
     background-color: #000;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table__body tr > td{
-    background-color:#000 !important;
+
+  ::v-deep .el-table__body tr>td {
+    background-color: #000 !important;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table__body tr:hover > td{
-    background-color:#858282 !important;
+
+  ::v-deep .el-table__body tr:hover>td {
+    background-color: #858282 !important;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table--border th.gutter:last-of-type{
+
+  ::v-deep .el-table--border th.gutter:last-of-type {
     border: none;
   }
-  ::v-deep .el-card__header{
+
+  ::v-deep .el-card__header {
     border: none;
     padding: 10px;
   }
 }
-::v-deep .el-switch__label{
-  color:#fff;
+
+::v-deep .el-switch__label {
+  color: #fff;
 }
-::v-deep .el-switch__label.is-active{
+
+::v-deep .el-switch__label.is-active {
   color: #428bca;
 }
-.colorOfRed{
+
+.colorOfRed {
   color: #f66;
 }
 </style>

From e7491501cfe6a9fc6ddf91eb5fbcd6ebf45b3eeb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 10 Oct 2025 15:12:27 +0800
Subject: [PATCH 003/333] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89-=E9=80=89=E6=8B=A9=EF=BC=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AE=80=E5=8E=86=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E7=9A=84=E4=B8=B4=E5=BA=8A=E8=AF=95?=
 =?UTF-8?q?=E9=AA=8C=E7=BB=8F=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/info/clinicalTrials.vue        |   5 +-
 src/views/reviewers/curriculumVitae/index.vue | 170 +++++++-----------
 2 files changed, 66 insertions(+), 109 deletions(-)

diff --git a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
index 80864609..1f6f3984 100644
--- a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
@@ -79,10 +79,7 @@
       <el-table-column prop="date" :label="$t('common:action:action')">
         <template
           slot-scope="scope"
-          v-if="
-            scope.row.ExperienceDataType != 2 &&
-            scope.row.ExperienceDataType != 3
-          "
+          v-if="scope.row.ExperienceDataType != 3"
         >
           <el-button
             type="text"
diff --git a/src/views/reviewers/curriculumVitae/index.vue b/src/views/reviewers/curriculumVitae/index.vue
index 186a4688..54718a8e 100644
--- a/src/views/reviewers/curriculumVitae/index.vue
+++ b/src/views/reviewers/curriculumVitae/index.vue
@@ -2,14 +2,8 @@
   <div class="curriculumVitae" v-loading="loading">
     <div class="leftMenu">
       <div class="title">{{ $t('curriculumVitae:menu:title') }}</div>
-      <el-menu
-        :default-active="activeIndex"
-        class="el-menu-demo"
-        mode="vertical"
-        @select="handleSelect"
-        background-color="#eee"
-        active-text-color="#000"
-      >
+      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="vertical" @select="handleSelect"
+        background-color="#eee" active-text-color="#000">
         <el-menu-item index="info">
           {{ $t('curriculumVitae:menu:info') }}
         </el-menu-item>
@@ -70,94 +64,58 @@
             </el-button>
           </div>
         </div>
+        <!--个人信息-->
         <div class="box" id="info">
-          <info
-            :DATA="{
-              ...reviewerData.BasicInfoView,
-              ...reviewerData.EmploymentView,
-            }"
-            :reviewerId.sync="reviewerId"
-            :isEN="isEN"
-            @getInfo="getDetail"
-          />
+          <info :DATA="{
+            ...reviewerData.BasicInfoView,
+            ...reviewerData.EmploymentView,
+          }" :reviewerId.sync="reviewerId" :isEN="isEN" @getInfo="getDetail" />
         </div>
+        <!--概述-->
         <div class="box" id="summarize">
-          <summarize
-            :DATA="{
-              ...reviewerData.SummarizeInfo,
-            }"
-            :reviewerId.sync="reviewerId"
-            :trialId="trialId"
-            :isEN="isEN"
-            @getInfo="getDetail"
-          />
+          <summarize :DATA="{
+            ...reviewerData.SummarizeInfo,
+          }" :reviewerId.sync="reviewerId" :trialId="trialId" :isEN="isEN" @getInfo="getDetail" />
         </div>
+        <!--专业-->
         <div class="box" id="specialty">
-          <specialty
-            :DATA="{
-              ...reviewerData.SpecialtyView,
-            }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <specialty :DATA="{
+            ...reviewerData.SpecialtyView,
+          }" :isEN="isEN" :reviewerId.sync="reviewerId" @getInfo="getDetail" />
         </div>
+        <!--教育经历-->
         <div class="box" id="educationalExperience">
-          <educationalExperience
-            :DATA="reviewerData.EducationList"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <educationalExperience :DATA="reviewerData.EducationList" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
         </div>
+        <!--进修培训-->
         <div class="box" id="continuingTraining">
-          <continuingTraining
-            :DATA="reviewerData.PostgraduateList"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <continuingTraining :DATA="reviewerData.PostgraduateList" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
         </div>
+        <!--科研课题-->
         <div class="box" id="scientificResearchProject">
-          <scientificResearchProject
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <scientificResearchProject :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN"
+            :reviewerId.sync="reviewerId" @getInfo="getDetail" />
         </div>
+        <!--临床试验-->
         <div class="box" id="clinicalTrials">
-          <clinicalTrials
-            :DATA="{ ...reviewerData.TrialExperienceView }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            :trialId="trialId"
-            @getInfo="getDetail"
-          />
+          <clinicalTrials :DATA="{ ...reviewerData.TrialExperienceView }" :isEN="isEN" :reviewerId.sync="reviewerId"
+            :trialId="trialId" @getInfo="getDetail" />
         </div>
+        <!--gcp证书-->
         <div class="box" id="treatise">
-          <treatise
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <treatise :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
         </div>
+        <!--其他相关经历-->
         <div class="box" id="other">
-          <other
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <other :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
         </div>
         <div class="box" id="pay">
-          <pay
-            :DATA="{ ...reviewerData.PaymentModeInfo }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <pay :DATA="{ ...reviewerData.PaymentModeInfo }" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
         </div>
         <div class="box" id="setting" v-if="isPM">
           <setting :isEN="isEN" :reviewerId.sync="reviewerId" />
@@ -167,38 +125,19 @@
         <!--简历附件-->
         <curriculum :isEN="isEN" :reviewerId.sync="reviewerId" />
         <!--资历证书-->
-        <certificate
-          :DATA="reviewerData.AttachmentList"
-          :isEN="isEN"
-          :reviewerId.sync="reviewerId"
-          @getInfo="getDetail"
-        />
+        <certificate :DATA="reviewerData.AttachmentList" :isEN="isEN" :reviewerId.sync="reviewerId"
+          @getInfo="getDetail" />
         <!--协议-->
-        <agreement
-          :DATA="reviewerData.AttachmentList"
-          :isEN="isEN"
-          :isPM="isPM"
-          :reviewerId.sync="reviewerId"
-          @getInfo="getDetail"
-        />
+        <agreement :DATA="reviewerData.AttachmentList" :isEN="isEN" :isPM="isPM" :reviewerId.sync="reviewerId"
+          @getInfo="getDetail" />
       </div>
     </div>
     <el-dialog :visible.sync="visible" fullscreen append-to-body>
       <div style="height: 100%; overflow: auto">
-        <preview
-          :isEN="isEN"
-          :reviewerId.sync="reviewerId"
-          :trialId="trialId"
-          :isAll="isAll"
-          v-if="visible"
-        />
+        <preview :isEN="isEN" :reviewerId.sync="reviewerId" :trialId="trialId" :isAll="isAll" v-if="visible" />
       </div>
     </el-dialog>
-    <holiday
-      v-if="holidayVisible"
-      :reviewerId.sync="reviewerId"
-      :visible.sync="holidayVisible"
-    />
+    <holiday v-if="holidayVisible" :reviewerId.sync="reviewerId" :visible.sync="holidayVisible" />
     <!-- <setting
       v-if="settingVisible"
       :reviewerId.sync="reviewerId"
@@ -383,12 +322,14 @@ export default {
   position: relative;
   height: 100%;
 }
+
 .title {
   line-height: 50px;
   background-color: #fff;
   text-align: center;
   font-weight: bold;
 }
+
 .leftMenu {
   position: absolute;
   left: 0;
@@ -397,12 +338,15 @@ export default {
   height: 100%;
   background-color: #eee;
   border-right: 1px solid #eee;
+
   ::v-deep .el-menu {
     padding: 5px 5px 0;
   }
+
   ::v-deep .is-active {
     background-color: #fff !important;
     position: relative;
+
     &::before {
       display: block;
       content: '';
@@ -415,6 +359,7 @@ export default {
     }
   }
 }
+
 .main {
   width: calc(100% - 300px);
   height: 100%;
@@ -423,9 +368,11 @@ export default {
   display: flex;
   align-items: flex-start;
 }
+
 .content {
   width: calc(100% - 300px);
   padding: 0 50px 0 20px;
+
   .title {
     line-height: 50px;
     background-color: #fff;
@@ -434,35 +381,42 @@ export default {
     justify-content: space-between;
   }
 }
+
 .box {
   border: 1px solid #ddd;
   border-radius: 3px;
   padding: 15px;
   margin-bottom: 20px;
 }
+
 ::v-deep .noData {
   color: #909399;
   text-align: center;
 }
+
 .rightFile {
   width: 300px;
   padding-right: 10px;
+
   ::v-deep .title {
     line-height: 50px;
     background-color: #fff;
     text-align: left;
     font-weight: bold;
   }
+
   ::v-deep .fileBox {
     background-color: #eee;
     padding: 10px;
     font-size: 14px;
     border-radius: 3px;
   }
+
   ::v-deep .file_title {
     line-height: 40px;
     font-weight: bold;
   }
+
   ::v-deep .btnBox {
     display: flex;
     align-items: center;
@@ -474,17 +428,23 @@ export default {
     width: 100%;
     display: flex;
     margin-bottom: 10px;
+
     .name {
       width: 70%;
-      white-space: nowrap; /* 文本不会换行，会在同一行内继续，直到遇到<br>标签为止 */
-      text-overflow: ellipsis; /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
-      overflow: hidden; /* 隐藏溢出容器的文本 */
+      white-space: nowrap;
+      /* 文本不会换行，会在同一行内继续，直到遇到<br>标签为止 */
+      text-overflow: ellipsis;
+      /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
+      overflow: hidden;
+      /* 隐藏溢出容器的文本 */
     }
+
     i {
       cursor: pointer;
       margin: 3px;
       color: #409eff;
     }
+
     .disable {
       cursor: not-allowed;
       color: #909399;

From 553014be791e7d01b98600d131bf34ae58dd86bf Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 10 Oct 2025 15:19:17 +0800
Subject: [PATCH 004/333] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84=E5=AD=90=E9=A1=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=9A=E6=8C=87=E5=AE=9A=E6=A0=87=E5=87=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dictionary/checkConfig/index.vue           | 12 ++++++++++++
 .../trial-summary/audit-record/index.vue             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index 1ef91c7e..8c6776fc 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -191,6 +191,17 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item>
+              <span slot="label">
+                适用的标准
+              </span>
+              <el-select v-model="form.ApplyCriterionList" placeholder="" clearable multiple>
+                <el-option v-for="item in $d.CriterionType" :key="item.id" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="12">
             <el-form-item>
               <span slot="label">
@@ -1008,6 +1019,7 @@ export default {
         ValueCN: null,
         EnumType: '',
         IsShowByTrialConfig: false,
+        ApplyCriterionList: [],
         TrialConfigRelyFieldName: null,
         Identification: null,
         IsForwardPosition: false,
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 492b6bfd..f8b50654 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -856,6 +856,7 @@ export default {
 
         var item
         if (!v.IsEnable) return
+        if (v.ApplyCriterionList && Array.isArray(v.ApplyCriterionList) && v.ApplyCriterionList.length > 0 && !v.ApplyCriterionList.includes(this.currentRow.CriterionType)) return false
         if (v.IsShowByTrialConfig) {
           if (!parentRow[v.TrialConfigRelyFieldName]) return
         }

From ef336eafe643447d4c333a2d7e8c6ca82bbdde4f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 10 Oct 2025 16:46:50 +0800
Subject: [PATCH 005/333] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=9A=90=E7=A7=81?=
 =?UTF-8?q?=E6=94=BF=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2674658f..c3231d89 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -94,6 +94,10 @@
               {{ $t('login:button:forgetPassword') }}
             </el-button>
           </div>
+          <div class="PrivacyPolicy">
+            <span>{{ $t('login:message:PrivacyPolicy') }}</span>
+            <span style="cursor: pointer;color:#428bca">《{{ $t('login:message:PrivacyPolicyName') }}》</span>
+          </div>
         </el-form>
       </div>
     </div>

From ff1b4f6f21a04d3c58856379e25f7dff1081c417 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 10 Oct 2025 16:47:25 +0800
Subject: [PATCH 006/333] =?UTF-8?q?=E9=98=85=E7=89=87=E6=AF=94=E4=BE=8B?=
 =?UTF-8?q?=E5=B0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/ReportPage.vue  |    2 +-
 .../dicoms3D/components/PetCtViewport.vue     |    6 +-
 .../reading/dicoms3D/components/ReadPage.vue  | 1249 ++++++++---------
 .../dicoms3D/components/ReportPage.vue        |    2 +-
 .../reading/dicoms3D/components/Viewport.vue  |  114 +-
 5 files changed, 633 insertions(+), 740 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index df82f47b..b5b244f4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -265,7 +265,7 @@ export default {
     ...mapGetters(['language']),
     isBaseline() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
-      return this.visitTaskList[i].IsBaseLine
+      return this.visitTaskList[i] ? this.visitTaskList[i].IsBaseLine : false
     }
   },
   watch: {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
index d92f2aff..99b6222d 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
@@ -260,9 +260,9 @@ export default {
           this.defaultWindowLevel.windowCenter = windowCenter
           this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
         }
-        // const toolGroupId = `viewport-${this.viewportIndex}`
-        // const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
-        // toolGroup.setToolEnabled('ScaleOverlay')
+        const toolGroupId = this.viewportId
+        const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId)
+        toolGroup.setToolEnabled('ScaleOverlay')
       }
 
     },
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 0bc8a2a7..c64aa02b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -1,40 +1,21 @@
 <template>
-  <div
-    v-loading="loading"
-    :element-loading-text="loadingText"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    class="read-page-container"
-  >
+  <div v-loading="loading" :element-loading-text="loadingText" element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)" class="read-page-container">
     <!-- 检查列表 -->
     <div class="left-panel">
       <div class="task-container">
         <div class="task-info">
-          <div
-            v-for="(s, index) in visitTaskList"
-            :key="s.VisitTaskId"
-            class="task-item"
-            :class="{'task-item-active': activeTaskId==s.VisitTaskId}"
-
-            @click.prevent="toggleTask(s, index)"
-          >{{ s.TaskBlindName }}</div>
+          <div v-for="(s, index) in visitTaskList" :key="s.VisitTaskId" class="task-item"
+            :class="{ 'task-item-active': activeTaskId == s.VisitTaskId }" @click.prevent="toggleTask(s, index)">{{
+              s.TaskBlindName }}</div>
         </div>
       </div>
       <div v-loading="sLoading" class="study-info">
-        <div
-          v-for="s in visitTaskList"
-          v-show="activeTaskId === s.VisitTaskId"
-          :key="s.VisitTaskId"
-          style="height:100%;"
-        >
-          <study-list
-            v-if="selectArr.includes(s.VisitTaskId) && s.StudyList.length > 0"
-            :ref="s.VisitTaskId"
-            :visit-task-info="s"
-            :marked-series-ids="markedSeriesIds"
-            @activeSeries="activeSeries"
-            @showMultiFrame="showMultiFrame"
-          />
+        <div v-for="s in visitTaskList" v-show="activeTaskId === s.VisitTaskId" :key="s.VisitTaskId"
+          style="height:100%;">
+          <study-list v-if="selectArr.includes(s.VisitTaskId) && s.StudyList.length > 0" :ref="s.VisitTaskId"
+            :visit-task-info="s" :marked-series-ids="markedSeriesIds" @activeSeries="activeSeries"
+            @showMultiFrame="showMultiFrame" />
 
         </div>
       </div>
@@ -47,12 +28,8 @@
         <div class="tools-wrapper">
           <div class="tools-left">
             <!-- 布局 -->
-            <div
-              :class="['tool-item', isFusion ? 'tool-disabled' : '']"
-              :title="$t('trials:reading:button:layout')"
-              @click.stop="showPanel($event, 'layout')"
-              @mouseleave="toolMouseout"
-            >
+            <div :class="['tool-item', isFusion ? 'tool-disabled' : '']" :title="$t('trials:reading:button:layout')"
+              @click.stop="showPanel($event, 'layout')" @mouseleave="toolMouseout">
               <div class="dropdown">
                 <div class="icon">
                   <svg-icon icon-class="layout" class="svg-icon" />
@@ -73,7 +50,8 @@
                         A
                       </div>
                     </li>
-                    <li v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1" class="layout_flex_row" @click.stop="changeLayout(3)">
+                    <li v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1" class="layout_flex_row"
+                      @click.stop="changeLayout(3)">
                       <div class="layout_box_1_1">
                         A
                       </div>
@@ -106,12 +84,9 @@
               </div>
             </div>
             <!-- 调窗 -->
-            <div
-              :class="['tool-item', activeTool === 'WindowLevel' ? 'tool-item-active' : '']"
-              :title="$t('trials:reading:button:wwwc')"
-              @click.stop="setWindowLevelActive($event)"
-              @mouseleave="toolMouseout"
-            >
+            <div :class="['tool-item', activeTool === 'WindowLevel' ? 'tool-item-active' : '']"
+              :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" />
@@ -121,7 +96,8 @@
                   <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 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>
@@ -130,7 +106,7 @@
                         </div>
                       </a>
                       <el-divider v-if="item.val === 1" class="divider" content-position="center">
-                        {{ ` ${$t('trials:reading:title:preset') }` }}
+                        {{ ` ${$t('trials:reading:title:preset')}` }}
                       </el-divider>
                     </li>
                   </ul>
@@ -138,27 +114,17 @@
               </div>
             </div>
             <!-- 反色 -->
-            <div
-              class="tool-item"
-              :title="$t('trials:reading:button:reverseColor')"
-              @click.prevent="toggleInvert"
-            >
+            <div class="tool-item" :title="$t('trials:reading:button:reverseColor')" @click.prevent="toggleInvert">
               <svg-icon icon-class="reversecolor" class="svg-icon" />
             </div>
             <!-- 缩放 -->
-            <div
-              :class="['tool-item', activeTool === 'Zoom' ? 'tool-item-active' : '']"
-              :title="$t('trials:reading:button:zoom')"
-              @click.prevent="setToolActive('Zoom')"
-            >
+            <div :class="['tool-item', activeTool === 'Zoom' ? 'tool-item-active' : '']"
+              :title="$t('trials:reading:button:zoom')" @click.prevent="setToolActive('Zoom')">
               <svg-icon icon-class="magnifier" class="svg-icon" />
             </div>
             <!-- 移动 -->
-            <div
-              :class="['tool-item', activeTool === 'Pan' ? 'tool-item-active' : '']"
-              :title="$t('trials:reading:button:move')"
-              @click.prevent="setToolActive('Pan')"
-            >
+            <div :class="['tool-item', activeTool === 'Pan' ? 'tool-item-active' : '']"
+              :title="$t('trials:reading:button:move')" @click.prevent="setToolActive('Pan')">
               <svg-icon icon-class="move" class="svg-icon" />
             </div>
             <!-- 旋转 -->
@@ -169,18 +135,10 @@
             >
               <svg-icon icon-class="rotate" class="svg-icon" />
             </div> -->
-            <div
-              class="tool-item"
-              :title="$t('trials:reading:button:rotate')"
-              @click.stop="showPanel($event)"
-              @mouseleave="toolMouseout"
-            >
+            <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':'']"
-                >
+                <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>
@@ -196,36 +154,27 @@
               </div>
             </div>
             <!-- 适应图像或窗口 -->
-            <div
-              class="tool-item"
+            <div class="tool-item"
               :title="forceFitToWindow ? `${$t('trials:reading:button:fitWindow')}` : `${$t('trials:reading:button:fitImage')}`"
-              @click.prevent="fitToType(forceFitToWindow)"
-            >
+              @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>
             <!--融合-->
-            <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')" @click.prevent="openFusion">
+            <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')"
+              @click.prevent="openFusion">
               <svg-icon icon-class="fusion" class="svg-icon" />
             </div>
-            <div
-              v-for="tool in tools"
-              :key="tool.toolName"
+            <div v-for="tool in tools" :key="tool.toolName"
               :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === tool.toolName ? 'tool-item-active' : '']"
-              :style="{cursor: tool.isDisabled ? 'not-allowed' : 'pointer'}"
+              :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)"
-            >
+              @click.prevent="setAnnotateToolActive(tool.toolName)" @mouseenter="enter($event, tool.toolName)">
               <svg-icon :icon-class="tool.icon" class="svg-icon" />
             </div>
             <!-- 清除标注 -->
-            <div
-              v-if="criterionType === 0"
-              :class="['tool-item', activeTool === 'Eraser' ? 'tool-item-active' : '']"
-              :title="$t('trials:dicom-show:Eraser')"
-              @click.prevent="setToolActive('Eraser')"
-            >
+            <div v-if="criterionType === 0" :class="['tool-item', activeTool === 'Eraser' ? 'tool-item-active' : '']"
+              :title="$t('trials:dicom-show:Eraser')" @click.prevent="setToolActive('Eraser')">
               <svg-icon icon-class="clear" class="svg-icon" />
             </div>
             <div class="tool-frame">
@@ -238,20 +187,11 @@
                 <svg-icon icon-class="previousframe" class="svg-icon" />
               </div>
               <!-- 播放/暂停 -->
-              <div
-                v-if="clipPlaying"
-                :title="$t('trials:dicom-show:stop')"
-                class="icon"
-                @click.prevent="toggleClipPlay(false)"
-              >
+              <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"
-                @click.prevent="toggleClipPlay(true)"
-              >
+              <div v-else :title="$t('trials:dicom-show:play')" class="icon" @click.prevent="toggleClipPlay(true)">
                 <svg-icon icon-class="play" class="svg-icon" />
               </div>
               <!-- 下一帧 -->
@@ -262,7 +202,8 @@
               <div :title="$t('trials:dicom-show:lastframe')" class="icon" @click.prevent="scrollPage(99999)">
                 <svg-icon icon-class="lastframe" class="svg-icon" />
               </div>
-              <select v-model="fps" :title="$t('trials:dicom-show:speed')" 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>
@@ -273,32 +214,20 @@
               </select>
             </div>
             <!-- 重置 -->
-            <div
-              class="tool-item"
-              :title="$t('trials:reading:button:reset')"
-              @click.prevent="resetViewport"
-            >
+            <div class="tool-item" :title="$t('trials:reading:button:reset')" @click.prevent="resetViewport">
               <svg-icon icon-class="refresh" class="svg-icon" />
             </div>
             <!-- 更多 :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']" -->
-            <div
-              v-if="criterionType === 0"
-              :title="$t('trials:reading:button:more')"
-              :class="['tool-item']"
-              @click.stop="showPanel($event)"
-              @mouseleave="toolMouseout"
-            >
+            <div v-if="criterionType === 0" :title="$t('trials:reading:button:more')" :class="['tool-item']"
+              @click.stop="showPanel($event)" @mouseleave="toolMouseout">
               <div class="dropdown">
-                <div
-                  class="icon"
-                  data-tool="more"
-                >
+                <div class="icon" data-tool="more">
                   <svg-icon icon-class="more" class="svg-icon" />
                   <i class="el-icon-arrow-down" style="color:#fff;" />
                 </div>
                 <div class="dropdown-content">
                   <!--v-if="readingTaskState < 2"-->
-                  <ul  style="width:100px;">
+                  <ul style="width:100px;">
                     <li v-for="i in customizeStandards" :key="i.toolName" style="text-align:left;">
                       <a href="#" @click.prevent="setMoreToolActive(i.toolName)">
                         <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />
@@ -309,32 +238,23 @@
                 </div>
               </div>
             </div>
-            <div
-                class="tool-item"
-                :title="$t('trials:reading:button:upload')"
-                v-if="trialCriterion.ImageUploadEnum > 0 && readingTaskState < 2"
-                v-hasPermi="['role:ir']"
-              >
-                <div class="tool-wrapper">
+            <div class="tool-item" :title="$t('trials:reading:button:upload')"
+              v-if="trialCriterion.ImageUploadEnum > 0 && readingTaskState < 2" v-hasPermi="['role:ir']">
+              <div class="tool-wrapper">
                 <div class="icon" @click.prevent="openUploadImage('upload')">
                   <i class="el-icon-upload2 svg-icon" />
                 </div>
               </div>
             </div>
-            <div
-              v-if="trialCriterion.ImageDownloadEnum > 0"
-              v-hasPermi="[
-                'role:ir',
-                'role:mim',
-                'role:mc',
-                'role:pm',
-                'role:apm',
-                'role:ea',
-                'role:qa',
-              ]"
-              class="tool-item"
-              :title="$t('trials:reading:button:download')"
-            >
+            <div v-if="trialCriterion.ImageDownloadEnum > 0" v-hasPermi="[
+              'role:ir',
+              'role:mim',
+              'role:mc',
+              'role:pm',
+              'role:apm',
+              'role:ea',
+              'role:qa',
+            ]" class="tool-item" :title="$t('trials:reading:button:download')">
               <div class="tool-wrapper">
                 <div class="icon" @click.prevent="openUploadImage('download')">
                   <i class="el-icon-download svg-icon" />
@@ -349,26 +269,16 @@
 
           <div>
             <!-- 手册 -->
-            <el-button
-              v-if="taskInfo && taskInfo.ExistsManual"
-              type="text"
-              @click="previewManuals"
-            >
+            <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"
-              @click="previewCD(taskInfo.VisitTaskId)"
-            >
+            <el-button v-if="taskInfo && taskInfo.IsExistsClinicalData" type="text"
+              @click="previewCD(taskInfo.VisitTaskId)">
               {{ $t('trials:reading:button:clinicalData') }}
             </el-button>
             <!-- 个性化配置 -->
-            <el-button
-              type="text"
-              @click="previewConfig"
-            >
+            <el-button type="text" @click="previewConfig">
               {{ $t('trials:reading:button:customCfg') }}
             </el-button>
           </div>
@@ -377,104 +287,59 @@
           <!-- viewports -->
           <div class="viewports-wrapper">
             <div ref="container" class="grid-container">
-              <div :class="[ 'viewports-box', isFusion ? 'viewports-box-down' : '' ]" :style="gridStyle">
-                <div
-                  v-for="(v, index) in cellsMax"
-                  v-show="index < cells.length"
-                  :key="`viewport-${index}`"
+              <div :class="['viewports-box', isFusion ? 'viewports-box-down' : '']" :style="gridStyle">
+                <div v-for="(v, index) in cellsMax" v-show="index < cells.length" :key="`viewport-${index}`"
                   :style="cellStyle"
                   :class="['grid-cell', index === activeViewportIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
-                  @dblclick="toggleFullScreen($event, index)"
-                  @click="activeViewport(index)"
-                >
-                  <Viewport
-                    :ref="`viewport-${index}`"
-                    :data-viewport-uid="`viewport-${index}`"
-                    :rendering-engine-id="renderingEngineId"
-                    :viewport-id="`viewport-${index}`"
-                    :viewport-index="index"
-                    @activeViewport="activeViewport"
-                    @toggleTaskByViewport="toggleTaskByViewport"
-                    @previewCD="previewCD"
-                    @renderAnnotations="renderAnnotations"
-                  />
+                  @dblclick="toggleFullScreen($event, index)" @click="activeViewport(index)">
+                  <Viewport :ref="`viewport-${index}`" :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>
-              <div v-if="readingTool === 2" :class="[ 'viewports-box', !isFusion ? 'viewports-box-down' : '' ]" :style="gridStyle">
-                <div
-                  v-for="(v, index) in cellsMax"
-                  v-show="index < cells.length"
-                  :key="`viewport-fusion-${index}`"
+              <div v-if="readingTool === 2" :class="['viewports-box', !isFusion ? 'viewports-box-down' : '']"
+                :style="gridStyle">
+                <div v-for="(v, index) in cellsMax" v-show="index < cells.length" :key="`viewport-fusion-${index}`"
                   :style="cellStyle"
                   :class="['grid-cell', index === activeViewportIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
-                  @dblclick="toggleFullScreen($event, index)"
-                  @click="activeViewport(index)"
-                >
-                  <PetCtViewport
-                    :ref="`viewport-fusion-${index}`"
-                    :data-viewport-uid="`viewport-fusion-${index}`"
-                    :rendering-engine-id="renderingEngineId"
-                    :viewport-id="`viewport-fusion-${index}`"
-                    :viewport-index="index"
-                    @activeViewport="activeViewport"
-                    @toggleTaskByViewport="toggleTaskByViewport"
-                    @previewCD="previewCD"
-                    @renderAnnotations="renderAnnotations"
-                    @upperRangeChange="upperRangeChange"
-                  />
+                  @dblclick="toggleFullScreen($event, index)" @click="activeViewport(index)">
+                  <PetCtViewport :ref="`viewport-fusion-${index}`" :data-viewport-uid="`viewport-fusion-${index}`"
+                    :rendering-engine-id="renderingEngineId" :viewport-id="`viewport-fusion-${index}`"
+                    :viewport-index="index" @activeViewport="activeViewport"
+                    @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD"
+                    @renderAnnotations="renderAnnotations" @upperRangeChange="upperRangeChange" />
                 </div>
               </div>
             </div>
           </div>
           <!-- 表单 -->
           <div class="form-wrapper">
-            <div
-              v-for="s in visitTaskList"
-              v-show="lastViewportTaskId === s.VisitTaskId"
-              :key="s.VisitTaskId"
-              style="height: 100%;"
-            >
-              <mRecisit
-                v-if="lastViewportTaskId && criterionType === 7 && lastViewportTaskIds.includes(s.VisitTaskId)"
+            <div v-for="s in visitTaskList" v-show="lastViewportTaskId === s.VisitTaskId" :key="s.VisitTaskId"
+              style="height: 100%;">
+              <mRecisit v-if="lastViewportTaskId && criterionType === 7 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
                 :reading-task-state="currentVisitInfo.VisitTaskId === taskInfo.VisitTaskId ? readingTaskState : 2"
-                :last-viewport-task-id="lastViewportTaskId"
-                :visit-info="s"
-                @removeAnnotation="removeAnnotation"
-                @getScreenshots="getScreenshots"
-                @setMarkName="setMarkName"
-                @imageLocation="imageLocation"
-                @resetAnnotations="resetAnnotations"
-                @getAnnotations="getAnnotations"
-                @setToolToTarget="setToolToTarget"
-              />
+                :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
+                @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
+                @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations"
+                @setToolToTarget="setToolToTarget" />
               <recisit
                 v-else-if="lastViewportTaskId && criterionType === 1 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
                 :reading-task-state="currentVisitInfo.VisitTaskId === taskInfo.VisitTaskId ? readingTaskState : 2"
-                :last-viewport-task-id="lastViewportTaskId"
-                :visit-info="s"
-                @removeAnnotation="removeAnnotation"
-                @getScreenshots="getScreenshots"
-                @setMarkName="setMarkName"
-                @imageLocation="imageLocation"
-                @resetAnnotations="resetAnnotations"
-                @getAnnotations="getAnnotations"
-                @setToolToTarget="setToolToTarget"
-              />
+                :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
+                @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
+                @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations"
+                @setToolToTarget="setToolToTarget" />
               <customize-question-list
                 v-else-if="lastViewportTaskId && criterionType === 0 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
                 :reading-task-state="taskInfo && currentVisitInfo.VisitTaskId === taskInfo.VisitTaskId ? readingTaskState : 2"
-                :last-viewport-task-id="lastViewportTaskId"
-                :visit-info="s"
-                @resetAnnotations="resetAnnotations"
-                @setReadingTaskState="setReadingTaskState"
-                @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
-                @getCustomScreenshots="getCustomScreenshots"
-                @setReadingToolActive="setReadingToolActive"
-                @setReadingToolPassive="setReadingToolPassive"
-              />
+                :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @resetAnnotations="resetAnnotations"
+                @setReadingTaskState="setReadingTaskState" @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
+                @getCustomScreenshots="getCustomScreenshots" @setReadingToolActive="setReadingToolActive"
+                @setReadingToolPassive="setReadingToolPassive" />
             </div>
           </div>
         </div>
@@ -483,30 +348,21 @@
     </div>
 
     <!-- 自定义调窗 -->
-    <el-dialog
-      v-if="customWwc.visible"
-      :visible.sync="customWwc.visible"
-      :close-on-click-modal="false"
-      :title="customWwc.title"
-      width="400px"
-      custom-class="base-dialog-wrapper"
-    >
-      <custom-wwwc-form :ww="activeViewportWW" :wc="activeViewportWC" @close="customWwc.visible = false" @setWwwc="setWwwc" />
+    <el-dialog v-if="customWwc.visible" :visible.sync="customWwc.visible" :close-on-click-modal="false"
+      :title="customWwc.title" width="400px" custom-class="base-dialog-wrapper">
+      <custom-wwwc-form :ww="activeViewportWW" :wc="activeViewportWC" @close="customWwc.visible = false"
+        @setWwwc="setWwwc" />
     </el-dialog>
     <!-- 手册 -->
-    <el-dialog
-      v-if="manualsDialog.visible"
-      :visible.sync="manualsDialog.visible"
-      :custom-class="manualsDialog.isFullscreen?'manuals-full-dialog-container':'manuals-dialog-container'"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :fullscreen="manualsDialog.isFullscreen"
-    >
+    <el-dialog v-if="manualsDialog.visible" :visible.sync="manualsDialog.visible"
+      :custom-class="manualsDialog.isFullscreen ? 'manuals-full-dialog-container' : 'manuals-dialog-container'"
+      :show-close="false" :close-on-click-modal="false" :fullscreen="manualsDialog.isFullscreen">
       <span slot="title" class="dialog-footer">
         <!-- 手册 -->
         <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute;right: 20px;font-size: 20px;">
-          <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" style="margin-right:10px;cursor: pointer;" @click="manualsDialog.isFullscreen=!manualsDialog.isFullscreen" />
+          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'" style="margin-right:10px;cursor: pointer;"
+            @click="manualsDialog.isFullscreen = !manualsDialog.isFullscreen" />
           <svg-icon icon-class="close" style="cursor: pointer;" @click="manualsDialog.visible = false" />
         </span>
       </span>
@@ -515,13 +371,8 @@
       </div>
     </el-dialog>
     <!-- 个性化配置 -->
-    <el-dialog
-      v-if="personalConfigDialog.visible"
-      :visible.sync="personalConfigDialog.visible"
-      :close-on-click-modal="false"
-      :title="personalConfigDialog.title"
-      width="600px"
-    >
+    <el-dialog v-if="personalConfigDialog.visible" :visible.sync="personalConfigDialog.visible"
+      :close-on-click-modal="false" :title="personalConfigDialog.title" width="600px">
       <el-tabs v-model="personalConfigDialog.activeName" class="personal_config">
         <!-- 热键 -->
         <el-tab-pane :label="$t('trials:reading:tab:hotkeys')" name="1">
@@ -539,57 +390,35 @@
 
     </el-dialog>
     <!-- 临床数据 -->
-    <el-dialog
-      :visible.sync="clinicalDataVisible"
-      :custom-class="isClinicalDataFullscreen?'cd-full-dialog-container':'cd-dialog-container'"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :fullscreen="isClinicalDataFullscreen"
-    >
+    <el-dialog :visible.sync="clinicalDataVisible"
+      :custom-class="isClinicalDataFullscreen ? 'cd-full-dialog-container' : 'cd-dialog-container'" :show-close="false"
+      :close-on-click-modal="false" :fullscreen="isClinicalDataFullscreen">
       <span slot="title" class="dialog-footer">
         <div style="position: absolute;right: 20px;top: 10px;color: #000;">
-          <svg-icon :icon-class="isClinicalDataFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen=!isClinicalDataFullscreen" />
-          <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="clinicalDataVisible = false" />
+          <svg-icon :icon-class="isClinicalDataFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+            style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen = !isClinicalDataFullscreen" />
+          <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
+            @click="clinicalDataVisible = false" />
         </div>
       </span>
       <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
-        <clinical-data
-          v-if="clinicalDataVisible"
-          style="flex: 1"
-          :trial-id="trialId"
-          :subject-id="taskInfo.SubjectId"
-          :visit-task-id="cdVisitTaskId"
-          :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
-        />
+        <clinical-data v-if="clinicalDataVisible" style="flex: 1" :trial-id="trialId" :subject-id="taskInfo.SubjectId"
+          :visit-task-id="cdVisitTaskId" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo" />
       </div>
 
     </el-dialog>
-    <el-dialog
-      :visible.sync="fusionVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:lugano:button:record')"
-      width="850px"
-    >
-      <FusionForm v-if="fusionVisible" :active-task-index="activeTaskIndex" :task-list="visitTaskList" @close="closeFusion" @fusion="handleFusion" />
+    <el-dialog :visible.sync="fusionVisible" :close-on-click-modal="false" :title="$t('trials:lugano:button:record')"
+      width="850px">
+      <FusionForm v-if="fusionVisible" :active-task-index="activeTaskIndex" :task-list="visitTaskList"
+        @close="closeFusion" @fusion="handleFusion" />
     </el-dialog>
 
-    <upload-dicom-and-nonedicom
-      v-if="uploadImageVisible"
-      :subject-id="uploadSubjectId"
-      :subject-code="uploadSubjectCode"
-      :criterion="uploadTrialCriterion"
-      :visible.sync="uploadImageVisible"
-      :visit-task-id="taskId"
-      :is-reading-task-view-in-order="isReadingTaskViewInOrder"
-    />
-    <download-dicom-and-nonedicom
-      v-if="downloadImageVisible"
-      :subject-id="uploadSubjectId"
-      :subject-code="uploadSubjectCode"
-      :criterion="uploadTrialCriterion"
-      :task-id="taskId"
-      :visible.sync="downloadImageVisible"
-    />
+    <upload-dicom-and-nonedicom v-if="uploadImageVisible" :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible"
+      :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" />
+    <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
+      :visible.sync="downloadImageVisible" />
   </div>
 </template>
 <script>
@@ -825,7 +654,7 @@ export default {
     },
   },
   watch: {
-    currentReadingTaskState(){console.log(this.currentReadingTaskState,'currentReadingTaskState')},
+    currentReadingTaskState() { console.log(this.currentReadingTaskState, 'currentReadingTaskState') },
     activeTaskId: {
       immediate: true,
       handler(id) {
@@ -883,7 +712,7 @@ export default {
       this.tools = getCustomizeStandardsTools(this.taskInfo.ReadingToolList)
       const toolNames = this.tools.map(i => i.toolName)
       this.customizeStandards = config.customizeStandards.filter(item => !toolNames.includes(item.toolName))
-      console.log(this.customizeStandards,'this.customizeStandards')
+      console.log(this.customizeStandards, 'this.customizeStandards')
     } else {
       this.tools = getTools(this.criterionType)
     }
@@ -978,7 +807,7 @@ export default {
     },
     // 加载检查及标注信息
     async loadTaskDetails(taskInfo, taskIndex) {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         try {
           const sujectVisitId = taskInfo.VisitId
           const taskId = taskInfo.VisitTaskId
@@ -1242,10 +1071,10 @@ export default {
         toolGroup.addTool(PlanarRotateTool.toolName)
         toolGroup.addTool(ArrowAnnotateTool.toolName, {
           arrowHeadStyle: 'standard',
-          changeTextCallback: async(data, eventData, doneChangingTextCallback) => {
+          changeTextCallback: async (data, eventData, doneChangingTextCallback) => {
             return doneChangingTextCallback(data.text)
           },
-          getTextCallback: async(doneChangingTextCallback) => {
+          getTextCallback: async (doneChangingTextCallback) => {
             return doneChangingTextCallback('Annotation')
           }
         })
@@ -1300,6 +1129,13 @@ export default {
             ]
           })
         }
+        toolGroup.setToolConfiguration(
+          ScaleOverlayTool.toolName,
+          {
+            scaleLocation: 'bottom'
+          },
+          true // overwrite
+        )
         toolGroup.setToolActive(StackScrollTool.toolName, {
           bindings: [{ mouseButton: MouseBindings.Wheel }]
         })
@@ -1513,9 +1349,9 @@ export default {
     },
     annotationRemovedListener(e) {
       const { annotation } = e.detail
-      try{
+      try {
         if (!annotation) return
-        if (this. readingTaskState === 2 && !annotation.data.label) return false
+        if (this.readingTaskState === 2 && !annotation.data.label) return false
         if (this.readingTaskState === 2) {
           const errorMsg = { message: 'annotation Not allowed to operate' }
           throw errorMsg
@@ -1577,7 +1413,7 @@ export default {
               clearTimeout(this.saveCustomAnnotationTimer)
               this.saveCustomAnnotationTimer = null
             }
-            this.saveCustomAnnotationTimer = setTimeout(()=>{this.saveCustomAnnotation(annotation)},500)
+            this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 500)
           }
         } else {
           // if (this.isNumber(operateStateEnum)) {
@@ -1598,29 +1434,29 @@ export default {
         const measureData = Object.assign({}, annotation)
         const params = {}
         await this.getScreenshots({
-            visitTaskId: this.visitTaskId,
-            annotation
-          },async (base64Str) =>{
-            const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str)
-            let picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-            params.PicturePath = picturePath
-            params.MarkTool = measureData.markTool
-            params.OrderMarkName = measureData.data.label
-            params.VisitTaskId = this.taskInfo.VisitTaskId
-            params.StudyId = annotation.studyId
-            params.SeriesId = annotation.seriesId
-            params.InstanceId = annotation.instanceId
-            params.Id = annotation.id ? annotation.id : ''
-            params.MeasureData = JSON.stringify(measureData)
-            params.NumberOfFrames = annotation.numberOfFrames
-            params.MarkId = annotation.annotationUID
-            const res = await submitCustomTag(params)
-            annotation.id = res.Result
-            annotation.markId = params.MarkId
-          })
-        
+          visitTaskId: this.visitTaskId,
+          annotation
+        }, async (base64Str) => {
+          const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str)
+          let picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+          params.PicturePath = picturePath
+          params.MarkTool = measureData.markTool
+          params.OrderMarkName = measureData.data.label
+          params.VisitTaskId = this.taskInfo.VisitTaskId
+          params.StudyId = annotation.studyId
+          params.SeriesId = annotation.seriesId
+          params.InstanceId = annotation.instanceId
+          params.Id = annotation.id ? annotation.id : ''
+          params.MeasureData = JSON.stringify(measureData)
+          params.NumberOfFrames = annotation.numberOfFrames
+          params.MarkId = annotation.annotationUID
+          const res = await submitCustomTag(params)
+          annotation.id = res.Result
+          annotation.markId = params.MarkId
+        })
+
       } catch (e) {
-         this.loading = false
+        this.loading = false
         console.log(e)
       }
     },
@@ -1647,7 +1483,7 @@ export default {
             clearTimeout(this.saveCustomAnnotationTimer)
             this.saveCustomAnnotationTimer = null
           }
-          this.saveCustomAnnotationTimer = setTimeout(()=>{this.saveCustomAnnotation(annotation)},1000)
+          this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 1000)
         }
       }
       this.setToolsPassive()
@@ -1685,11 +1521,11 @@ export default {
               '?'
             )
             if (annotation.markId) {
-            let res = await deleteCustomTag(annotation.markId)
-            if (!res.IsSuccess) throw ''
-            }else if (annotation.id) {
-            let res = await deleteCustomTag(annotation.id)
-            if (!res.IsSuccess) throw ''
+              let res = await deleteCustomTag(annotation.markId)
+              if (!res.IsSuccess) throw ''
+            } else if (annotation.id) {
+              let res = await deleteCustomTag(annotation.id)
+              if (!res.IsSuccess) throw ''
             }
           }
           const index = this.markedSeriesIds.indexOf(annotation.seriesId)
@@ -1739,7 +1575,7 @@ export default {
         }
       }
     },
-    annotationSelectionChangeListener(e) {},
+    annotationSelectionChangeListener(e) { },
     async getAnnotations(visitTaskId) {
       if (this.readingTaskState === 2) return
       const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
@@ -1936,7 +1772,7 @@ export default {
       if (length === undefined) {
         return textLines
       }
-      
+
       textLines.push(
         `L: ${parseFloat(length).toFixed(this.digitPlaces)} ${unit || unit}`,
         `S: ${parseFloat(width).toFixed(this.digitPlaces)} ${unit}`
@@ -2036,7 +1872,7 @@ export default {
     processSingle(str, precision) {
       const num = parseFloat(str)
       if (isNaN(num)) return 'NaN'
-      
+
       // 保留原极小值处理逻辑
       if (Math.abs(num) < 0.0001) return str
       const factor = 10 ** precision
@@ -2330,7 +2166,7 @@ export default {
       } else {
         const lower = v.wc - v.ww / 2
         const upper = v.wc + v.ww / 2 - 1
-        viewport.setProperties({ voiRange: { upper: upper, lower: lower }})
+        viewport.setProperties({ voiRange: { upper: upper, lower: lower } })
         viewport.render()
       }
     },
@@ -2345,7 +2181,7 @@ export default {
       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.setProperties({ voiRange: { upper: upper, lower: lower } })
       viewport.render()
       this.customWwc.visible = false
     },
@@ -2975,7 +2811,7 @@ export default {
         // if (isShowCancelButton) {
         //   message = `<div><p>${this.$t('trials:noneDicom:message:msg1')}</p><p style='font-size:12px' class='customPromptTip'>${this.$t('trials:noneDicom:message:saveTip')}</p></div>`
         // }
-        const { value } = await this.$prompt( message, '', {
+        const { value } = await this.$prompt(message, '', {
           showClose: false,
           cancelButtonText: isShowCancelButton ? this.$t('trials:reading:button:temporarySave') : this.$t('common:button:cancel'),
           confirmButtonText: isShowCancelButton ? this.$t('trials:reading:button:enduringSave') : this.$t('trials:reading:button:relevancy'),
@@ -2984,7 +2820,7 @@ export default {
           inputValidator: (res) => {
             if (!res) {
               return isShowCancelButton ? this.$t('trials:noneDicom:message:saveTip') : this.$t('trials:noneDicom:message:saveTipByRelevancy')
-            } 
+            }
           },
           inputErrorMessage: this.$t('trials:noneDicom:message:saveTip'),
           showCancelButton: true,
@@ -3006,7 +2842,7 @@ export default {
           }
         })
         return value
-      } catch(err) {
+      } catch (err) {
         console.log(err)
         return null
       }
@@ -3023,7 +2859,7 @@ export default {
     },
     debounce(callback, delay) {
       let timerId
-      return function() {
+      return function () {
         clearTimeout(timerId)
         timerId = setTimeout(() => {
           callback.apply(this, arguments)
@@ -3240,7 +3076,7 @@ export default {
         .then((res) => {
           this.trialCriterion = res.Result
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     async uploadScreenshots(fileName, file) {
       try {
@@ -3299,370 +3135,431 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .read-page-container {
-    box-sizing: border-box;
-    height: 100%;
+.read-page-container {
+  box-sizing: border-box;
+  height: 100%;
+  display: flex;
+
+  ::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+
+  .left-panel {
     display: flex;
+    width: 200px;
+    border: 1px solid #727272;
+    color: #fff;
+    user-select: none;
+
     ::-webkit-scrollbar {
-      width: 5px;
-      height: 5px;
+      width: 3px;
+      height: 3px;
     }
+
     ::-webkit-scrollbar-thumb {
       border-radius: 10px;
       background: #d0d0d0;
     }
-    .left-panel {
+
+    .task-container {
+      position: relative;
+      width: 25px;
+      overflow-y: auto;
+    }
+
+    .task-info {
+      position: absolute;
+      top: 5px;
+      right: 20px;
+      transform-origin: right top;
+      transform: rotate(-90deg);
       display: flex;
-      width: 200px;
-      border: 1px solid #727272;
-      color: #fff;
-      user-select: none;
-      ::-webkit-scrollbar {
-        width: 3px;
-        height: 3px;
+
+      .task-item {
+        margin-left: 10px;
+        white-space: nowrap;
+        padding: 0px 4px;
+        border: 1px solid #999999;
+        border-bottom: none;
+        text-align: center;
+        background-color: #4e4e4e;
+        color: #d5d5d5;
+        cursor: pointer;
       }
-      ::-webkit-scrollbar-thumb {
-        border-radius: 10px;
-        background: #d0d0d0;
-      }
-      .task-container {
-        position: relative;
-        width: 25px;
-        overflow-y: auto;
-      }
-      .task-info {
-        position: absolute;
-        top: 5px;
-        right: 20px;
-        transform-origin: right top;
-        transform: rotate(-90deg);
-        display: flex;
-        .task-item {
-          margin-left: 10px;
-          white-space: nowrap;
-          padding: 0px  4px;
-          border: 1px solid #999999;
-          border-bottom:none ;
-          text-align: center;
-          background-color: #4e4e4e;
-          color: #d5d5d5;
-          cursor: pointer;
-        }
-        .task-item-active {
-          background-color: #607d8b;
-          border: 1px solid #607d8b;
-        }
-      }
-      .study-info {
-        width: 170px;
-        border-left: 1px solid #727272;
+
+      .task-item-active {
+        background-color: #607d8b;
+        border: 1px solid #607d8b;
       }
     }
-    .middle-panel {
-      flex: 1;
-      border: 1px solid #727272;
-      margin: 0 5px;
+
+    .study-info {
+      width: 170px;
+      border-left: 1px solid #727272;
+    }
+  }
+
+  .middle-panel {
+    flex: 1;
+    border: 1px solid #727272;
+    margin: 0 5px;
+    user-select: none;
+
+    .dicom-viewer {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      height: 100%;
       user-select: none;
-      .dicom-viewer {
+
+      .tools-wrapper {
+        height: 50px;
         display: flex;
-        flex-direction: column;
-        width:100%;
-        height: 100%;
-        user-select: none;
-        .tools-wrapper {
-          height: 50px;
-          display: flex;
-          align-items: center;
-          border-bottom: 1px solid #727272;
-          color: #ddd;
-          padding: 0 5px;
-          .tools-left {
-            flex: 1;
-            display: flex;
-            flex-direction: row;
-            justify-content: flex-start;
-            align-items: center;
-          }
-          .tool-item {
-            padding: 5px;
-            margin: 0 5px;
-            border: 1px solid #333;
-            font-size: 20px;
-            cursor: pointer;
-            .el-dropdown-link {
-              .svg-icon {
-                color: #ddd;
-                font-size: 20px;
-              }
-            }
-          }
-          .tool-item-active {
-            background-color: #607d8b;
-          }
-          .tool-disabled {
-            cursor: not-allowed;
-          }
-          .tool-frame{
-            display: flex;
-            flex-direction: row;
-            justify-content: flex-start;
-            align-items: center;
-            // margin-right: 20px;
-            padding: 1px;
-            margin: 0 5px;
-            border: 1px solid #404040;
-            .icon{
-              padding: 5px;
-              border-right: 1px solid #404040;
-              cursor: pointer;
-              text-align: center;
-              .svg-icon{
-                font-size:20px;
-                color:#ddd;
-              }
-            }
-            .select-wrapper{
-              width: 60px;
-              background-color: black;
-              color: #ddd;
-              border: none;
-              font-size: 13px;
-              outline: none;
-            }
-            .text{
-              position: relative;
-              font-size: 12px;
-              margin-top: 5px;
-              color: #d0d0d0;
-              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;
-          }
-        }
-        .content-wrapper {
+        align-items: center;
+        border-bottom: 1px solid #727272;
+        color: #ddd;
+        padding: 0 5px;
+
+        .tools-left {
           flex: 1;
-          height: calc(100% - 50px);
           display: flex;
           flex-direction: row;
+          justify-content: flex-start;
+          align-items: center;
         }
-        .viewports-wrapper {
-          flex: 1;
-          .grid-container {
-            display: grid;
-            height: 100%;
-            width: 100%;
+
+        .tool-item {
+          padding: 5px;
+          margin: 0 5px;
+          border: 1px solid #333;
+          font-size: 20px;
+          cursor: pointer;
+
+          .el-dropdown-link {
+            .svg-icon {
+              color: #ddd;
+              font-size: 20px;
+            }
+          }
+        }
+
+        .tool-item-active {
+          background-color: #607d8b;
+        }
+
+        .tool-disabled {
+          cursor: not-allowed;
+        }
+
+        .tool-frame {
+          display: flex;
+          flex-direction: row;
+          justify-content: flex-start;
+          align-items: center;
+          // margin-right: 20px;
+          padding: 1px;
+          margin: 0 5px;
+          border: 1px solid #404040;
+
+          .icon {
+            padding: 5px;
+            border-right: 1px solid #404040;
+            cursor: pointer;
+            text-align: center;
+
+            .svg-icon {
+              font-size: 20px;
+              color: #ddd;
+            }
+          }
+
+          .select-wrapper {
+            width: 60px;
+            background-color: black;
+            color: #ddd;
+            border: none;
+            font-size: 13px;
+            outline: none;
+          }
+
+          .text {
             position: relative;
-          }
-          .viewports-box {
-            display: grid;
-            position: absolute;
-            height: 100%;
-            width: 100%;
-            top: 0;
-            left: 0;
-            bottom: 0;
-            right: 0;
-            z-index: 9;
-          }
-          .viewports-box-down{
-            z-index: 1;
-          }
-          .grid-cell {
-            border: 1px dashed #ccc;;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            z-index: 1;
-          }
-          .cell_active {
-            border-color: #fafa00!important;
-          }
-          .cell-full-screen {
-            grid-column: 1 / -1;
-            grid-row: 1 / -1;
-            z-index: 9;
+            font-size: 12px;
+            margin-top: 5px;
+            color: #d0d0d0;
+            display: none;
           }
         }
-        .form-wrapper {
-          width: 400px;
-          height: 100%;
-          border: 1px solid #727272;
-          user-select: 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;
         }
       }
-    }
 
-    .personal_config {
-      ::v-deep .el-tabs__content{
-        height: 450px;
-        overflow-y: auto;
-      }
-    }
-    ::v-deep .manuals-dialog-container{
-      margin-top: 50px !important;
-      width:75%;
-      height:80%;
-      .el-dialog__body{
-        padding: 10px;
-        height: calc(100% - 50px) !important;
-      }
-      .el-dialog__header{
-        position: relative;
-      }
-    }
-    ::v-deep .manuals-full-dialog-container{
-      .el-dialog__body{
-        padding: 10px;
-        height: calc(100% - 50px) !important;
-      }
-      .el-dialog__header{
-        position: relative;
-      }
-    }
-    ::v-deep .cd-dialog-container{
-      background: #fff !important;
-      margin-top: 50px !important;
-      width: 75%;
-      height: 80%;
-      .el-dialog__body{
-        padding: 20px 20px 0 20px;
-        height: calc(100% - 70px);
-      }
-      .el-dialog__header{
-        position: relative;
-      }
-    }
-
-    ::v-deep .cd-full-dialog-container{
-      background: #fff !important;
-      .el-dialog__body{
-        padding: 10px;
-        height: calc(100% - 50px) !important;
-      }
-      .el-dialog__header{
-        position: relative;
-      }
-    }
-    ::v-deep .el-dropdown-menu{
-      .el-dropdown-menu__item {
-        padding: 0 5px;
-      }
-      .layout_flex_row {
+      .content-wrapper {
+        flex: 1;
+        height: calc(100% - 50px);
         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;
+
+      .viewports-wrapper {
+        flex: 1;
+
+        .grid-container {
+          display: grid;
+          height: 100%;
+          width: 100%;
+          position: relative;
+        }
+
+        .viewports-box {
+          display: grid;
+          position: absolute;
+          height: 100%;
+          width: 100%;
+          top: 0;
+          left: 0;
+          bottom: 0;
+          right: 0;
+          z-index: 9;
+        }
+
+        .viewports-box-down {
+          z-index: 1;
+        }
+
+        .grid-cell {
+          border: 1px dashed #ccc;
+          ;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          z-index: 1;
+        }
+
+        .cell_active {
+          border-color: #fafa00 !important;
+        }
+
+        .cell-full-screen {
+          grid-column: 1 / -1;
+          grid-row: 1 / -1;
+          z-index: 9;
+        }
       }
-      .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;
+
+      .form-wrapper {
+        width: 400px;
+        height: 100%;
+        border: 1px solid #727272;
+        user-select: none;
       }
     }
   }
 
+  .personal_config {
+    ::v-deep .el-tabs__content {
+      height: 450px;
+      overflow-y: auto;
+    }
+  }
+
+  ::v-deep .manuals-dialog-container {
+    margin-top: 50px !important;
+    width: 75%;
+    height: 80%;
+
+    .el-dialog__body {
+      padding: 10px;
+      height: calc(100% - 50px) !important;
+    }
+
+    .el-dialog__header {
+      position: relative;
+    }
+  }
+
+  ::v-deep .manuals-full-dialog-container {
+    .el-dialog__body {
+      padding: 10px;
+      height: calc(100% - 50px) !important;
+    }
+
+    .el-dialog__header {
+      position: relative;
+    }
+  }
+
+  ::v-deep .cd-dialog-container {
+    background: #fff !important;
+    margin-top: 50px !important;
+    width: 75%;
+    height: 80%;
+
+    .el-dialog__body {
+      padding: 20px 20px 0 20px;
+      height: calc(100% - 70px);
+    }
+
+    .el-dialog__header {
+      position: relative;
+    }
+  }
+
+  ::v-deep .cd-full-dialog-container {
+    background: #fff !important;
+
+    .el-dialog__body {
+      padding: 10px;
+      height: calc(100% - 50px) !important;
+    }
+
+    .el-dialog__header {
+      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>
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 4adf0b6e..c1fd2a45 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -255,7 +255,7 @@ export default {
     ...mapGetters(['language']),
     isBaseline() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
-      return this.visitTaskList[i].IsBaseLine
+      return this.visitTaskList[i] ? this.visitTaskList[i].IsBaseLine : false
     }
   },
   watch: {
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 f37090b0..0a3adcd5 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
@@ -1,59 +1,34 @@
 <template>
-  <div
-    ref="viewport"
-    class="viewport-wrapper"
-    v-loading="loading"
-    :element-loading-text="NSTip"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    @mouseup="sliderMouseup"
-    @mousemove="sliderMousemove"
-    @mouseleave="sliderMouseleave"
-  >
+  <div ref="viewport" class="viewport-wrapper" v-loading="loading" :element-loading-text="NSTip"
+    element-loading-background="rgba(0, 0, 0, 0.8)" @mouseup="sliderMouseup" @mousemove="sliderMousemove"
+    @mouseleave="sliderMouseleave">
     <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)"
-        />
+      <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)" />
       </div>
-      <h2
-        v-if="taskInfo.IsReadingShowSubjectInfo"
-        class="subject-info"
-      >
+      <h2 v-if="taskInfo.IsReadingShowSubjectInfo" class="subject-info">
         {{ `${series.TaskInfo.SubjectCode} ${series.TaskInfo.TaskBlindName} ` }}
       </h2>
       <div>Series: #{{ series.SeriesNumber }}</div>
       <div v-if="series.Stack">Image: #{{ `${series.SliceIndex + 1}/${series.Stack.length}` }}</div>
       <div>{{ series.Modality }}</div>
     </div>
-    <div
-      v-if="series && taskInfo && taskInfo.IsReadingTaskViewInOrder === 1"
-      class="top-center-tool"
-    >
+    <div v-if="series && taskInfo && taskInfo.IsReadingTaskViewInOrder === 1" class="top-center-tool">
       <div class="toggle-visit-container">
-        <div
-          class="arrw_icon"
-          :style="{ cursor: series.TaskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: series.TaskInfo.VisitTaskNum !== 0 ? '#fff': '#6b6b6b' }"
+        <div class="arrw_icon"
+          :style="{ cursor: series.TaskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: series.TaskInfo.VisitTaskNum !== 0 ? '#fff' : '#6b6b6b' }"
           @click.stop.prevent="toggleTask($event, series.TaskInfo.VisitTaskNum, -1)"
-          @dblclick.stop="preventDefault($event)"
-        >
+          @dblclick.stop="preventDefault($event)">
           <i class="el-icon-caret-left" />
         </div>
         <div class="arrow_text">
           {{ series.TaskInfo.TaskBlindName }}
         </div>
-        <div
-          class="arrw_icon"
-          :style="{ cursor: series.TaskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: series.TaskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff': '#6b6b6b' }"
+        <div class="arrw_icon"
+          :style="{ cursor: series.TaskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: series.TaskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff' : '#6b6b6b' }"
           @click.stop.prevent="toggleTask($event, series.TaskInfo.VisitTaskNum, 1)"
-          @dblclick.stop="preventDefault($event)"
-        >
+          @dblclick.stop="preventDefault($event)">
           <i class="el-icon-caret-right" />
         </div>
       </div>
@@ -65,11 +40,13 @@
       <div v-show="mousePosition.index.length > 0">
         Pos: {{ mousePosition.index[0] }}, {{ mousePosition.index[1] }}
       </div>
-      <div v-if="(series.Modality === 'CT' || series.Modality === 'DR' || series.Modality === 'CR') && mousePosition.value">
+      <div
+        v-if="(series.Modality === 'CT' || series.Modality === 'DR' || series.Modality === 'CR') && mousePosition.value">
         HU: {{ mousePosition.value }}
       </div>
       <div v-else-if="(series.Modality === 'PT' && mousePosition.value)">
-        {{mousePosition.modalityUnit}}: {{ digitPlaces === -1 ?mousePosition.value.toFixed(3) :mousePosition.value.toFixed(digitPlaces) }}
+        {{ mousePosition.modalityUnit }}: {{ digitPlaces === -1 ? mousePosition.value.toFixed(3)
+          : mousePosition.value.toFixed(digitPlaces) }}
       </div>
       <div v-else-if="mousePosition.value">
         Density: {{ mousePosition.value }}
@@ -83,8 +60,9 @@
     </div>
     <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>
+      <div v-show="series.SliceThickness">Slice Thickness: {{ `${Number(series.SliceThickness).toFixed(digitPlaces)} mm`
+      }}</div>
+      <div v-show="imageInfo.wwwc">WW/WL: {{ imageInfo.wwwc }}</div>
     </div>
     <div class="orientation-top">
       {{ markers.top }}
@@ -100,7 +78,8 @@
       {{ markers.left }}
     </div>
     <div ref="sliderBox" class="right-slider-box" @click.stop="clickSlider($event)">
-      <div :style="{top: sliderInfo.height + '%'}" class="slider" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
+      <div :style="{ top: sliderInfo.height + '%' }" class="slider" @click.stop.prevent="() => { return }"
+        @mousedown.stop="sliderMousedown($event)" />
     </div>
   </div>
 </template>
@@ -195,7 +174,7 @@ export default {
       this.element.addEventListener('CORNERSTONE_STACK_NEW_IMAGE', this.stackNewImage)
       // this.element.addEventListener('CORNERSTONE_VOI_MODIFIED', this.voiModified)
       // this.element.addEventListener('CORNERSTONE_CAMERA_MODIFIED', this.cameraModified)
-      
+
       this.element.addEventListener('CORNERSTONE_IMAGE_RENDERED', this.imageRendered)
       this.element.addEventListener('CORNERSTONE_TOOLS_MOUSE_MOVE', this.cornerstoneToolsMouseMove)
       this.element.addEventListener('mouseleave', () => {
@@ -219,9 +198,9 @@ export default {
       // this.imageInfo.wwwc = `${Math.round(detail.image.windowWidth)}/${Math.round(detail.image.windowCenter)}`
       this.getOrientationMarker()
       this.$emit('renderAnnotations', this.series)
-      // const toolGroupId = `viewport-${this.viewportIndex}`
-      // const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
-      // toolGroup.setToolEnabled('ScaleOverlay')
+      const toolGroupId = this.viewportId
+      const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId)
+      toolGroup.setToolEnabled('ScaleOverlay')
     },
     imageRendered(e) {
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
@@ -385,7 +364,7 @@ export default {
       }
     },
     cachePTMetadata(images) {
-      images.map(i=>{
+      images.map(i => {
         const instanceMetadata = getPTImageIdInstanceMetadata(i.imageId)
         if (typeof instanceMetadata.CorrectedImage === 'string') {
           instanceMetadata.CorrectedImage = instanceMetadata.CorrectedImage.split('\\')
@@ -416,7 +395,7 @@ export default {
         }
         this.prefetchMetadataInformation(obj.ImageIds, obj.Modality)
         await viewport.setStack(this.series.Stack, obj.SliceIndex)
-        
+
         viewport.render()
       } catch (e) {
         console.log(e)
@@ -549,10 +528,11 @@ export default {
 </script>
 <style lang="scss" scoped>
 .viewport-wrapper {
-  width:100%;
-  height:100%;
+  width: 100%;
+  height: 100%;
   position: relative;
   cursor: default !important;
+
   .left-top-text {
     position: absolute;
     left: 5px;
@@ -560,26 +540,31 @@ export default {
     color: #ddd;
     z-index: 1;
     font-size: 12px;
+
     .cd-info {
       color: #ddd;
       font-size: 18px;
     }
+
     .subject-info {
-      color:#f44336;
+      color: #f44336;
       padding: 5px 0px;
       margin: 0;
     }
   }
+
   .top-center-tool {
     position: absolute;
-    left:50%;
+    left: 50%;
     top: 5px;
     transform: translateX(-50%);
     z-index: 1;
+
     .toggle-visit-container {
       display: flex;
     }
-    .arrw_icon{
+
+    .arrw_icon {
       width: 20px;
       height: 20px;
       background-color: #3f3f3f;
@@ -587,15 +572,17 @@ export default {
       line-height: 20px;
       border-radius: 10%;
     }
-    .arrow_text{
+
+    .arrow_text {
       height: 20px;
       line-height: 20px;
       background-color: #00000057;
       color: #fff;
-      padding:0 10px;
+      padding: 0 10px;
       font-size: 14px;
     }
   }
+
   .right-top-text {
     position: absolute;
     right: 5px;
@@ -604,6 +591,7 @@ export default {
     z-index: 1;
     font-size: 12px;
   }
+
   .left-bottom-text {
     position: absolute;
     left: 5px;
@@ -612,6 +600,7 @@ export default {
     z-index: 1;
     font-size: 12px;
   }
+
   .right-bottom-text {
     position: absolute;
     right: 5px;
@@ -620,6 +609,7 @@ export default {
     z-index: 1;
     font-size: 12px;
   }
+
   .right-slider-box {
     position: absolute;
     right: 1px;
@@ -631,7 +621,8 @@ export default {
     z-index: 1;
     cursor: pointer;
   }
-  .right-slider-box:after{
+
+  .right-slider-box:after {
     content: '';
     position: absolute;
     bottom: -20px;
@@ -640,15 +631,17 @@ export default {
     width: 100%;
     background: #333;
   }
+
   .slider {
     height: 20px;
     width: 100%;
     position: absolute;
     top: 0;
-    z-index:10;
+    z-index: 10;
     background: #9e9e9e;
     cursor: move
   }
+
   .orientation-top {
     position: absolute;
     left: 50%;
@@ -657,6 +650,7 @@ export default {
     transform: translateX(-50%);
     z-index: 1;
   }
+
   .orientation-bottom {
     position: absolute;
     left: 50%;
@@ -665,6 +659,7 @@ export default {
     transform: translateX(-50%);
     z-index: 1;
   }
+
   .orientation-left {
     position: absolute;
     top: 50%;
@@ -673,6 +668,7 @@ export default {
     transform: translateY(-50%);
     z-index: 1;
   }
+
   .orientation-right {
     position: absolute;
     top: 50%;

From 38eef44d79195016aacd80b0f1e27de5a595e0fa Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 10 Oct 2025 16:47:44 +0800
Subject: [PATCH 007/333] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/customize/QuestionFormItem.vue |  4 ++--
 .../customize/QuestionTableFormItem.vue       | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 55eb03c1..35483470 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -8,7 +8,7 @@
       style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
       <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
         <span :title="question.Remark">{{ question.QuestionName }}</span>
-        <el-button size="mini" v-if="readingTaskState < 2" @click="openAddTableCol(question)">
+        <el-button size="mini" v-if="readingTaskState < 2 && !question.IsPreinstall" @click="openAddTableCol(question)">
           {{ $t('common:button:add') }}
         </el-button>
       </div>
@@ -39,7 +39,7 @@
               {{ $t('common:button:edit') }}
             </el-button>
             <el-button type="text" size="mini" :disabled="addOrEdit.visible"
-              v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || isBaseline"
+              v-if="(scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || isBaseline) && !question.IsPreinstall"
               @click="deleteTableCol(question, scope.$index)">
               {{ $t('common:button:delete') }}
             </el-button>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index 690db9da..cbb9bc2e 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -15,14 +15,14 @@
       :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' || question.Type === 'screenshot' ? 'uploadWrapper' : '']">
       <!-- 输入框 -->
       <el-input v-if="question.Type === 'input'" v-model="questionForm[question.Id]"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')" />
+        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False') || question.IsPreinstall" />
       <!-- 多行文本输入框 -->
       <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False') || question.IsPreinstall"
         :autosize="{ minRows: 2, maxRows: 4 }" />
       <!-- 下拉框 -->
       <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
-        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+        :disabled="(question.TableQuestionType === 2 || question.IsPreinstall || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
         @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]"
@@ -44,7 +44,7 @@
       </el-select>
       <!-- 单选 -->
       <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+        :disabled="question.TableQuestionType === 2 || question.IsPreinstall || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
         @change="((val) => { formItemChange(val, question) })">
         <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
           {{ val }}
@@ -52,7 +52,7 @@
       </el-radio-group>
       <!-- 复选框 -->
       <el-checkbox-group v-if="question.Type === 'checkbox'"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+        :disabled="question.TableQuestionType === 2 || question.IsPreinstall || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
         v-model="questionForm[question.Id]">
         <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
           {{ val }}
@@ -62,11 +62,11 @@
       <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
         v-model="questionForm[question.Id]" />
       <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType" @change="(val) => { formItemChange(val, question) }">
+        :disabled="!question.ClassifyEditType || question.IsPreinstall" @change="(val) => { formItemChange(val, question) }">
         <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
       </el-select>
       <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-        v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType"
+        v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || question.IsPreinstall"
         @change="(val) => { formItemChange(val, question) }">
         <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
           {{ item.trim() }}
@@ -86,7 +86,7 @@
             @blur="questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked ? () => { } : handleMarkedQsBlur(questionForm[question.Id], questionForm, question.Id, question)"
             v-model="questionForm[question.Id]"
             :title="questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] ? questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].OrderMarkName : question.Remark"
-            :disabled="(questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked && question.ImageMarkEnum === 2) || question.ImageMarkEnum === 1"
+            :disabled="(questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked && question.ImageMarkEnum === 2) || question.ImageMarkEnum === 1 || question.IsPreinstall"
             style="width: 150px;margin-right: 5px;">
             <template v-if="question.Unit !== 0" slot="append">
               {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
@@ -144,21 +144,21 @@
           <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
         </el-select>
         <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False') || question.IsPreinstall"
           @change="((val) => { formItemNumberChange(val, question) })" @input="numberInput(question.Id)"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)" v-model="questionForm[question.Id]">
           <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
             question.CustomUnit }}</template>
         </el-input>
         <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource === 1"
-          :disabled="question.DataSource === 1" @input="numberInput(question.Id, true)"
+          :disabled="question.DataSource === 1" @input="numberInput(question.Id, true) || question.IsPreinstall"
           @blur="handleCalculationBlur(calculationValue)" v-model="calculationValue">
           <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
             question.CustomUnit }}</template>
         </el-input>
       </template>
       <!-- 上传图像 -->
-      <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'" :disabled="readingTaskState === 2"
+      <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'" :disabled="readingTaskState === 2 || question.IsPreinstall"
         action :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
         :on-preview="handlePictureCardPreview"
         :before-upload="(file) => { return handleBeforeUpload(file, question.FileType, question.Type) }"

From a804ba40f06ec23ac2de2ffa326f059b5f67e126 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 10 Oct 2025 17:26:04 +0800
Subject: [PATCH 008/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE=E6=98=AF=E5=90=A6=E9=A2=84?=
 =?UTF-8?q?=E8=AE=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-unit/components/TableQsForm.vue   | 920 ++++++------------
 1 file changed, 277 insertions(+), 643 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index bc74f99b..90f65b9b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -1,157 +1,95 @@
 <template>
-  <el-form
-    ref="tableQsForm"
-    v-loading="loading"
-    :model="form"
-    size="small"
-    :rules="rules"
-    :disabled="type === 'look'"
-    label-width="130px"
-  >
+  <el-form ref="tableQsForm" v-loading="loading" :model="form" size="small" :rules="rules" :disabled="type === 'look'"
+    label-width="130px">
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 100px;">
         <!-- 类型 -->
         <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
-          <el-select
-            v-model="form.Type"
-            clearable
-            @change="((val)=>{qsTypeChange(val, form)})"
-          >
+          <el-select v-model="form.Type" clearable @change="((val) => { qsTypeChange(val, form) })">
             <template v-for="item of $d.Criterion_Question_Type">
               <el-option
-                v-if="item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group' && item.value !== 'fixedTable' && item.value !== 'calculation' "
-                :key="item.value"
-                :value="item.value"
-                :label="item.label"
-              />
+                v-if="item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group' && item.value !== 'fixedTable' && item.value !== 'calculation'"
+                :key="item.value" :value="item.value" :label="item.label" />
             </template>
           </el-select>
         </el-form-item>
         <!-- 问题名称 -->
-        <el-form-item
-          v-if="form.Type !== 'group'&& $i18n.locale !== 'en'"
-          :label="$t('trials:readingUnit:qsList:title:qsName')"
-          prop="QuestionName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group' && $i18n.locale !== 'en'"
+          :label="$t('trials:readingUnit:qsList:title:qsName')" prop="QuestionName" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
-          <el-input
-            v-model="form.QuestionName"
-          />
+          ]">
+          <el-input v-model="form.QuestionName" />
         </el-form-item>
         <!-- 问题名称（EN） -->
-        <el-form-item
-          v-if="form.Type !== 'group'&& $i18n.locale !== 'zh'"
-          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          prop="QuestionEnName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group' && $i18n.locale !== 'zh'"
+          :label="$t('trials:readingUnit:qsList:title:qsNameEn')" prop="QuestionEnName" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
-          <el-input
-            v-model="form.QuestionEnName"
-          />
+          ]">
+          <el-input v-model="form.QuestionEnName" />
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
         <!-- 公有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:publicProperties') }}</el-divider>
         <!-- 是否显示 -->
         <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isEnable')" prop="ShowQuestion">
-          <el-radio-group
-            v-model="form.ShowQuestion"
-            @change="((val)=>{isShowQuestionChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.ShowQuestion"
-              :key="`ShowQuestion${item.value}`"
-              :label="item.value"
-            >
+          <el-radio-group v-model="form.ShowQuestion" @change="((val) => { isShowQuestionChange(val, form) })">
+            <el-radio v-for="item of $d.ShowQuestion" :key="`ShowQuestion${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 是否必填 -->
-        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'summary'" :label="$t('trials:qcCfg:table:isRequired')" prop="IsRequired">
-          <el-radio-group
-            v-model="form.IsRequired"
-            :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-            @change="((val)=>{isRequiredChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.QuestionRequired"
-              :key="`QuestionRequired${item.value}`"
-              :label="item.value"
-            >
+        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'summary'"
+          :label="$t('trials:qcCfg:table:isRequired')" prop="IsRequired">
+          <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
+            @change="((val) => { isRequiredChange(val, form) })">
+            <el-radio v-for="item of $d.QuestionRequired" :key="`QuestionRequired${item.value}`" :label="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 是否预设 -->
+        <el-form-item v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'"
+          :label="$t('trials:qcCfg:table:IsPreinstall')" prop="IsPreinstall">
+          <el-radio-group v-model="form.IsPreinstall">
+            <el-radio v-for="item of $d.YesOrNo" :key="`QuestionIsPreinstall${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 显示时依赖父问题 -->
-        <el-form-item
-          v-if="form.ShowQuestion===1"
-          :label="$t('trials:readingUnit:qsList:title:parentId')"
-          prop="ParentId"
-        >
-          <el-select
-            v-model="form.ParentId"
-            clearable
-            @change="((val)=>{parentQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`ParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.ShowQuestion === 1" :label="$t('trials:readingUnit:qsList:title:parentId')"
+          prop="ParentId">
+          <el-select v-model="form.ParentId" clearable @change="((val) => { parentQuestionChange(val, form) })">
+            <el-option v-for="item of parentOptions" :key="`ParentId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 显示时依赖父问题触发值 -->
-        <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValueList">
+        <el-form-item v-if="form.ParentId && form.ShowQuestion === 1"
+          :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValueList">
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-            <el-option
-              v-for="item of parentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
+            <el-option v-for="item of parentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="String(item.value)" />
           </el-select>
         </el-form-item>
         <!-- 父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-          prop="RelevanceId"
-        >
-          <el-select
-            v-model="form.RelevanceId"
-            clearable
-            @change="((val)=>{relevanceQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`RelevanceId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')" prop="RelevanceId">
+          <el-select v-model="form.RelevanceId" clearable @change="((val) => { relevanceQuestionChange(val, form) })">
+            <el-option v-for="item of parentOptions" :key="`RelevanceId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 必填依赖的父问题触发值 -->
-        <el-form-item
-          v-if="form.RelevanceId && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-          prop="RelevanceValueList"
-        >
+        <el-form-item v-if="form.RelevanceId && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')" prop="RelevanceValueList">
           <el-select v-model="form.RelevanceValueList" clearable multiple>
-            <el-option
-              v-for="item of reParentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
+            <el-option v-for="item of reParentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="String(item.value)" />
           </el-select>
         </el-form-item>
         <!-- 导出标识 -->
@@ -176,589 +114,327 @@
           </el-radio-group>
         </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
-          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'">
           <el-select v-model="form.ExportResult" multiple>
-            <el-option
-              v-for="item in $d.ExportResult"
-              :key="`ExportResult${item.value}`"
-              :label="item.label"
+            <el-option v-for="item in $d.ExportResult" :key="`ExportResult${item.value}`" :label="item.label"
               :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
         <!-- 限制编辑 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
-          v-if="form.Type !== 'summary'"
-          prop="LimitEdit"
-          :rules="[
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="form.Type !== 'summary'"
+          prop="LimitEdit" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-radio-group v-model="form.LimitEdit">
             <el-radio v-for="item of $d.LimitEdit" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 是否复制前值 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:PrecopyValue')" 
-          v-if="form.Type !== 'summary'"
-        >
-          <el-switch
-            v-model="form.IsCopy"
-          />
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:PrecopyValue')" v-if="form.Type !== 'summary'">
+          <el-switch v-model="form.IsCopy" />
         </el-form-item>
         <!-- 注释 -->
-        <el-form-item
-          :label="$t('trials:readingUnit:qsList:title:Remark')"
-          prop="Remark"
-        >
-          <el-input
-            v-model="form.Remark"
-          />
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:Remark')" prop="Remark">
+          <el-input v-model="form.Remark" />
         </el-form-item>
         <!-- 序号 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:order')" 
-          prop="ShowOrder"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-input-number
-            v-model="form.ShowOrder"
-            controls-position="right"
-            :min="0"
-          />
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder" :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
         </el-form-item>
         <!-- 重复出现最大次数 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:MaxRowCount')" 
-          v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'"
-          prop="MaxRowCount"
-        >
-          <el-input-number
-            v-model="form.MaxRowCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:MaxRowCount')"
+          v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'" prop="MaxRowCount">
+          <el-input-number v-model="form.MaxRowCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
 
 
         <!-- 私有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
         <!-- 问题数据来源 -->
-        <el-form-item 
-          v-if="form.Type === 'number'" 
-          :label="$t('trials:readingUnit:qsList:title:dataSource')"
-          prop="DataSource"
-          :rules="[
+        <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
+          prop="DataSource" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.DataSource"
-          >
-            <el-radio
-              v-for="item of $d.DataSource"
-              :key="`DataSource${item.value}`"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.DataSource">
+            <el-radio v-for="item of $d.DataSource" :key="`DataSource${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 数值类型 -->
-        <el-form-item
-          v-if="form.Type === 'number'"
-          :label="$t('trials:readingUnit:qsList:title:valueType')"
-          prop="ValueType"
-          :rules="[
-            { required: true, message: $t('trials:researchForm:formRule:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ValueType"
-          >
-          <template v-for="item of $d.ValueType">
-            <el-radio 
-              v-if="item.value !== 3"
-              :key="item.id"
-              :label="item.value"
-            >
-              {{ item.label }}
-            </el-radio>
-          </template>
+        <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:valueType')"
+          prop="ValueType" :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:select') }
+          ]">
+          <el-radio-group v-model="form.ValueType">
+            <template v-for="item of $d.ValueType">
+              <el-radio v-if="item.value !== 3" :key="item.id" :label="item.value">
+                {{ item.label }}
+              </el-radio>
+            </template>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item
-          v-if="form.Type === 'number' && form.ValueType === 1"
-          :label="$t('trials:readingUnit:qsList:title:digitPlaces')"
-          prop="ValueType"
-          :rules="[
-            { required: true, message:  $t('trials:researchForm:formRule:select')}
-          ]"
-        >
+        <el-form-item v-if="form.Type === 'number' && form.ValueType === 1"
+          :label="$t('trials:readingUnit:qsList:title:digitPlaces')" prop="ValueType" :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:select') }
+          ]">
           <el-input :value="$fd('DigitPlaces', digitPlaces).toString()" :disabled="true" />
         </el-form-item>
         <!-- 单位 -->
-        <el-form-item
-          v-if="form.Type === 'number'"
-          :label="$t('trials:readingUnit:qsList:title:unit')"
-          prop="Unit"
+        <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:unit')" prop="Unit"
           :rules="[
-            { required: true, message: $t('trials:researchForm:formRule:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.Unit"
-          >
+            { required: true, message: $t('trials:researchForm:formRule:select') }
+          ]">
+          <el-radio-group v-model="form.Unit">
             <el-radio v-for="item of $d.ValueUnit" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 自定义单位 -->
-        <el-form-item
-          v-if="form.Type === 'number' && form.Unit === 4"
-          :label="$t('trials:readingUnit:qsList:title:customUnit')"
-          prop="CustomUnit"
-          :rules="[
-            { required: true, message: $t('trials:researchForm:formRule:select')}
-          ]"
-        >
+        <el-form-item v-if="form.Type === 'number' && form.Unit === 4"
+          :label="$t('trials:readingUnit:qsList:title:customUnit')" prop="CustomUnit" :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:select') }
+          ]">
           <el-input v-model="form.CustomUnit" />
         </el-form-item>
-        <div v-if="form.Type === 'number' && form.DataSource === 1" style="background: #f8f8f8;padding: 10px 0px;border-radius: 10px;position: relative;margin-bottom: 10px;">
-          <el-form-item
-            :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
-            prop="CustomCalculateMark"
+        <div v-if="form.Type === 'number' && form.DataSource === 1"
+          style="background: #f8f8f8;padding: 10px 0px;border-radius: 10px;position: relative;margin-bottom: 10px;">
+          <el-form-item :label="$t('trials:readingUnit:qsList:title:customCalculateMark')" prop="CustomCalculateMark"
             :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-          >
-            <el-radio-group
-              v-model="form.CustomCalculateMark"
-              style="line-height: 40px;"
-              @change="(v) => CustomCalculateMarkChange(v)"
-            >
+              { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+            ]">
+            <el-radio-group v-model="form.CustomCalculateMark" style="line-height: 40px;"
+              @change="(v) => CustomCalculateMarkChange(v)">
               <div>
-                <el-radio
-                  v-for="item of $d.CustomCalculateMark"
-                  v-show="item.value <= 4"
-                  :key="`CustomCalculateMark${item.value}`"
-                  :label="item.value"
-                >
+                <el-radio v-for="item of $d.CustomCalculateMark" v-show="item.value <= 4"
+                  :key="`CustomCalculateMark${item.value}`" :label="item.value">
                   {{ item.label }}
                 </el-radio>
               </div>
               <div>
-                <el-radio
-                  v-for="item of $d.CustomCalculateMark"
-                  v-show="item.value > 6 && item.value < 10"
-                  :key="`CustomCalculateMark${item.value}`"
-                  :label="item.value"
-                >
+                <el-radio v-for="item of $d.CustomCalculateMark" v-show="item.value > 6 && item.value < 10"
+                  :key="`CustomCalculateMark${item.value}`" :label="item.value">
                   {{ item.label }}
                 </el-radio>
               </div>
             </el-radio-group>
           </el-form-item>
-          <el-table
-            :data="form.CalculateQuestions"
-            style="margin: 10px;width: calc(100% - 20px)"
-            size="small"
-          >
-            <el-table-column
-              :label="$t('trials:readingUnit:qsList:title:order')"
-              min-width="70"
-            >
+          <el-table :data="form.CalculateQuestions" style="margin: 10px;width: calc(100% - 20px)" size="small">
+            <el-table-column :label="$t('trials:readingUnit:qsList:title:order')" min-width="70">
               <template slot-scope="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
-            <el-table-column
-              :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
-              show-overflow-tooltip
-              min-width="70"
-            >
+            <el-table-column :label="$t('trials:readingUnit:qsList:title:customCalculateMark')" show-overflow-tooltip
+              min-width="70">
               <template slot-scope="scope">
-                {{ scope.$index === 0 && [1, 2, 3, 4].includes(form.CustomCalculateMark) ? null : $fd('CustomCalculateMark', form.CustomCalculateMark) }}
+                {{ scope.$index === 0 && [1, 2, 3, 4].includes(form.CustomCalculateMark) ? null :
+                  $fd('CustomCalculateMark', form.CustomCalculateMark) }}
               </template>
             </el-table-column>
-            <el-table-column
-              :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-              prop="TableQuestionId"
-              show-overflow-tooltip
-              min-width="180"
-            >
+            <el-table-column :label="$t('trials:readingUnit:qsList:title:qsNameEn')" prop="TableQuestionId"
+              show-overflow-tooltip min-width="180">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.TableQuestionId" clearable>
-                  <el-option v-for="item of numberQuestions" :key="item.QuestionId" :label="item.QuestionName" :value="item.QuestionId" />
+                  <el-option v-for="item of numberQuestions" :key="item.QuestionId" :label="item.QuestionName"
+                    :value="item.QuestionId" />
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              :label="$t('common:action:action')"
-              prop="TableQuestionId"
-              show-overflow-tooltip
-            >
+            <el-table-column :label="$t('common:action:action')" prop="TableQuestionId" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-button
-                  icon="el-icon-plus"
-                  size="mini"
-                  circle
-                  :title="$t('common:button:add')"
-                  @click="addCustomCalculateMark(scope.$index)"
-                />
-                <el-button
-                  icon="el-icon-minus"
-                  size="mini"
-                  circle
-                  :disabled="form.CalculateQuestions.length <= 2"
-                  :title="$t('common:button:delete')"
-                  @click="deleteCustomCalculateMark(scope.$index)"
-                />
+                <el-button icon="el-icon-plus" size="mini" circle :title="$t('common:button:add')"
+                  @click="addCustomCalculateMark(scope.$index)" />
+                <el-button icon="el-icon-minus" size="mini" circle :disabled="form.CalculateQuestions.length <= 2"
+                  :title="$t('common:button:delete')" @click="deleteCustomCalculateMark(scope.$index)" />
               </template>
             </el-table-column>
           </el-table>
           <div style="font-size: 12px;color:#666;padding: 0 15px 0;text-align: right">
-            <i class="el-icon-info" />{{ [1, 2, 3, 4].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2') }}
+            <i class="el-icon-info" />{{ [1, 2, 3, 4].includes(form.CustomCalculateMark) ?
+              $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2') }}
           </div>
         </div>
         <!-- 影像标记:disabled="form.IsRequired === 0" -->
-        <el-form-item
-          v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
-          :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')"
-          prop="ImageMarkEnum"
-        >
-          <el-radio-group
-            v-model="form.ImageMarkEnum"
-            
-            @change="imageMarkEnumChange"
-          >
-            <el-radio v-for="item of $d.ImageMark" :key="item.id" :label="item.value" :disabled="form.IsRequired === 2 && item.value === 1">{{ item.label }}</el-radio>
+        <el-form-item v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
+          :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')" prop="ImageMarkEnum">
+          <el-radio-group v-model="form.ImageMarkEnum" @change="imageMarkEnumChange">
+            <el-radio v-for="item of $d.ImageMark" :key="item.id" :label="item.value"
+              :disabled="form.IsRequired === 2 && item.value === 1">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 测量工具 ImageTool -->
-        <el-form-item
-          v-if="form.ImageMarkEnum === 1 || form.ImageMarkEnum === 2"
-          :label="$t('trials:readingUnit:qsList:title:ImageTool')"
-          prop="ImageTool"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ImageTool"
-            @change="imageToolChange"
-          >
-            <el-radio 
-              v-for="tool of readingTools" 
-              :key="tool.toolName" 
-              :label="tool.toolName" 
-            >
+        <el-form-item v-if="form.ImageMarkEnum === 1 || form.ImageMarkEnum === 2"
+          :label="$t('trials:readingUnit:qsList:title:ImageTool')" prop="ImageTool" :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select') }
+          ]">
+          <el-radio-group v-model="form.ImageTool" @change="imageToolChange">
+            <el-radio v-for="tool of readingTools" :key="tool.toolName" :label="tool.toolName">
               {{ $t(tool.i18nKey) }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 测量值 ImageToolAttribute -->
-        <el-form-item
-          v-if="form.ImageTool && imageToolAttributes.length > 0"
-          :label="$t('trials:readingUnit:qsList:title:ImageToolAttribute')"
-          prop="ImageToolAttribute"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ImageToolAttribute"
-          >
-            <el-radio 
-              v-for="i of imageToolAttributes" 
-              :key="i" 
-              :label="i" 
-            >
+        <el-form-item v-if="form.ImageTool && imageToolAttributes.length > 0"
+          :label="$t('trials:readingUnit:qsList:title:ImageToolAttribute')" prop="ImageToolAttribute" :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select') }
+          ]">
+          <el-radio-group v-model="form.ImageToolAttribute">
+            <el-radio v-for="i of imageToolAttributes" :key="i" :label="i">
               {{ i }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item
-          v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'input') && isFromSystem"
-          :label="$t('trials:readingUnit:label:QuestionGenre')"
-          prop="TableQuestionType"
-          :rules="[
-            { required: form.Type !== 'input', message: $t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.TableQuestionType"
-            @change="((val)=>{tableQuestionTypeChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.TableQuestionType"
-              :key="item.id"
-              :label="item.value"
-              :disabled="form.Type === 'radio' && (item.value===1 || item.value===2)"
-            >
+        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'input') && isFromSystem"
+          :label="$t('trials:readingUnit:label:QuestionGenre')" prop="TableQuestionType" :rules="[
+            { required: form.Type !== 'input', message: $t('common:ruleMessage:select') }
+          ]">
+          <el-radio-group v-model="form.TableQuestionType" @change="((val) => { tableQuestionTypeChange(val, form) })">
+            <el-radio v-for="item of $d.TableQuestionType" :key="item.id" :label="item.value"
+              :disabled="form.Type === 'radio' && (item.value === 1 || item.value === 2)">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item
           v-if="(!isFromSystem || form.TableQuestionType === 3) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation' || form.Type === 'class' || form.Type === 'number')"
-          :label="$t('trials:readingUnit:qsList:title:typeValue')"
-          prop="TypeValue"
-          :rules="[
-            {required: form.Type !== 'number', message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
-            {validator: validateTypeVal, trigger: ['blur', 'change']},
-            {max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}]"
-        >
-          <el-input
-            v-model="form.TypeValue"
-            :placeholder="$t('trials:readingUnit:qsList:message:msg3')"
-            @change="typeValueChange"
-          />
+          :label="$t('trials:readingUnit:qsList:title:typeValue')" prop="TypeValue" :rules="[
+            { required: form.Type !== 'number', message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] },
+            { validator: validateTypeVal, trigger: ['blur', 'change'] },
+            { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }]">
+          <el-input v-model="form.TypeValue" :placeholder="$t('trials:readingUnit:qsList:message:msg3')"
+            @change="typeValueChange" />
         </el-form-item>
-        <el-form-item
-          v-if="(form.Type === 'select' || form.Type === 'radio') && form.TypeValue"
-          :label="$t('trials:readingUnit:qsList:title:defaultValue')"
-        >
+        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio') && form.TypeValue"
+          :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-              :key="'TypeValue' + item"
-              :label="item"
-              :value="item"
-            />
+            <el-option v-for="item of form.TypeValue ? form.TypeValue.split('|') : []" :key="'TypeValue' + item"
+              :label="item" :value="item" />
           </el-select>
         </el-form-item>
-        <el-form-item
-          v-if="form.Type === 'number' && !isFromSystem"
-          :label="$t('trials:readingUnit:qsList:title:defaultValue')"
-        >
-          <el-input
-            :disabled="form.DataSource === 1"
-            v-model="form.DefaultValue"
-          />
+        <el-form-item v-if="form.Type === 'number' && !isFromSystem"
+          :label="$t('trials:readingUnit:qsList:title:defaultValue')">
+          <el-input :disabled="form.DataSource === 1" v-model="form.DefaultValue" />
         </el-form-item>
-        <el-form-item
-          v-if="form.TableQuestionType === 2 && isFromSystem"
-          :label="$t('trials:readingUnit:qsList:title:DependParentId')"
-          prop="DependParentId"
-        >
-          <el-select
-            v-model="form.DependParentId"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`DependParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.TableQuestionType === 2 && isFromSystem"
+          :label="$t('trials:readingUnit:qsList:title:DependParentId')" prop="DependParentId">
+          <el-select v-model="form.DependParentId">
+            <el-option v-for="item of parentOptions" :key="`DependParentId${item.QuestionId}`"
+              :label="item.QuestionName" :value="item.QuestionId" />
           </el-select>
         </el-form-item>
-        <el-form-item
-          v-if="form.TableQuestionType === 1 || !!form.DependParentId && isFromSystem"
-          :label="$t('trials:readingUnit:qsList:title:DataTableColumn')"
-          prop="DataTableColumn"
-        >
+        <el-form-item v-if="form.TableQuestionType === 1 || !!form.DependParentId && isFromSystem"
+          :label="$t('trials:readingUnit:qsList:title:DataTableColumn')" prop="DataTableColumn">
           <el-select v-model="form.DataTableColumn">
-            <el-option
-              v-for="item of $d.OrganColumn"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.OrganColumn" :key="item.id" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
 
-        <el-form-item
-          v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2 && isFromSystem"
-          :label="$t('trials:readingUnit:label:DictionaryCode')"
-          prop="DictionaryCode"
-          :rules="[{ required: form.TableQuestionType === 3, message: $t('common:ruleMessage:select'), trigger: 'blur' }]"
-        >
+        <el-form-item v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2 && isFromSystem"
+          :label="$t('trials:readingUnit:label:DictionaryCode')" prop="DictionaryCode"
+          :rules="[{ required: form.TableQuestionType === 3, message: $t('common:ruleMessage:select'), trigger: 'blur' }]">
           <el-select v-model="form.DictionaryCode">
-            <el-option
-              v-for="item of dicList"
-              :key="item.Id"
-              :label="item.Code"
-              :value="item.Code"
-            />
+            <el-option v-for="item of dicList" :key="item.Id" :label="item.Code" :value="item.Code" />
           </el-select>
         </el-form-item>
-        
+
         <!-- 高亮标记值 -->
-        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio')" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio')"
+          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
-              <el-option
-                v-for="item of form.TypeValue.split('|')"
-                :key="'HighlightAnswerList' + item"
-                :label="item"
-                :value="item"
-              />
+              <el-option v-for="item of form.TypeValue.split('|')" :key="'HighlightAnswerList' + item" :label="item"
+                :value="item" />
             </template>
             <template v-else-if="form.DictionaryCode">
-              <el-option
-                v-for="item of highlightAnswers"
-                :key="item.Id"
-                :label="item.ValueCN"
-                :value="item.Code"
-              />
+              <el-option v-for="item of highlightAnswers" :key="item.Id" :label="item.ValueCN" :value="item.Code" />
             </template>
           </el-select>
         </el-form-item>
         <!-- 最大字符数 -->
-        <el-form-item 
-          v-if="form.Type === 'input' || form.Type === 'textarea'"
-          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
-          prop="MaxAnswerLength"
-          :rules="[
+        <el-form-item v-if="form.Type === 'input' || form.Type === 'textarea'"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')" prop="MaxAnswerLength" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
         </el-form-item>
         <!-- 最大上传个数 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:imageCount')"
-          prop="ImageCount"
-        >
-          <el-input-number
-            v-model="form.ImageCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')"
+          prop="ImageCount">
+          <el-input-number v-model="form.ImageCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
         <!-- 文件类型 -->
-        <el-form-item 
-          v-show="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:FileType')"
+        <el-form-item v-show="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
-          :rules="[{ type: 'array', required: form.Type === 'upload', message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
-        >
-          <el-checkbox-group
-            v-model="form.FileType"
-            @change="(v) => {
-              if (v.includes('-1')) {
-                form.FileType = ['-1']
-              } else {
-              }
-            }"
-          >
-            <el-checkbox
-              v-for="item of $d.fileType"
-              :key="`fileType${item.value}`"
-              :value="item.value + ''"
-              :label="item.value"
-              :disabled="form.FileType.includes('-1') && item.value !== '-1'"
-            >
+          :rules="[{ type: 'array', required: form.Type === 'upload', message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }]">
+          <el-checkbox-group v-model="form.FileType" @change="(v) => {
+            if (v.includes('-1')) {
+              form.FileType = ['-1']
+            } else {
+            }
+          }">
+            <el-checkbox v-for="item of $d.fileType" :key="`fileType${item.value}`" :value="item.value + ''"
+              :label="item.value" :disabled="form.FileType.includes('-1') && item.value !== '-1'">
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        
+
         <!-- 分类 -->
-        <el-form-item 
-          v-if="form.Type === 'class'" 
-          :label="$t('trials:readingUnit:qsList:title:ClassifyType')"
-          prop="ClassifyType"
-          :rules="[
+        <el-form-item v-if="form.Type === 'class'" :label="$t('trials:readingUnit:qsList:title:ClassifyType')"
+          prop="ClassifyType" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ClassifyType"
-            @change="classifyTypeChange"
-          >
-            <el-radio
-              v-for="item of $d.ClassifyType"
-              :key="item.id"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.ClassifyType" @change="classifyTypeChange">
+            <el-radio v-for="item of $d.ClassifyType" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item
-          v-if="form.Type === 'class' && form.ClassifyType === 0"
-          :label="$t('trials:readingUnit:label:ClassifyQuestion')"
-          prop="ClassifyTableQuestionId"
-          :rules="[
+        <el-form-item v-if="form.Type === 'class' && form.ClassifyType === 0"
+          :label="$t('trials:readingUnit:label:ClassifyQuestion')" prop="ClassifyTableQuestionId" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-select v-model="form.ClassifyTableQuestionId" clearable>
             <el-option v-for="item of numberQuestions" :key="item.QuestionId" :label="item.QuestionName"
-                      :value="item.QuestionId"/>
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
-        <el-form-item
-          v-if="form.Type === 'class' && form.ClassifyType === 1"
-          :label="$t('trials:readingUnit:label:ClassifyQuestion')"
-          prop="ClassifyTableQuestionId"
-          :rules="[
+        <el-form-item v-if="form.Type === 'class' && form.ClassifyType === 1"
+          :label="$t('trials:readingUnit:label:ClassifyQuestion')" prop="ClassifyTableQuestionId" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-select v-model="form.ClassifyTableQuestionId" clearable @change="classifyTableQuestionChange">
-            <el-option 
-              v-for="item in selectQuestions" 
-              :key="item.QuestionId" 
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+            <el-option v-for="item in selectQuestions" :key="item.QuestionId" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
-        <el-form-item
-          v-if="form.Type === 'class'  &&  form.ClassifyType === 0"
-          :label="$t('trials:readingUnit:label:ClassifyAlgorithms')"
-          prop="ClassifyAlgorithms"
-          :rules="[
+        <el-form-item v-if="form.Type === 'class' && form.ClassifyType === 0"
+          :label="$t('trials:readingUnit:label:ClassifyAlgorithms')" prop="ClassifyAlgorithms" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <div>
-            <el-table
-              ref="CalculateTable"
-              :data="ClassifyAlgorithmsList"
-              style="margin: 10px;width: calc(100% - 20px)"
-              size="small"
-            >
+            <el-table ref="CalculateTable" :data="ClassifyAlgorithmsList" style="margin: 10px;width: calc(100% - 20px)"
+              size="small">
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:label')"
-                show-overflow-tooltip
-                min-width="70"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:label')" show-overflow-tooltip min-width="70">
                 <template slot-scope="scope">
                   {{ scope.row.label }}
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:gt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:gt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.gt"></el-input-number>
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:lt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:lt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.lt"></el-input-number>
                 </template>
@@ -766,44 +442,24 @@
             </el-table>
           </div>
         </el-form-item>
-        <el-form-item
-          v-if="form.Type === 'class' &&  form.ClassifyType === 1"
-          :label="$t('trials:readingUnit:label:ClassifyAlgorithms')"
-          prop="ClassifyAlgorithms"
-          :rules="[
+        <el-form-item v-if="form.Type === 'class' && form.ClassifyType === 1"
+          :label="$t('trials:readingUnit:label:ClassifyAlgorithms')" prop="ClassifyAlgorithms" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <div>
-            <el-table
-              ref="CalculateTable"
-              :data="ClassifyAlgorithmsList"
-              style="margin: 10px;width: calc(100% - 20px)"
-              size="small"
-            >
+            <el-table ref="CalculateTable" :data="ClassifyAlgorithmsList" style="margin: 10px;width: calc(100% - 20px)"
+              size="small">
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:label')"
-                show-overflow-tooltip
-                min-width="70"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:label')" show-overflow-tooltip min-width="70">
                 <template slot-scope="scope">
                   {{ scope.row.label }}
                 </template>
               </el-table-column>
               <!-- 选项 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:options')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:options')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-select v-model="scope.row.val" multiple>
-                    <el-option
-                      v-for="item in classifyQuestionOptions"
-                      :key="item"
-                      :label="item"
-                      :value="item">
+                    <el-option v-for="item in classifyQuestionOptions" :key="item" :label="item" :value="item">
                     </el-option>
                   </el-select>
                 </template>
@@ -812,57 +468,33 @@
           </div>
         </el-form-item>
         <!-- 分类是否可编辑 -->
-        <el-form-item 
-          v-if="form.Type === 'class'" 
-          :label="$t('trials:readingUnit:qsList:title:ClassifyEditType')"
-          prop="ClassifyEditType"
-          :rules="[
+        <el-form-item v-if="form.Type === 'class'" :label="$t('trials:readingUnit:qsList:title:ClassifyEditType')"
+          prop="ClassifyEditType" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ClassifyEditType"
-          >
-            <el-radio
-              v-for="item of $d.ClassifyEditType"
-              :key="item.id"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.ClassifyEditType">
+            <el-radio v-for="item of $d.ClassifyEditType" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 分类显示类型 -->
-        <el-form-item 
-          v-if="form.Type === 'class'" 
-          :label="$t('trials:readingUnit:qsList:title:ClassifyShowType')"
-          prop="ClassifyShowType"
-          :rules="[
+        <el-form-item v-if="form.Type === 'class'" :label="$t('trials:readingUnit:qsList:title:ClassifyShowType')"
+          prop="ClassifyShowType" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ClassifyShowType"
-          >
-            <el-radio
-              v-for="item of $d.ClassifyShowType"
-              :key="item.id"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.ClassifyShowType">
+            <el-radio v-for="item of $d.ClassifyShowType" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
       </div>
-      
+
     </div>
     <div v-if="type !== 'look'" class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <!-- 取消 -->
-      <el-button
-        size="small"
-        type="primary"
-        @click="close"
-      >
+      <el-button size="small" type="primary" @click="close">
         {{ $t('common:button:cancel') }}
       </el-button>
       <!-- 保存 -->
@@ -933,6 +565,7 @@ export default {
         ShowOrder: 0,
         ShowQuestion: 0,
         IsRequired: 2,
+        IsPreinstall: false,
         Remark: '',
         RelevanceId: '',
         RelevanceValueList: [],
@@ -983,6 +616,7 @@ export default {
         //   { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
         ShowQuestion: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        IsPreinstall: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentTriggerValueList: [
           { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -1048,9 +682,9 @@ export default {
         if (new Set(arr).size !== arr.length) {
           // '选项不允许存在相同值'
           callback(new Error(this.$t('trials:readingUnit:qsList:message:msg0')))
-        } else if (value && this.form.Type === 'number' && arr.findIndex(i=>isNaN(parseFloat(i)) && i!== 'NE') > -1) {
+        } else if (value && this.form.Type === 'number' && arr.findIndex(i => isNaN(parseFloat(i)) && i !== 'NE') > -1) {
           callback(new Error(this.$t('trials:readingUnit:qsList:message:msg5')))
-        }  else {
+        } else {
           callback()
         }
       }
@@ -1069,11 +703,11 @@ export default {
         }
         let res = await getCalculateTableQuestions(params)
         if (res.Result) {
-          this.tableQuestions = res.Result.filter(i=>i.Type === 'basicTable')
-          this.selectQuestions = res.Result.filter(i=>i.Type === 'select' || i.Type === 'radio' || i.Type === 'class')
-          this.numberQuestions = res.Result.filter(i=>i.Type === 'number')
+          this.tableQuestions = res.Result.filter(i => i.Type === 'basicTable')
+          this.selectQuestions = res.Result.filter(i => i.Type === 'select' || i.Type === 'radio' || i.Type === 'class')
+          this.numberQuestions = res.Result.filter(i => i.Type === 'number')
         }
-      } catch(e) {
+      } catch (e) {
         console.log(e)
       }
     },
@@ -1159,10 +793,10 @@ export default {
     //     }
     //   })
     // },
-    classifyTableQuestionChange (v){
-      let obj = this.selectQuestions.find(i=>i.QuestionId === v)
+    classifyTableQuestionChange(v) {
+      let obj = this.selectQuestions.find(i => i.QuestionId === v)
       let arr = obj && obj.TypeValue ? obj.TypeValue.split('|') : []
-      arr = arr.length > 0 ? arr.map(i=>i.trim()) : []
+      arr = arr.length > 0 ? arr.map(i => i.trim()) : []
       this.classifyQuestionOptions = arr
     },
     async initForm() {
@@ -1174,8 +808,8 @@ export default {
             console.log('CalculateQuestions', this.form[k])
           } else if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
             this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
-          } else if(k === 'FileType'){
-            if (this.data[k]){
+          } else if (k === 'FileType') {
+            if (this.data[k]) {
               this.form[k] = this.data[k].split(',')
             }
           } else {
@@ -1206,10 +840,10 @@ export default {
             if (this.parentOptions[index].QuestionGenre === 3) {
               // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
               let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+
+              this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -1218,7 +852,7 @@ export default {
               })
               this.parentTriggerValOptions = options
             }
-            
+
           }
         }
         if (this.form.RelevanceId) {
@@ -1230,9 +864,9 @@ export default {
             if (this.parentOptions[i].QuestionGenre === 3) {
               // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode] 
               let dicCode = this.parentOptions[i].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -1248,8 +882,8 @@ export default {
         }
       }
       if (this.form.ClassifyTableQuestionId) {
-          this.classifyQuestionChange(this.form.ClassifyTableQuestionId)
-        }
+        this.classifyQuestionChange(this.form.ClassifyTableQuestionId)
+      }
       if (!this.data.ShowOrder && this.data.ShowOrder !== 0) {
         if (this.list.length > 0) {
           var ShowOrderList = this.list.map(v => v.ShowOrder)
@@ -1257,10 +891,10 @@ export default {
         }
       }
     },
-    classifyQuestionChange (v){
-      let obj = this.selectQuestions.find(i=>i.Id === v)
+    classifyQuestionChange(v) {
+      let obj = this.selectQuestions.find(i => i.Id === v)
       let arr = obj && obj.TypeValue ? obj.TypeValue.split('|') : []
-      arr = arr.length > 0 ? arr.map(i=>i.trim()) : []
+      arr = arr.length > 0 ? arr.map(i => i.trim()) : []
       this.classifyQuestionOptions = arr
     },
     getBasicConfigSelect() {
@@ -1276,10 +910,10 @@ export default {
       this.$refs.tableQsForm.validate(valid => {
         if (!valid) return
         this.loading = true
-        
-        if(this.form.QuestionName && this.$i18n.locale === 'zh'){
+
+        if (this.form.QuestionName && this.$i18n.locale === 'zh') {
           this.form.QuestionEnName = this.form.QuestionName;
-        }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){
+        } else if (this.form.QuestionEnName && this.$i18n.locale === 'en') {
           this.form.QuestionName = this.form.QuestionEnName;
         }
         var params = Object.assign({}, this.form)
@@ -1359,7 +993,7 @@ export default {
       }
     },
     imageToolChange(v) {
-      let i = this.readingTools.findIndex(tool=>tool.toolName === v)
+      let i = this.readingTools.findIndex(tool => tool.toolName === v)
       if (i > -1) {
         this.imageToolAttributes = this.readingTools[i].props
       }
@@ -1370,15 +1004,15 @@ export default {
           return item.QuestionId === val
         })
         if (index !== -1) {
-           if (this.parentOptions[index].QuestionGenre === 3) {
+          if (this.parentOptions[index].QuestionGenre === 3) {
             // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
             let dicCode = this.parentOptions[index].DictionaryCode
-            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-            
-            this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+
+            this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
             })
-          } else { 
+          } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
               options.push({ id: index, label: item, value: item })
@@ -1399,10 +1033,10 @@ export default {
           if (this.parentOptions[index].QuestionGenre === 3) {
             // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
             let dicCode = this.parentOptions[index].DictionaryCode
-            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-            
-            this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
             })
           } else {
             const options = []
@@ -1450,6 +1084,7 @@ export default {
         form.ClassifyEditType = null
       }
       form.IsRequired = 2
+      form.IsPreinstall = false
       form.TypeValue = ''
       form.TableQuestionType = null
       form.DependParentId = ''
@@ -1484,5 +1119,4 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

From 602f942e9eec1ba513f16fa7a80e6dbb828b6ba3 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 13 Oct 2025 10:01:22 +0800
Subject: [PATCH 009/333] =?UTF-8?q?=E9=99=84=E5=8A=A0=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/AdditionalAssessment.vue    | 8 ++++++--
 .../reading/dicoms/components/AssessmentFormItem.vue      | 3 ++-
 .../trials-panel/reading/dicoms/components/ReportPage.vue | 4 ++++
 .../reading/dicoms3D/components/ReportPage.vue            | 6 +++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue b/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
index c5fb4570..af6e1597 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
@@ -47,7 +47,7 @@
         <el-button size="small" @click="handleCancel">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" @click="handleSave">
+        <el-button size="small" type="primary" v-if="readingTaskState < 2" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -75,6 +75,10 @@ export default {
     readingTaskState: {
       type: Number,
       default: 0
+    },
+    additionalAssessmentsType: {
+      type: String,
+      default: 'edit'
     }
   },
   data() {
@@ -116,7 +120,7 @@ export default {
         }
         const res = await submitTaskAdditionalQuestion(params)
         if (res.IsSuccess) {
-          this.$emit('sign')
+          this.$emit(this.additionalAssessmentsType)
         }
         loading.close()
       } catch (e) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
index 19d5910b..46183305 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
@@ -42,7 +42,8 @@
     </template>
 
     <AssessmentFormItem v-for="(item) in question.Childrens" :key="item.Id" :question="item"
-      :question-form="questionForm" @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
+      :readingTaskState="readingTaskState" :question-form="questionForm" @setFormItemData="setFormItemData"
+      @resetFormItemData="resetFormItemData" />
   </div>
 </template>
 <script>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index b5b244f4..13c0822f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -193,6 +193,7 @@
     <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"
+        :readingTaskState="readingTaskState" :additionalAssessmentsType="additionalAssessmentsType"
         @close="additionalAssessmentsDig.visible = false" @sign="sign" />
     </el-dialog>
     <!-- 签名框 -->
@@ -254,6 +255,7 @@ export default {
       CriterionType: 0,
       height: 0,
       additionalAssessmentsDig: { visible: false, title: this.$t('trials:trials-panel:setting:reading-unit:TrialCriterionAdditionalAssessmentTypeList') },
+      additionalAssessmentsType: 'edit',
       assessmentQuestions: [],
       tLesionCount: null,
       ntLesionCount: null,
@@ -608,6 +610,7 @@ export default {
         if (this.assessmentQuestions.length > 0) {
           // 打开附加评估框
           this.additionalAssessmentsDig.visible = true
+          this.additionalAssessmentsType = 'edit'
         }
       } catch (err) {
         console.log(err)
@@ -626,6 +629,7 @@ export default {
           if (this.assessmentQuestions.length > 0) {
             // 打开附加评估框
             this.additionalAssessmentsDig.visible = true
+            this.additionalAssessmentsType = 'sign'
           } else {
             const { ImageAssessmentReportConfirmation } = const_.processSignature
             this.signCode = ImageAssessmentReportConfirmation
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 c1fd2a45..1eea1621 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -193,7 +193,8 @@
     <el-dialog v-if="additionalAssessmentsDig.visible" :visible.sync="additionalAssessmentsDig.visible"
       :close-on-click-modal="false" :title="additionalAssessmentsDig.title" width="600px">
       <additional-assessment :questions="assessmentQuestions" :visit-task-id="visitTaskId"
-        :readingTaskState="readingTaskState" @close="additionalAssessmentsDig.visible = false" @sign="sign" />
+        :readingTaskState="readingTaskState" :additionalAssessmentsType="additionalAssessmentsType"
+        @close="additionalAssessmentsDig.visible = false" @sign="sign" />
     </el-dialog>
     <!-- 签名框 -->
     <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
@@ -241,6 +242,7 @@ export default {
       criterionType: 0,
       height: 0,
       additionalAssessmentsDig: { visible: false, title: this.$t('trials:trials-panel:setting:reading-unit:TrialCriterionAdditionalAssessmentTypeList') },
+      additionalAssessmentsType: 'edit',
       assessmentQuestions: [],
       tLesionCount: null,
       ntLesionCount: null,
@@ -562,6 +564,7 @@ export default {
         if (this.assessmentQuestions.length > 0) {
           // 打开附加评估框
           this.additionalAssessmentsDig.visible = true
+          this.additionalAssessmentsType = 'edit'
         }
       } catch (err) {
         console.log(err)
@@ -580,6 +583,7 @@ export default {
           if (this.assessmentQuestions.length > 0) {
             // 打开附加评估框
             this.additionalAssessmentsDig.visible = true
+            this.additionalAssessmentsType = 'sign'
           } else {
             const { ImageAssessmentReportConfirmation } = const_.processSignature
             this.signCode = ImageAssessmentReportConfirmation

From 877535f57925c4acde8a1b2c5a1f6cc41bf04eb2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 13 Oct 2025 10:20:09 +0800
Subject: [PATCH 010/333] 1

---
 .../reading/dicoms/components/AssessmentFormItem.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
index 46183305..db4cf4dc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
@@ -15,7 +15,7 @@
         ]" :class="[question.Type === 'group' ? 'mb' : '']">
         <!-- 下拉框 -->
         <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
-          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState > 2">
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState >= 2">
           <template v-if="question.DictionaryCode">
             <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
               :label="item.label" />
@@ -26,7 +26,7 @@
         </el-select>
         <!-- 单选 -->
         <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState > 2">
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState >= 2">
           <template v-if="question.DictionaryCode">
             <el-radio v-for="item of $d[question.DictionaryCode]" :key="item.id" :label="String(item.value)">
               {{ item.label }}

From 341a707c80b373b94b1b3e7bdd9c5a4b31fc7b4f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 13 Oct 2025 14:01:46 +0800
Subject: [PATCH 011/333] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E4=BA=BA=E7=AE=80=E5=8E=86=E6=9F=A5=E7=9C=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/enrolled-reviewers/list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 67fecb88..97d4d806 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -21,7 +21,7 @@
           <template slot-scope="scope">
             <el-button type="text" @click="
               go(
-                `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`
+                `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}&trialId=${$route.query.trialId}`
               )
               ">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
           </template>

From 7238b12424cb78a04b256479ac4c74676f180ad7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 13 Oct 2025 16:17:48 +0800
Subject: [PATCH 012/333] =?UTF-8?q?Lugano=202014=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=9E=8B=EF=BC=8C=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE=E8=A2=AB=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EvaluationOfGlobalConfig.vue   | 171 +++++-------------
 1 file changed, 50 insertions(+), 121 deletions(-)

diff --git a/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue b/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue
index f388d67a..dd753315 100644
--- a/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue
+++ b/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="position: relative">
-    <el-form  size="small" :inline="true" style="position: relative;">
+    <el-form size="small" :inline="true" style="position: relative;">
       <!-- 阅片规则 -->
       <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:readingRules') }}</el-divider>
       <!-- 是否必须全局阅片 -->
@@ -8,68 +8,38 @@
         {{ $fd('YesOrNo', IsMustGlobalReading) }}
       </el-form-item>
       <!-- 配置 -->
-      <el-button
-        size="mini"
-        type="primary"
-        style="position: absolute;right: 10px;top: 15px"
-        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
-        @click="handleAdd(1)"
-      >
+      <el-button size="mini" type="primary" style="position: absolute;right: 10px;top: 15px"
+        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)" @click="handleAdd(1)">
         {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
     </el-form>
-    <el-form  size="small" :inline="true"  style="position: relative">
+    <el-form size="small" :inline="true" style="position: relative">
       <!-- 名称 -->
       <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:name') }}</el-divider>
       <!-- 配置 -->
-      <el-button
-        size="mini"
-        type="primary"
-        style="position: absolute;right: 10px;top: 15px"
-        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
-        @click="handleAdd(2)"
-      >
+      <el-button size="mini" type="primary" style="position: absolute;right: 10px;top: 15px"
+        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)" @click="handleAdd(2)">
         {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
       <!-- 评估更新类型 -->
       <el-form-item :label="$t('dictionary:template:globalConfig:updateType')" style="width: 100%">
       </el-form-item>
-      <el-table
-        v-loading="loading"
-        style="width: 100%"
-        :data="list"
-        stripe
-      >
+      <el-table v-loading="loading" style="width: 100%" :data="list" stripe>
         <!-- 序号 -->
-        <el-table-column
-          prop=""
-          :label="$t('dictionary:template:globalConfig:order')"
-          width="80"
-        >
+        <el-table-column prop="" :label="$t('dictionary:template:globalConfig:order')" width="80">
           <template slot-scope="scope">
-            {{scope.$index + 1}}
+            {{ scope.$index + 1 }}
           </template>
         </el-table-column>
         <!-- 中文值 -->
-        <el-table-column
-          prop="ValueCN"
-          :label="$t('dictionary:template:globalConfig:valueCN')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="ValueCN" :label="$t('dictionary:template:globalConfig:valueCN')" show-overflow-tooltip>
         </el-table-column>
         <!-- 英文值 -->
-        <el-table-column
-          prop="Value"
-          :label="$t('dictionary:template:globalConfig:value')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="Value" :label="$t('dictionary:template:globalConfig:value')" show-overflow-tooltip>
         </el-table-column>
         <!-- 是否基线评估 -->
-        <el-table-column
-          prop="IsBaseLineUse"
-          :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="IsBaseLineUse" :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
+          show-overflow-tooltip>
           <template slot-scope="scope">
             <!--              <el-switch-->
             <!--                @change="(v) => {BaseLineUseChange(v, scope.row)}"-->
@@ -81,92 +51,64 @@
           </template>
         </el-table-column>
         <!-- 是否随访评估 -->
-        <el-table-column
-          prop="IsFollowVisitUse"
-          :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="IsFollowVisitUse" :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
+          show-overflow-tooltip>
           <template slot-scope="scope">
             <!--              <el-switch-->
             <!--                @change="(v) => {FollowVisitUseChange(v, scope.row)}"-->
             <!--                v-model="scope.row.IsFollowVisitUse"-->
             <!--              >-->
             <!--              </el-switch>-->
-            <el-tag v-if="scope.row.IsFollowVisitUse" type="primary">{{ $fd('YesOrNo', scope.row.IsFollowVisitUse) }}</el-tag>
+            <el-tag v-if="scope.row.IsFollowVisitUse" type="primary">{{ $fd('YesOrNo', scope.row.IsFollowVisitUse)
+            }}</el-tag>
             <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsFollowVisitUse) }}</el-tag>
             <!--              <span>{{$fd('YesOrNo', scope.row.IsFollowVisitUse)}}</span>-->
           </template>
         </el-table-column>
       </el-table>
     </el-form>
-    <base-model
-      :config="config"
-    >
+    <base-model :config="config">
       <template slot="dialog-body">
-        <el-form  size="small" :inline="true"  label-width="130px">
+        <el-form size="small" :inline="true" label-width="130px">
           <!-- 是否必须全局阅片 -->
-          <el-form-item :label="$t('dictionary:template:globalConfig:isMustGlobalReading')" v-if="config.configType === 1">
+          <el-form-item :label="$t('dictionary:template:globalConfig:isMustGlobalReading')"
+            v-if="config.configType === 1">
             <el-radio-group v-model="form.IsMustGlobalReading">
-              <el-radio v-for="item of $d.YesOrNo" :key="'form.IsMustGlobalReading' + item.value" :label="item.value">{{ item.label }}</el-radio>
+              <el-radio v-for="item of $d.YesOrNo" :key="'form.IsMustGlobalReading' + item.value" :label="item.value">{{
+                item.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <!-- 评估更新类型 -->
-          <el-form-item v-if="config.configType === 2" :label="$t('dictionary:template:globalConfig:updateType')" style="width: 100%">
+          <!-- 评估更新类型 @selection-change="handleSelectionChange"-->
+          <el-form-item v-if="config.configType === 2" :label="$t('dictionary:template:globalConfig:updateType')"
+            style="width: 100%">
           </el-form-item>
-          <el-table
-            v-if="config.configType === 2"
-            v-loading="loading"
-            ref="multipleTable"
-            :data="GlobalAssessType"
-            stripe
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              type="selection"
-              width="55">
-            </el-table-column>
+          <el-table v-if="config.configType === 2" v-loading="loading" ref="multipleTable" :data="GlobalAssessType"
+            stripe>
+            <!-- <el-table-column type="selection" width="55">
+            </el-table-column> -->
             <!-- 中文值 -->
-            <el-table-column
-              prop="ValueCN"
-              :label="$t('dictionary:template:globalConfig:valueCN')"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="ValueCN" :label="$t('dictionary:template:globalConfig:valueCN')"
+              show-overflow-tooltip>
             </el-table-column>
             <!-- 英文值 -->
-            <el-table-column
-              prop="Value"
-              :label="$t('dictionary:template:globalConfig:value')"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="Value" :label="$t('dictionary:template:globalConfig:value')" show-overflow-tooltip>
             </el-table-column>
             <!-- 是否基线评估 -->
-            <el-table-column
-              prop="IsBaseLineUse"
-              :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="IsBaseLineUse" :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
+              show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.IsBaseLineUse"
-                  @change="() => $forceUpdate()"
-                >
+                <el-switch v-model="scope.row.IsBaseLineUse" @change="() => $forceUpdate()">
                 </el-switch>
-                <span>{{$fd('YesOrNo', scope.row.IsBaseLineUse)}}</span>
+                <span>{{ $fd('YesOrNo', scope.row.IsBaseLineUse) }}</span>
               </template>
             </el-table-column>
             <!-- 是否随访评估 -->
-            <el-table-column
-              prop="IsFollowVisitUse"
-              :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="IsFollowVisitUse" :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
+              show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.IsFollowVisitUse"
-                  @change="() => $forceUpdate()"
-                >
+                <el-switch v-model="scope.row.IsFollowVisitUse" @change="() => $forceUpdate()">
                 </el-switch>
-                <span>{{$fd('YesOrNo', scope.row.IsFollowVisitUse)}}</span>
+                <span>{{ $fd('YesOrNo', scope.row.IsFollowVisitUse) }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -226,7 +168,7 @@ export default {
   mounted() {
     this.getList()
     this.getSystemGlobalInfo()
-    this.getCriterionDictionary()
+    // this.getCriterionDictionary()
   },
   methods: {
     getCriterionDictionary() {
@@ -241,12 +183,12 @@ export default {
       getSystemGlobalInfo({
         SystemCriterionId: this.criterionId
       }).then(res => {
-
+        this.GlobalAssessType = res.Result.DictionaryList
       })
     },
     FollowVisitUseChange(v, row) {
       this.loading = true
-      setDictionaryFollowVisitUse({Id:row.Id, IsFollowVisitUse: v}).then(res => {
+      setDictionaryFollowVisitUse({ Id: row.Id, IsFollowVisitUse: v }).then(res => {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
       }).catch(() => {
@@ -255,7 +197,7 @@ export default {
     },
     BaseLineUseChange(v, row) {
       this.loading = true
-      setDictionaryBaseLineUse({Id:row.Id, isBaseLineUse: v}).then(res => {
+      setDictionaryBaseLineUse({ Id: row.Id, isBaseLineUse: v }).then(res => {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
       }).catch(() => {
@@ -273,6 +215,7 @@ export default {
       }
     },
     handleSelectionChange(val) {
+      console.log(this.selectedList, 'this.selectedList')
       this.selectedList = val
     },
     getList() {
@@ -295,18 +238,6 @@ export default {
       } else {
         this.config.title = this.$t('dictionary:template:globalConfig:updateType')
         this.config.visible = true
-        this.$nextTick(() => {
-          var a = this.$d.GlobalAssessType.filter(v => {
-            return !!this.list.find(v1 => {
-              if (v.id === v1.DictionaryId) {
-                v.IsBaseLineUse = v1.IsBaseLineUse
-                v.IsFollowVisitUse = v1.IsFollowVisitUse
-              }
-              return v1.DictionaryId === v.id
-            })
-          })
-          this.toggleSelection(a)
-        })
       }
     },
     handleSave() {
@@ -319,11 +250,11 @@ export default {
       var params = {
         SystemCriterionId: this.criterionId,
         IsMustGlobalReading: this.form.IsMustGlobalReading,
-        DictionaryList: this.config.configType === 1 ? this.list : this.selectedList.map(v => {
+        DictionaryList: this.config.configType === 1 ? this.list : this.GlobalAssessType.map(v => {
           return {
-            DictionaryId: v.id,
-            IsBaseLineUse: v.IsBaseLineUse,
-            IsFollowVisitUse: v.IsFollowVisitUse,
+            DictionaryId: v.DictionaryId,
+            IsBaseLineUse: v.IsBaseLineUse ? v.IsBaseLineUse : false,
+            IsFollowVisitUse: v.IsFollowVisitUse ? v.IsFollowVisitUse : false,
           }
         }),
       }
@@ -342,5 +273,3 @@ export default {
   }
 }
 </script>
-
-

From 3c661ae86a03ef161ad7bf18b4817ffefb71e355 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 14 Oct 2025 11:13:48 +0800
Subject: [PATCH 013/333] 1

---
 .../reading/dicoms/components/AdditionalAssessment.vue         | 2 +-
 .../trials-panel/reading/dicoms/components/ReportPage.vue      | 3 ++-
 .../trials-panel/reading/dicoms3D/components/ReportPage.vue    | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue b/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
index af6e1597..8725c252 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
@@ -120,7 +120,7 @@ export default {
         }
         const res = await submitTaskAdditionalQuestion(params)
         if (res.IsSuccess) {
-          this.$emit(this.additionalAssessmentsType)
+          this.$emit('sign', this.additionalAssessmentsType)
         }
         loading.close()
       } catch (e) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 13c0822f..21c31908 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -645,8 +645,9 @@ export default {
         this.loading = false
       }
     },
-    sign() {
+    sign(type = 'sign') {
       this.additionalAssessmentsDig.visible = false
+      if (type === 'edit') return false
       this.$nextTick(() => {
         const { ImageAssessmentReportConfirmation } = const_.processSignature
         this.signCode = ImageAssessmentReportConfirmation
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 1eea1621..821b3aa8 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -599,8 +599,9 @@ export default {
         this.loading = false
       }
     },
-    sign() {
+    sign(type = 'sign') {
       this.additionalAssessmentsDig.visible = false
+      if (type === 'edit') return false
       this.$nextTick(() => {
         const { ImageAssessmentReportConfirmation } = const_.processSignature
         this.signCode = ImageAssessmentReportConfirmation

From 1e49dedd238db059116d1b337f025d5a83d6f7cf Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 14 Oct 2025 13:33:15 +0800
Subject: [PATCH 014/333] Lugano 2014 without FDG-PET

---
 .../reading/dicoms/components/DicomViewer.vue |   11 +-
 .../LuganoWithoutPET/QuestionForm.vue         | 1887 +++++++++++++++++
 .../LuganoWithoutPET/QuestionList.vue         | 1483 +++++++++++++
 .../global-review/components/LuganoTable.vue  |  352 ++-
 .../components/LuganoWithoutPETTable.vue      |  427 ++++
 .../global-review/components/MRecistTable.vue |    5 +-
 .../reading/global-review/index.vue           |  182 +-
 .../inspectionManagement/dataForm.vue         |   10 +
 .../components/inspectionManagement/index.vue |   14 +
 9 files changed, 4027 insertions(+), 344 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
 create mode 100644 src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
 create mode 100644 src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 0e7571f7..25ec4043 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -467,7 +467,14 @@
               :is-show="isShow"
               :is-reading-show-subject-info="isReadingShowSubjectInfo"
             />
-
+            <LuganoWithoutPETQuestionList
+              v-else-if="CriterionType === 18"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
             <RecistQuestionList
               v-else-if="CriterionType === 1"
               ref="measurementList"
@@ -792,6 +799,7 @@ import RecistBMQuestionList from './RecistBM/QuestionList'
 import IRecistQuestionList from './IRecist/QuestionList'
 import PCWGQuestionList from './PCWG/QuestionList'
 import LuganoQuestionList from './Lugano/QuestionList'
+import LuganoWithoutPETQuestionList from './LuganoWithoutPET/QuestionList'
 import IVUSList from './IVUS/QuestionList'
 import OCTList from './OCT/QuestionList'
 import MRIPDFF from './MRIPDFF/QuestionList'
@@ -825,6 +833,7 @@ export default {
     RecistBMQuestionList,
     IRecistQuestionList,
     LuganoQuestionList,
+    LuganoWithoutPETQuestionList,
     IVUSList,
     OCTList,
     MRIPDFF,
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
new file mode 100644
index 00000000..5b13de71
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -0,0 +1,1887 @@
+<template>
+  <el-form
+    v-if="isRender"
+    ref="measurementForm"
+    v-loading="loading"
+    :model="questionForm"
+    size="mini"
+    class="measurement-form"
+  >
+    <div class="base-dialog-body">
+      <div style="display: flex;justify-content: space-between;">
+        <h3 v-if="lesionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
+          <!-- {{ `${questionName} (${orderMark}${String(rowIndex).padStart(2, '0')})` }} -->
+          {{ lesionName }}
+        </h3>
+        <!-- 关闭 -->
+        <div>
+          <i class="el-icon-circle-close" style="font-size: 25px;cursor: pointer;" @click="handleClose" />
+        </div>
+      </div>
+      <div ref="scrollPanel" style="height: 420px;overflow-y: auto;overflow-x: hidden;" @scroll.stop="scrollHandle">
+        <el-form-item
+          :label="$t('trials:reading:title:lesionType')"
+          prop="LesionType"
+          :rules="[
+            { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
+          ]"
+        >
+          <!-- 下拉框 -->
+          <el-select
+            :ref="`select_LesionType`"
+            v-model="questionForm.LesionType"
+            filterable
+            :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
+            @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 && (qs.RelevanceValue.includes(questionForm[qs.RelevanceId]))) || (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'">
+            <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
+            <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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || answers.SplitOrMergeType === '1'"
+              @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}"
+            maxlength="500"
+            :disabled="!isCurrentTask || readingTaskState>=2 || answers.SplitOrMergeType === '1'"
+            @change="((val)=>{formItemChange(val, qs)})"
+          />
+          <!-- 下拉框 -->
+          <!-- :disabled="!isCurrentTask || readingTaskState>=2 || (!isBaseLineTask && qs.QuestionMark === 5 && isCurrentTaskAdd === 'False') || qs.QuestionMark === 2 || (qs.QuestionMark === 8 && !isBaseLineTask && isCurrentTaskAdd === 'False')" -->
+
+          <el-select
+            v-if="qs.Type==='select'"
+            :ref="`select_${qs.Id}`"
+            v-model="questionForm[qs.Id]"
+            filterable
+            :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
+            @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(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode,parseFloat(answers.LastTaskState))}` : ''"
+              >
+                <!-- 首次分裂的病灶只能选择存在 -->
+                <template v-if="answers.IsFristAdd=== 'True' && answers.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 || answers.SplitOrMergeType === '1'"
+          >
+            <el-radio
+              v-for="val in qs.options.split('|')"
+              :key="val"
+              :label="val"
+              @change="((val)=>{formItemChange(val, qs)})"
+            >
+              {{ val }}
+            </el-radio>
+          </el-radio-group>
+          <template v-if="qs.QuestionMark === 20">
+            <div style="display: flex;flex-direction: row;justify-content: flex-start;">
+
+              <el-input
+                v-if="qs.Type==='calculation'"
+                v-model="questionForm[qs.Id]"
+                disabled
+                style="width:120px;"
+                @change="((val)=>{formItemChange(val, qs)})"
+              >
+                <template v-if="qs.Unit" slot="append">
+                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                </template>
+              </el-input>
+              <viewer
+                v-if="answers.OtherPicturePath"
+                ref="viewer"
+                style="margin:0 10px;"
+                :images="[`${OSSclientConfig.basePath}${answers.OtherPicturePath}`]"
+              >
+                <span style="color:#409eff;cursor: pointer" @click="previewImage()">
+                  {{ $t('trials:lugano:button:suvscreenshot1') }}
+                </span>
+                <img
+                  v-show="false"
+                  crossorigin="anonymous"
+                  :src="`${OSSclientConfig.basePath}${answers.OtherPicturePath}`"
+                  alt="Image"
+                >
+              </viewer>
+              <!-- <img
+                v-if="answers.OtherPicturePath"
+                v-viewer
+                :options="{ toolbar: false }"
+                style="width: 25px; height: 25px; cursor: pointer;margin-left:10px;"
+                crossorigin="anonymous"
+                :src="answers.OtherPicturePath"
+                alt="Image"
+                class="suv_viewer"
+              > -->
+              <!-- <el-link v-if="answers.OtherPicturePath" type="primary" style="margin-left:10px;" @click="previewImage(answers.OtherPicturePath)">截图</el-link> -->
+            </div>
+          </template>
+          <template v-else>
+            <el-input
+              v-if="qs.Type==='calculation'"
+              v-model="questionForm[qs.Id]"
+              disabled
+              @change="((val)=>{formItemChange(val, qs)})"
+            >
+              <template v-if="qs.Unit" slot="append">
+                {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+              </template>
+            </el-input>
+          </template>
+        </el-form-item>
+      </div>
+      <div
+        v-if="isCurrentTask && readingTaskState<2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+        class="base-dialog-footer"
+        style="text-align:right;margin-top:10px;"
+      >
+        <!-- 清除标记 -->
+        <el-button
+          v-if="questionForm.MeasureData"
+          size="mini"
+          @click="handleDeleteMeasureData"
+        >
+          {{ $t('trials:reading:button:removeMark') }}
+        </el-button>
+        <!-- 删除 -->
+        <el-button
+          v-if="isCurrentTaskAdd !== 'False'"
+          size="mini"
+          @click="handleDelete"
+        >
+          {{ $t('common:button:delete') }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="mini"
+          @click="handleSave"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </div>
+    </div>
+  </el-form>
+</template>
+<script>
+import { submitTableQuestion, deleteReadingRowAnswer, getIsSuvMaxLesion } from '@/api/trials'
+// import { uploadPrintscreen } from '@/api/reading'
+import DicomEvent from './../DicomEvent'
+import store from '@/store'
+export default {
+  name: 'MeasurementForm',
+  props: {
+    questions: {
+      type: Array,
+      default() { return [] }
+    },
+    answers: {
+      type: Object,
+      default() { return {} }
+    },
+    lesionType: {
+      type: Number,
+      required: true
+    },
+    visitTaskId: {
+      type: String,
+      required: true
+    },
+    parentQsId: {
+      type: String,
+      required: true
+    },
+    isCurrentTask: {
+      type: Boolean,
+      required: true
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    isBaseLineTask: {
+      type: Boolean,
+      required: true
+    },
+    orderMark: {
+      type: String,
+      default: ''
+    },
+    questionName: {
+      type: String,
+      required: true
+    },
+    rowIndex: {
+      type: String,
+      required: true
+    },
+    tableQuestions: {
+      type: Array,
+      default() { return [] }
+    }
+  },
+  data() {
+    return {
+      questionForm: {},
+      loading: false,
+      trialId: '',
+      organList: [],
+      originalQuestionForm: {},
+      isRender: false,
+      toolType: '',
+      lesionName: '',
+      isCurrentTaskAdd: 'False',
+      splitOrMergeLesionName: '',
+      lesionMark: '',
+      deleteInfo: null,
+      pictureBaseStr: '',
+      currentMarkTool: '',
+      digitPlaces: 2,
+      stateDisabled: false,
+      splitLesionTargetPPD: null,
+      splitLesionTargetLDi: null,
+      splitLesionTargetSDi: null
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.initForm()
+    DicomEvent.$on('handleImageQualityAbnormal', () => {
+      this.setState()
+    })
+    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+    // var container = document.getElementById('qs_container')
+    // container.addEventListener('scroll', this.scrollHandle , true)
+  },
+  beforeDestroy() {
+    DicomEvent.$off('handleImageQualityAbnormal')
+    // var container = document.getElementById('qs_container')
+    // container.removeEventListener('scroll', this.scrollHandle , true)
+  },
+  methods: {
+    scrollHandle() {
+      for (const k in this.$refs) {
+        if (k.indexOf('select_') === -1) continue
+        if (this.$refs[k] instanceof Array) {
+          this.$refs[k][0].blur()
+        } else {
+          this.$refs[k].blur()
+        }
+      }
+    },
+    previewImage() {
+      this.$refs.viewer[0].$viewer.show()
+    },
+    async initForm(params) {
+      const loading = this.$loading({ fullscreen: true })
+      this.questions.forEach(item => {
+        var val = this.answers[item.Id]
+        if (item.DictionaryCode) {
+          val = isNaN(parseInt(this.answers[item.Id])) ? this.answers[item.Id] : parseInt(this.answers[item.Id])
+        }
+        if (this.isBaseLineTask && item.QuestionMark === 7 && this.lesionType === 0) {
+          val = 0
+        }
+        if (this.isBaseLineTask && item.QuestionMark === 7 && this.lesionType === 1) {
+          val = 0
+        }
+        // 最低点PPD（13）、PPD最低点所在访视（14）、PPD最低点LDi（15）、PPD最低点SDi（16）
+        if (this.isBaseLineTask && (item.QuestionMark === 13 || item.QuestionMark === 14 || item.QuestionMark === 15 || item.QuestionMark === 16)) {
+          val = 'NA'
+        }
+        // PPD（12）、相比最低点PPD增加百分比（17）、相比PPD最低点LDi增加值（18）、相比PPD最低点SDi增加值（19）为空是，默认值为NA
+        if (!val && (item.QuestionMark === 12 || item.QuestionMark === 17 || item.QuestionMark === 18 || item.QuestionMark === 19)) {
+          val = 'NA'
+        }
+
+        this.$set(this.questionForm, item.Id, val)
+      })
+      this.$set(this.questionForm, 'MeasureData', this.answers.MeasureData ? JSON.parse(this.answers.MeasureData) : '')
+      this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
+      this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
+      this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
+
+      // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
+      var lesionState = this.getQuestionVal(7)
+      if (this.questionForm.RowId) {
+        this.$set(this.questionForm, 'saveTypeEnum', isNaN(parseInt(lesionState)) ? 1 : 2)
+      } else {
+        this.$set(this.questionForm, 'saveTypeEnum', 0)
+      }
+      this.$set(this.questionForm, 'IsCanEditPosition', this.answers.IsCanEditPosition === 'True')
+      this.$set(this.questionForm, 'IsDicomReading', this.answers.IsDicomReading !== 'False')
+
+      this.toolType = this.questionForm.MeasureData ? this.questionForm.MeasureData.type : ''
+      this.currentMarkTool = this.questionForm.MeasureData ? this.questionForm.MeasureData.type : this.answers.MarkTool
+      if (!this.questionForm.LesionType) {
+        this.$set(this.questionForm, 'LesionType', this.lesionType)
+      }
+      this.lesionName = this.getLesionInfo(this.orderMark, this.rowIndex)
+      this.isCurrentTaskAdd = this.answers.IsCurrentTaskAdd ? this.answers.IsCurrentTaskAdd : 'True'
+      this.lesionMark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
+      this.originalQuestionForm = { ...this.questionForm }
+      // this.lesionType === 0 && this.questionForm.MeasureData
+      if (this.answers.measureObj) {
+        await this.setMeasureData(this.answers.measureObj, true)
+      } else {
+        this.organList = []
+        await this.getOrganInfoList()
+      }
+
+      // 首次分裂的病灶默认状态为空时，设置默认值为存在
+      if (this.answers.IsFristAdd === 'True' && this.answers.SplitOrMergeType === '0' && lesionState === '') {
+        const stateId = this.getQuestionId(7)
+        this.$set(this.questionForm, stateId, 0)
+        var isLymphLesion = this.getQuestionVal(2)
+        const lesionPart = this.getQuestionVal(8)
+        const lesionOrgan = this.getQuestionVal(6)
+        const lesionLength = this.getQuestionVal(0)
+        const lesionShort = this.getQuestionVal(1)
+        const lesionState = this.getQuestionVal(7)
+        this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+      }
+      if (this.lesionType === 0 && params) {
+        // ppd
+
+        var ppd = this.getQuestionVal(12)
+        ppd = isNaN(parseFloat(ppd)) ? 0 : parseFloat(ppd)
+
+        this.splitLesionTargetPPD = ppd + params.splitLesionTargetPPD
+        this.splitLesionTargetLDi = params.splitLesionTargetLDi
+        this.splitLesionTargetSDi = params.splitLesionTargetSDi
+      }
+
+      // 如果当前病灶状态为“疾病进展”，且满足疾病进展的条件，则状态不允许更改
+      var state = this.getQuestionVal(7)// 长径
+      var ldi = this.getQuestionVal(0)// 长径
+      ldi = isNaN(parseFloat(ldi)) ? 0 : ldi
+      var pddIncrease = this.getQuestionVal(17) // 相比最低点PPD增加百分比
+      pddIncrease = isNaN(parseFloat(pddIncrease)) ? 0 : parseFloat(pddIncrease)
+      var ldiIncrease = this.getQuestionVal(18)// 相比PPD最低点LDi增加值
+      ldiIncrease = isNaN(parseFloat(ldiIncrease)) ? 0 : parseFloat(ldiIncrease)
+      var sdiIncrease = this.getQuestionVal(19)// 相比PPD最低点SDi增加值
+      sdiIncrease = isNaN(parseFloat(sdiIncrease)) ? 0 : parseFloat(sdiIncrease)
+
+      if (!this.isBaseLineTask && state === 4 && this.lesionType === 0 && ldi && pddIncrease && ldiIncrease && sdiIncrease) {
+        /** 融合主病灶疾病进展
+         * 当前融合靶病灶LDi>15
+         * 相比最低点PPD增加百分比 ≥50％
+        **/
+        if (this.answers.SplitOrMergeType === '4' || this.answers.SplitOrMergeType === '5') {
+          if (ldi > 15 && pddIncrease >= 50) {
+            this.stateDisabled = true
+          } else {
+            this.stateDisabled = false
+          }
+        } else {
+          if (this.lesionType === 0 && this.answers.SplitOrMergeType === '2' && this.splitLesionTargetPPD) {
+            var minPPD = this.getQuestionVal(13)
+            minPPD = parseFloat(minPPD)
+            pddIncrease = ((((this.splitLesionTargetPPD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+            ldi = this.splitLesionTargetLDi + ldi
+            var minLDi = this.getQuestionVal(15)
+            ldiIncrease = ldi - minLDi
+            var sdi = this.getQuestionVal(1)// 短径
+            sdi = isNaN(parseFloat(sdi)) ? 0 : sdi
+            sdi = this.splitLesionTargetSDi + sdi
+            var minSDi = this.getQuestionVal(16)
+            sdiIncrease = sdi - minSDi
+          }
+
+          /** 疾病进展
+         * 15mm<当前靶病灶LDi≤20mm
+         * 相比最低点PPD增加百分比 ≥50％
+         * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
+        **/
+          if ((ldi > 15 && ldi <= 20) && (pddIncrease >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
+            this.stateDisabled = true
+          } else if ((ldi > 20) && (pddIncrease >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
+          /** 疾病进展
+           * 当前靶病灶LDi>20 mm
+           * 相比最低点PPD增加百分比 ≥50％
+           * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
+          **/
+            this.stateDisabled = true
+          } else {
+            this.stateDisabled = false
+          }
+        }
+      } else {
+        this.stateDisabled = false
+      }
+      this.isRender = true
+      loading.close()
+    },
+    getLesionName(orderMark, rowIndex) {
+      var lessionName = ''
+      var rowIndexArr = rowIndex.split('.')
+      var x = parseInt(rowIndexArr[0])
+      var 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
+    },
+    getLesionInfo(orderMark, rowIndex) {
+      var arr = []
+      var lessionName = ''
+      var rowIndexArr = rowIndex.split('.')
+      var x = parseInt(rowIndexArr[0])
+      var y = parseInt(rowIndexArr[1])
+      if (y > 0) {
+        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
+        arr.push(lessionName)
+      } else {
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
+        arr.push(lessionName)
+      }
+      if (this.answers.SplitOrMergeLesionName && parseInt(this.answers.SplitOrMergeType) === 0) {
+        arr.push(`(Split from ${this.answers.SplitOrMergeLesionName})`)
+      } else if (this.answers.SplitOrMergeLesionName && parseInt(this.answers.SplitOrMergeType) === 1) {
+        arr.push(`(Merge to ${this.answers.SplitOrMergeLesionName})`)
+      }
+      return arr.join(' ')
+    },
+    getQuestionId(questionMark) {
+      var idx = this.questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        return this.questions[idx].Id
+      } else {
+        return ''
+      }
+    },
+    getOrganInfoList(isLymphNodes = null) {
+      return new Promise(async resolve => {
+        // var param = {
+        //   trialId: this.trialId,
+        //   visitTaskId: this.visitTaskId,
+        //   lesionType: this.lesionType,
+        //   isEnable: true
+        // }
+        // if (isLymphNodes !== undefined && isLymphNodes !== null) {
+        //   param.isLymphNodes = isLymphNodes
+        // }
+        // getTrialOrganList(param).then(res => {
+        //   this.organList = res.Result
+        //   resolve()
+        // })
+        if (!sessionStorage.getItem('organList')) {
+          await store.dispatch('reading/getOrganInfo', this.visitTaskId)
+        }
+        var organList = sessionStorage.getItem('organList') ? JSON.parse(sessionStorage.getItem('organList')) : []
+        var idx = organList.findIndex(i => i.LesionType === this.lesionType)
+        if (idx > -1) {
+          organList = organList[idx].OrganList
+
+          if (!isNaN(parseInt(isLymphNodes))) {
+            this.organList = organList.filter((item) => item.IsLymphNodes === parseInt(isLymphNodes))
+          } else {
+            this.organList = organList
+          }
+        }
+        resolve()
+      })
+    },
+    async lesionTypeChange(v) {
+      this.$emit('determineExistsUnsavedLession', async val => {
+        if (val) {
+          // 基线时，靶病灶只能用直径和长短径标注，非dicom文件的标注不能作为靶病灶
+          //
+          if ((this.isBaseLineTask || this.questionForm.IsDicomReading === false) && this.questionForm.MeasureData && this.questionForm.MeasureData.type === 'ArrowAnnotate' && v === 0) {
+            // 当前病灶不允许设置为靶病灶
+            this.$confirm(this.$t(' trials:reading:warnning:msg15'), {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            })
+              .then(() => {})
+              .catch(() => {})
+            this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
+            return
+          }
+          // 判断是否超过该病灶类型个数的最大值
+          var idx = this.tableQuestions.findIndex(item => item.LesionType === v)
+          if (idx > -1 && !!this.tableQuestions[idx].MaxQuestionCount && this.tableQuestions[idx].MaxQuestionCount <= this.tableQuestions[idx].TableQuestions.Answers.length) {
+            let msg = this.$t('trials:reading:warnning:msg14')
+            // msg = msg.replace('xxx', this.tableQuestions[idx].QuestionName)
+            msg = msg.replace('xxx', this.tableQuestions[idx].MaxQuestionCount)
+            this.$confirm(msg, {
+              type: 'warning',
+              showCancelButton: false,
+              callback: action => {}
+            })
+            this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
+            return
+          }
+
+          var arr = []
+          this.questionForm[this.getQuestionId(8)] = ''
+          this.questionForm[this.getQuestionId(5)] = ''
+          this.questionForm[this.getQuestionId(10)] = ''// 部位描述
+          this.questionForm[this.getQuestionId(4)] = ''
+          this.questionForm[this.getQuestionId(6)] = ''
+          this.questionForm[this.getQuestionId(2)] = ''
+          this.questions.forEach(item => {
+            item.Answer = this.questionForm[item.Id] ? this.questionForm[item.Id] : ''
+            arr.push(item)
+          })
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
+          DicomEvent.$emit('imageLocation', obj)
+          var type = null
+          if (this.questionForm.RowId) {
+            type = 1
+          } else {
+            type = 0
+          }
+          DicomEvent.$emit('changeLesionType', { questionForm: arr, oldLesionType: this.lesionType, newLesionType: v, rowIndex: this.questionForm.RowIndex, questionId: this.parentQsId, measureData: this.questionForm.MeasureData, type, rowId: this.questionForm.RowId })
+        } else {
+          this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
+        }
+      })
+    },
+    deleteLesionInfo() {
+      return new Promise(async(resolve, reject) => {
+        const loading = this.$loading({ fullscreen: true })
+        var param = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.parentQsId,
+          rowId: this.questionForm.RowId
+        }
+        try {
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            DicomEvent.$emit('getReportInfo', true)
+          }
+          loading.close()
+          resolve()
+        } catch (e) {
+          loading.close()
+          reject()
+        }
+      })
+    },
+    async formItemChange(v, question) {
+      if (question.QuestionMark === 8 && question.RelationQuestions.length > 0) {
+        // 当选择部位时，联动器官、位置、是否淋巴结问题答案
+        var index = this.organList.findIndex(item => item[question.DataTableColumn] === v)
+        if (index > -1) {
+          var selected = this.organList[index]
+          question.RelationQuestions.map(qs => {
+            var val = selected[qs.DataTableColumn]
+            this.$set(this.questionForm, qs.Id, val)
+          })
+          this.$set(this.questionForm, 'OrganInfoId', selected.OrganInfoId)
+          this.$set(this.questionForm, 'IsCanEditPosition', selected['IsCanEditPosition'])
+        } else {
+          question.RelationQuestions.map(qs => {
+            this.$set(this.questionForm, qs.Id, '')
+          })
+        }
+      }
+
+      // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
+      if (this.questionForm.RowId) {
+        this.$set(this.questionForm, 'saveTypeEnum', 1)
+      } else {
+        this.$set(this.questionForm, 'saveTypeEnum', 0)
+      }
+      var isLymphLesion = this.getQuestionVal(2)
+      const lesionPart = this.getQuestionVal(8)
+      const lesionOrgan = this.getQuestionVal(6)
+      const lesionLength = this.getQuestionVal(0)
+      const lesionShort = this.getQuestionVal(1)
+      const lesionState = this.getQuestionVal(7)
+      this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+
+      if (question.QuestionMark === 7) {
+        var status = ''
+        if (this.lesionType === 0 && lesionState === 1) {
+          status = 'T'
+        }
+        if ((this.lesionType === 0 && lesionState === 3) || (this.lesionType === 1 && lesionState === 3) || (this.lesionType === 2 && lesionState === 3)) {
+          status = 'D'
+        }
+        if (this.questionForm.MeasureData) {
+          this.questionForm.MeasureData.status = status
+        }
+        await store.dispatch('reading/updateMeasureDataStatus', { visitTaskId: this.visitTaskId, rowIndex: this.rowIndex, questionId: this.parentQsId, status })
+        DicomEvent.$emit('getMeasureData')
+      }
+    },
+    setMeasureData(measureData, isInit = false) {
+      console.log('setMeasureData')
+      return new Promise(resolve => {
+        if (measureData) {
+          if (measureData.pictureBaseStr) {
+            this.pictureBaseStr = measureData.pictureBaseStr
+            measureData.pictureBaseStr = ''
+          }
+          // 获取长径(0)
+          // const loading = this.$loading({ fullscreen: true })
+          var lengthObj = this.questions.find(i => i.QuestionMark === 0)
+          var shortObj = this.questions.find(i => i.QuestionMark === 1)
+
+          if (measureData.type === 'Length' || measureData.type === 'Bidirectional') {
+            var length = ''
+            if (measureData.type === 'Length') {
+              length = measureData.data.length
+            } else if (measureData.type === 'Bidirectional') {
+              length = measureData.data.longestDiameter
+            }
+            this.$set(this.questionForm, lengthObj.Id, length)
+            // 获取短径(1)
+
+            var short = ''
+            if (measureData.type === 'Bidirectional') {
+              short = measureData.data.shortestDiameter
+            }
+            this.$set(this.questionForm, shortObj.Id, short)
+          } else if (measureData.type === 'ArrowAnnotate') {
+            this.$set(this.questionForm, lengthObj.Id, '')
+            this.$set(this.questionForm, shortObj.Id, '')
+          }
+          var isLymphLesion = this.getQuestionVal(2)
+          this.organList = []
+          this.getOrganInfoList()
+
+          var data = {}
+          if (measureData.isDicomReading === false) {
+            this.$set(this.questionForm, 'IsDicomReading', false)
+            data = {
+              Id: '',
+              IsDicomReading: false,
+              StudyId: measureData.studyId,
+              InstanceId: measureData.instanceId,
+              SeriesId: measureData.seriesId,
+              MeasureData: measureData,
+              QuestionId: this.parentQsId,
+              RowIndex: this.questionForm.RowIndex,
+              RowId: this.questionForm.RowId,
+              VisitTaskId: this.visitTaskId
+            }
+            measureData.data.uuid = `${measureData.instanceId}-${measureData.data.remark}`
+          } else {
+            this.$set(this.questionForm, 'IsDicomReading', true)
+            const lesionState = this.getQuestionVal(7)
+            // 基线时，默认状态都为存在
+            if (this.isBaseLineTask && !lesionState) {
+              const stateId = this.getQuestionId(7)
+              this.$set(this.questionForm, stateId, 0)
+            }
+            var lesionLength = this.getQuestionVal(0)
+            // 当前添加的新病灶不做处理
+            if (!(this.isCurrentTaskAdd === 'True') && this.lesionType === 0 && !this.isBaseLineTask && measureData.type === 'Bidirectional') {
+              if (isLymphLesion) {
+                // 淋巴结靶病灶
+                if (lesionLength > 15) {
+                  // 长径大于15mm,自动给“存在”状态
+                  const stateId = this.getQuestionId(7)
+                  this.$set(this.questionForm, stateId, 0)
+                } else {
+                  // 长径小于或等于15mm,自动给“消失”状态
+                  const stateId = this.getQuestionId(7)
+                  this.$set(this.questionForm, stateId, 3)
+                }
+              } else {
+                // 非淋巴结靶病灶
+                if (lesionLength > 0) {
+                  // 长径大于0,自动给“存在”状态
+                  const stateId = this.getQuestionId(7)
+                  this.$set(this.questionForm, stateId, 0)
+                }
+              }
+            } else if (this.isCurrentTaskAdd === 'True' && !lesionState && measureData.type === 'Bidirectional') {
+              const stateId = this.getQuestionId(7)
+              this.$set(this.questionForm, stateId, 0)
+            }
+            if (this.lesionType === 0) {
+              this.calculatePPD()
+            }
+            
+            var status = ''
+            if (lesionState) {
+              if (this.lesionType === 0 && lesionState === 1) {
+                status = 'T'
+              }
+              if ((this.lesionType === 0 && lesionState === 3) || (this.lesionType === 1 && lesionState === 3) || (this.lesionType === 2 && lesionState === 3)) {
+                status = 'D'
+              }
+            }
+            measureData.data.status = status
+
+            measureData.data.remark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
+            data = {
+              Id: '',
+              IsDicomReading: true,
+              StudyId: measureData.studyId,
+              InstanceId: measureData.instanceId,
+              SeriesId: measureData.seriesId,
+              MeasureData: measureData,
+              QuestionId: this.parentQsId,
+              RowIndex: this.questionForm.RowIndex,
+              RowId: this.questionForm.RowId,
+              VisitTaskId: this.visitTaskId,
+              OrderMarkName: measureData.data.remark,
+              frame: isNaN(parseInt(measureData.frame)) ? 0 : measureData.frame
+            }
+          }
+          // Store.$emit('addTemporaryMeasuredData', data)
+          store.dispatch('reading/addMeasuredData', { visitTaskId: this.visitTaskId, data: data })
+          if (!this.questionForm.IsDicomReading) {
+            DicomEvent.$emit('addNoneDicomMeasureData', measureData)
+          }
+          DicomEvent.$emit('getMeasureData')
+        }
+        if (!isInit) {
+          // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+          if (this.questionForm.RowId) {
+            this.$set(this.questionForm, 'saveTypeEnum', 1)
+          } else {
+            this.$set(this.questionForm, 'saveTypeEnum', 0)
+          }
+        }
+        this.$set(this.questionForm, 'MeasureData', measureData)
+        var isLymph = this.getQuestionVal(2)
+        const lesionPart = this.getQuestionVal(8)
+        const lesionOrgan = this.getQuestionVal(6)
+        const lesionL = this.getQuestionVal(0)
+        const lesionS = this.getQuestionVal(1)
+        var lesionState = this.getQuestionVal(7)
+        // // 状态为空时，非淋巴结靶病灶长径>0mm，自动给“存在”状态，如果淋巴结靶病灶短径>=10mm，自动给“存在”状态。淋巴结靶病灶在短径小于10mm时，用十字线标记测量时标记为消失
+        // if (!this.isBaseLineTask && this.lesionType === 0 && ((isLymphLesion === 0 && lesionLength > 0) || (isLymphLesion === 1 && lesionShort >= 10))) {
+        //   const stateId = this.getQuestionId(7)
+        //   this.$set(this.questionForm, stateId, 0)
+        //   lesionState = 0
+        // }
+
+        // if (!this.isBaseLineTask && this.lesionType === 0 && (isLymphLesion === 1 && measureData.type === 'Bidirectional' && lesionShort < 10)) {
+        //   const stateId = this.getQuestionId(7)
+        //   this.$set(this.questionForm, stateId, 3)
+        //   lesionState = 3
+        // }
+        // // 基线时，默认状态都为存在
+        // if (this.isBaseLineTask && !lesionState) {
+        //   const stateId = this.getQuestionId(7)
+        //   this.$set(this.questionForm, stateId, 0)
+        //   lesionState = 0
+        // }
+
+        this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, lesionOrgan, lesionShort: lesionS, lesionLength: lesionL, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+        this.toolType = measureData.type
+        DicomEvent.$emit('refreshStudyListMeasureData')
+        resolve()
+      })
+
+      // loading.close()
+      // this.handleSave()
+    },
+    calculatePPD() {
+      // 最低点PPD（13）、PPD最低点LDi（15）、	PPD最低点SDi（16）
+      // 长径(0)/短径(1)发生改变，计算PPD（12）、相比最低点PPD增加百分比（17）、相比PPD最低点LDi增加值（18）、相比PPD最低点SDi增加值（19）
+      var ldi = this.getQuestionVal(0)
+      var sdi = this.getQuestionVal(1)
+      var ppd = null
+      if (!isNaN(parseFloat(ldi)) && !isNaN(parseFloat(sdi))) {
+        ldi = parseFloat(ldi)
+        sdi = parseFloat(sdi)
+        ppd = (ldi * sdi).toFixed(this.digitPlaces)
+      } else {
+        ppd = 'NA'
+      }
+      var ppdObj = this.questions.find(i => i.QuestionMark === 12)
+      this.$set(this.questionForm, ppdObj.Id, ppd)
+      // if(isNaN(parseFloat(ppd))){
+
+      // }
+      var minPPD = this.getQuestionVal(13)
+      var pddIncrease = null
+      // 相比最低点PPD增加百分比
+      var ppdIncreaseObj = this.questions.find(i => i.QuestionMark === 17)
+      if (!isNaN(parseFloat(minPPD)) && !isNaN(parseFloat(ppd))) {
+        minPPD = parseFloat(minPPD)
+        pddIncrease = ((((ppd - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+        this.$set(this.questionForm, ppdIncreaseObj.Id, pddIncrease)
+      } else {
+        this.$set(this.questionForm, ppdIncreaseObj.Id, 'NA')
+      }
+      var minLDi = this.getQuestionVal(15)
+      var ldiIncrease = null
+      // 相比PPD最低点LDi增加值
+      var ldiIncreaseObj = this.questions.find(i => i.QuestionMark === 18)
+      if (!isNaN(parseFloat(minLDi)) && !isNaN(parseFloat(ldi))) {
+        minLDi = parseFloat(minLDi)
+        ldiIncrease = ldi - minLDi
+        this.$set(this.questionForm, ldiIncreaseObj.Id, ldiIncrease.toFixed(this.digitPlaces))
+      } else {
+        this.$set(this.questionForm, ldiIncreaseObj.Id, 'NA')
+      }
+      var minSDi = this.getQuestionVal(16)
+      var sdiIncrease = null
+      // 相比PPD最低点SDi增加值
+      var sdiIncreaseObj = this.questions.find(i => i.QuestionMark === 19)
+      if (!isNaN(parseFloat(minSDi)) && !isNaN(parseFloat(sdi))) {
+        minSDi = parseFloat(minSDi)
+        sdiIncrease = sdi - minSDi
+        this.$set(this.questionForm, sdiIncreaseObj.Id, sdiIncrease.toFixed(this.digitPlaces))
+      } else {
+        this.$set(this.questionForm, sdiIncreaseObj.Id, 'NA')
+      }
+      var pddIncreaseNum = null
+      if (this.lesionType === 0 && this.answers.SplitOrMergeType === '2' && this.splitLesionTargetPPD) {
+        pddIncreaseNum = ((((this.splitLesionTargetPPD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+        ldi = this.splitLesionTargetLDi + ldi
+        ldiIncrease = ldi - minLDi
+        sdi = this.splitLesionTargetSDi + sdi
+        sdiIncrease = sdi - minSDi
+      } else {
+        pddIncreaseNum = ((((ppd - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+      }
+      /** 疾病进展* **/
+      if (!this.isBaseLineTask && ldi && pddIncreaseNum && ldiIncrease && sdiIncrease && this.lesionType === 0 && this.isCurrentTaskAdd === 'False') {
+        if (this.answers.SplitOrMergeType === '4' || this.answers.SplitOrMergeType === '5') {
+          /** 融合主病灶疾病进展
+           * 当前融合靶病灶LDi>15
+           * 相比最低点PPD增加百分比 ≥50％
+          **/
+          if (ldi > 15 && pddIncreaseNum >= 50) {
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 4)
+            this.stateDisabled = true
+          } else {
+            // 不符合疾病进展是否需要清空修改前疾病进展的状态
+            this.stateDisabled = false
+          }
+        } else {
+        /** 疾病进展
+         * 15mm<当前靶病灶LDi≤20mm
+         * 相比最低点PPD增加百分比 ≥50％
+         * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
+        **/
+          if ((ldi > 15 && ldi <= 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 4)
+            this.stateDisabled = true
+          } else if ((ldi > 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
+          /** 疾病进展
+           * 当前靶病灶LDi>20 mm
+           * 相比最低点PPD增加百分比 ≥50％
+           * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
+          **/
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 4)
+            this.stateDisabled = true
+          } else {
+          // 不符合疾病进展是否需要清空修改前疾病进展的状态
+          // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
+          // if (lesionState === 4) {
+          //   const stateId = this.getQuestionId(7)
+          //   this.$set(this.questionForm, stateId, null)
+          // }
+            this.stateDisabled = false
+          }
+        }
+      } else {
+        // 不符合疾病进展是否需要清空修改前疾病进展的状态
+        // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
+        // if (lesionState === 4) {
+        //   const stateId = this.getQuestionId(7)
+        //   this.$set(this.questionForm, stateId, null)
+        // }
+        this.stateDisabled = false
+      }
+    },
+    returnFloat(num) {
+      if (num) return
+      var value = Math.round(parseFloat(num) * 100) / 100
+      var s = value.toString().split('.')
+      if (s.length === 1) {
+        value = value.toString() + '.00'
+        return value
+      }
+      if (s.length > 1) {
+        if (s[1].length < 2) {
+          value = value.toString() + '0'
+        }
+        return value
+      }
+    },
+    getQuestionVal(questionMark) {
+      const idx = this.questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        const questionId = this.questions[idx].Id
+        const answer = this.questionForm[questionId]
+        if (isNaN(parseFloat(answer))) {
+          return answer
+        } else {
+          return parseFloat(answer)
+        }
+      } else {
+        return ''
+      }
+    },
+    filterState(arr) {
+      if (!this.isBaseLineTask) {
+        const isLymphLesion = this.getQuestionVal(2)
+        const lesionLength = this.getQuestionVal(0)
+        const lesionShort = this.getQuestionVal(1)
+        const bLesionL = !isNaN(parseInt(this.answers.LastTaskMajorAxis)) ? parseInt(this.answers.LastTaskMajorAxis) : 0
+        const bLesionS = !isNaN(parseInt(this.answers.LastTaskShortAxis)) ? parseInt(this.answers.LastTaskShortAxis) : 0
+        if (this.lesionType === 1 && isLymphLesion === 1 && this.questionForm.MeasureData && this.questionForm.MeasureData.type === 'Bidirectional' && lesionShort < bLesionS) {
+          arr = arr.filter(i => i.value !== 1)
+        } else if (this.lesionType === 1 && isLymphLesion === 1 && this.questionForm.MeasureData && this.questionForm.MeasureData.type === '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.type === 'Length' || this.questionForm.MeasureData.type === 'Bidirectional') && lesionLength < bLesionL) {
+          arr = arr.filter(i => i.value !== 1)
+        }
+        return arr
+      } else {
+        return arr
+      }
+    },
+    setDeleteInfo(deleteInfo) {
+      this.deleteInfo = deleteInfo
+    },
+    // async uploadScreenshots(fileName, file) {
+    //   try {
+    //     file = this.convertBase64ToBlob(file)
+    //     const formData = new FormData()
+    //     formData.append('file', file)
+    //     const result = await uploadPrintscreen(formData, this.$route.query.subjectId)
+    //     result.url = result.Result.Path
+    //     // const result = await this.OSSclient.put(`${fileName}.png`, file)
+    //     return { isSuccess: true, result: result }
+    //   } catch (e) {
+    //     console.log(e)
+    //     return { isSuccess: false, result: e }
+    //   }
+    // },
+    async uploadScreenshots(fileName, file) {
+      try {
+        file = this.convertBase64ToBlob(file)
+        var trialId = this.$route.query.trialId
+        var subjectId = this.$route.query.trialId
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
+        return { isSuccess: true, result: result }
+      } catch (e) {
+        console.log(e)
+        return { isSuccess: false, result: e }
+      }
+    },
+    convertBase64ToBlob(imageEditorBase64) {
+      var base64Arr = imageEditorBase64.split(',')
+      var imgtype = ''
+      var base64String = ''
+      if (base64Arr.length > 1) {
+        // 如果是图片base64，去掉头信息
+        base64String = base64Arr[1]
+        imgtype = base64Arr[0].substring(
+          base64Arr[0].indexOf(':') + 1,
+          base64Arr[0].indexOf(';')
+        )
+      }
+      // 将base64解码
+      var bytes = atob(base64String)
+      // var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length)
+      // 转换为类型化数组
+      var byteArray = new Uint8Array(bytesCode)
+
+      // 将base64转换为ascii码
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
+      }
+
+      // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], { type: imgtype })
+    },
+    async handleSave() {
+      const valid = await this.$refs.measurementForm.validate()
+      if (!valid) {
+        if (this.lesionType === 0) {
+          this.$refs['scrollPanel'].scrollTo({ top: 0, behavior: 'smooth' })
+        }
+        return
+      }
+      const loading = this.$loading({ fullscreen: true })
+      var measureData = this.questionForm.MeasureData
+      var lesionState = this.getQuestionVal(7)
+      var lesionLength = this.getQuestionVal(0)
+      var lesionShort = this.getQuestionVal(1)
+      var lymphNodes = this.getQuestionVal(2)
+      lymphNodes = (lymphNodes !== null && lymphNodes !== undefined) ? parseInt(lymphNodes) : null
+      if (this.isBaseLineTask) {
+        // 基线
+        // 靶病灶且状态为存在（0）
+        if (this.lesionType === 0 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            //  评估状态为“存在”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15 && lesionLength >= 2 * measureData.thick)) {
+              this.$confirm(this.$t('trials:lugano:message:validState1'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 评估状态为“存在”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 10 && lesionLength >= 2 * measureData.thick)) {
+              this.$confirm(this.$t('trials:lugano:message:validState2'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为存在（0）
+        if (this.lesionType === 1 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
+              this.$confirm(this.$t('trials:reading:warnning:msg21'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
+              this.$confirm(this.$t('trials:lugano:message:validState12'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+      } else {
+        // 非基线
+        // 靶病灶且状态为存在（0）
+        if (this.lesionType === 0 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15)) {
+              // 状态为“存在”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
+              this.$confirm(this.$t('trials:lugano:message:validState3'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 长短径测量工具
+            if (!(measureData && measureData.type === 'Bidirectional')) {
+              // 状态为“存在”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
+              this.$confirm(this.$t('trials:lugano:message:validState4'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+        // 靶病灶且状态为太小（1）
+        if (this.lesionType === 0 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用箭头工具，长径、短径记录为5mm
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg25'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.type === 'ArrowAnnotate') {
+              const shortId = this.getQuestionId(1)
+              this.$set(this.questionForm, shortId, 5)
+              lesionShort = 5
+              const lengthId = this.getQuestionId(0)
+              this.$set(this.questionForm, lengthId, 5)
+              lesionLength = 5
+            }
+          } else {
+            // 非淋巴结靶病灶 箭头工具，长径记录为5mm
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg26'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.type === 'ArrowAnnotate') {
+              const shortId = this.getQuestionId(1)
+              this.$set(this.questionForm, shortId, 5)
+              lesionShort = 5
+              const lengthId = this.getQuestionId(0)
+              this.$set(this.questionForm, lengthId, 5)
+              lesionLength = 5
+            }
+          }
+        }
+
+        // 靶病灶且状态为无法评估（2）
+        if (this.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 (this.lesionType === 0 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 使用箭头工具
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+              // 评估状态为消失的淋巴结靶病灶需使用箭头工具或长短径工具添加标记！
+              this.$confirm(this.$t('trials:lugano:message:validState5'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.type === 'Bidirectional' && lesionLength > 15) {
+              // 评估状态为消失的淋巴结靶病灶,短径应不大于15mm！
+              this.$confirm(this.$t('trials:lugano:message:validState6'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+            // if (!(measureData && (measureData.type === '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.type === 'ArrowAnnotate')) {
+              // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg30'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+            //  else if (measureData && measureData.type === 'ArrowAnnotate') {
+            //   const lId = this.getQuestionId(0)
+            //   this.$set(this.questionForm, lId, 0)
+            //   lesionLength = 0
+            // }
+          }
+          if (measureData && measureData.type === 'ArrowAnnotate') {
+            const shortId = this.getQuestionId(1)
+            this.$set(this.questionForm, shortId, null)
+            lesionShort = null
+            const lengthId = this.getQuestionId(0)
+            this.$set(this.questionForm, lengthId, null)
+            lesionLength = null
+          }
+        }
+
+        // 靶病灶且状态为疾病进展 （4）
+        if (this.lesionType === 0 && lesionState === 4) {
+          if (lymphNodes === 1) {
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15)) {
+              // 状态为“疾病进展”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
+              this.$confirm(this.$t('trials:lugano:message:validState7'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 直径测量工具
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 10)) {
+              // 状态为“疾病进展”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
+              this.$confirm(this.$t('trials:lugano:message:validState8'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为存在（0）
+        if (this.lesionType === 1 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg31'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:lugano:message:validState9'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为显著增大（1）
+        if (this.lesionType === 1 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg33'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 矩形工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为显著增大的非淋巴结非靶病灶需使用矩形工具添加标记！
+              this.$confirm(this.$t('trials:lugano:message:validState10'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为无法评估（2）
+        if (this.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 (this.lesionType === 1 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg37'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 箭头工具
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg38'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为存在（0）
+        if (this.lesionType === 2 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg39'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为存在的非淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:lugano:message:validState11'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为疑似  不限制（1）
+        // if (this.lesionType === 2 && lesionState === 1) {
+        //   if (lymphNodes === 1) {
+        //     // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+        //     if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
+        //       // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+        //       this.$confirm(this.$t('trials:reading:warnning:msg41'), {
+        //         type: 'warning',
+        //         showCancelButton: false,
+        //         callback: action => {}
+        //       })
+        //       loading.close()
+        //       return
+        //     }
+        //   } else {
+        //     // 非淋巴结非靶病灶 直径测量工具、箭头工具
+        //     if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
+        //       // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
+        //       this.$confirm(this.$t('trials:reading:warnning:msg42'), {
+        //         type: 'warning',
+        //         showCancelButton: false,
+        //         callback: action => {}
+        //       })
+        //       loading.close()
+        //       return
+        //     }
+        //   }
+        // }
+
+        // 新病灶且状态为无法评估（2）
+        if (this.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 (this.lesionType === 2 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg45'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 箭头工具
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg46'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+      }
+      DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
+        // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
+        // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
+        // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
+        var picturePath = ''
+        if (val && measureData && this.questionForm.IsDicomReading) {
+          var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
+          picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+        }
+        var answers = []
+        var 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 this.questionForm) {
+          if (reg.test(k)) {
+            if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+              answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
+            }
+          }
+        }
+
+        var params = {
+          computationTrigger: -2,
+          questionId: this.parentQsId,
+          rowId: this.questionForm.RowId,
+          rowIndex: this.answers.RowIndex,
+          visitTaskId: this.visitTaskId,
+          trialId: this.trialId,
+          measureData: measureData ? JSON.stringify(measureData) : '',
+          answerList: answers,
+          isCanEditPosition: this.questionForm.IsCanEditPosition,
+          studyId: measureData ? this.questionForm.MeasureData.studyId : '',
+          seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
+          instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
+          numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
+          picturePath: picturePath,
+          organInfoId: this.questionForm.OrganInfoId,
+          markTool: measureData ? measureData.type : ''
+        }
+        if (this.questionForm.IsDicomReading === false) {
+          params.isDicomReading = false
+        }
+        if (this.deleteInfo) {
+          var param = {
+            visitTaskId: this.visitTaskId,
+            questionId: this.deleteInfo.questionId,
+            rowId: this.deleteInfo.rowId
+          }
+          await deleteReadingRowAnswer(param)
+          this.deleteInfo = null
+          params.rowId = ''
+        }
+        try {
+          const res = await submitTableQuestion(params)
+          if (res.IsSuccess) {
+            // 保存成功！
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+
+            this.currentMarkTool = measureData ? measureData.type : ''
+            this.$set(this.questionForm, 'saveTypeEnum', 2)
+            this.originalQuestionForm = { ...this.questionForm }
+            var isLymphLesion = this.getQuestionVal(2)
+            var lesionOrgan = this.getQuestionVal(6)
+            this.$set(this.questionForm, 'RowId', res.Result.RowId)
+            const lesionPart = this.getQuestionVal(8)
+            const lesionState = this.getQuestionVal(7)
+            this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+            this.$emit('close')
+            DicomEvent.$emit('readingPageUpdate', {})
+            DicomEvent.$emit('getReportInfo', true)
+            DicomEvent.$emit('setMeasuredToolsPassive')
+            if (parseInt(this.answers.SplitOrMergeType) === 0) {
+              this.$emit('getReadingQuestionAndAnswer')
+            }
+          }
+          loading.close()
+        } catch (e) {
+          loading.close()
+        }
+      })
+    },
+    async handleDeleteMeasureData() {
+      // 是否确认清除标记？
+      const confirm = await this.$confirm(
+        this.$t('trials:reading:warnning:msg47'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      this.stateDisabled = false
+      this.organList = []
+      await this.getOrganInfoList()
+      // 重置长短径 和 状态
+      var lengId = this.getQuestionId(0)
+      this.$set(this.questionForm, lengId, '')
+      var shortId = this.getQuestionId(1)
+      this.$set(this.questionForm, shortId, '')
+      var stateId = this.getQuestionId(7)
+      this.$set(this.questionForm, stateId, '')
+      // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+      if (this.questionForm.RowId) {
+        this.$set(this.questionForm, 'saveTypeEnum', 1)
+      } else {
+        this.$set(this.questionForm, 'saveTypeEnum', 0)
+      }
+      await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+      DicomEvent.$emit('getMeasureData')
+      // Store.$emit('updateImage', this.questionForm.MeasureData.instanceId)
+      const isLymphLesion = this.getQuestionVal(2)
+      const lesionPart = this.getQuestionVal(8)
+      const lesionOrgan = this.getQuestionVal(6)
+      const lesionLength = ''
+      const lesionShort = ''
+      const lesionState = this.getQuestionVal(7)
+
+      if (!this.questionForm.IsDicomReading) {
+        DicomEvent.$emit('removeNoneDicomMeasureData', this.questionForm.MeasureData)
+      }
+      this.$set(this.questionForm, 'IsDicomReading', true)
+
+      this.$set(this.questionForm, 'MeasureData', '')
+      let anwsers = null
+      if (this.answers.measureObj) {
+        anwsers = Object.assign({ measureObj: '' }, this.questionForm)
+      } else {
+        anwsers = Object.assign({}, this.questionForm)
+      }
+      this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
+      if (this.lesionType === 0) {
+        this.calculatePPD()
+      }
+      DicomEvent.$emit('refreshStudyListMeasureData')
+    },
+    async handleDelete() {
+      let message = this.$t('trials:reading:warnning:msg48')
+      // 判断该病灶的suvmax是否是最大的
+      const suvMax = this.getQuestionVal(20)
+      if (this.questionForm.RowId && !!suvMax) {
+        const res = await getIsSuvMaxLesion({ visitTaskId: this.visitTaskId, rowId: this.questionForm.RowId })
+        if (res.IsSuccess && res.Result.IsSuvMaxLesion) {
+          message = this.$t('trials:reading:warnning:msg58')
+        }
+      }
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      if (this.questionForm.RowId) {
+        const loading = this.$loading({ fullscreen: true })
+        var param = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.parentQsId,
+          rowId: this.questionForm.RowId
+        }
+        try {
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            if (this.questionForm.IsDicomReading && this.questionForm.MeasureData) {
+              await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+            }
+            if (!this.questionForm.IsDicomReading && this.questionForm.MeasureData) {
+              DicomEvent.$emit('removeNoneDicomMeasureData', this.questionForm.MeasureData)
+            }
+            this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
+            DicomEvent.$emit('getReportInfo', true)
+            DicomEvent.$emit('readingPageUpdate', {})
+            // '删除成功！'
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          }
+          loading.close()
+        } catch (e) {
+          console.log(e)
+          loading.close()
+        }
+      } else {
+        // 移除新建病灶并关闭窗口
+        if (this.questionForm.MeasureData && this.questionForm.IsDicomReading) {
+          await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+        }
+        if (!this.questionForm.IsDicomReading && this.questionForm.MeasureData) {
+          DicomEvent.$emit('removeNoneDicomMeasureData', this.questionForm.MeasureData)
+        }
+        this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
+      }
+      DicomEvent.$emit('refreshStudyListMeasureData')
+    },
+    async handleClose() {
+      if (!this.questionForm.RowId) {
+        // '当前病灶为新建病灶，未保存。如果关闭窗口，将会删除病灶信息，是否继续？'
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg49'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        if (this.questionForm.MeasureData) {
+          await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+        }
+        DicomEvent.$emit('getMeasureData')
+        this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
+      } else {
+        if (this.questionForm.saveTypeEnum === 1) {
+          this.$emit('close')
+        } else {
+          this.$emit('close')
+        }
+      }
+    },
+    setState() {
+      this.$nextTick(() => {
+        if (this.isCurrentTask && this.readingTaskState < 2) {
+          var lesionState = this.getQuestionVal(7)
+          if (isNaN(parseInt(lesionState)) && this.answers.IsFristAdd === 'False') {
+            if (this.answers.SplitOrMergeType !== '3') {
+              const stateId = this.getQuestionId(7)
+              this.$set(this.questionForm, stateId, 2)
+            }
+            const isLymphLesion = this.getQuestionVal(2)
+            const lesionPart = this.getQuestionVal(8)
+            const lesionOrgan = this.getQuestionVal(6)
+            const lesionLength = this.getQuestionVal(0)
+            const lesionShort = this.getQuestionVal(1)
+            const lesionState = this.getQuestionVal(7)
+            this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-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;
+    flex-wrap: wrap;
+  }
+  ::v-deep .el-form-item__content{
+    flex: 1;
+  }
+  ::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-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;
+  }
+  .suv_viewer{
+    ::v-deep .viewer-play {
+      display: none;
+    }
+  }
+}
+
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
new file mode 100644
index 00000000..97eeacd3
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
@@ -0,0 +1,1483 @@
+<template>
+  <div class="measurement-wrapper">
+
+    <div class="container">
+      <div class="basic-info">
+        <h3 v-if="isReadingShowSubjectInfo">
+          <span v-if="subjectCode">{{ subjectCode }} </span>
+          <span style="margin-left:5px;">{{ 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="resetMeasuredData"
+            />
+          </el-tooltip>
+        </div>
+      </div>
+      <!-- 非测量问题 -->
+      <div class="lesions">
+        <!-- 影像质量问题 -->
+        <!-- <Questions
+          ref="ecrf"
+          :question-form-change-state="questionFormChangeState"
+          :question-form-change-num="questionFormChangeNum"
+          :group-classify="1"
+        /> -->
+        <Questions
+          ref="ecrf"
+          :question-form-change-state="true"
+          :question-form-change-num="0"
+          :is-qulity-issues="false"
+          :group-classify="1"
+        />
+      </div>
+      <!-- 测量问题 -->
+      <template v-if="questions.length > 0 && CriterionType !== 10">
+        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" 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="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
+              <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
+                <div class="title">{{ item.QuestionName }}</div>
+                <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
+                  <i class="el-icon-plus" />
+                </div>
+              </div>
+              <!-- @change="handleCollapseChange(qs.Childrens,item)" -->
+              <el-collapse
+                v-if="item.Type === 'table' && item.TableQuestions"
+                v-model="activeName"
+                accordion
+                @change="handleCollapseChange"
+              >
+                <el-collapse-item
+                  v-for="(q,i) in item.TableQuestions.Answers"
+                  :key="`${item.Id}_${q.RowIndex}`"
+                  :name="`${item.Id}_${q.RowIndex}`"
+                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
+                >
+                  <template slot="title">
+                    <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+
+                      {{ getLesionName(item.OrderMark,q.RowIndex) }}
+                      <!-- 未保存 -->
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i].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: item.LesionType === 1 && readingTaskState < 2?'58px':'50px',top: '2px'}">
+                        <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+
+                        <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              <span class="login-cycle" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle" />
+                          </div>
+                          <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart" style="max-width: 100px;overflow: hidden;">
+                              {{ item.TableQuestions.Answers[i].lesionPart }}
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.LesionType === 0" style="margin:0 5px;">
+                            {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                          </div>
+                          <div v-else-if="item.LesionType === 1" style="margin:0 5px;">
+                            {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                          </div>
+                          <div v-else style="margin:0 5px;">
+                            {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                          </div>
+                          <div v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                            <el-tooltip class="item" effect="dark" :content="`${item.TableQuestions.Answers[i].lesionLength}*${item.TableQuestions.Answers[i].lesionShort}m㎡`" placement="bottom">
+                              <span>{{ item.TableQuestions.Answers[i].lesionLength }}*{{ item.TableQuestions.Answers[i].lesionShort }}m㎡</span>
+                            </el-tooltip>
+                          </div>
+
+                        </div>
+                      </div>
+                      <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False' && readingTaskState < 2" style="position: absolute;right: 5px;top: 2px;">
+                        <!-- 分裂 -->
+                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && ((item.LesionType === 0 && [0,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0))" class="item" :content="$t('trials:reading:button:split')" placement="bottom">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />
+                        </el-tooltip>
+
+                        <!-- 融合 -->
+                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0,1,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))" class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;" @click.stop="handleMerge(item.TableQuestions.Answers[i],item.Id,item.OrderMark)" />
+                        </el-tooltip>
+                      </div>
+
+                    </div>
+
+                  </template>
+                  <QuestionForm
+                    :ref="`${item.Id}_${q.RowIndex}`"
+                    :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]"
+                    :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark"
+                    :table-questions="tableQuestions"
+                    :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName"
+                    :parent-qs-id="item.Id"
+                    :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask"
+                    :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask"
+                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @determineExistsUnsavedLession="determineExistsUnsavedLession"
+                    @resetQuestions="resetQuestions"
+                    @close="close"
+                  />
+                </el-collapse-item>
+
+              </el-collapse>
+            </div>
+          </div>
+        </div>
+      </template>
+      <!-- <el-divider /> -->
+      <!-- 肝脏评估 -->
+      <Questions
+        ref="ecrf2"
+        :question-form-change-state="true"
+        :question-form-change-num="0"
+        :group-classify="2"
+        :is-qulity-issues="false"
+        style="margin-top:20px"
+        :question-type="6"
+        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
+      />
+      <!-- 脾脏评估 -->
+      <Questions
+        ref="ecrf3"
+        :question-form-change-state="true"
+        :question-form-change-num="0"
+        :group-classify="3"
+        :is-qulity-issues="false"
+        :question-type="7"
+        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
+      />
+    </div>
+    <el-dialog
+      v-if="merge.visible"
+      v-loading="merge.loading"
+      :visible.sync="merge.visible"
+      :close-on-click-modal="false"
+      :title="$t('trials:reading:lugano:message:merge')"
+      width="500px"
+    >
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table
+          :data="lesionData"
+          style="width: 450px"
+          size="small"
+          height="200"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="45"
+          />
+          <el-table-column
+            prop="OrderMarkName"
+            :label="$t('trials:reading:lugano:label:lesionNumber')"
+            width="100"
+          />
+          <el-table-column
+            prop="Part"
+            :label="$t('trials:reading:lugano:label:lesionLocation')"
+            min-width="120"
+            show-overflow-tooltip
+          />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button
+          type="primary"
+          size="mini"
+          :disabled="mergeList.length === 0"
+          @click="confirmMerge"
+        >
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { splitLesion, getSplitPPdSum, getCanMergeLesion, mergeLesion } from '@/api/trials'
+import { resetReadingTask } from '@/api/reading'
+import DicomEvent from './../DicomEvent'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+import Questions from './../Questions'
+import QuestionForm from './QuestionForm'
+export default {
+  name: 'MeasurementList',
+  components: {
+    Questions,
+    QuestionForm
+  },
+  props: {
+    isShow: {
+      type: Boolean,
+      required: true
+    },
+    isReadingShowSubjectInfo: {
+      type: Boolean,
+      required: true
+    },
+    questionFormChangeState: {
+      type: Boolean,
+      default() {
+        return false
+      }
+    },
+    questionFormChangeNum: {
+      type: Number,
+      default() {
+        return 0
+      }
+    }
+  },
+  data() {
+    return {
+      questions: [],
+      activeName: '',
+      activeItem: {
+        activeRowIndex: null,
+        activeCollapseId: null
+      },
+      visitTaskId: '',
+      isCurrentTask: false,
+      loading: false,
+      unSaveTargets: [],
+      temporaryLesions: [],
+      readingTaskState: 2,
+      isBaseLineTask: false,
+      taskBlindName: '',
+      tableQuestions: [],
+      isFirstRender: false,
+      CriterionType: null,
+      subjectCode: '',
+      isNonTargetMeasurement: false,
+      splitTargetLesions: [],
+      lesionTypeQuestionId: '',
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
+    }
+  },
+  computed: {
+    ...mapGetters(['visitTaskList', 'language', 'lastCanvasTaskId', 'currentReadingTaskState'])
+  },
+  watch: {
+    lastCanvasTaskId: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.initList()
+        }
+        console.log('lastCanvasTaskId', val)
+      }
+    },
+    currentReadingTaskState: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.readingTaskState = val
+        }
+      }
+    }
+  },
+  mounted() {
+    // this.subjectCode = this.$router.currentRoute.query.subjectCode
+    this.subjectCode = localStorage.getItem('subjectCode')
+    window.addEventListener('message', this.receiveMsg)
+    this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
+    DicomEvent.$on('setCollapseActive', measureData => {
+      this.setCollapseActive(measureData)
+      console.log('setCollapseActive')
+    })
+    DicomEvent.$on('changeLesionType', (questionsObj) => {
+      this.changeLesionType(questionsObj)
+      console.log('changeLesionType')
+    })
+    DicomEvent.$on('getAllUnSaveLesions', (callback) => {
+      var list = this.getAllUnSaveLesions()
+      callback(list)
+      console.log('getAllUnSaveLesions')
+    })
+
+    DicomEvent.$on('split', measureData => {
+      this.handleSplit(measureData.RowId, measureData.QuestionId)
+    })
+    DicomEvent.$on('refreshQuestions', async(obj) => {
+      var triald = this.$router.currentRoute.query.trialId
+      await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+      this.$nextTick(() => {
+        this.$refs['ecrf'].getQuestions(this.visitTaskId)
+        this.$refs['ecrf2'].getQuestions(this.visitTaskId)
+        this.$refs['ecrf3'].getQuestions(this.visitTaskId)
+      })
+    })
+    DicomEvent.$on('refreshSplitTargetLesionPDD', async(callback) => {
+      const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+      this.splitTargetLesions = res.Result
+      if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
+        this.splitTargetLesions.map(i => {
+          var refName = `${this.lesionTypeQuestionId}_${i.RowIndex}`
+          console.log(refName)
+          var params = {}
+          params.splitLesionTargetPPD = i.AllPPD
+          params.splitLesionTargetLDi = i.AllLDi
+          params.splitLesionTargetSDi = i.AllSDi
+          this.$refs[refName] && this.$refs[refName][0].initForm(params)
+        })
+      }
+      callback(true)
+    })
+  },
+  beforeDestroy() {
+    DicomEvent.$off('setCollapseActive')
+    DicomEvent.$off('changeLesionType')
+    DicomEvent.$off('getUnSaveTarget')
+    DicomEvent.$off('refreshQuestions')
+  },
+  methods: {
+    async initList() {
+      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
+      if (i > -1) {
+        this.visitTaskId = this.visitTaskList[i].VisitTaskId
+        this.taskBlindName = this.visitTaskList[i].TaskBlindName
+        this.readingTaskState = this.visitTaskList[i].ReadingTaskState
+        this.isBaseLineTask = this.visitTaskList[i].IsBaseLineTask
+        this.isCurrentTask = this.visitTaskList[i].IsCurrentTask
+        this.activeName = ''
+        this.activeItem.activeRowIndex = null
+        this.activeItem.activeCollapseId = null
+        if (!this.visitTaskList[i].IsInit) {
+          var loading = this.$loading({ fullscreen: true })
+          var triald = this.$router.currentRoute.query.trialId
+          if (!this.visitTaskList[i].measureDataInit) {
+            await store.dispatch('reading/getMeasuredData', this.visitTaskList[i].VisitTaskId)
+          }
+          if (!this.visitTaskList[i].studyListInit) {
+            await store.dispatch('reading/getStudyInfo', { trialId: triald, subjectVisitId: this.visitTaskList[i].VisitId, visitTaskId: this.visitTaskList[i].VisitTaskId, taskBlindName: this.visitTaskList[i].TaskBlindName })
+          }
+          if (!this.visitTaskList[i].readingQuestionsInit) {
+            await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+          if (!this.visitTaskList[i].questionsInit) {
+            await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+
+          await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[i].VisitTaskId })
+          loading.close()
+        }
+        if (!this.isBaseLineTask) {
+          const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+          this.splitTargetLesions = res.Result
+        }
+        this.questions = this.visitTaskList[i].ReadingQuestions
+        this.$nextTick(() => {
+          this.$refs['ecrf'].getQuestions(this.visitTaskId)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId)
+          this.getTableQuestions()
+          this.tableQuestions.forEach(item => {
+            item.TableQuestions.Answers.forEach(i => {
+              var refName = `${item.Id}_${i.RowIndex}`
+              var params = {}
+              if (parseInt(i.LesionType) === 0) {
+                this.lesionTypeQuestionId = item.Id
+                var idx = this.splitTargetLesions.findIndex(v => v.RowId === i.RowId)
+                if (idx > -1) {
+                  params.splitLesionTargetPPD = this.splitTargetLesions[idx].AllPPD
+                  params.splitLesionTargetLDi = this.splitTargetLesions[idx].AllLDi
+                  params.splitLesionTargetSDi = this.splitTargetLesions[idx].AllSDi
+                }
+              }
+              this.$refs[refName] && this.$refs[refName][0].initForm(params)
+            })
+          })
+        })
+      }
+    },
+    async resetQuestions(obj) {
+      this.setQuestions(this.questions, obj)
+      await store.dispatch('reading/setReadingQuestionAndAnswer', { questions: this.questions, visitTaskId: this.visitTaskId })
+
+      this.getTableQuestions()
+    },
+    setQuestions(questions, obj) {
+      questions.forEach(item => {
+        if (item.Type === 'table' && item.Id === obj.questionId) {
+          var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
+          item.TableQuestions.Answers[idx].isLymphLesion = obj.isLymphLesion
+          item.TableQuestions.Answers[idx].loctation = obj.lesionOrgan
+          item.TableQuestions.Answers[idx].lesionPart = obj.lesionPart
+          item.TableQuestions.Answers[idx].lesionLength = obj.lesionLength
+          item.TableQuestions.Answers[idx].lesionShort = obj.lesionShort
+          item.TableQuestions.Answers[idx].lesionState = obj.lesionState
+          item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum
+
+          for (const i in obj.anwsers) {
+            if (i === 'MeasureData' && obj.anwsers[i]) {
+              item.TableQuestions.Answers[idx].InstanceId = obj.anwsers[i].instanceId
+              item.TableQuestions.Answers[idx].SeriesId = obj.anwsers[i].seriesId
+              item.TableQuestions.Answers[idx][i] = JSON.stringify(obj.anwsers[i])
+              item.TableQuestions.Answers[idx].isDicomReading = !(obj.anwsers[i].IsDicomReading === false || obj.anwsers[i].IsDicomReading === 'False')
+            } else {
+              item.TableQuestions.Answers[idx][i] = String(obj.anwsers[i])
+            }
+          }
+        }
+        if (item.Childrens.length > 0) {
+          this.setQuestions(item.Childrens, obj)
+        }
+      })
+    },
+    getQuestions(questions) {
+      questions.forEach(item => {
+        if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+          item.TableQuestions.Answers.forEach(answerObj => {
+            this.$set(answerObj, 'loctation', this.getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj))
+            this.$set(answerObj, 'lesionLength', this.getQuestionAnswer(item.TableQuestions.Questions, 0, answerObj))
+            this.$set(answerObj, 'lesionShort', this.getQuestionAnswer(item.TableQuestions.Questions, 1, answerObj))
+            var isLymphLesion = this.getQuestionAnswer(item.TableQuestions.Questions, 2, answerObj)
+            isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
+            this.$set(answerObj, 'isLymphLesion', isLymphLesion)
+
+            var lesionState = this.getQuestionAnswer(item.TableQuestions.Questions, 7, answerObj)
+            lesionState = !isNaN(parseInt(lesionState)) ? parseInt(lesionState) : ''
+            this.$set(answerObj, 'lesionState', lesionState)
+            if (answerObj.RowId) {
+              var idx = item.TableQuestions.Questions.findIndex(i => i.QuestionMark === 11)
+              if (idx > -1) {
+                var lesionNum = this.getQuestionAnswer(item.TableQuestions.Questions, 11, answerObj)
+                lesionNum = !isNaN(parseInt(lesionNum)) ? parseInt(lesionNum) : ''
+                this.$set(answerObj, 'saveTypeEnum', isNaN(parseInt(lesionNum)) ? 1 : 2)
+              } else {
+                this.$set(answerObj, 'saveTypeEnum', isNaN(parseInt(lesionState)) ? 1 : 2)
+              }
+            } else {
+              this.$set(answerObj, 'saveTypeEnum', 0)
+            }
+          })
+        }
+        if (item.Childrens.length > 0) {
+          this.getQuestions(item.Childrens)
+        }
+      })
+      return questions
+    },
+    getTableQuestions() {
+      this.tableQuestions = []
+      this.questions.map(item => {
+        if (item.Type === 'table') {
+          this.tableQuestions.push(item)
+        }
+        if (item.Childrens.length > 0) {
+          this.getTableQuestionsChild(item.Childrens)
+        }
+      })
+    },
+    getTableQuestionsChild(obj) {
+      obj.map(item => {
+        if (item.Type === 'table') {
+          this.tableQuestions.push(item)
+        }
+        if (item.Childrens.length > 0) {
+          this.getTableQuestionsChild(item.Childrens)
+        }
+      })
+    },
+    refreshReadingQuestionAndAnswer(type) {
+      if (type === 0) {
+        // 删除
+        this.activeName = ''
+        this.activeItem.activeRowIndex = null
+        this.activeItem.activeCollapseId = null
+      }
+
+      this.getReadingQuestionAndAnswer(this.visitTaskId)
+    },
+    getReadingQuestionAndAnswer() {
+      return new Promise(async resolve => {
+        try {
+          const loading = this.$loading({ fullscreen: true })
+
+          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(async() => {
+            var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+            if (idx > -1) {
+              if (this.visitTaskList[idx].ReadingQuestions.length > 0) {
+                this.questions = this.visitTaskList[idx].ReadingQuestions
+              }
+              this.readingTaskState = this.visitTaskList[idx].ReadingTaskState
+              this.isBaseLineTask = this.visitTaskList[idx].IsBaseLineTask
+              this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
+            }
+            if (!this.isBaseLineTask) {
+              const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+              this.splitTargetLesions = res.Result
+            }
+            this.getTableQuestions()
+            this.$nextTick(() => {
+              this.tableQuestions.forEach(item => {
+                item.TableQuestions.Answers.forEach(i => {
+                  var refName = `${item.Id}_${i.RowIndex}`
+                  var params = {}
+                  if (parseInt(i.LesionType) === 0) {
+                    var idx = this.splitTargetLesions.findIndex(v => v.RowId === i.RowId)
+                    if (idx > -1) {
+                      params.splitLesionTargetPPD = this.splitTargetLesions[idx].AllPPD
+                      params.splitLesionTargetLDi = this.splitTargetLesions[idx].AllLDi
+                      params.splitLesionTargetSDi = this.splitTargetLesions[idx].AllSDi
+                    }
+                  }
+                  this.$refs[refName] && this.$refs[refName][0].initForm(params)
+                })
+              })
+            })
+          }) 
+          await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
+          DicomEvent.$emit('getMeasureData')
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: this.$route.query.trialId, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          loading.close()
+          resolve()
+        } catch (e) { console.log(e) }
+      })
+    },
+    getQuestionAnswer(questions, questionMark, answers) {
+      var idx = questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        var questionId = questions[idx].Id
+        return answers[questionId]
+      } else {
+        return ''
+      }
+    },
+    // 分裂
+    handleSplit(rowId, questionId) {
+      // 消失，无法评估，疑似，太小等状态病灶不支持分裂
+      // 获取病灶状态
+      var idx = this.tableQuestions.findIndex(i => i.Id === questionId)
+      if (idx > -1) {
+        var i = this.tableQuestions[idx].TableQuestions.Answers.findIndex(i => i.RowId === rowId)
+        if (i > -1) {
+          // var refName = `${questionId}_${this.tableQuestions[idx].TableQuestions.Answers[i].RowIndex}`
+          // var lesionState = this.$refs[refName][0].getQuestionVal(7)
+          // var lesionType = this.$refs[refName][0].lesionType
+          // var isCurrentTaskAdd = this.tableQuestions[idx].TableQuestions.Answers[i].IsCurrentTaskAdd
+          // if (isNaN(parseInt(lesionState))) {
+          //   this.$confirm(`请先为病灶设置状态`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else if (lesionType === 0 && lesionState !== 0) {
+          //   // 靶病灶
+          //   this.$confirm(`病灶状态为消失或无法评估或太小，不支持分裂`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else if (lesionType === 1 && lesionState === 2 || lesionState === 3) {
+          //   // 非靶病灶
+          //   this.$confirm(`病灶状态为消失或无法评估，不支持分裂`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else if (lesionType === 2 && (lesionState === 1 || lesionState === 2 || lesionState === 3)) {
+          //   // 新病灶
+          //   this.$confirm(`病灶状态为疑似或消失或无法评估，不支持分裂`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else if (isCurrentTaskAdd !== 'False') {
+          //   this.$confirm(`首次添加的病灶不支持分裂`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else {}
+          var arr = []
+          this.getUnSaveTarget()
+          if (this.unSaveTargets.length > 0) {
+            this.unSaveTargets.forEach(item => {
+              arr.push(item.lessionName)
+            })
+          }
+          var unSavedList = this.getAllUnSaveLesions()
+          unSavedList.forEach(item => {
+            arr.push(item.lessionName)
+          })
+          if (arr.length > 0) {
+            // 病灶${message}，未保存。如果分裂，信息将被还原，是否继续？
+            var msg = this.$t('trials:reading:warnning:msg3')
+            msg = msg.replaceAll('xxx', arr.join('、'))
+            this.$confirm(msg, {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            })
+              .then(() => {
+                this.split(rowId, questionId)
+              })
+              .catch(() => {})
+          } else {
+            // 是否确认分裂
+            this.$confirm(this.$t('trials:reading:warnning:msg4'), {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            })
+              .then(() => {
+                this.split(rowId, questionId)
+              })
+              .catch(() => {})
+          }
+        }
+      }
+    },
+    async split(rowId, questionId) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: questionId,
+          rowId: rowId
+        }
+        await splitLesion(params)
+        await this.getReadingQuestionAndAnswer()
+        this.$nextTick(() => {
+          this.tableQuestions.forEach(item => {
+            item.TableQuestions.Answers.forEach(i => {
+              var refName = `${item.Id}_${i.RowIndex}`
+              this.$refs[refName] && this.$refs[refName][0].initForm()
+            })
+          })
+        })
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+    // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          DicomEvent.$emit('readingPageUpdate', {})
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          this.getReadingQuestionAndAnswer()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
+    isCanActiveTool(toolName) {
+      this.isNonTargetMeasurement = false
+      this.getUnSaveTarget()
+      if (this.unSaveTargets.length > 0) {
+        var rowIndex = String(this.unSaveTargets[0].rowIndex)
+        var questionId = this.unSaveTargets[0].questionId
+        const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
+          return this.checkToolCanActive(toolName)
+        } else {
+          var msg = this.$t('trials:reading:warnning:msg5')
+          msg = msg.replace('xxx', this.unSaveTargets[0].lessionName)
+          // `病灶${this.unSaveTargets[0].lessionName}信息未保存，不允许继续添加！`
+          return { isCanActiveTool: false, reason: msg }
+        }
+      } else {
+        if (this.activeItem.activeCollapseId) {
+          return this.checkToolCanActive(toolName)
+        } else {
+          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'RectangleRoi' || toolName === 'CircleROI')) {
+            return { isCanActiveTool: true, reason: '' }
+          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'RectangleRoi' || toolName === 'CircleROI')) {
+            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) {
+      console.log('checkToolCanActive')
+      const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
+      isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
+      if (!this.$refs[refName][0].questionForm.MeasureData) {
+        if (this.isBaseLineTask) {
+          if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
+            // '淋巴结靶病灶需使用长短径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg6') }
+          } else if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 0 && toolName !== 'Bidirectional') {
+            // ' 请使用长短径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools9') }
+          } else if (this.$refs[refName][0].lesionType === 0 && toolName !== 'Bidirectional') {
+            // '请使用长短径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools9') }
+          } else if (this.$refs[refName][0].lesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi') {
+            // '淋巴结非靶病灶需使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg8') }
+          } else if (this.$refs[refName][0].lesionType === 1 && isLymphNodes === 0 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi') {
+            // '请使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools8') }
+          } else if (this.$refs[refName][0].lesionType === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi') {
+            // '请使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools8') }
+          } else if (toolName === 'ArrowAnnotate') {
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
+          } else if (toolName === 'Length' && !isNaN(parseInt(this.$refs[refName][0].lesionType))) {
+            // '请使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools8') }
+          } else {
+            return { isCanActiveTool: true, reason: '' }
+          }
+        } else {
+          if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 请使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools1') }
+          } else if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 0 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 请使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools1') }
+          } else if (this.$refs[refName][0].lesionType === 0 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 请使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools1') }
+          } else if (this.$refs[refName][0].lesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // 淋巴结非靶病灶需使用长短径测量工具或矩形工具或矩形工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg52') }
+          } else if (this.$refs[refName][0].lesionType === 1 && isLymphNodes === 0 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // '请使用长短径测量工具或矩形工具或箭头工具进行淋巴结非靶病灶的标记。'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools2') }
+          } else if (this.$refs[refName][0].lesionType === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // 请使用长短径测量工具或矩形工具或箭头工具进行非靶病灶的标记。
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools3') }
+          } else if (this.$refs[refName][0].lesionType === 2 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 淋巴结新病灶需使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg12') }
+          } else if (this.$refs[refName][0].lesionType === 2 && isLymphNodes === 0 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // '请使用长短径测量工具或箭头工具进行淋巴结非靶病灶的标记。'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools4') }
+          } else if (this.$refs[refName][0].lesionType === 2 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // '请使用长短径测量工具或箭头工具进行新病灶的标记。'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools5') }
+          } else if (toolName === 'Length' && !isNaN(parseInt(this.$refs[refName][0].lesionType))) {
+            // '请使用长短径测量工具或矩形工具或箭头工具。'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools6') }
+          } else {
+            return { isCanActiveTool: true, reason: '' }
+          }
+        }
+      } else {
+        if (toolName === 'Bidirectional' || toolName === 'RectangleRoi' || toolName === 'ArrowAnnotate') {
+          return { isCanActiveTool: true, reason: '' }
+        } else {
+          return { isCanActiveTool: false, reason: '' }
+        }
+      }
+    },
+
+    async handleAdd(qs) {
+      this.$emit('setToolPassive')
+      // 判断是否有未保存的病灶
+      this.getUnSaveTarget()
+      if (this.unSaveTargets.length > 0) {
+        // 病灶${this.unSaveTargets[0].lessionName}信息未保存，不允许继续添加！
+        let msg = this.$t('trials:reading:warnning:msg5')
+        msg = msg.replace('xxx', this.unSaveTargets[0].lessionName)
+
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        return
+      }
+      if (!!qs.MaxQuestionCount && qs.MaxQuestionCount <= qs.TableQuestions.Answers.length) {
+        let msg = this.$t('trials:reading:warnning:msg14')
+        // msg = msg.replace('xxx', qs.QuestionName)
+        msg = msg.replace('xxx', qs.MaxQuestionCount)
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+      } else {
+        // saveTypeEnum: 0
+        var obj = { saveTypeEnum: 0 }
+        // var questions = qs.TableQuestions.Questions.find(item => item.QuestionMark === 3)
+        // if (questions) {
+        //   console.log(questions)
+        //   var maxIndex = this.getMaxRowIndex(qs.TableQuestions.Answers)
+        //   obj.RowIndex = `${maxIndex + 1}.00`
+        //   obj[questions.Id] = `${qs.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+        // }
+        var maxIndex = this.getMaxRowIndex(qs.TableQuestions.Answers)
+        obj.RowIndex = `${maxIndex + 1}.00`
+        obj.IsDicomReading = true
+        await store.dispatch('reading/addReadingQuestionAndAnswer', { lesionType: qs.LesionType, visitTaskId: this.visitTaskId, lesionObj: obj })
+
+        this.activeItem.activeRowIndex = String(obj.RowIndex)
+        this.activeItem.activeCollapseId = qs.Id
+        this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      }
+    },
+    getMaxRowIndex(answerList) {
+      if (answerList.length > 0) {
+        var arr = []
+        answerList.forEach(item => {
+          var rowIndex = item.RowIndex
+          arr.push(parseInt(rowIndex))
+        })
+        var max = Math.max.apply(null, arr)
+        return max
+      } else {
+        return 0
+      }
+    },
+    determineExistsUnsavedLession(callback) {
+      // const loading = this.$loading({ fullscreen: true })
+      this.getUnSaveTarget()
+      if (this.unSaveTargets.length > 0) {
+        var rowIndex = String(this.unSaveTargets[0].rowIndex)
+        var questionId = this.unSaveTargets[0].questionId
+        if (rowIndex === String(this.activeItem.activeRowIndex) && questionId === this.activeItem.activeCollapseId) {
+          callback(true)
+          // loading.close()
+          return
+        } else {
+          // 病灶${this.unSaveTargets[0].lessionName}信息未保存，不允许执行此操作！
+          let msg = this.$t('trials:reading:warnning:msg17')
+          msg = msg.replace('xxx', this.unSaveTargets[0].lessionName)
+          this.$confirm(msg, {
+            type: 'warning',
+            showCancelButton: false,
+            callback: action => { }
+          })
+          callback(false)
+          // loading.close()
+          return
+        }
+      }
+      callback(true)
+      // loading.close()
+      return
+    },
+    getUnSaveTarget() {
+      this.unSaveTargets = []
+      this.tableQuestions.map(item => {
+        if (item.TableQuestions && item.TableQuestions.Answers) {
+          item.TableQuestions.Answers.map(t => {
+            if (!t.RowId) {
+              var lessionName = this.getLesionName(item.OrderMark, t.RowIndex)
+              this.unSaveTargets.push({ lessionName: lessionName, rowIndex: t.RowIndex, questionId: item.Id })
+            }
+          })
+        }
+      })
+      // console.log(this.unSaveTargets)
+      return this.unSaveTargets
+    },
+    getAllUnSaveLesions() {
+      var arr = []
+      this.tableQuestions.map(item => {
+        if (item.TableQuestions && item.TableQuestions.Answers) {
+          item.TableQuestions.Answers.map(t => {
+            const refName = `${item.Id}_${t.RowIndex}`
+            if (this.$refs[refName] && this.$refs[refName][0] && this.$refs[refName][0].questionForm.saveTypeEnum !== 2) {
+              var lessionName = this.getLesionName(item.OrderMark, t.RowIndex)
+              arr.push({ lessionName: lessionName, rowIndex: t.RowIndex, questionId: item.Id })
+            }
+          })
+        }
+      })
+      return arr
+    },
+    getLesionName(orderMark, rowIndex) {
+      var lessionName = ''
+      var rowIndexArr = rowIndex.split('.')
+      var x = parseInt(rowIndexArr[0])
+      var 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
+    },
+    handleCollapseChange(val) {
+      if (this.activeName) {
+        var arr = this.activeName.split('_')
+        this.activeItem.activeRowIndex = arr[1]
+        this.activeItem.activeCollapseId = arr[0]
+        this.$nextTick(() => {
+          const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
+            var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType
+            var markTool = splitOrMergeType !== '3' ? this.$refs[refName][0].currentMarkTool : ''
+            var readingTaskState = this.readingTaskState
+            var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
+            DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked })
+          }
+        })
+      } else {
+        this.activeItem.activeRowIndex = null
+        this.activeItem.activeCollapseId = null
+      }
+    },
+    collapseRightClick(e, obj, activeCollapseId, activeRowIndex) {
+      if (obj.IsDicomReading !== false) {
+        const refName = `${activeCollapseId}_${activeRowIndex}`
+        DicomEvent.$emit('imageLocation', { questionId: activeCollapseId, rowIndex: activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType })
+      }
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    // 更改病灶类型
+    async changeLesionType(questionsObj) {
+      await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
+      // saveTypeEnum: 0
+      var lesionObj = { }
+      var questionObj = questionsObj.questionForm
+      // 切换到新的病灶集合
+      var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
+      var lesionMark = ''
+      var maxIndex = this.getMaxRowIndex(targetObj.TableQuestions.Answers)
+      lesionObj.RowIndex = `${maxIndex + 1}.00`
+      lesionMark = `${targetObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+      targetObj.TableQuestions.Questions.forEach(i => {
+        // if (i.QuestionMark === 3) {
+        //   var maxIndex = this.getMaxRowIndex(targetObj.TableQuestions.Answers)
+        //   lesionObj.RowIndex = `${maxIndex + 1}.00`
+        //   lesionObj[i.Id] = `${targetObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+        //   lesionMark = lesionObj[i.Id]
+        // } else {
+        //   var obj = questionObj.find(v => v.QuestionMark === i.QuestionMark)
+        //   if (obj) {
+        //     lesionObj[i.Id] = obj.Answer
+        //   }
+        // }
+        var obj = questionObj.find(v => v.QuestionMark === i.QuestionMark)
+        if (obj) {
+          lesionObj[i.Id] = obj.Answer
+        }
+      })
+
+      // 需要处理2D 和 3D的标记
+      if (questionsObj.measureData) {
+        await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: questionsObj.measureData, questionId: questionsObj.questionId, rowIndex: questionsObj.rowIndex })
+
+        questionsObj.measureData.data.remark = lesionMark
+        lesionObj.MeasureData = JSON.stringify(questionsObj.measureData)
+      }
+
+      var deleteInfo = null
+      if (questionsObj.rowId) {
+        deleteInfo = { rowId: questionsObj.rowId, questionId: questionsObj.questionId }
+        lesionObj.RowId = questionsObj.rowId
+      }
+      await store.dispatch('reading/addReadingQuestionAndAnswer', { lesionType: questionsObj.newLesionType, visitTaskId: this.visitTaskId, lesionObj: lesionObj })
+
+      this.activeItem.activeRowIndex = String(lesionObj.RowIndex)
+      this.activeItem.activeCollapseId = targetObj.Id
+      this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      this.$nextTick(() => {
+        if (deleteInfo) {
+          this.$refs[refName][0].setDeleteInfo(deleteInfo)
+        }
+        this.$refs[refName][0].setMeasureData(questionsObj.measureData, deleteInfo)
+      })
+    },
+    removeQuestionAnswer(questionsObj) {
+      // 移除当前病灶
+      var currentObj = this.tableQuestions.find(item => item.LesionType === questionsObj.oldLesionType)
+      if (currentObj) {
+        var i = currentObj.TableQuestions.Answers.findIndex(i => String(i.RowIndex) === String(questionsObj.rowIndex))
+        if (i === -1) return
+        currentObj.TableQuestions.Answers.splice(i, 1)
+      }
+    },
+    // 创建新病灶
+    createNLTarget(measureData) {
+      var idx = this.tableQuestions.findIndex(item => item.LesionType === 2)
+      if (idx > -1) {
+        this.addTarget(this.tableQuestions[idx], measureData)
+      }
+    },
+    // 创建靶病灶
+    createTTarget(measureData) {
+      var idx = this.tableQuestions.findIndex(item => item.LesionType === 0)
+      if (idx > -1) {
+        this.addTarget(this.tableQuestions[idx], measureData)
+      }
+    },
+
+    async addTarget(target, measureData) {
+      // saveTypeEnum: 0
+      var obj = {}
+      var maxIndex = this.getMaxRowIndex(target.TableQuestions.Answers)
+      obj.RowIndex = `${maxIndex + 1}.00`
+      // obj.RowIndex = target.TableQuestions.Answers.length + 1
+      // var questions = target.TableQuestions.Questions.find(item => item.QuestionMark === 3)
+      // if (questions) {
+      //   var maxIndex = this.getMaxRowIndex(target.TableQuestions.Answers)
+      //   obj.RowIndex = `${maxIndex + 1}.00`
+      //   obj[questions.Id] = `${target.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+      //   // obj[questions.Id] = `${target.OrderMark}${String(obj.RowIndex).padStart(2, '0')}`
+      // }
+      // target.TableQuestions.Answers.push(obj)
+      obj.IsDicomReading = !(measureData.isDicomReading === false || measureData.isDicomReading === 'False')
+      obj.measureObj = measureData
+      await store.dispatch('reading/addReadingQuestionAndAnswer', { lesionType: target.LesionType, visitTaskId: this.visitTaskId, lesionObj: obj })
+
+      this.activeItem.activeRowIndex = String(obj.RowIndex)
+      this.activeItem.activeCollapseId = target.Id
+      this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      // const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      // this.$nextTick(() => {
+      //   this.$refs[refName][0].setMeasureData(measureData)
+      // })
+    },
+    createNTTarget(measureData) {
+      var idx = this.tableQuestions.findIndex(item => item.LesionType === 1)
+      if (idx > -1) {
+        this.addTarget(this.tableQuestions[idx], measureData)
+      }
+    },
+    setCollapseActive(measureData) {
+      if (measureData) {
+        if (this.activeItem.activeRowIndex === measureData.RowIndex && this.activeItem.activeCollapseId === measureData.QuestionId) {
+          return
+        } else {
+          this.activeItem.activeCollapseId = measureData.QuestionId
+          this.activeItem.activeRowIndex = measureData.RowIndex
+          this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        }
+      }
+    },
+    modifyMeasuredData(measureObj) {
+      if (measureObj.measureData.data.remark === 'Spleen Top' || measureObj.measureData.data.remark === 'Spleen Bottom') {
+        this.$refs['ecrf3'].setMeasuredData(measureObj.measureData)
+        this.isNonTargetMeasurement = false
+      } else {
+        if (measureObj.questionInfo) {
+          this.activeItem.activeCollapseId = measureObj.questionInfo.QuestionId
+          this.activeItem.activeRowIndex = String(measureObj.questionInfo.RowIndex)
+          this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          this.$refs[refName][0].setMeasureData(measureObj.measureData)
+        }
+      }
+    },
+    // 设置测量数据
+    setMeasuredData(measureData) {
+      if (this.isNonTargetMeasurement || measureData.data.remark === 'Spleen Top' || measureData.data.remark === 'Spleen Bottom') {
+        this.$refs['ecrf3'].setMeasuredData(measureData)
+        this.isNonTargetMeasurement = false
+        return
+      }
+      if (this.activeItem.activeCollapseId) {
+        // 判断是否存在测量数据
+        this.$nextTick(() => {
+          const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          if (!this.$refs[refName][0].questionForm.MeasureData || (this.$refs[refName][0].questionForm && this.$refs[refName][0].questionForm.MeasureData && measureData.data.uuid === this.$refs[refName][0].questionForm.MeasureData.data.uuid)) {
+            if (!this.$refs[refName][0].questionForm.MeasureData && this.$refs[refName][0].answers.SplitOrMergeType === '3') {
+              this.createNLTarget(measureData)
+            } else {
+              this.$refs[refName][0].setMeasureData(measureData)
+            }
+          } else {
+            if (this.isBaseLineTask) {
+              var idx = this.tableQuestions.findIndex(item => item.LesionType === 0)
+              if (this.tableQuestions[idx].TableQuestions.Answers.length < this.tableQuestions[idx].MaxQuestionCount && (measureData.type === 'Bidirectional')) {
+                this.createTTarget(measureData)
+              } else {
+                this.createNTTarget(measureData)
+              }
+            } else {
+              this.createNLTarget(measureData)
+            }
+          }
+        })
+      } else {
+        if (this.isBaseLineTask) {
+          var idx = this.tableQuestions.findIndex(item => item.LesionType === 0)
+          if (this.tableQuestions[idx].TableQuestions.Answers.length < this.tableQuestions[idx].MaxQuestionCount && (measureData.type === 'Bidirectional')) {
+            this.createTTarget(measureData)
+          } else {
+            this.createNTTarget(measureData)
+          }
+        } else {
+          this.createNLTarget(measureData)
+        }
+      }
+    },
+    setNonTargetMeasurementStatus(obj) {
+      this.isNonTargetMeasurement = obj.status
+    },
+    async close(questionsObj) {
+      if (questionsObj) {
+        this.getReadingQuestionAndAnswer(questionsObj.visitTaskId)
+      }
+      this.activeItem.activeRowIndex = null
+      this.activeItem.activeCollapseId = null
+      this.activeName = ''
+    },
+    getECRFQuestions(obj) {
+      this.$nextTick(() => {
+        this.$refs['ecrf'].getQuestions(obj.visitTaskId)
+        this.$refs['ecrf2'].getQuestions(obj.visitTaskId)
+        this.$refs['ecrf3'].getQuestions(obj.visitTaskId)
+      })
+    },
+    receiveMsg(event) {
+      if (event.data.type === 'isCanActiveNoneDicomTool') {
+        this.getUnSaveTarget()
+        var obj = {}
+        if (this.unSaveTargets.length > 0) {
+          var rowIndex = String(this.unSaveTargets[0].rowIndex)
+          var questionId = this.unSaveTargets[0].questionId
+          const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
+            // 判断是否是靶病灶
+            //  questions.findIndex(i => i.QuestionMark === questionMark)
+            var lesionType = this.$refs[refName][0].questionForm.LesionType
+            if (lesionType === 0) {
+              // '当前病灶为靶病灶，不允许添加标记！'
+              obj = { isCanActiveTool: false, lesionName: '', reason: this.$t('trials:reading:warnning:msg18') }
+            } else {
+              obj = { isCanActiveTool: true, lesionName: this.$refs[refName][0].lesionMark, reason: '', toolName: event.data.toolName }
+            }
+          } else {
+            let msg = this.$t('trials:reading:warnning:msg5')
+            msg = msg.replace('xxx', this.unSaveTargets[0].lessionName)
+            obj = { isCanActiveTool: false, lesionName: '', reason: msg }
+          }
+        } else {
+          if (this.activeItem.activeCollapseId) {
+            // 判断是否是靶病灶
+            const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+            // obj = { isCanActiveTool: true, lesionName: this.$refs[refName][0].lesionMark, reason: '' }
+            const lesionType = this.$refs[refName][0].questionForm.LesionType
+            if (lesionType === 0) {
+              // 当前病灶为靶病灶，不允许添加标记！
+              obj = { isCanActiveTool: false, lesionName: '', reason: this.$t('trials:reading:warnning:msg18') }
+            } else {
+              obj = { isCanActiveTool: true, lesionName: this.$refs[refName][0].lesionMark, reason: '', toolName: event.data.toolName }
+            }
+          } else {
+            // 获取非靶病灶/新病灶的长度及标识
+            var qsObj = null
+            var lesionName = ''
+            if (this.isBaseLineTask) {
+              const idx = this.tableQuestions.findIndex(item => item.LesionType === 1)
+              if (idx > -1) {
+                qsObj = this.tableQuestions[idx]
+              }
+            } else {
+              const idx = this.tableQuestions.findIndex(item => item.LesionType === 2)
+              if (idx > -1) {
+                qsObj = this.tableQuestions[idx]
+              }
+            }
+
+            // var questions = qsObj.TableQuestions.Questions.find(item => item.QuestionMark === 3)
+            // if (questions) {
+            //   var maxIndex = this.getMaxRowIndex(qsObj.TableQuestions.Answers)
+            //   lesionName = `${qsObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+            // }
+            var maxIndex = this.getMaxRowIndex(qsObj.TableQuestions.Answers)
+            lesionName = `${qsObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+            obj = { isCanActiveTool: true, lesionName: lesionName, reason: '', toolName: event.data.toolName }
+          }
+        }
+
+        DicomEvent.$emit('isCanActiveNoneDicomTool', obj)
+      } else if (event.data.type === 'setMeasurement') {
+        this.setMeasuredData(event.data.data)
+      } else if (event.data.type === 'petctLesionUpdate') {
+        this.refreshQuestions()
+      }
+    },
+    async refreshQuestions() {
+      const loading = this.$loading({ fullscreen: true })
+      await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
+      await this.getReadingQuestionAndAnswer()
+      var triald = this.$router.currentRoute.query.trialId
+      await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+      this.$nextTick(() => {
+        this.$refs['ecrf'].getQuestions(this.visitTaskId)
+        this.$refs['ecrf2'].getQuestions(this.visitTaskId)
+        this.$refs['ecrf3'].getQuestions(this.visitTaskId)
+      })
+      DicomEvent.$emit('getReportInfo', true)
+      loading.close()
+    },
+    async resetMeasuredData() {
+      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.activeItem.activeRowIndex = null
+          this.activeItem.activeCollapseId = null
+          await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getMeasureData')
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('refreshStudyListMeasureData')
+          DicomEvent.$emit('resetPage', {})
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-wrapper{
+  height: 100%;
+  overflow-y: auto;
+  .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;
+      }
+    }
+  }
+  .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;
+  }
+  .login-cycle{
+    width: 5px;
+    height: 5px;
+    display: inline-block;
+    background-color: #428bca;
+    border-radius: 50%;
+    margin-right: 2px;
+    margin-bottom: 2px;
+  }
+  .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;
+    }
+
+  }
+  .merge-table{
+    padding:0 10px;
+    ::v-deep.el-table{
+      background-color:  #1e1e1e !important;
+      color: #383838;
+    }
+    ::v-deep.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+      border-bottom: 1px solid #383838;
+    }
+    .el-table--border::after, .el-table--group::after, .el-table::before{
+      background-color: #1e1e1e;
+    }
+    ::v-deep.el-table__header-wrapper{
+        th{
+          background-color:  #1e1e1e !important;
+          color: #dfdfdf;
+          border-bottom: 1px solid #383838;
+        }
+      }
+    ::v-deep.el-table__body-wrapper{
+      tr{
+        background-color:  #1e1e1e !important;
+        color: #dfdfdf;
+      }
+      tr:hover > td{
+        background-color:  #1e1e1e !important;
+      }
+    }
+    ::v-deep.el-table__empty-block{
+      background-color:  #1e1e1e !important;
+    }
+    .merge-label{
+      color:#ddd;
+      font-size: 13px;
+      margin-bottom: 10px;
+      span{
+        font-size: 15px;
+        color: red;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
index d72d689c..d34d241b 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
@@ -1,253 +1,173 @@
 <template>
   <el-form v-if="globalForm.taskList.length > 0" ref="globalRuleForm" :model="globalForm" class="global-form">
-    <el-table
-      v-loading="loading"
-      :data="globalForm.taskList"
-    >
+    <el-table v-loading="loading" :data="globalForm.taskList">
       <!-- 访视名称 -->
-      <el-table-column
-        prop="BlindName"
-        :label="$t('trials:globalReview:table:visitName')"
-        show-overflow-tooltip
-        width="150"
-      />
+      <el-table-column prop="BlindName" :label="$t('trials:globalReview:table:visitName')" show-overflow-tooltip
+        width="150" />
       <!-- 评估结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:evaluationRes')"
-        align="center"
-        prop=""
-      >
+      <el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
         <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.evaluationQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in globalInfo.evaluationQsList" :key="index" prop="" :label="qs"
+            show-overflow-tooltip width="150">
             <template slot-scope="scope">
-              <template v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===4)">
-                <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
-                <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
-                </span>
-                <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
-              </div>
+              <template
+                v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 4)">
+                <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer"
+                  :style="{ color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null }">
+                  <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
+                    {{
+                      $fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
+                    }}
+                  </span>
+                  <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
+                </div>
               </template>
-              
+
             </template>
           </el-table-column>
         </template>
       </el-table-column>
       <!-- 是否同意访视结果 -->
-      <el-table-column
-        prop=""
-        :label="$t('trials:globalReview:table:isAgreeEvaluationRes')"
-        show-overflow-tooltip
-        width="170"
-      >
+      <el-table-column prop="" :label="$t('trials:globalReview:table:isAgreeEvaluationRes')" show-overflow-tooltip
+        width="170">
         <template slot-scope="scope">
-          <el-form-item
-            v-if="readingTaskState<2"
-            :prop="`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`"
-            label=""
-            :rules="[
-              { required: true,message: $t('common:ruleMessage:select'), trigger: ['change','blur']},
-            ]"
-            class="form-item"
-          >
-            <el-radio-group
-              v-model="globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]"
-              @change="handleAgreeOrNotChange(scope.$index,scope.row.AgreeOrNot[0].GlobalAnswerType)"
-            >
-              <el-radio
-                v-for="item of $d.ReadingYesOrNo"
-                :key="'AgreeOrNot' + item.value"
-                :label="String(item.value)"
-              >
+          <el-form-item v-if="readingTaskState < 2" :prop="`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`"
+            label="" :rules="[
+              { required: true, message: $t('common:ruleMessage:select'), trigger: ['change', 'blur'] },
+            ]" class="form-item">
+            <el-radio-group v-model="globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]"
+              @change="handleAgreeOrNotChange(scope.$index, scope.row.AgreeOrNot[0].GlobalAnswerType)">
+              <el-radio v-for="item of $d.ReadingYesOrNo" :key="'AgreeOrNot' + item.value" :label="String(item.value)">
                 {{ item.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
 
-          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 1" type="primary">
-            {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}
+          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 1"
+            type="primary">
+            {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}
           </el-tag>
-          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
+          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 0"
+            type="danger"> {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
           <span v-else />
         </template>
       </el-table-column>
 
       <!-- 调整后结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:adjustedRes')"
-        align="center"
-        prop=""
-      >
-        <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.adjustedQsList"
-            v-if="qs.isShow"
-            :key="index"
-            prop=""
-            :label="qs.questionName"
-            show-overflow-tooltip
-            width="150"
-          >
+      <el-table-column :label="$t('trials:globalReview:table:adjustedRes')" align="center" prop="">
+        <template v-for="(qs, index) in globalInfo.adjustedQsList">
+          <el-table-column v-if="qs.isShow" :key="index" prop="" :label="qs.questionName" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
+              <div
+                v-if="readingTaskState < 2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
                 <!-- <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
                   {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].VisitAnswer)) }}
                 </span> -->
 
-                <el-form-item
-                  style="margin-bottom: 0;"
-                  :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
-                  label=""
-                  :rules="[
-                    { required:parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  ]"
-                >
-                  <label v-if="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0" />
+                <el-form-item style="margin-bottom: 0;"
+                  :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : scope.row.AfterQuestionList[index].GlobalAnswerType}`"
+                  label="" :rules="[
+                    { required: parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0, message: $t('common:ruleMessage:specify'), trigger: ['change', 'blur'] },
+                  ]">
+                  <label
+                    v-if="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0" />
                   <!-- 裁判问题 -->
-                  <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 0 ">
-                    <el-tooltip v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])" class="item" effect="dark" :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])" placement="top-start">
+                  <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 0">
+                    <el-tooltip
+                      v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])"
+                      class="item" effect="dark"
+                      :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])"
+                      placement="top-start">
                       <el-select
-                        v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                        v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
                         style="width:90%;"
-                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                      >
+                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
                         <template v-if="scope.row.AfterQuestionList[index].TypeValue">
-                          <el-option
-                            v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
-                            :key="val"
-                            :label="val"
-                            :value="val"
-                          />
+                          <el-option v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')" :key="val"
+                            :label="val" :value="val" />
                         </template>
-                        <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value!==-1"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
+                        <template
+                          v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            v-show="item.value !== -1" :key="item.id" :value="String(item.value)" :label="item.label"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
                         </template>
                         <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                            :label="item.label"
-                          />
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            :key="item.id" :value="String(item.value)"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)"
+                            :label="item.label" />
                         </template>
                       </el-select>
                     </el-tooltip>
-                    <el-select
-                      v-else
-                      v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                    <el-select v-else
+                      v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
                       style="width:90%;"
-                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                    >
+                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
                       <template v-if="scope.row.AfterQuestionList[index].TypeValue">
-                        <el-option
-                          v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
-                          :key="val"
-                          :label="val"
-                          :value="val"
-                        />
+                        <el-option v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')" :key="val"
+                          :label="val" :value="val" />
                       </template>
-                      <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
-                        <template v-if="getLesionCount(scope.row.LesionCountList,0)">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value!==-1 && item.value !== 1 && item.value !== 3"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
+                      <template
+                        v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
+                        <template v-if="getLesionCount(scope.row.LesionCountList, 0)">
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            v-show="item.value !== -1 && item.value !== 1 && item.value !== 3" :key="item.id"
+                            :value="String(item.value)" :label="item.label"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
                         </template>
-                        <template v-else-if="getLesionCount(scope.row.LesionCountList,1)">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value!==-1 && item.value !== 1 && item.value !== 6"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
+                        <template v-else-if="getLesionCount(scope.row.LesionCountList, 1)">
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            v-show="item.value !== -1 && item.value !== 1 && item.value !== 6" :key="item.id"
+                            :value="String(item.value)" :label="item.label"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
                         </template>
                         <template v-else>
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value === 1 || item.value === 2 || item.value === 4"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            v-show="item.value === 1 || item.value === 2 || item.value === 4" :key="item.id"
+                            :value="String(item.value)" :label="item.label"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
                         </template>
 
                       </template>
                       <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                        <el-option
-                          v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                          v-show="item.value !== 6"
-                          :key="item.id"
-                          :value="String(item.value)"
-                          :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          :label="item.label"
-                        />
+                        <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                          v-show="item.value !== 6" :key="item.id" :value="String(item.value)"
+                          :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)"
+                          :label="item.label" />
                       </template>
                     </el-select>
                   </template>
                   <!-- 评估更新类型 GlobalAnswerType:3 -->
                   <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
-                    <el-tooltip v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)" class="item" effect="dark" :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)" placement="top-start">
+                    <el-tooltip
+                      v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)"
+                      class="item" effect="dark"
+                      :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)"
+                      placement="top-start">
                       <el-select
                         v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
                         style="width:90%;"
-                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                      >
-                        <el-option
-                          v-for="val in globalInfo.assessTypeList"
+                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                        <el-option v-for="val in globalInfo.assessTypeList"
                           v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
-                          :key="val.Code"
-                          :label="language === 'en'?val.Value:val.ValueCN"
-                          :value="val.Code"
-                        />
+                          :key="val.Code" :label="language === 'en' ? val.Value : val.ValueCN" :value="val.Code" />
                       </el-select>
                     </el-tooltip>
-                    <el-select
-                      v-else
+                    <el-select v-else
                       v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
                       style="width:90%;"
-                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                    >
-                      <el-option
-                        v-for="val in globalInfo.assessTypeList"
+                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                      <el-option v-for="val in globalInfo.assessTypeList"
                         v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
-                        :key="val.Code"
-                        :label="language === 'en'?val.Value:val.ValueCN"
-                        :value="val.Code"
-                      />
+                        :key="val.Code" :label="language === 'en' ? val.Value : val.ValueCN" :value="val.Code" />
                     </el-select>
                   </template>
-                  <el-input
-                    v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 1"
-                    v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
-                    type="textarea"
-                    maxlength="100"
-                    show-word-limit
-                    style="width:90%;"
-                    :autosize="{ minRows: 2 }"
-                    :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                  />
+                  <el-input v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 1"
+                    v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                    type="textarea" maxlength="100" show-word-limit style="width:90%;" :autosize="{ minRows: 2 }"
+                    :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0" />
                 </el-form-item>
               </div>
               <div v-else>
@@ -255,7 +175,9 @@
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
+                  }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
               </div>
@@ -282,18 +204,10 @@
           </el-table-column>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('common:action:action')"
-        min-width="150"
-        fixed="right"
-      >
+      <el-table-column :label="$t('common:action:action')" min-width="150" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:globalReview:table:view')"
-            icon="el-icon-view"
-            @click="handleView(scope.row)"
-          />
+          <el-button circle :title="$t('trials:globalReview:table:view')" icon="el-icon-view"
+            @click="handleView(scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -362,7 +276,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0 || readingTool === 2 ) {
+      if (readingTool === 0 || readingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
@@ -389,16 +303,18 @@ export default {
                 if (i.QuestionId) {
                   obj.questionId = i.QuestionId
                   obj.globalAnswerType = i.GlobalAnswerType
-                  obj.answer = this.globalForm[ `${index}${i.QuestionId}`]
+                  obj.answer = this.globalForm[`${index}${i.QuestionId}`]
                 } else {
                   obj.questionId = ''
                   obj.globalAnswerType = i.GlobalAnswerType
-                  obj.answer = this.globalForm[ `${index}${i.GlobalAnswerType}`]
+                  obj.answer = this.globalForm[`${index}${i.GlobalAnswerType}`]
                 }
                 answerList.push(obj)
               })
-              answerList.push({ questionId: '', globalAnswerType: item.AgreeOrNot[0].GlobalAnswerType,
-                answer: this.globalForm[ `${index}${item.AgreeOrNot[0].GlobalAnswerType}`] })
+              answerList.push({
+                questionId: '', globalAnswerType: item.AgreeOrNot[0].GlobalAnswerType,
+                answer: this.globalForm[`${index}${item.AgreeOrNot[0].GlobalAnswerType}`]
+              })
 
               visitTaskAnswerList.push({ visitTaskId: item.VisitTaskId, answerList: answerList })
             })
@@ -415,17 +331,17 @@ export default {
             }
             this.$emit('getGlInfo')
             resolve(true)
-            
+
           } else {
             resolve(false)
           }
-        } catch(e) {
+        } catch (e) {
           console.log(e)
           this.loading = false
           resolve(false)
-        } 
-        
-        
+        }
+
+
       })
     },
     getBeforeAnswer(qsId, row) {
@@ -471,22 +387,26 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item label:before {
-    content: '*';
-    color: #F56C6C;
-    margin-right: 4px;
+  content: '*';
+  color: #F56C6C;
+  margin-right: 4px;
 }
-::v-deep .el-textarea .el-input__count{
-  background: rgba(0,0,0,0);
+
+::v-deep .el-textarea .el-input__count {
+  background: rgba(0, 0, 0, 0);
   line-height: normal;
 }
-::v-deep .el-form-item{
+
+::v-deep .el-form-item {
   margin-bottom: 0px;
 }
-.global-form{
-  ::v-deep .el-form-item__content{
+
+.global-form {
+  ::v-deep .el-form-item__content {
     padding-bottom: 10px;
   }
-  ::v-deep .form-item .el-form-item__error{
+
+  ::v-deep .form-item .el-form-item__error {
     top: 60%;
   }
 }
diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue
new file mode 100644
index 00000000..2f83ef37
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue
@@ -0,0 +1,427 @@
+<template>
+    <el-form v-if="globalForm.taskList.length > 0" ref="globalRuleForm" :model="globalForm" class="global-form">
+        <el-table v-loading="loading" :data="globalForm.taskList">
+            <!-- 访视名称 -->
+            <el-table-column prop="BlindName" :label="$t('trials:globalReview:table:visitName')" show-overflow-tooltip
+                width="150" />
+            <!-- 评估结果 -->
+            <el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
+                <template>
+                    <el-table-column v-for="(qs, index) in globalInfo.evaluationQsList" :key="index" prop="" :label="qs"
+                        show-overflow-tooltip width="150">
+                        <template slot-scope="scope">
+                            <template
+                                v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 4)">
+                                <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer"
+                                    :style="{ color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null }">
+                                    <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
+                                        {{
+                                            $fd(scope.row.BeforeQuestionList[index].DictionaryCode,
+                                                parseInt(scope.row.BeforeQuestionList[index].Answer))
+                                        }}
+                                    </span>
+                                    <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
+                                </div>
+                            </template>
+
+                        </template>
+                    </el-table-column>
+                </template>
+            </el-table-column>
+            <!-- 是否同意访视结果 -->
+            <el-table-column prop="" :label="$t('trials:globalReview:table:isAgreeEvaluationRes')" show-overflow-tooltip
+                width="170">
+                <template slot-scope="scope">
+                    <el-form-item v-if="readingTaskState < 2"
+                        :prop="`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`" label="" :rules="[
+                            { required: true, message: $t('common:ruleMessage:select'), trigger: ['change', 'blur'] },
+                        ]" class="form-item">
+                        <el-radio-group
+                            v-model="globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]"
+                            @change="handleAgreeOrNotChange(scope.$index, scope.row.AgreeOrNot[0].GlobalAnswerType)">
+                            <el-radio v-for="item of $d.ReadingYesOrNo" :key="'AgreeOrNot' + item.value"
+                                :label="String(item.value)">
+                                {{ item.label }}
+                            </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+
+                    <el-tag
+                        v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 1"
+                        type="primary">
+                        {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}
+                    </el-tag>
+                    <el-tag
+                        v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 0"
+                        type="danger"> {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
+                    <span v-else />
+                </template>
+            </el-table-column>
+
+            <!-- 调整后结果 -->
+            <el-table-column :label="$t('trials:globalReview:table:adjustedRes')" align="center" prop="">
+                <template v-for="(qs, index) in globalInfo.adjustedQsList">
+                    <el-table-column v-if="qs.isShow" :key="index" prop="" :label="qs.questionName"
+                        show-overflow-tooltip width="150">
+                        <template slot-scope="scope">
+                            <div
+                                v-if="readingTaskState < 2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
+                                <el-form-item style="margin-bottom: 0;"
+                                    :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : scope.row.AfterQuestionList[index].GlobalAnswerType}`"
+                                    label="" :rules="[
+                                        { required: parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0, message: $t('common:ruleMessage:specify'), trigger: ['change', 'blur'] },
+                                    ]">
+                                    <label
+                                        v-if="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0" />
+                                    <!-- 裁判问题 -->
+                                    <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 0">
+                                        <el-tooltip
+                                            v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])"
+                                            class="item" effect="dark"
+                                            :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])"
+                                            placement="top-start">
+                                            <el-select
+                                                v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                                                style="width:90%;"
+                                                :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                                                <template v-if="scope.row.AfterQuestionList[index].TypeValue">
+                                                    <el-option
+                                                        v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
+                                                        :key="val" :label="val" :value="val" />
+                                                </template>
+                                                <template
+                                                    v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        v-show="item.value !== -1" :key="item.id"
+                                                        :value="String(item.value)" :label="item.label"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
+                                                </template>
+                                                <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        :key="item.id" :value="String(item.value)"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)"
+                                                        :label="item.label" />
+                                                </template>
+                                            </el-select>
+                                        </el-tooltip>
+                                        <el-select v-else
+                                            v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                                            style="width:90%;"
+                                            :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                                            <template v-if="scope.row.AfterQuestionList[index].TypeValue">
+                                                <el-option
+                                                    v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
+                                                    :key="val" :label="val" :value="val" />
+                                            </template>
+                                            <template
+                                                v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
+                                                <template v-if="getLesionCount(scope.row.LesionCountList, 0)">
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        v-show="item.value !== -1 && item.value !== 1 && item.value !== 3"
+                                                        :key="item.id" :value="String(item.value)" :label="item.label"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
+                                                </template>
+                                                <template v-else-if="getLesionCount(scope.row.LesionCountList, 1)">
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        v-show="item.value !== -1 && item.value !== 1 && item.value !== 6"
+                                                        :key="item.id" :value="String(item.value)" :label="item.label"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
+                                                </template>
+                                                <template v-else>
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        v-show="item.value === 1 || item.value === 2 || item.value === 4"
+                                                        :key="item.id" :value="String(item.value)" :label="item.label"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
+                                                </template>
+
+                                            </template>
+                                            <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                                                <el-option
+                                                    v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                    v-show="item.value !== 6" :key="item.id" :value="String(item.value)"
+                                                    :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)"
+                                                    :label="item.label" />
+                                            </template>
+                                        </el-select>
+                                    </template>
+                                    <!-- 评估更新类型 GlobalAnswerType:3 -->
+                                    <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
+                                        <el-tooltip
+                                            v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)"
+                                            class="item" effect="dark"
+                                            :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)"
+                                            placement="top-start">
+                                            <el-select
+                                                v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
+                                                style="width:90%;"
+                                                :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                                                <el-option v-for="val in globalInfo.assessTypeList"
+                                                    v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
+                                                    :key="val.Code" :label="language === 'en' ? val.Value : val.ValueCN"
+                                                    :value="val.Code" />
+                                            </el-select>
+                                        </el-tooltip>
+                                        <el-select v-else
+                                            v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
+                                            style="width:90%;"
+                                            :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                                            <el-option v-for="val in globalInfo.assessTypeList"
+                                                v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
+                                                :key="val.Code" :label="language === 'en' ? val.Value : val.ValueCN"
+                                                :value="val.Code" />
+                                        </el-select>
+                                    </template>
+                                    <el-input v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 1"
+                                        v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                                        type="textarea" maxlength="100" show-word-limit style="width:90%;"
+                                        :autosize="{ minRows: 2 }"
+                                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0" />
+                                </el-form-item>
+                            </div>
+                            <div v-else>
+                                <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
+                                    {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
+                                </span>
+                                <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                                    {{
+                                        $fd(scope.row.AfterQuestionList[index].DictionaryCode,
+                                            parseInt(scope.row.AfterQuestionList[index].Answer))
+                                    }}
+                                </span>
+                                <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
+                            </div>
+                            <!-- <div v-else-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 4 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 5) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 6))">
+                <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
+                  {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
+                </span>
+                <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                </span>
+                <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
+              </div> -->
+                            <!-- <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+
+                <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
+                  {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
+                </span>
+                <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                </span>
+                <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
+              </div> -->
+                        </template>
+                    </el-table-column>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('common:action:action')" min-width="150" fixed="right">
+                <template slot-scope="scope">
+                    <el-button circle :title="$t('trials:globalReview:table:view')" icon="el-icon-view"
+                        @click="handleView(scope.row)" />
+                </template>
+            </el-table-column>
+        </el-table>
+    </el-form>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { batchSubmitGlobalReadingInfo } from '@/api/trials'
+import { mapGetters } from 'vuex'
+export default {
+    props: {
+        globalInfo: {
+            type: Object,
+            default() {
+                return {}
+            }
+        },
+        globalForm: {
+            type: Object,
+            default() {
+                return {}
+            }
+        },
+        readingTaskState: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            loading: false,
+            assessTypes: []
+        }
+    },
+    computed: {
+        ...mapGetters(['language'])
+    },
+    mounted() {
+        console.log(this.globalInfo)
+        this.assessTypes = this.globalInfo.assessTypeList.filter(i => i.IsBaseLineUse === this.isBaseline)
+    },
+    methods: {
+        getText(val, row, type) {
+            if (type === 3) {
+                var o = this.globalInfo.assessTypeList.find(v => {
+                    return parseInt(v.Code) === parseInt(val)
+                })
+                if (!o) {
+                    return ''
+                }
+                return this.language === 'en' ? o.Value : o.ValueCN
+            } else if (row.TypeValue) {
+                return val
+            } else if (row.DictionaryCode) {
+                return this.$fd(row.DictionaryCode, parseInt(val))
+            }
+        },
+
+        handleView(row) {
+            var token = getToken()
+            var visitTaskId = row.VisitTaskId
+            var criterionType = this.$router.currentRoute.query.criterionType
+            var readingTool = this.$router.currentRoute.query.readingTool
+            readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
+            var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
+            var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
+            var path = ''
+            if (readingTool === 0 || readingTool === 2) {
+                path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+            } else {
+                path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+            }
+            const routeData = this.$router.resolve({ path })
+            var newWindow = window.open(routeData.href, '_blank')
+            this.$emit('setOpenWindow', newWindow)
+        },
+        getLesionCount(lesionList, lesionType) {
+            const lesion = lesionList.find(i => i.LesionType === lesionType)
+            return lesion ? lesion.Count : 0
+        },
+        handleSave(isPrompt = true) {
+            return new Promise(async (resolve, reject) => {
+                try {
+                    let valid = await this.$refs['globalRuleForm'].validate()
+                    if (valid) {
+                        this.loading = true
+                        var visitTaskAnswerList = []
+                        this.globalForm.taskList.forEach((item, index) => {
+                            var answerList = []
+                            item.AfterQuestionList.map(i => {
+                                var obj = {}
+                                if (i.QuestionId) {
+                                    obj.questionId = i.QuestionId
+                                    obj.globalAnswerType = i.GlobalAnswerType
+                                    obj.answer = this.globalForm[`${index}${i.QuestionId}`]
+                                } else {
+                                    obj.questionId = ''
+                                    obj.globalAnswerType = i.GlobalAnswerType
+                                    obj.answer = this.globalForm[`${index}${i.GlobalAnswerType}`]
+                                }
+                                answerList.push(obj)
+                            })
+                            answerList.push({
+                                questionId: '', globalAnswerType: item.AgreeOrNot[0].GlobalAnswerType,
+                                answer: this.globalForm[`${index}${item.AgreeOrNot[0].GlobalAnswerType}`]
+                            })
+
+                            visitTaskAnswerList.push({ visitTaskId: item.VisitTaskId, answerList: answerList })
+                        })
+                        var params = {
+                            globalTaskId: this.globalInfo.visitTaskId,
+                            subjectId: this.globalInfo.subjectId,
+                            trialId: this.globalInfo.trialId,
+                            visitTaskAnswerList
+                        }
+                        await batchSubmitGlobalReadingInfo(params)
+                        this.loading = false
+                        if (isPrompt) {
+                            this.$message.success(this.$t('common:message:savedSuccessfully'))
+                        }
+                        this.$emit('getGlInfo')
+                        resolve(true)
+
+                    } else {
+                        resolve(false)
+                    }
+                } catch (e) {
+                    console.log(e)
+                    this.loading = false
+                    resolve(false)
+                }
+
+
+            })
+        },
+        getBeforeAnswer(qsId, row) {
+            var i = row.BeforeQuestionList.findIndex(item => item.QuestionName === qsId)
+
+            if (i > -1 && row.BeforeQuestionList[i].Answer) {
+                var answer = ''
+                if (row.BeforeQuestionList[i].DictionaryCode) {
+                    answer = row.BeforeQuestionList[i].Answer
+                } else {
+                    answer = row.BeforeQuestionList[i].Answer
+                }
+                return answer
+            } else {
+                return ''
+            }
+        },
+        handleAgreeOrNotChange(index, globalAnswerType) {
+            var agreeOrNot = parseInt(this.globalForm[`${index}${globalAnswerType}`])
+            if (agreeOrNot === 1) {
+                var qsList = this.globalForm.taskList[index].AfterQuestionList
+                qsList.map(v => {
+                    if (v.QuestionId) {
+                        this.globalForm[`${index}${v.QuestionId}`] = ''
+                    } else if (v.GlobalAnswerType !== globalAnswerType) {
+                        this.globalForm[`${index}${v.GlobalAnswerType}`] = ''
+                    }
+                })
+            }
+        },
+        getAssessType(v) {
+            console.log(this.language)
+            var i = this.globalInfo.assessTypeList.findIndex(i => String(i.Code) === String(v))
+            if (i > -1) {
+                return this.language === 'en' ? this.globalInfo.assessTypeList[i].Value : this.globalInfo.assessTypeList[i].ValueCN
+            } else {
+                return ''
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-form-item label:before {
+    content: '*';
+    color: #F56C6C;
+    margin-right: 4px;
+}
+
+::v-deep .el-textarea .el-input__count {
+    background: rgba(0, 0, 0, 0);
+    line-height: normal;
+}
+
+::v-deep .el-form-item {
+    margin-bottom: 0px;
+}
+
+.global-form {
+    ::v-deep .el-form-item__content {
+        padding-bottom: 10px;
+    }
+
+    ::v-deep .form-item .el-form-item__error {
+        top: 60%;
+    }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
index 24c3babb..cbc25162 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
@@ -93,9 +93,8 @@
         align="center"
         prop=""
       >
-        <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.adjustedQsList"
+        <template v-for="(qs,index) in globalInfo.adjustedQsList">
+          <el-table-column 
             v-if="qs.isShow"
             :key="index"
             prop=""
diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue
index 473bb5b0..a091edcb 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@@ -24,15 +24,11 @@
         </div>
       </div>
 
-      <div v-if=" readingTaskState < 2" style="text-align:right;margin:5px 0;">
-        <el-button
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
-            <!-- 跳过 -->
-            {{ $t('trials:readingReport:button:skip') }}
-          </el-button>
+      <div v-if="readingTaskState < 2" style="text-align:right;margin:5px 0;">
+        <el-button type="primary" size="small" @click="skipTask">
+          <!-- 跳过 -->
+          {{ $t('trials:readingReport:button:skip') }}
+        </el-button>
         <el-button size="small" type="primary" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
@@ -41,72 +37,31 @@
           {{ $t('trials:globalReview:button:submit') }}
         </el-button>
       </div>
-      <customize-table
-        v-if="CriterionType === 0 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      <recist-table
-        v-if="CriterionType === 1 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      <lugano-table
-        v-if="CriterionType === 2 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @handleView="handleView"
-        @setOpenWindow="setOpenWindow"
-      />
-      <pcwg3-table
-        v-if="CriterionType === 10 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @handleView="handleView"
-        @setOpenWindow="setOpenWindow"
-      />
-      <irecist-table
-        v-if="CriterionType === 3 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      <recistbm-table
-        v-if="CriterionType === 17 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      <mrecist-table
-        v-if="CriterionType === 7 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      
+      <customize-table v-if="CriterionType === 0 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+      <recist-table v-if="CriterionType === 1 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+      <lugano-table v-if="CriterionType === 2 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @handleView="handleView" @setOpenWindow="setOpenWindow" />
+      <luganoWithoutPET-table v-if="CriterionType === 18 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @handleView="handleView" @setOpenWindow="setOpenWindow" />
+      <pcwg3-table v-if="CriterionType === 10 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @handleView="handleView" @setOpenWindow="setOpenWindow" />
+      <irecist-table v-if="CriterionType === 3 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+      <recistbm-table v-if="CriterionType === 17 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+      <mrecist-table v-if="CriterionType === 7 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+
     </el-card>
 
     <el-card v-if="isReadingShowPreviousResults" :body-style="{ padding: '10px' }" shadow="never">
@@ -114,51 +69,28 @@
         <!-- 既往全局阅片结果 -->
         <span style="font-weight: bold;">{{ $t('trials:globalReview:title:previousRes') }}</span>
       </div>
-      <el-table
-        v-loading="historyLoading"
-        :data="historyTaskList"
-      >
+      <el-table v-loading="historyLoading" :data="historyTaskList">
         <!-- 全局 -->
-        <el-table-column
-          prop="TaskBlindName"
-          :label="$t('trials:globalReview:table:globalReading')"
-          show-overflow-tooltip
-          width="200"
-        />
-        <el-table-column
-          prop="VisitBlindName"
-          :label="$t('trials:globalReview:table:cutOffVisitName')"
-          show-overflow-tooltip
-          width="200"
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          width="200"
-        >
+        <el-table-column prop="TaskBlindName" :label="$t('trials:globalReview:table:globalReading')"
+          show-overflow-tooltip width="200" />
+        <el-table-column prop="VisitBlindName" :label="$t('trials:globalReview:table:cutOffVisitName')"
+          show-overflow-tooltip width="200" />
+        <el-table-column :label="$t('common:action:action')" width="200">
           <template slot-scope="scope">
             <!-- 查看详情 -->
-            <el-button
-              circle
-              :title="$t('trials:globalReview:table:view')"
-              icon="el-icon-view"
-              @click="handleView(scope.row)"
-            />
+            <el-button circle :title="$t('trials:globalReview:table:view')" icon="el-icon-view"
+              @click="handleView(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
     <!-- 签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
+    <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>
+        <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>
@@ -177,13 +109,14 @@ import pcwg3Table from './components/PCWG3Table'
 import irecistTable from './components/IRecistTable'
 import recistbmTable from './components/RecistBMTable'
 import luganoTable from './components/LuganoTable'
+import luganoWithoutPETTable from './components/LuganoTable'
 import mrecistTable from './components/MRecistTable.vue'
 import SignForm from '@/views/trials/components/newSignForm'
 import { changeURLStatic } from '@/utils/history.js'
 import store from '@/store'
 export default {
   name: 'GlobalReview',
-  components: { CustomizeTable, RecistTable, pcwg3Table, irecistTable, recistbmTable,luganoTable,mrecistTable, SignForm },
+  components: { CustomizeTable, RecistTable, pcwg3Table, irecistTable, recistbmTable, luganoTable, luganoWithoutPETTable, mrecistTable, SignForm },
   props: {
     trialId: {
       type: String,
@@ -294,19 +227,19 @@ export default {
                 console.log(qs)
                 if (qs.GlobalAnswerType === 1 && (this.CriterionType === 10)) {
                   // 访视阅片备注
-                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:visitRemark'),isShow:true})
+                  adjustedQsList.push({ questionName: this.$t('trials:globalReview:table:visitRemark'), isShow: true })
                 } else if (qs.GlobalAnswerType === 1 && (this.CriterionType !== 10)) {
                   // 全局阅片备注
-                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:globalRemark'),isShow:true})
+                  adjustedQsList.push({ questionName: this.$t('trials:globalReview:table:globalRemark'), isShow: true })
                 } else if (qs.GlobalAnswerType === 3 && (this.CriterionType !== 10)) {
                   // 评估更新类型
-                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:updateType'),isShow:true})
+                  adjustedQsList.push({ questionName: this.$t('trials:globalReview:table:updateType'), isShow: true })
                 } else {
                   var isShow = true
-                  if(this.CriterionType === 2 && (qs.QuestionType === 39 || qs.QuestionType === 40 || qs.QuestionType === 41)){
+                  if ((this.CriterionType === 2 || this.CriterionType === 18) && (qs.QuestionType === 39 || qs.QuestionType === 40 || qs.QuestionType === 41)) {
                     isShow = false
                   }
-                  adjustedQsList.push({questionName:qs.QuestionName,isShow:isShow})
+                  adjustedQsList.push({ questionName: qs.QuestionName, isShow: isShow })
                 }
               })
               qs.AgreeOrNot.map(qs => {
@@ -353,7 +286,7 @@ export default {
         this.historyTaskList = res.Result
         this.historyLoading = false
       } catch (e) {
-        this.historyLoading = false 
+        this.historyLoading = false
       }
     },
     handleSave() {
@@ -390,8 +323,8 @@ export default {
           type: 'warning',
           distinguishCancelAndClose: true
         })
-          .then(() => {})
-          .catch(() => {})
+          .then(() => { })
+          .catch(() => { })
       } else {
         // 自动保存
         let res = await this.$refs['globalTbl'].handleSave(false)
@@ -400,7 +333,7 @@ export default {
           this.signCode = ImageAssessmentReportConfirmation
           this.signVisible = true
         }
-        
+
       }
     },
     // 关闭签名框
@@ -420,7 +353,7 @@ export default {
         },
         signInfo: signInfo
       }
-      try{
+      try {
         let res = await submitGlobalReadingInfo(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
@@ -471,7 +404,7 @@ export default {
         readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
         var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
         var path = ''
-        if (readingTool === 0 || readingTool === 2 ) {
+        if (readingTool === 0 || readingTool === 2) {
           path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
         } else {
           path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
@@ -501,14 +434,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.glReview_wrapper{
+.glReview_wrapper {
   flex: 1;
   padding: 10px;
   width: 100%;
   height: 100%;
   overflow-y: auto;
-  .box-mr{
-    margin:10px 0;
+
+  .box-mr {
+    margin: 10px 0;
   }
 }
 </style>
diff --git a/src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue b/src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue
index e59cba20..3fd41aad 100644
--- a/src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue
+++ b/src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue
@@ -35,6 +35,14 @@
                             }}</el-button>
                     </div>
                 </el-form-item> -->
+                <!-- 查看培训记录 -->
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:IsViewTrainingRecord')"
+                    prop="IsViewTrainingRecord">
+                    <el-radio-group v-model="from.IsViewTrainingRecord">
+                        <el-radio v-for="item in $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label
+                        }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
                 <!-- 稽查日期 -->
                 <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:AuditTime')"
                     prop="AuditTime">
@@ -112,6 +120,7 @@ export default {
                     })
                     this.from.ViewTime = []
                     this.from.IdnetityUserIdList = []
+                    this.from.IsViewTrainingRecord = false
                 }
             },
             immediate: true,
@@ -142,6 +151,7 @@ export default {
                 AuditType: '',
                 IdnetityUserIdList: [],
                 IdnetityUserName: '',
+                IsViewTrainingRecord: false,
                 ViewTime: []
             },
             rules: {
diff --git a/src/views/trials/trials-workbench/components/inspectionManagement/index.vue b/src/views/trials/trials-workbench/components/inspectionManagement/index.vue
index 7e0ce58b..c3906fae 100644
--- a/src/views/trials/trials-workbench/components/inspectionManagement/index.vue
+++ b/src/views/trials/trials-workbench/components/inspectionManagement/index.vue
@@ -34,6 +34,12 @@
                 <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:IdentityUserName')">
                     <el-input v-model="searchData.IdentityUserName" clearable placeholder=""></el-input>
                 </el-form-item>
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:IsViewTrainingRecord')">
+                    <el-select v-model="searchData.IsViewTrainingRecord" placeholder="" clearable>
+                        <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')">
                     <el-date-picker v-model="auditTime" type="daterange" range-separator="-"
                         :start-placeholder="$t('imageInspect:daterange:startPlaceholder')"
@@ -99,6 +105,13 @@
                     </span> -->
                     </template>
                 </el-table-column>
+                <el-table-column prop="IsViewTrainingRecord" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:IsViewTrainingRecord')"
+                    sortable="custom">
+                    <template slot-scope="scope">
+                        <span>{{ $fd('YesOrNo', scope.row.IsViewTrainingRecord) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="AuditTime" show-overflow-tooltip
                     :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')" sortable="custom">
                 </el-table-column>
@@ -166,6 +179,7 @@ const searchDataDefault = () => {
         EndTime: '',
         BeginCreateTime: '',
         EndCreateTime: '',
+        IsViewTrainingRecord: '',
         PageIndex: 1,
         PageSize: 20,
         Asc: false,

From 58c33bc008230fd37ceebbffb08bbf93d7e248c9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 14 Oct 2025 14:48:17 +0800
Subject: [PATCH 015/333] =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=A2=84=E8=AE=BE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=99=90=E5=88=B6=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E3=80=81=E5=8D=95=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/reading-unit/components/TableQsForm.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index 90f65b9b..4797e4b8 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -52,7 +52,7 @@
           </el-radio-group>
         </el-form-item>
         <!-- 是否预设 -->
-        <el-form-item v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'"
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
           :label="$t('trials:qcCfg:table:IsPreinstall')" prop="IsPreinstall">
           <el-radio-group v-model="form.IsPreinstall">
             <el-radio v-for="item of $d.YesOrNo" :key="`QuestionIsPreinstall${item.value}`" :label="item.value">

From b44d8322419af0ea2d65644d0058f48982444c6e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 15 Oct 2025 14:32:15 +0800
Subject: [PATCH 016/333] 1

---
 .../trials-panel/reading/dicoms/components/ReportPage.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 21c31908..575a62cf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -78,7 +78,7 @@
                   </template>
                   <!-- 整体肿瘤评估（非基线可修改） -->
                   <template
-                    v-else-if="!task.IsBaseLine && (scope.row.QuestionType === 13 || scope.row.QuestionType === 42)">
+                    v-else-if="!task.IsBaseLine && (scope.row.QuestionType === 13 || scope.row.QuestionType === 42 || (scope.row.QuestionType === 36 && CriterionType === 18))">
                     <el-select v-if="scope.row.Type === 'select' && scope.row.DictionaryCode"
                       v-model="currentEvaluateResult" size="mini" @change="handleEvaluateResultChange">
                       <template v-if="CriterionType === 1 && tLesionCount">
@@ -813,7 +813,7 @@ export default {
     getWarningText() {
       var sysRes = ''
       var curRes = ''
-      if (this.CriterionType === 2) {
+      if (this.CriterionType === 2 || this.CriterionType === 18) {
         sysRes = this.$fd('ImagingOverallAssessment_Lugano', this.tumorEvaluate)
         curRes = this.$fd('ImagingOverallAssessment_Lugano', this.currentEvaluateResult)
       } else {

From f58c1163827306c10bdb99188682aafdc44e562f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 15 Oct 2025 14:47:41 +0800
Subject: [PATCH 017/333] =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9F=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E9=87=8F=E9=80=89=E6=8B=A9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?100=E3=80=81500=E3=80=811000?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/reading-period/components/AddOrEditPR.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue
index fc6723db..e3597f0a 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue
@@ -152,7 +152,7 @@
         </el-table>
         <!-- 分页组件 -->
         <div style="text-align:right">
-          <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" :disabled="list.length === 0" @pagination="getReadingReriodList" />
+          <pagination class="page" :total="total" :pageSizes="[10, 20, 30, 50, 100, 500, 1000]" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" :disabled="list.length === 0" @pagination="getReadingReriodList" />
         </div>
 
         <div style="text-align:right;padding-top: 10px;">

From 7f20bfecdc42a052bed7957289e550d716ce4832 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 15 Oct 2025 15:37:46 +0800
Subject: [PATCH 018/333] =?UTF-8?q?=E6=96=B0=E6=A0=87=E5=87=86=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E9=98=85=E7=89=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/reading/global-review/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue
index a091edcb..b3101768 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@@ -236,7 +236,7 @@ export default {
                   adjustedQsList.push({ questionName: this.$t('trials:globalReview:table:updateType'), isShow: true })
                 } else {
                   var isShow = true
-                  if ((this.CriterionType === 2 || this.CriterionType === 18) && (qs.QuestionType === 39 || qs.QuestionType === 40 || qs.QuestionType === 41)) {
+                  if ((this.CriterionType === 2) && (qs.QuestionType === 39 || qs.QuestionType === 40 || qs.QuestionType === 41)) {
                     isShow = false
                   }
                   adjustedQsList.push({ questionName: qs.QuestionName, isShow: isShow })

From cbcc11fe972013b604330fb184c7a0b66305a17b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 15 Oct 2025 17:10:18 +0800
Subject: [PATCH 019/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-unit/components/ReadingRules.vue  |   2 +-
 .../setting/reading-unit/index.vue            | 190 ++++++------------
 2 files changed, 66 insertions(+), 126 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index b359e87c..56a4e131 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -657,7 +657,7 @@ export default {
           this.$emit('setGlobalReading', res.Result.IsGlobalReading)
           this.$emit('setOncologyReading', res.Result.IsOncologyReading)
           this.$emit('setDigitPlaces', res.Result.DigitPlaces)
-          this.$emit('setReadingTools', res.Result.ReadingToolList)
+          this.$emit('setReadingTools', { readingTools: res.Result.ReadingToolList, isNoneDicom: this.form.ReadingTool === 1 })
 
           if (res.Result.ReadingType === 1) {
             this.$emit('setArbitrationReading', false)
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index a1cd1268..23ceda7d 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -3,99 +3,51 @@
     <div v-if="isShow" class="content">
       <el-tabs v-model="TrialReadingCriterionId" type="border-card">
         <template v-for="item of trialCriterionList">
-          <el-tab-pane
-            :key="item.TrialReadingCriterionId"
-            :label="item.TrialReadingCriterionName"
-            :name="item.TrialReadingCriterionId"
-          >
-            <div style="text-align: right; padding: 5px 0px" v-if="!hasPermi(['role:admin','role:qa','role:ea'])">
+          <el-tab-pane :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName"
+            :name="item.TrialReadingCriterionId">
+            <div style="text-align: right; padding: 5px 0px" v-if="!hasPermi(['role:admin', 'role:qa', 'role:ea'])">
               <!-- 同步当前标准 -->
-              <el-button
-                type="primary"
-                icon="el-icon-refresh-left"
-                :loading="loading"
-                size="mini"
-                
-                @click="syncSign"
-              >
+              <el-button type="primary" icon="el-icon-refresh-left" :loading="loading" size="mini" @click="syncSign">
                 {{ $t("trials:readingUnit:button:sync") }}
               </el-button>
             </div>
-            <el-collapse
-              v-model="activeCollapse"
-              class="setting-config"
-              v-if="
-                item.isPaneShow &&
-                item.TrialReadingCriterionId === TrialReadingCriterionId
-              "
-            >
+            <el-collapse v-model="activeCollapse" class="setting-config" v-if="
+              item.isPaneShow &&
+              item.TrialReadingCriterionId === TrialReadingCriterionId
+            ">
               <!-- 阅片规则 -->
-              <el-collapse-item
-                :title="$t('trials:readingUnit:readingRules')"
-                name="1"
-              >
-                <ReadingRules
-                  :ref="`readingRules${item.TrialReadingCriterionId}`"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
-                  :CriterionType="item.CriterionType"
-                  @setConfirm="setConfirm"
-                  @reloadArbitrationRules="reloadArbitrationRules"
-                  @setArbitrationReading="setArbitrationReading"
-                  @setAdditionalAssessment="setAdditionalAssessment"
-                  @setIsClinicalReading="setIsClinicalReading"
-                  @setGlobalReading="setGlobalReading"
-                  @setOncologyReading="setOncologyReading"
-                  @setDigitPlaces="setDigitPlaces"
-                  @setReadingTools="setReadingTools"
-                />
+              <el-collapse-item :title="$t('trials:readingUnit:readingRules')" name="1">
+                <ReadingRules :ref="`readingRules${item.TrialReadingCriterionId}`"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" :CriterionType="item.CriterionType"
+                  @setConfirm="setConfirm" @reloadArbitrationRules="reloadArbitrationRules"
+                  @setArbitrationReading="setArbitrationReading" @setAdditionalAssessment="setAdditionalAssessment"
+                  @setIsClinicalReading="setIsClinicalReading" @setGlobalReading="setGlobalReading"
+                  @setOncologyReading="setOncologyReading" @setDigitPlaces="setDigitPlaces"
+                  @setReadingTools="setReadingTools" />
               </el-collapse-item>
               <!-- 阅片标准 -->
-              <el-collapse-item
-                :title="$t('trials:readingUnit:readingCriterion')"
-                name="2"
-              >
-                <ReadingCriterions
-                  :ref="`readingCriterions${item.TrialReadingCriterionId}`"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
-                  :digit-places="digitPlaces"
-                  :readingTools="readingTools"
-                  :is-additional-assessment="isAdditionalAssessment"
-                  @reloadArbitrationRules="reloadArbitrationRules"
-                />
+              <el-collapse-item :title="$t('trials:readingUnit:readingCriterion')" name="2">
+                <ReadingCriterions :ref="`readingCriterions${item.TrialReadingCriterionId}`"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" :digit-places="digitPlaces"
+                  :readingTools="readingTools" :is-additional-assessment="isAdditionalAssessment"
+                  @reloadArbitrationRules="reloadArbitrationRules" />
               </el-collapse-item>
               <!-- 全局阅片 -->
-              <el-collapse-item
-                v-if="isGlobalReading && CriterionType !== 10"
-                :title="$t('trials:readingUnit:GlobalReading')"
-                name="5"
-              >
-                <GlobalReading
-                  :ref="`globalReading${item.TrialReadingCriterionId}`"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
-                />
+              <el-collapse-item v-if="isGlobalReading && CriterionType !== 10"
+                :title="$t('trials:readingUnit:GlobalReading')" name="5">
+                <GlobalReading :ref="`globalReading${item.TrialReadingCriterionId}`"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" />
               </el-collapse-item>
               <!-- 仲裁规则 -->
-              <el-collapse-item
-                v-if="isArbitrationReading"
-                :title="$t('trials:readingUnit:adRules')"
-                name="3"
-              >
-                <ArbitrationRules
-                  :ref="`arbitrationRules${item.TrialReadingCriterionId}`"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
-                />
+              <el-collapse-item v-if="isArbitrationReading" :title="$t('trials:readingUnit:adRules')" name="3">
+                <ArbitrationRules :ref="`arbitrationRules${item.TrialReadingCriterionId}`"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" />
               </el-collapse-item>
               <!-- 肿瘤学阅片配置 -->
               <!-- v-if="isClinicalReading" -->
-              <el-collapse-item
-                v-if="isOncologyReading"
-                :title="$t('trials:readingUnit:oncologyReading')"
-                name="4"
-              >
-                <OncologyForm
-                  :ref="`oncologyForm${item.TrialReadingCriterionId}`"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
-                />
+              <el-collapse-item v-if="isOncologyReading" :title="$t('trials:readingUnit:oncologyReading')" name="4">
+                <OncologyForm :ref="`oncologyForm${item.TrialReadingCriterionId}`"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" />
               </el-collapse-item>
             </el-collapse>
           </el-tab-pane>
@@ -103,13 +55,10 @@
       </el-tabs>
     </div>
 
-    <div
-      v-if="
-        !isConfirm &&
-        hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-      "
-      class="bottom"
-    >
+    <div v-if="
+      !isConfirm &&
+      hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+    " class="bottom">
       <!-- 确认 -->
       <el-button type="danger" @click="handleConfirm">
         {{ $t("trials:readingUnit:button:confirm") }}
@@ -117,44 +66,26 @@
     </div>
 
     <!--签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
+    <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"
-      />
+      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
     <!--签名框 -->
-    <el-dialog
-      v-if="signVisible2"
-      :visible.sync="signVisible2"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="signVisible2" :visible.sync="signVisible2" :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="signForm2"
-        :sign-code-enum="signCode2"
-        @closeDialog="closeSignDialog2"
-      />
+      <SignForm ref="signForm2" :sign-code-enum="signCode2" @closeDialog="closeSignDialog2" />
     </el-dialog>
   </div>
 </template>
@@ -176,7 +107,7 @@ import GlobalReading from "./components/GlobalReading";
 import OncologyForm from "./components/OncologyForm";
 import SignForm from "@/views/trials/components/newSignForm";
 import const_ from "@/const/sign-code";
-import { getCustomizeStandardsTools } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
+import { getCustomizeStandardsTools, getCustomizeStandardsNoneDicomTools } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
 export default {
   name: "ReadingUnit",
   components: {
@@ -290,7 +221,7 @@ export default {
             this.trialCriterionList[0].TrialReadingCriterionId;
           this.isShow = true;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     setConfirm(isConfirm) {
       this.isConfirm = isConfirm;
@@ -298,8 +229,14 @@ export default {
     setDigitPlaces(digitPlaces) {
       this.digitPlaces = digitPlaces;
     },
-    setReadingTools(readingTools) {
-      this.readingTools = getCustomizeStandardsTools(readingTools)
+    setReadingTools(data) {
+      let { readingTools, isNoneDicom } = data
+      if (isNoneDicom) {
+        this.readingTools = getCustomizeStandardsNoneDicomTools(readingTools)
+      } else {
+        this.readingTools = getCustomizeStandardsTools(readingTools)
+      }
+
     },
     setIsClinicalReading(isClinicalReading) {
       this.isClinicalReading = isClinicalReading;
@@ -324,11 +261,9 @@ export default {
       })
         .then((res) => {
           this.$router.push({
-            path: `/trials/trials-panel/setting/reading-unit?trialId=${
-              this.$route.query.trialId
-            }&trialCode=${this.$route.query.trialCode}&researchProgramNo=${
-              this.$route.query.researchProgramNo
-            }&t=${new Date().getTime()}`,
+            path: `/trials/trials-panel/setting/reading-unit?trialId=${this.$route.query.trialId
+              }&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo
+              }&t=${new Date().getTime()}`,
           });
           this.loading = false;
         })
@@ -352,7 +287,7 @@ export default {
               .then(() => {
                 this.updateCriterions();
               })
-              .catch((action) => {});
+              .catch((action) => { });
           } else {
             try {
               var isCheckList = [];
@@ -468,27 +403,27 @@ export default {
                 this.$refs[
                   "readingRules" + this.TrialReadingCriterionId
                 ][0].initPage();
-              } catch (e) {}
+              } catch (e) { }
               try {
                 this.$refs[
                   "readingCriterions" + this.TrialReadingCriterionId
                 ][0].initPage();
-              } catch (e) {}
+              } catch (e) { }
               try {
                 this.$refs[
                   "arbitrationRules" + this.TrialReadingCriterionId
                 ][0].getList();
-              } catch (e) {}
+              } catch (e) { }
               try {
                 this.$refs[
                   "globalReading" + this.TrialReadingCriterionId
                 ][0].initForm();
-              } catch (e) {}
+              } catch (e) { }
               try {
                 this.$refs[
                   "oncologyForm" + this.TrialReadingCriterionId
                 ][0].initForm();
-              } catch (e) {}
+              } catch (e) { }
               this.$refs["signForm"].btnLoading = false;
               this.signVisible = false;
             } catch (e) {
@@ -523,20 +458,25 @@ export default {
   background-color: #fff;
   display: flex;
   flex-direction: column;
+
   .content {
     flex: 1;
     overflow-y: auto;
   }
+
   ::v-deep .el-collapse-item__header {
     background: #e5ecef;
     padding-left: 10px;
   }
+
   ::v-deep .el-tabs--border-card>.el-tabs__content {
     padding: 0px 15px;
   }
+
   ::v-deep .el-collapse-item__content {
     padding: 10px;
   }
+
   .bottom {
     height: 50px;
     display: flex;

From c0aa89c6ca626ac6caad5ee186d57893dbaa2a71 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 16 Oct 2025 15:41:24 +0800
Subject: [PATCH 020/333] =?UTF-8?q?=E8=B0=83=E7=AA=97=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=97=A0=E6=B3=95=E8=BF=9B=E8=A1=8C=E8=B0=83?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomCanvas.vue     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 9cd34006..7065d52c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -1839,6 +1839,9 @@ export default {
       //   console.log(toolName)
       //   cornerstoneTools.setToolPassiveForElement(this.canvas, toolName)
       // })
+      if (toolName === 'Wwwc') {
+        this.isInitWwwc = false
+      }
       this.activeToolName = toolName
       this.$nextTick(() => {
         // console.log(cornerstoneTools.isToolActiveForElement(this.canvas, 'Bidirectional'))

From 5528188a8bd675ad21e34bd2902017cb54090c6d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 16 Oct 2025 18:41:01 +0800
Subject: [PATCH 021/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=A0=87=E8=AE=B0=E7=BB=91=E5=AE=9A=EF=BC=88?=
 =?UTF-8?q?=E5=BE=85=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit-review/components/ReadPage.vue      | 297 +++++++++---------
 1 file changed, 152 insertions(+), 145 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index e99466ee..6eedab56 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -4,29 +4,16 @@
     <div class="left-panel">
       <div class="task-container">
         <div class="task-info">
-          <div
-            v-for="s in visitTaskList"
-            :key="s.VisitTaskId"
-            class="task-item"
-            :class="{'task-item-active': activeTaskVisitId==s.VisitTaskId}"
-
-            @click.prevent="toggleTask(s)"
-          >{{ s.TaskBlindName }}</div>
+          <div v-for="s in visitTaskList" :key="s.VisitTaskId" class="task-item"
+            :class="{ 'task-item-active': activeTaskVisitId == s.VisitTaskId }" @click.prevent="toggleTask(s)">{{
+              s.TaskBlindName }}</div>
         </div>
       </div>
       <div class="study-info">
-        <div
-          v-for="s in visitTaskList"
-          v-show="activeTaskVisitId === s.VisitTaskId"
-          :key="s.VisitTaskId"
-          style="height:100%;"
-        >
-          <study-list
-            v-if="selectArr.includes(s.VisitTaskId) && s.StudyList.length > 0"
-            :ref="s.VisitTaskId"
-            :visit-task-info="s"
-            @selectFile="selectFile"
-          />
+        <div v-for="s in visitTaskList" v-show="activeTaskVisitId === s.VisitTaskId" :key="s.VisitTaskId"
+          style="height:100%;">
+          <study-list v-if="selectArr.includes(s.VisitTaskId) && s.StudyList.length > 0" :ref="s.VisitTaskId"
+            :visit-task-info="s" @selectFile="selectFile" />
 
         </div>
       </div>
@@ -48,65 +35,46 @@
         @toggleTask="toggleTask"
         @toggleImage="toggleImage"
       /> -->
-      <file-viewer
-        ref="fileViewer"
-        :related-study-info="relatedStudyInfo"
-        :ps-arr="psArr"
-        @toggleTaskByViewer="toggleTaskByViewer"
-        @toggleTask="toggleTask"
-        @toggleImage="toggleImage"
-        @previewCD="previewCD"
-        @setPS="setPS"
-      />
+      <file-viewer ref="fileViewer" :related-study-info="relatedStudyInfo" :ps-arr="psArr"
+        @toggleTaskByViewer="toggleTaskByViewer" @toggleTask="toggleTask" @toggleImage="toggleImage"
+        @previewCD="previewCD" @setPS="setPS" />
     </div>
     <!-- 表单 -->
     <div class="right-panel">
-      <div
-        v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo"
-        class="text-info"
-      >
+      <div v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo" class="text-info">
         <h3>
-          <span
-            v-if="currentVisitInfo && currentVisitInfo.SubjectCode"
-          >
+          <span v-if="currentVisitInfo && currentVisitInfo.SubjectCode">
             {{ currentVisitInfo.SubjectCode }}
           </span>
-          <span
-            v-if="currentVisitInfo && currentVisitInfo.TaskBlindName"
-            style="margin-left:5px;"
-          >
+          <span v-if="currentVisitInfo && currentVisitInfo.TaskBlindName" style="margin-left:5px;">
             {{ currentVisitInfo.TaskBlindName }}
           </span>
         </h3>
       </div>
-      <ecrf-list
+      <!-- <ecrf-list
         v-if="currentVisitInfo"
         :visit-task-info="currentVisitInfo"
-      />
+      /> -->
+      <customize-question-list v-if="currentVisitInfo.VisitTaskId" :ref="`ecrf_1`" :reading-task-state="1"
+        :visit-info="currentVisitInfo" @resetAnnotations="resetAnnotations" @setReadingTaskState="setReadingTaskState"
+        @viewCustomAnnotationSeries="viewCustomAnnotationSeries" @getCustomScreenshots="getCustomScreenshots"
+        @setReadingToolActive="setReadingToolActive" @setReadingToolPassive="setReadingToolPassive" />
     </div>
 
-    <el-dialog
-      :visible.sync="clinicalDataVisible"
-      :custom-class="isClinicalDataFullscreen?'full-dialog-container':'dialog-container'"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :fullscreen="isClinicalDataFullscreen"
-    >
+    <el-dialog :visible.sync="clinicalDataVisible"
+      :custom-class="isClinicalDataFullscreen ? 'full-dialog-container' : 'dialog-container'" :show-close="false"
+      :close-on-click-modal="false" :fullscreen="isClinicalDataFullscreen">
       <span slot="title" class="dialog-footer">
         <div style="position: absolute;right: 20px;top: 10px;">
-          <svg-icon :icon-class="isClinicalDataFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen=!isClinicalDataFullscreen" />
-          <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="clinicalDataVisible = false" />
+          <svg-icon :icon-class="isClinicalDataFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+            style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen = !isClinicalDataFullscreen" />
+          <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
+            @click="clinicalDataVisible = false" />
         </div>
       </span>
       <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
-        <clinical-data
-          v-if="clinicalDataVisible"
-          style="flex: 1"
-          :trial-id="trialId"
-          :subject-id="taskInfo.SubjectId"
-          :visit-task-id="cdVisitTaskId"
-          :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
-        />
+        <clinical-data v-if="clinicalDataVisible" style="flex: 1" :trial-id="trialId" :subject-id="taskInfo.SubjectId"
+          :visit-task-id="cdVisitTaskId" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo" />
       </div>
 
     </el-dialog>
@@ -120,6 +88,7 @@ import StudyList from './StudyList'
 // import PdfViewer from './PDFViewer'
 import FileViewer from './FileViewer'
 import EcrfList from './EcrfList'
+import customizeQuestionList from '@/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList'
 import ClinicalData from '@/views/trials/trials-panel/reading/clinical-data'
 import { mapGetters } from 'vuex'
 export default {
@@ -130,7 +99,8 @@ export default {
     // ImageViewer,
     // PdfViewer,
     EcrfList,
-    ClinicalData
+    ClinicalData,
+    customizeQuestionList
   },
   data() {
     return {
@@ -149,7 +119,7 @@ export default {
       selectArr: [],
       fileType: 'image',
       currentStudyInfo: null,
-      currentVisitInfo: null,
+      currentVisitInfo: {},
       relatedStudyInfo: null,
       clinicalDataVisible: false,
       isClinicalDataFullscreen: false,
@@ -180,6 +150,27 @@ export default {
     this.getRelatedTask()
   },
   methods: {
+    resetAnnotations() { },
+    setReadingTaskState() { },
+    viewCustomAnnotationSeries() { },
+    getCustomScreenshots() { },
+    setReadingToolPassive() { },
+    setReadingToolActive(toolName) {
+      if (this.readingTaskState === 2) return
+      if (this.activeTool === toolName) return
+      const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
+      if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
+        const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
+        const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+        if (this.activeTool) {
+          toolGroup.setToolPassive(this.activeTool)
+        }
+        toolGroup.setToolActive(toolName, {
+          bindings: [{ mouseButton: MouseBindings.Primary }]
+        })
+        this.activeTool = toolName
+      }
+    },
     // 获取关联任务信息
     async getRelatedTask() {
       this.loading = true
@@ -232,7 +223,7 @@ export default {
     },
     // 获取任务关联的文件信息
     getReadingImageFile(visitTaskId, visitTaskIdx) {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         this.loading = true
         try {
           const params = {
@@ -253,7 +244,7 @@ export default {
     },
     // 获取任务关联的标注信息
     getAnnotations(visitTaskId, visitTaskIdx) {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         this.loading = true
         try {
           const params = {
@@ -337,98 +328,114 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .read-page-container {
-    box-sizing: border-box;
-    height: 100%;
+.read-page-container {
+  box-sizing: border-box;
+  height: 100%;
+  display: flex;
+
+  ::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+
+  .left-panel {
     display: flex;
+    width: 200px;
+    border: 1px solid #727272;
+    color: #fff;
+
     ::-webkit-scrollbar {
-      width: 5px;
-      height: 5px;
+      width: 3px;
+      height: 3px;
     }
+
     ::-webkit-scrollbar-thumb {
       border-radius: 10px;
       background: #d0d0d0;
     }
-    .left-panel {
-      display: flex;
-      width: 200px;
-      border: 1px solid #727272;
-      color: #fff;
-      ::-webkit-scrollbar {
-        width: 3px;
-        height: 3px;
-      }
-      ::-webkit-scrollbar-thumb {
-        border-radius: 10px;
-        background: #d0d0d0;
-      }
-      .task-container {
-        position: relative;
-        width: 25px;
-        overflow-y: auto;
-      }
-      .task-info {
-        position: absolute;
-        top: 5px;
-        right: 20px;
-        transform-origin: right top;
-        transform: rotate(-90deg);
-        display: flex;
-        .task-item {
-          margin-left: 10px;
-          white-space: nowrap;
-          padding: 0px  4px;
-          border: 1px solid #999999;
-          border-bottom:none ;
-          text-align: center;
-          background-color: #4e4e4e;
-          color: #d5d5d5;
-          cursor: pointer;
-        }
-        .task-item-active {
-          background-color: #607d8b;
-          border: 1px solid #607d8b;
-        }
-      }
-      .study-info {
-        width: 170px;
-        border-left: 1px solid #727272;
-      }
-    }
-    .middle-panel {
-      flex: 1;
-      border: 1px solid #727272;
-      margin: 0 5px;
-    }
-    .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;
-      }
-    }
-    ::v-deep .dialog-container{
-      margin-top: 50px !important;
-      width:75%;
-      height:80%;
-    }
-    ::v-deep .el-dialog__body{
-        padding: 20px 20px 0 20px;
-        height: calc(100% - 70px);
-      }
-    .el-dialog__header{
+
+    .task-container {
       position: relative;
+      width: 25px;
+      overflow-y: auto;
     }
-    .full-dialog-container{
-      ::v-deep .is-fullscreen .el-dialog__body{
-        height: calc(100% - 70px);
+
+    .task-info {
+      position: absolute;
+      top: 5px;
+      right: 20px;
+      transform-origin: right top;
+      transform: rotate(-90deg);
+      display: flex;
+
+      .task-item {
+        margin-left: 10px;
+        white-space: nowrap;
+        padding: 0px 4px;
+        border: 1px solid #999999;
+        border-bottom: none;
+        text-align: center;
+        background-color: #4e4e4e;
+        color: #d5d5d5;
+        cursor: pointer;
       }
+
+      .task-item-active {
+        background-color: #607d8b;
+        border: 1px solid #607d8b;
+      }
+    }
+
+    .study-info {
+      width: 170px;
+      border-left: 1px solid #727272;
     }
   }
 
+  .middle-panel {
+    flex: 1;
+    border: 1px solid #727272;
+    margin: 0 5px;
+  }
+
+  .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;
+    }
+  }
+
+  ::v-deep .dialog-container {
+    margin-top: 50px !important;
+    width: 75%;
+    height: 80%;
+  }
+
+  ::v-deep .el-dialog__body {
+    padding: 20px 20px 0 20px;
+    height: calc(100% - 70px);
+  }
+
+  .el-dialog__header {
+    position: relative;
+  }
+
+  .full-dialog-container {
+    ::v-deep .is-fullscreen .el-dialog__body {
+      height: calc(100% - 70px);
+    }
+  }
+}
 </style>

From 7c79e4b1f35065fa8c9c64be83ed704dc27a1ebf Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 17 Oct 2025 10:00:11 +0800
Subject: [PATCH 022/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E7=94=B3=E5=8A=9E=E6=96=B9=E5=92=8C?=
 =?UTF-8?q?CRO=E9=80=89=E6=8B=A9=E5=90=8E=E6=97=A0=E6=B3=95=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-list/components/TrialForm.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue
index e3c252ed..4c631c6e 100644
--- a/src/views/trials/trials-list/components/TrialForm.vue
+++ b/src/views/trials/trials-list/components/TrialForm.vue
@@ -82,6 +82,7 @@
           filterable
           allow-create
           default-first-option
+          clearable
           @change="(value) => handleSelectChange(value, 'sponsor')"
           @visible-change="
             (flag) => handleSelectVisibbleChange(flag, 'sponsor')
@@ -102,6 +103,7 @@
           filterable
           allow-create
           default-first-option
+          clearable
           @change="(value) => handleSelectChange(value, 'cro')"
           @visible-change="(flag) => handleSelectVisibbleChange(flag, 'cro')"
         >

From b7f113c109a5b2559ceacff8ebc2de8d540b0248 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 17 Oct 2025 10:03:48 +0800
Subject: [PATCH 023/333] =?UTF-8?q?=E3=80=90Lugano2014=20no=20pet=E3=80=91?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E6=8A=A5=E5=91=8A=E6=95=B4=E4=BD=93=E8=82=BF?=
 =?UTF-8?q?=E7=98=A4=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E5=9C=A8=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E9=98=85=E7=89=87=E6=97=B6=E6=9C=89=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=BC=A0=E6=A0=87=E6=82=AC=E6=B5=AE=E5=9C=A8=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8A=E6=97=B6=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BF=AE=E6=94=B9=E7=9A=84=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/ReportPage.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 575a62cf..3b00b25a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -145,7 +145,7 @@
                   <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">
+                <template v-else-if="scope.row.QuestionType === 13 || scope.row.QuestionType === 42 || scope.row.QuestionType === 39">
                   <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">

From 2c567e353076ff16d44607998f7ce795829ce9a7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 17 Oct 2025 13:58:58 +0800
Subject: [PATCH 024/333] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8F=97=E8=AE=AD=E4=BA=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/attachment-management/index.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/attachments/attachment-management/index.vue b/src/views/trials/trials-panel/attachments/attachment-management/index.vue
index 62993b37..58c3b5e7 100644
--- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue
+++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue
@@ -39,7 +39,22 @@
           <el-input v-model="searchData.Name" clearable style="width: 120px" />
         </el-form-item>
         <!-- 签署人 -->
-        <el-form-item :label="$t('trials:signRecords:table:user')" v-if="!isDoc">
+        <el-form-item :label="$t('trials:signRecords:table:user')" v-if="!isSystem">
+          <el-select v-model="searchData.UserId" clearable filterable style="width: 140px">
+            <el-option v-for="item of userOptions" :key="item.UserId" :label="item.RealName" :value="item.UserId">
+              <span style="float: left">{{ item.RealName || item.FullName }}</span>
+              <span style="
+                  float: right;
+                  color: #8492a6;
+                  font-size: 13px;
+                  margin-left: 5px;
+                ">
+                {{ item.UserName }}
+              </span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('trials:signRecords:table:user')" v-else-if="!isDoc">
           <el-select v-model="searchData.UserId" clearable filterable style="width: 140px">
             <el-option v-for="item of userOptions" :key="item.ConfirmUserId" :label="item.FullName"
               :value="item.ConfirmUserId">

From 0f6da34395692007ce4c2f1551b2ca03a445e388 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 17 Oct 2025 15:14:15 +0800
Subject: [PATCH 025/333] 1

---
 .../trials-list/components/TrialForm.vue      | 263 ++++--------------
 1 file changed, 53 insertions(+), 210 deletions(-)

diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue
index 4c631c6e..020940bf 100644
--- a/src/views/trials/trials-list/components/TrialForm.vue
+++ b/src/views/trials/trials-list/components/TrialForm.vue
@@ -1,72 +1,33 @@
 <!-- eslint-disable -->
 <template>
-  <el-form
-    ref="trialForm"
-    v-loading="loading"
-    label-width="250px"
-    :rules="trialFormRules"
-    class="demo-ruleForm trial-Form"
-    :model="trialForm"
-    label-position="right"
-    :inline="true"
-  >
+  <el-form ref="trialForm" v-loading="loading" label-width="250px" :rules="trialFormRules"
+    class="demo-ruleForm trial-Form" :model="trialForm" label-position="right" :inline="true">
     <el-row>
       <!-- 项目编号 -->
-      <el-form-item
-        v-if="trialForm.Id !== ''"
-        :label="$t('trials:trials-list:form:trialId')"
-        prop="TrialCode"
-      >
-        <el-input
-          v-model="trialForm.TrialCode"
-          @keyup.native="trialCodekeyUp"
-        />
+      <el-form-item v-if="trialForm.Id !== ''" :label="$t('trials:trials-list:form:trialId')" prop="TrialCode">
+        <el-input v-model="trialForm.TrialCode" @keyup.native="trialCodekeyUp" />
       </el-form-item>
       <!-- 项目类型 -->
-      <el-form-item
-        :label="$t('trials:trials-list:form:trialType')"
-        prop="TrialType"
-      >
-        <el-radio-group
-          v-model="trialForm.TrialType"
-          :disabled="trialForm.Id !== ''"
-        >
-          <el-radio
-            v-for="item of $d.TrialType"
-            :disabled="isTestUser && (item.value === 1 || item.value === 2)"
-            :key="item.id"
-            :label="item.value"
-            >{{ item.label }}</el-radio
-          >
+      <el-form-item :label="$t('trials:trials-list:form:trialType')" prop="TrialType">
+        <el-radio-group v-model="trialForm.TrialType" :disabled="trialForm.Id !== ''">
+          <el-radio v-for="item of $d.TrialType" :disabled="isTestUser && (item.value === 1 || item.value === 2)"
+            :key="item.id" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
     </el-row>
     <el-row>
       <!-- 试验名称 -->
-      <el-form-item
-        :label="$t('trials:trials-list:form:experimentName')"
-        prop="ExperimentName"
-      >
-        <el-input
-          v-model="trialForm.ExperimentName"
-          type="textarea"
-          :autosize="{ minRows: 1, maxRows: 4 }"
-        />
+      <el-form-item :label="$t('trials:trials-list:form:experimentName')" prop="ExperimentName">
+        <el-input v-model="trialForm.ExperimentName" type="textarea" :autosize="{ minRows: 1, maxRows: 4 }" />
       </el-form-item>
       <!-- 研究方案号 -->
-      <el-form-item
-        :label="$t('trials:trials-list:form:researchNumber')"
-        prop="ResearchProgramNo"
-      >
+      <el-form-item :label="$t('trials:trials-list:form:researchNumber')" prop="ResearchProgramNo">
         <el-input v-model="trialForm.ResearchProgramNo" />
       </el-form-item>
     </el-row>
     <el-row>
       <!-- 主研单位 -->
-      <el-form-item
-        :label="$t('trials:trials-list:form:researchUnit')"
-        prop="MainResearchUnit"
-      >
+      <el-form-item :label="$t('trials:trials-list:form:researchUnit')" prop="MainResearchUnit">
         <el-input v-model="trialForm.MainResearchUnit" />
       </el-form-item>
       <!-- 负责人PI -->
@@ -77,65 +38,28 @@
     <el-row>
       <!-- 申办方 -->
       <el-form-item :label="$t('trials:trials-list:form:sponsor')">
-        <el-select
-          v-model="trialForm.SponsorId"
-          filterable
-          allow-create
-          default-first-option
-          clearable
-          @change="(value) => handleSelectChange(value, 'sponsor')"
-          @visible-change="
+        <el-select v-model="trialForm.SponsorId" filterable allow-create default-first-option clearable
+          @change="(value) => handleSelectChange(value, 'sponsor')" @visible-change="
             (flag) => handleSelectVisibbleChange(flag, 'sponsor')
-          "
-        >
-          <el-option
-            v-for="item in sponsorList"
-            :key="item.Id"
-            :label="item.SponsorName"
-            :value="item.Id"
-          />
+          ">
+          <el-option v-for="item in sponsorList" :key="item.Id" :label="item.SponsorName" :value="item.Id" />
         </el-select>
       </el-form-item>
       <!-- CRO -->
       <el-form-item :label="$t('trials:trials-list:form:cro')">
-        <el-select
-          v-model="trialForm.CROId"
-          filterable
-          allow-create
-          default-first-option
-          clearable
+        <el-select v-model="trialForm.CROId" filterable allow-create default-first-option clearable
           @change="(value) => handleSelectChange(value, 'cro')"
-          @visible-change="(flag) => handleSelectVisibbleChange(flag, 'cro')"
-        >
-          <el-option
-            v-for="item of croList"
-            :key="item.Id"
-            :label="item.CROName"
-            :value="item.Id"
-          />
+          @visible-change="(flag) => handleSelectVisibbleChange(flag, 'cro')">
+          <el-option v-for="item of croList" :key="item.Id" :label="item.CROName" :value="item.Id" />
         </el-select>
       </el-form-item>
     </el-row>
     <el-row>
       <!-- DeclarationType -->
-      <el-form-item
-        :label="$t('trials:trials-list:form:declarationType')"
-        prop="DeclarationTypeEnumList"
-      >
-        <el-select
-          v-model="trialForm.DeclarationTypeEnumList"
-          size="small"
-          multiple
-          clearable
-          @change="handleDeclarationTypeChange"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item of $d.DeclarationType"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
+      <el-form-item :label="$t('trials:trials-list:form:declarationType')" prop="DeclarationTypeEnumList">
+        <el-select v-model="trialForm.DeclarationTypeEnumList" size="small" multiple clearable
+          @change="handleDeclarationTypeChange" style="width: 100%">
+          <el-option v-for="item of $d.DeclarationType" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
       <!-- Phase -->
@@ -147,79 +71,41 @@
             :label="item.Value"
             :value="item.Id"
           /> -->
-          <el-option
-            v-for="item of $d.Trial_Phase"
-            :key="item.id"
-            :label="item.label"
-            :value="item.id"
-          />
+          <el-option v-for="item of $d.Trial_Phase" :key="item.id" :label="item.label" :value="item.id" />
         </el-select>
       </el-form-item>
     </el-row>
     <el-row>
       <!-- 适应症类型 IndicationType -->
-      <el-form-item
-        :label="$t('trials:trials-list:form:indicationType')"
-        prop="IndicationTypeId"
-      >
-        <el-select
-          v-model="trialForm.IndicationTypeId"
-          @change="handleIndicationTypeChange"
-        >
+      <el-form-item :label="$t('trials:trials-list:form:indicationType')" prop="IndicationTypeId">
+        <el-select v-model="trialForm.IndicationTypeId" @change="handleIndicationTypeChange">
           <!-- <el-option
             v-for="item of dictionaryList.IndicationType"
             :key="item.Id"
             :label="item.Value"
             :value="item.Id"
           /> -->
-          <el-option
-            v-for="item of $d.IndicationType"
-            :key="item.id"
-            :label="item.label"
-            :value="item.id"
-          />
+          <el-option v-for="item of $d.IndicationType" :key="item.id" :label="item.label" :value="item.id" />
         </el-select>
       </el-form-item>
       <!-- Indication -->
-      <el-form-item
-        :label="$t('trials:trials-list:form:indication')"
-        prop="IndicationEnum"
-      >
+      <el-form-item :label="$t('trials:trials-list:form:indication')" prop="IndicationEnum">
         <!--        <el-input v-model="trialForm.Indication" />-->
-        <el-select
-          :disabled="!trialForm.IndicationTypeId"
-          v-if="![37, 38, 39].includes(trialForm.IndicationEnum)"
-          v-model="trialForm.IndicationEnum"
-        >
-          <el-option
-            v-for="item of $d.Indication"
-            v-show="indicationGrouping === item.raw.ChildGroup"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select :disabled="!trialForm.IndicationTypeId" v-if="![37, 38, 39].includes(trialForm.IndicationEnum)"
+          v-model="trialForm.IndicationEnum">
+          <el-option v-for="item of $d.Indication" v-show="indicationGrouping === item.raw.ChildGroup" :key="item.id"
+            :label="item.label" :value="item.value" />
         </el-select>
         <el-row v-if="[37, 38, 39].includes(trialForm.IndicationEnum)">
           <el-col :span="12">
-            <el-select
-              :disabled="!trialForm.IndicationTypeId"
-              v-model="trialForm.IndicationEnum"
-              style="width: 100%; margin-right: 10px"
-            >
-              <el-option
-                v-for="item of $d.Indication"
-                v-show="indicationGrouping === item.raw.ChildGroup"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select :disabled="!trialForm.IndicationTypeId" v-model="trialForm.IndicationEnum"
+              style="width: 100%; margin-right: 10px">
+              <el-option v-for="item of $d.Indication" v-show="indicationGrouping === item.raw.ChildGroup"
+                :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-col>
           <el-col :span="12">
-            <el-input
-              :disabled="!trialForm.IndicationTypeId"
-              v-model="trialForm.Indication"
-            />
+            <el-input :disabled="!trialForm.IndicationTypeId" v-model="trialForm.Indication" />
           </el-col>
         </el-row>
       </el-form-item>
@@ -234,99 +120,54 @@
             :label="item.Value"
             :value="item.Id"
           /> -->
-          <el-option
-            v-for="item of $d.Modality"
-            :key="item.id"
-            :label="item.label"
-            :value="item.id"
-          />
+          <el-option v-for="item of $d.Modality" :key="item.id" :label="item.label" :value="item.id" />
         </el-select>
       </el-form-item>
       <!-- Sites -->
       <el-form-item :label="$t('trials:trials-list:form:siteCount')">
-        <el-input-number
-          v-model="trialForm.PlanSiteCount"
-          controls-position="right"
-          :min="0"
-        />
+        <el-input-number v-model="trialForm.PlanSiteCount" controls-position="right" :min="0" />
       </el-form-item>
     </el-row>
     <el-row>
       <!-- Expected Patients Num -->
       <el-form-item :label="$t('trials:trials-list:form:patientsNum')">
-        <el-input-number
-          v-model="trialForm.ExpectedPatients"
-          controls-position="right"
-          :min="0"
-          @change="handleExpectedPatientsChange"
-        />
+        <el-input-number v-model="trialForm.ExpectedPatients" controls-position="right" :min="0"
+          @change="handleExpectedPatientsChange" />
       </el-form-item>
       <!-- Timepoints Per Patient -->
       <el-form-item :label="$t('trials:trials-list:form:timePointsPerPatient')">
-        <el-input-number
-          v-model="trialForm.TimePointsPerPatient"
-          controls-position="right"
-          :min="0"
-          @change="handleTpPerPatientChange"
-        />
+        <el-input-number v-model="trialForm.TimePointsPerPatient" controls-position="right" :min="0"
+          @change="handleTpPerPatientChange" />
       </el-form-item>
     </el-row>
     <el-row>
       <!-- Visits -->
       <el-form-item :label="$t('trials:trials-list:form:visitCount')">
-        <el-input-number
-          v-model="trialForm.PlanVisitCount"
-          controls-position="right"
-          :min="0"
-        />
+        <el-input-number v-model="trialForm.PlanVisitCount" controls-position="right" :min="0" />
       </el-form-item>
     </el-row>
     <el-row>
       <!-- Expedited -->
-      <el-form-item
-        :label="$t('trials:trials-list:form:expedited')"
-        prop="Expedited"
-      >
+      <el-form-item :label="$t('trials:trials-list:form:expedited')" prop="Expedited">
         <el-select v-model="trialForm.Expedited">
-          <el-option
-            v-for="item in expeditedOption"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in expeditedOption" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <!-- Turnaround Time -->
-      <el-form-item
-        :label="$t('trials:trials-list:form:projectCycle')"
-        prop="ProjectCycle"
-      >
+      <el-form-item :label="$t('trials:trials-list:form:projectCycle')" prop="ProjectCycle">
         <el-input v-model="trialForm.ProjectCycle" />
       </el-form-item>
     </el-row>
     <el-row>
       <!-- Total Reviewers -->
       <el-form-item :label="$t('trials:trials-list:form:totalReviewers')">
-        <el-input-number
-          v-model="trialForm.TotalReviewers"
-          controls-position="right"
-          :min="0"
-        />
+        <el-input-number v-model="trialForm.TotalReviewers" controls-position="right" :min="0" />
       </el-form-item>
       <!-- Type of Reviewers -->
       <el-form-item :label="$t('trials:trials-list:form:typeofReviewers')">
-        <el-select
-          v-model="trialForm.AttendedReviewerTypeEnumList"
-          size="small"
-          multiple
-          clearable
-        >
-          <el-option
-            v-for="item of $d.AttendedReviewerType"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
+        <el-select v-model="trialForm.AttendedReviewerTypeEnumList" size="small" multiple clearable>
+          <el-option v-for="item of $d.AttendedReviewerType" :key="item.value" :value="item.value"
+            :label="item.label" />
         </el-select>
         <!--        <el-row v-if="trialForm.AttendedReviewerTypeEnumList.includes(2)">-->
         <!--          <el-col :span="12">-->
@@ -559,6 +400,7 @@ export default {
     },
     // 申办方与CRO新增
     async handleSelectChange(value, key) {
+      if (!value) return false
       let arr = key == "sponsor" ? this.sponsorList : this.croList;
       let has = arr.some((item) => item.Id === value);
       if (!has) {
@@ -790,6 +632,7 @@ export default {
 .trial-Form .el-textarea {
   width: 340px;
 }
+
 .trial-Form .el-col .el-input {
   width: 165px;
   margin-right: 10px;

From 02a5e2fdc24e3fee92efe99c4dc87d36523387d1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Oct 2025 14:59:58 +0800
Subject: [PATCH 026/333] =?UTF-8?q?MFA=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=8C=81=E4=B9=85=E7=AE=A1=E7=90=86=E5=92=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                 |  1 +
 src/components/MFA/index.vue | 63 ++++++++++++++++--------------------
 src/utils/fingerprint.js     | 32 ++++++++++++++++++
 src/utils/request.js         |  3 ++
 4 files changed, 63 insertions(+), 36 deletions(-)
 create mode 100644 src/utils/fingerprint.js

diff --git a/package.json b/package.json
index 7e12deeb..87726183 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "@cornerstonejs/core": "^2.19.7",
     "@cornerstonejs/dicom-image-loader": "^2.19.7",
     "@cornerstonejs/tools": "^2.19.7",
+    "@fingerprintjs/fingerprintjs": "^4.6.2",
     "@icr/polyseg-wasm": "^0.4.0",
     "@microsoft/signalr": "^8.0.7",
     "@riophae/vue-treeselect": "^0.4.0",
diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index dcbd7f1d..b5b2186d 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -1,25 +1,11 @@
 <template>
   <!--MFA-->
-  <el-dialog
-    v-if="visible"
-    :visible.sync="visible"
-    width="540px"
-    :close-on-click-modal="false"
-    append-to-body
-    center
-    :show-close="status === 'login'"
-    @close="cancel"
-  >
+  <el-dialog v-if="visible" :visible.sync="visible" width="540px" :close-on-click-modal="false" append-to-body center
+    :show-close="status === 'login'" @close="cancel">
     <div slot="title">
       {{ status === "login" ? $t("mfa:title") : $t("mfa:lock:title") }}
     </div>
-    <el-form
-      ref="mfaForm"
-      label-position="right"
-      :model="form"
-      :rules="rules"
-      label-width="100px"
-    >
+    <el-form ref="mfaForm" label-position="right" :model="form" :rules="rules" label-width="100px">
       <!-- 邮箱 -->
       <p class="tip_mfa">
         <i class="el-icon-warning" style="color: #409eff"></i>
@@ -31,18 +17,11 @@
       </el-form-item>
       <!-- 验证码 -->
       <el-form-item :label="$t('mfa:form:MFACode')" prop="Code">
-        <el-input
-          :placeholder="$t('mfa:form:input:placeholder:Codes')"
-          v-model="form.Code"
-          style="width: 240px; margin-right: 10px"
-        />
-        <el-button
-          type="primary"
-          size="small"
-          @click.stop="sendMFACode"
-          :disabled="flag || sendFlag"
-          >{{ flag ? `${second}s` : $t("mfa:form:sendMFACode") }}</el-button
-        >
+        <el-input :placeholder="$t('mfa:form:input:placeholder:Codes')" v-model="form.Code"
+          style="width: 200px; margin-right: 10px" />
+        <el-button type="primary" size="small" @click.stop="sendMFACode" :disabled="flag || sendFlag"
+          style="float: right;margin-right: 35px;">{{ flag ?
+            `${second}s ${$t("mfa:form:sendMFACodeCountDown")}` : $t("mfa:form:sendMFACode") }}</el-button>
       </el-form-item>
     </el-form>
     <div slot="footer">
@@ -51,19 +30,16 @@
         {{ $t("mfa:button:cancel") }}
       </el-button> -->
       <!-- 保存 -->
-      <el-button
-        type="primary"
-        size="small"
-        @click="save"
-        :loading="loading"
-        style="width: 80%"
-      >
+      <el-button type="primary" size="small" @click="save" :loading="loading" style="width: 80%">
         {{
           status === "login"
             ? $t("mfa:button:save")
             : $t("mfa:lock:button:save")
         }}
       </el-button>
+      <p style="text-align: left;font-size: 14px;margin:10px auto;width: 80%;">
+        <el-checkbox v-model="form.isRemember" /><span style="margin-left: 10px;">{{ $t("mfa:tip:noLogin") }}</span>
+      </p>
     </div>
   </el-dialog>
 </template>
@@ -86,6 +62,7 @@ export default {
         IdentityUserId: null,
         EMail: null,
         username: null,
+        isRemember: true
       },
       rules: {
         Code: [
@@ -112,6 +89,18 @@ export default {
       },
     };
   },
+  mounted() {
+    this.flag = true;
+    this.second = 60;
+    this.timer = setInterval(() => {
+      this.second--;
+      if (this.second <= 0) {
+        this.flag = false;
+        clearInterval(this.timer);
+        this.timer = null;
+      }
+    }, 1000);
+  },
   methods: {
     open(data) {
       let { UserId, status, username, EMail } = data;
@@ -198,10 +187,12 @@ export default {
   line-height: 30px;
   border-radius: 5px;
   background-color: #eee;
+
   i {
     margin-right: 5px;
   }
 }
+
 ::v-deep .el-dialog__header {
   font-weight: bold;
 }
diff --git a/src/utils/fingerprint.js b/src/utils/fingerprint.js
new file mode 100644
index 00000000..e5a787bd
--- /dev/null
+++ b/src/utils/fingerprint.js
@@ -0,0 +1,32 @@
+import FingerprintJS from '@fingerprintjs/fingerprintjs';
+
+export const customAgent = () => {
+    return new Promise(async resolve => {
+        const fpPromise = await FingerprintJS.load({
+            monitoring: false
+        });
+        const result = await fpPromise.get({
+            products: ['fonts', 'screen', 'canvas'],
+            extendedData: true,
+            debug: false
+        })
+        // const filteredComponents = Object.fromEntries(
+        //     Object.entries(result.components)
+        //         .filter(([key, value]) => value.confidence > 0.5)
+        // );
+
+        resolve({
+            ...result,
+        });
+        // fpPromise
+        //     .then(fp => fp.get({
+        //         products: ['fonts', 'screen', 'canvas'],
+        //         extendedData: true,
+        //         debug: true
+        //     }))
+        //     .then(result => {
+        //         // 自定义数据转换
+
+        //     });
+    });
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index aaa72459..dba4f357 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,6 +5,7 @@ import router from '@/router'
 import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
 import { encryptConfig } from "@/utils/encrypt"
+import { customAgent } from './fingerprint'
 const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
@@ -26,6 +27,8 @@ service.interceptors.request.use(
     var language = zzSessionStorage.getItem('lang')
     config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
     config.headers['TimeZoneId'] = moment.tz.guess()
+    let fingerprint = await customAgent()
+    config.headers['BrowserFingerprint'] = fingerprint.visitorId
     if (config.ENCRYPT) {
       try {
         config = await encryptConfig(config)

From 2a27e1fbae777c833920fbde5becf814df058ca4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 11:38:35 +0800
Subject: [PATCH 027/333] =?UTF-8?q?=E3=80=90Lugano2014=20=E6=97=A0pet?=
 =?UTF-8?q?=E3=80=91=E6=8A=A5=E5=91=8A=E9=A1=B5=E7=9A=84=E6=95=B4=E4=BD=93?=
 =?UTF-8?q?=E8=82=BF=E7=98=A4=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/ReportPage.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 3b00b25a..86def2af 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -67,7 +67,7 @@
               <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)">
+                  v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13, 14, 15, 39, 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"
@@ -78,7 +78,7 @@
                   </template>
                   <!-- 整体肿瘤评估（非基线可修改） -->
                   <template
-                    v-else-if="!task.IsBaseLine && (scope.row.QuestionType === 13 || scope.row.QuestionType === 42 || (scope.row.QuestionType === 36 && CriterionType === 18))">
+                    v-else-if="!task.IsBaseLine && (scope.row.QuestionType === 13 || scope.row.QuestionType === 42 || (scope.row.QuestionType === 39 && CriterionType === 18))">
                     <el-select v-if="scope.row.Type === 'select' && scope.row.DictionaryCode"
                       v-model="currentEvaluateResult" size="mini" @change="handleEvaluateResultChange">
                       <template v-if="CriterionType === 1 && tLesionCount">
@@ -541,7 +541,7 @@ export default {
               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) {
+            if (item.QuestionType === 13 || item.QuestionType === 42 || item.QuestionType === 39) {
               this.currentEvaluateResult = obj.Answers[this.visitTaskId]
               this.answerArr.push({ id: item.QuestionId, answer: obj.Answers[this.visitTaskId], questionType: item.QuestionType })
             }
@@ -583,7 +583,7 @@ export default {
       }
       this.currentTaskReason = ''
       this.evaluateReasonChange('')
-      var idx = this.answerArr.findIndex(i => i.questionType === 13 || i.questionType === 42)
+      var idx = this.answerArr.findIndex(i => i.questionType === 13 || i.questionType === 42 || i.questionType === 39)
       if (idx > -1) {
         this.answerArr[idx].answer = val
       }

From 7f48e3777976074100794b709be5f33ca682928d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 11:48:41 +0800
Subject: [PATCH 028/333] 1

---
 .../LuganoWithoutPET/QuestionForm.vue         |   4 +-
 .../LuganoWithoutPET/QuestionList.vue         |   8 +-
 .../reading/dicoms/components/Questions.vue   | 173 ++++++++++--------
 3 files changed, 99 insertions(+), 86 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index 5b13de71..9a90d9a3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -272,7 +272,7 @@
   </el-form>
 </template>
 <script>
-import { submitTableQuestion, deleteReadingRowAnswer, getIsSuvMaxLesion } from '@/api/trials'
+import { submitTableQuestion, deleteReadingRowAnswer, getIsSuvMaxLesionNoPet } from '@/api/trials'
 // import { uploadPrintscreen } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -1737,7 +1737,7 @@ export default {
       // 判断该病灶的suvmax是否是最大的
       const suvMax = this.getQuestionVal(20)
       if (this.questionForm.RowId && !!suvMax) {
-        const res = await getIsSuvMaxLesion({ visitTaskId: this.visitTaskId, rowId: this.questionForm.RowId })
+        const res = await getIsSuvMaxLesionNoPet({ visitTaskId: this.visitTaskId, rowId: this.questionForm.RowId })
         if (res.IsSuccess && res.Result.IsSuvMaxLesion) {
           message = this.$t('trials:reading:warnning:msg58')
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
index 97eeacd3..94e0ecfc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
@@ -225,7 +225,7 @@
   </div>
 </template>
 <script>
-import { splitLesion, getSplitPPdSum, getCanMergeLesion, mergeLesion } from '@/api/trials'
+import { splitLesion, getSplitPPdSumNoPet, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -343,7 +343,7 @@ export default {
       })
     })
     DicomEvent.$on('refreshSplitTargetLesionPDD', async(callback) => {
-      const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+      const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
       this.splitTargetLesions = res.Result
       if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
         this.splitTargetLesions.map(i => {
@@ -397,7 +397,7 @@ export default {
           loading.close()
         }
         if (!this.isBaseLineTask) {
-          const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+          const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
           this.splitTargetLesions = res.Result
         }
         this.questions = this.visitTaskList[i].ReadingQuestions
@@ -540,7 +540,7 @@ export default {
               this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
             }
             if (!this.isBaseLineTask) {
-              const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+              const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
               this.splitTargetLesions = res.Result
             }
             this.getTableQuestions()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 765505d2..a465a15a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -1,27 +1,17 @@
 <template>
   <div v-loading="loading" class="ecrf-wrapper">
-    <el-form
-      v-if="questions.length > 0"
-      ref="questions"
-      size="small"
-      :model="questionForm"
-    >
-      <QuestionItem
-        v-for="question of questions"
-        :key="question.Id"
-        :question="question"
-        :question-form="questionForm"
-        :reading-task-state="readingTaskState"
-        :is-first-change-task="isFirstChangeTask"
-        :visit-task-id="visitTaskId"
-        @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData"
-      />
+    <el-form v-if="questions.length > 0" ref="questions" size="small" :model="questionForm">
+      <QuestionItem v-for="question of questions" :key="question.Id" :question="question" :question-form="questionForm"
+        :reading-task-state="readingTaskState" :is-first-change-task="isFirstChangeTask" :visit-task-id="visitTaskId"
+        @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
 
       <el-form-item v-if="readingTaskState < 2 && !isFirstChangeTask">
         <div class="ecrf-footer">
-          <i v-if="groupClassify === null || groupClassify === 1" class="el-icon-warning feedback-icon" @click="openFeedBackTable" :style="{color: isExistUnprocessedFeedback ? '#ffeb3b' : '#fff'}"/>
-          <el-button size="mini" :disabled="!questionFormChangeState || (!formChanged && groupClassify > 0)" :type="questionFormChangeState || (!formChanged && groupClassify > 0) ? 'primary' : null" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+          <i v-if="groupClassify === null || groupClassify === 1" class="el-icon-warning feedback-icon"
+            @click="openFeedBackTable" :style="{ color: isExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }" />
+          <el-button size="mini" :disabled="!questionFormChangeState || (!formChanged && groupClassify > 0)"
+            :type="questionFormChangeState || (!formChanged && groupClassify > 0) ? 'primary' : null"
+            @click="handleSave">{{ $t('common:button:save') }}</el-button>
         </div>
       </el-form-item>
     </el-form>
@@ -31,7 +21,7 @@
 
 <script>
 // import { uploadPrintscreen } from '@/api/reading'
-import { saveTaskQuestion, getSplenicState, getSplenicVerify, getCanChooseNotMerge, getDicomReadingQuestionAnswer } from '@/api/trials'
+import { saveTaskQuestion, getSplenicState, getSplenicStateNoPet, getSplenicVerify, getSplenicVerifyNoPet, getCanChooseNotMerge, getCanChooseNotMergeNoPet, getDicomReadingQuestionAnswer } from '@/api/trials'
 import { setSkipReadingCache } from '@/api/reading'
 import QuestionItem from './QuestionItem'
 import DicomEvent from './DicomEvent'
@@ -169,8 +159,14 @@ export default {
             this.measurements.push(i)
           })
           if (isChangeVisitTask || isRefresh) {
-            const { Result } = await getSplenicVerify(visitTaskId)
-            this.spleenInfo = Result
+            if (this.criterionType === 18) {
+              const { Result } = await getSplenicVerifyNoPet(visitTaskId)
+              this.spleenInfo = Result
+            } else {
+              const { Result } = await getSplenicVerify(visitTaskId)
+              this.spleenInfo = Result
+            }
+
           }
         }
 
@@ -271,10 +267,10 @@ export default {
     },
 
     handleSave() {
-      this.$refs['questions'].validate(async(valid) => {
+      this.$refs['questions'].validate(async (valid) => {
         if (!valid) return
         // lugano标准校验脾脏状态是否符合要求
-        if (this.criterionType === 2 && this.groupClassify === 3) {
+        if ((this.criterionType === 2 || this.criterionType === 18) && this.groupClassify === 3) {
           // 是否有标记未保存
           var existUnSave = this.checkAnnotationStatus(this.questions)
           if (existUnSave) {
@@ -291,28 +287,34 @@ export default {
           if (currentSpleenLength && currentSpleenStatus === 5) {
             // '脾脏状态为不可评估，不需要添加标记!'
             this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
-              callback: _ => {}
+              callback: _ => { }
             })
           } else if (currentSpleenStatus === 5 && ((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData))) {
             // 若有标记，状态不可为“无法评估”
             this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
-              callback: _ => {}
+              callback: _ => { }
             })
           } else if (((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData)) && !currentSpleenLength) {
             this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
-              callback: _ => {}
+              callback: _ => { }
             })
           } else {
             this.saveQuestionsList()
           }
-        } else if (this.criterionType === 2 && this.groupClassify === 1 && this.questionForm[this.imageQualityIssuesId] && parseInt(this.questionForm[this.imageQualityIssuesId]) === 6) {
+        } else if ((this.criterionType === 2 || this.criterionType === 18) && this.groupClassify === 1 && this.questionForm[this.imageQualityIssuesId] && parseInt(this.questionForm[this.imageQualityIssuesId]) === 6) {
           // 保存影响质量问题分组，如果质量问题为PET-CT影像无法融合则验证是否可以保存
-          const res = await getCanChooseNotMerge({ visitTaskId: this.visitTaskId })
+          let res = null
+          if (this.criterionType === 18) {
+            res = await getCanChooseNotMergeNoPet({ visitTaskId: this.visitTaskId })
+          } else {
+            res = await getCanChooseNotMerge({ visitTaskId: this.visitTaskId })
+          }
+
           if (res.IsSuccess && !res.Result.IsCanChooseNotMerge) {
             // this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {showCancelButton: false})
             this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             return
           } else {
@@ -377,7 +379,7 @@ export default {
         // DicomEvent.$emit('readingPageUpdate', {})
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
         const criterionType = parseInt(localStorage.getItem('CriterionType'))
-        if (idx > -1 && !this.visitTaskList[idx].IsBaseLineTask && (criterionType === 1 || criterionType === 2 || criterionType === 3 || criterionType === 17)) {
+        if (idx > -1 && !this.visitTaskList[idx].IsBaseLineTask && (criterionType === 1 || criterionType === 2 || criterionType === 18 || criterionType === 3 || criterionType === 17)) {
           if (parseInt(imageQuality) === 2) {
             this.$confirm(this.$t('trials:reading:warnning:unableEvaluate'), '', {
               type: 'warning'
@@ -441,7 +443,12 @@ export default {
       try {
         var spleenLength = this.questionForm[this.spleenLengthId]
         spleenLength = isNaN(parseFloat(spleenLength)) ? -1 : parseFloat(spleenLength)
-        const result = await getSplenicState(this.visitTaskId, spleenLength)
+        let result = null
+        if (this.criterionType === 18) {
+          result = await getSplenicStateNoPet(this.visitTaskId, spleenLength)
+        } else {
+          result = await getSplenicState(this.visitTaskId, spleenLength)
+        }
         return { isSuccess: true, result: result.Result }
       } catch (e) {
         return { isSuccess: false, result: e }
@@ -538,7 +545,7 @@ export default {
       if (!chenckVaild) {
         // 校验标记是否在同一序列的不同图像上
         this.$alert(this.$t('trials:lugano:message:validSpleen3'), this.$t('trials:lugano:fusionDialog:warning'), {
-          callback: _ => {}
+          callback: _ => { }
         })
         return
       }
@@ -820,7 +827,7 @@ export default {
         type: 'imgfail',
         trialId: this.$route.query.trialId,
         visitTaskId: this.visitTaskId,
-        callBack: async() => {
+        callBack: async () => {
           console.log('callBack')
           const confirm = await this.$confirm(
             this.$t('trials:reading:confirm:feedbackmsg'),
@@ -856,55 +863,61 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .ecrf-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;
-    }
+.ecrf-wrapper {
+  ::v-deep .el-form-item__label {
+    color: #c3c3c3;
+    text-align: left;
+  }
 
-    ::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 {
+  ::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%;
-    }
-    .ecrf-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;
-        }
+
+  ::v-deep .el-form-item__content .el-select {
+    width: 100%;
+  }
+
+  .ecrf-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;
       }
     }
   }
-
-  </style>
-
+}
+</style>

From 7478472e3391ee9e9b7f809784914c0dc8b1cfea Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 13:09:58 +0800
Subject: [PATCH 029/333] 1

---
 src/api/trials.js | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index becea280..ec4f2100 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -2833,7 +2833,13 @@ export function getSplitPPdSum(param) {
     data: param
   })
 }
-
+export function getSplitPPdSumNoPet(param) {
+  return request({
+    url: `/LuganoWithoutPETCalculateService/getSplitPPdSum`,
+    method: 'post',
+    data: param
+  })
+}
 export function submitDicomVisitTask(param) {
   return request({
     url: `/Inspection/ReadingImageTask/SubmitDicomVisitTask`,
@@ -2872,7 +2878,13 @@ export function getIsSuvMaxLesion(param) {
     data: param
   })
 }
-
+export function getIsSuvMaxLesionNoPet(param) {
+  return request({
+    url: `/LuganoWithoutPETCalculateService/getIsSuvMaxLesion`,
+    method: 'post',
+    data: param
+  })
+}
 export function getCanChooseNotMerge(param) {
   return request({
     url: `/LuganoCalculate/getCanChooseNotMerge`,
@@ -2880,6 +2892,13 @@ export function getCanChooseNotMerge(param) {
     data: param
   })
 }
+export function getCanChooseNotMergeNoPet(param) {
+  return request({
+    url: `/LuganoWithoutPETCalculateService/getCanChooseNotMerge`,
+    method: 'post',
+    data: param
+  })
+}
 export function saveTaskQuestion(saveQuestionType, param) {
   return request({
     url: `/SaveTaskQuestion/${saveQuestionType}`,
@@ -3603,13 +3622,24 @@ export function getSplenicState(visitTaskId, spleenLength) {
     method: 'post'
   })
 }
-
+export function getSplenicStateNoPet(visitTaskId, spleenLength) {
+  return request({
+    url: `/LuganoWithoutPETCalculateService/getSplenicState?visitTaskId=${visitTaskId}&spleenLength=${spleenLength}`,
+    method: 'post'
+  })
+}
 export function getSplenicVerify(visitTaskId) {
   return request({
     url: `/LuganoCalculate/getSplenicVerify?visitTaskId=${visitTaskId}`,
     method: 'post'
   })
 }
+export function getSplenicVerifyNoPet(visitTaskId) {
+  return request({
+    url: `/LuganoWithoutPETCalculateService/getSplenicVerify?visitTaskId=${visitTaskId}`,
+    method: 'post'
+  })
+}
 export function uploadTrialSiteSurveyUser(trialId, baseUrl, routeUrl, param) {
   return request({
     url: `/TrialSiteSurvey/UploadTrialSiteSurveyUser?trialId=${trialId}&baseUrl=${baseUrl}&routeUrl=${routeUrl}`,

From 689527b61e171435c3673733d0b58767e0f3d8ca Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 13:26:13 +0800
Subject: [PATCH 030/333] =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms3D/components/customize/QuestionTableFormItem.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index cbb9bc2e..7aa0c548 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -22,7 +22,7 @@
         :autosize="{ minRows: 2, maxRows: 4 }" />
       <!-- 下拉框 -->
       <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
-        :disabled="(question.TableQuestionType === 2 || question.IsPreinstall || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+        :disabled="(question.TableQuestionType === 2 || question.IsPreinstall || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
         @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]"

From 62f601a7be73404796523913c99b23c2e5d1ed78 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 13:36:59 +0800
Subject: [PATCH 031/333] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dictionary.js | 31 +++++++++++++++++++++++++++++++
 src/api/trials.js     | 10 +++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/api/dictionary.js b/src/api/dictionary.js
index f296d695..963cb84c 100644
--- a/src/api/dictionary.js
+++ b/src/api/dictionary.js
@@ -1403,3 +1403,34 @@ export function batchUpdateEmail(data) {
     data
   })
 }
+
+// 隐私政策和用户协议-获取列表
+export function getUserAgreementList(data) {
+  return request({
+    url: `/UserAgreement/getUserAgreementList`,
+    method: 'post',
+    data
+  })
+}
+// 隐私政策和用户协议-设置当前版本
+export function setCurrentVersion(data) {
+  return request({
+    url: `/UserAgreement/setCurrentVersion`,
+    method: 'post',
+    data
+  })
+}
+// 隐私政策和用户协议-新增或修改
+export function addOrUpdateUserAgreement(data) {
+  return request({
+    url: `/UserAgreement/addOrUpdateUserAgreement`,
+    method: 'post',
+    data
+  })
+}
+export function deleteUserAgreement(id) {
+  return request({
+    url: `/UserAgreement/deleteUserAgreement/${id}`,
+    method: 'delete',
+  })
+}
diff --git a/src/api/trials.js b/src/api/trials.js
index ec4f2100..eed4f198 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -2835,7 +2835,7 @@ export function getSplitPPdSum(param) {
 }
 export function getSplitPPdSumNoPet(param) {
   return request({
-    url: `/LuganoWithoutPETCalculateService/getSplitPPdSum`,
+    url: `/LuganoWithoutPETCalculate/getSplitPPdSum`,
     method: 'post',
     data: param
   })
@@ -2880,7 +2880,7 @@ export function getIsSuvMaxLesion(param) {
 }
 export function getIsSuvMaxLesionNoPet(param) {
   return request({
-    url: `/LuganoWithoutPETCalculateService/getIsSuvMaxLesion`,
+    url: `/LuganoWithoutPETCalculate/getIsSuvMaxLesion`,
     method: 'post',
     data: param
   })
@@ -2894,7 +2894,7 @@ export function getCanChooseNotMerge(param) {
 }
 export function getCanChooseNotMergeNoPet(param) {
   return request({
-    url: `/LuganoWithoutPETCalculateService/getCanChooseNotMerge`,
+    url: `/LuganoWithoutPETCalculate/getCanChooseNotMerge`,
     method: 'post',
     data: param
   })
@@ -3624,7 +3624,7 @@ export function getSplenicState(visitTaskId, spleenLength) {
 }
 export function getSplenicStateNoPet(visitTaskId, spleenLength) {
   return request({
-    url: `/LuganoWithoutPETCalculateService/getSplenicState?visitTaskId=${visitTaskId}&spleenLength=${spleenLength}`,
+    url: `/LuganoWithoutPETCalculate/getSplenicState?visitTaskId=${visitTaskId}&spleenLength=${spleenLength}`,
     method: 'post'
   })
 }
@@ -3636,7 +3636,7 @@ export function getSplenicVerify(visitTaskId) {
 }
 export function getSplenicVerifyNoPet(visitTaskId) {
   return request({
-    url: `/LuganoWithoutPETCalculateService/getSplenicVerify?visitTaskId=${visitTaskId}`,
+    url: `/LuganoWithoutPETCalculate/getSplenicVerify?visitTaskId=${visitTaskId}`,
     method: 'post'
   })
 }

From 19d472bfb3e280d1513d1e8811af5625c2c5307d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 16:04:23 +0800
Subject: [PATCH 032/333] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E9=9A=90=E7=A7=81=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dictionary.js                         |  17 +
 src/components/AGR/fun.js                     |  37 +++
 src/components/AGR/index.js                   |   7 +
 src/components/AGR/index.vue                  |  57 ++++
 src/main.js                                   |   2 +
 .../AgreementTemplate/TemplateForm.vue        | 150 +++++++++
 .../components/AgreementTemplate/index.vue    | 304 ++++++++++++++++++
 src/views/dictionary/attachment/index.vue     |   5 +-
 src/views/login/index.vue                     |  37 ++-
 src/views/system/login-log/detail.vue         |  37 ++-
 10 files changed, 631 insertions(+), 22 deletions(-)
 create mode 100644 src/components/AGR/fun.js
 create mode 100644 src/components/AGR/index.js
 create mode 100644 src/components/AGR/index.vue
 create mode 100644 src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue
 create mode 100644 src/views/dictionary/attachment/components/AgreementTemplate/index.vue

diff --git a/src/api/dictionary.js b/src/api/dictionary.js
index 963cb84c..4c16f173 100644
--- a/src/api/dictionary.js
+++ b/src/api/dictionary.js
@@ -1428,9 +1428,26 @@ export function addOrUpdateUserAgreement(data) {
     data
   })
 }
+// 隐私政策和用户协议-删除
 export function deleteUserAgreement(id) {
   return request({
     url: `/UserAgreement/deleteUserAgreement/${id}`,
     method: 'delete',
   })
 }
+// 隐私政策和用户协议-详情
+export function getUserAgreementById(data) {
+  return request({
+    url: `/UserAgreement/getUserAgreementById`,
+    method: 'post',
+    data
+  })
+}
+// 隐私政策和用户协议-当前版本
+export function getCurrentVersionUserAgreements(data) {
+  return request({
+    url: `/UserAgreement/getCurrentVersionUserAgreements`,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/components/AGR/fun.js b/src/components/AGR/fun.js
new file mode 100644
index 00000000..a7aca4f9
--- /dev/null
+++ b/src/components/AGR/fun.js
@@ -0,0 +1,37 @@
+import Vue from "vue";
+import AGRCOMP from "./index.vue";
+
+const MFAConstructor = Vue.extend(AGRCOMP);
+let MFAINSTANCELIST = [];
+const AGR = options => {
+    const { Id, callBack, cancelBack } = options;
+    if (!Id) throw `Id is requred.but ${Id}`
+    const id = `AGR${new Date().getTime()}`;
+    const instance = new MFAConstructor();
+    MFAINSTANCELIST.push(instance)
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open({ Id });
+    instance.vm.$on("success", (Id) => {
+        if (callBack) callBack(Id)
+    });
+    instance.vm.$on("closed", () => {
+        if (cancelBack) cancelBack();
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+        let index = MFAINSTANCELIST.findIndex(item => item.id === id);
+        MFAINSTANCELIST.splice(index, 1)
+    });
+    return instance.vm;
+}
+AGR.close = () => {
+    if (MFAINSTANCELIST.length <= 0) return;
+    MFAINSTANCELIST.forEach(item => {
+        document.body.removeChild(item.vm.$el);
+        item.vm.$destroy();
+    })
+    MFAINSTANCELIST = [];
+}
+export default AGR;
\ No newline at end of file
diff --git a/src/components/AGR/index.js b/src/components/AGR/index.js
new file mode 100644
index 00000000..203bfe87
--- /dev/null
+++ b/src/components/AGR/index.js
@@ -0,0 +1,7 @@
+import AGRCOMP from "./index.vue";
+import AGR from "./fun";
+
+export default Vue => {
+    Vue.component(AGRCOMP.name, AGRCOMP);
+    Vue.prototype.$AGR = AGR;
+};
\ No newline at end of file
diff --git a/src/components/AGR/index.vue b/src/components/AGR/index.vue
new file mode 100644
index 00000000..99abf7d2
--- /dev/null
+++ b/src/components/AGR/index.vue
@@ -0,0 +1,57 @@
+<template>
+  <!--AGR-->
+  <el-dialog v-if="visible" :visible.sync="visible" width="60%" :close-on-click-modal="false" append-to-body center
+    :show-close="true" @close="cancel">
+    <div slot="title">
+      {{ agreement.FileName }}
+    </div>
+    <div v-html="agreement.FileContent"></div>
+  </el-dialog>
+</template>
+<script>
+import {
+  getUserAgreementById
+} from '@/api/dictionary'
+export default {
+  name: "AGR",
+  data() {
+    return {
+      visible: false,
+      agreement: {}
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    async getAgreement(Id) {
+      try {
+        let data = {
+          Id
+        }
+        let res = await getUserAgreementById(data)
+        if (res.IsSuccess) {
+          this.agreement = res.Result
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    open(data) {
+      let { Id } = data;
+      this.getAgreement(Id)
+      this.visible = true
+    },
+    cancel() {
+      this.visible = false;
+      this.$emit("closed");
+    },
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .el-dialog__body {
+  height: 500px;
+}
+</style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 66fff15a..b82918cf 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,6 +61,8 @@ import Onlyoffice from '@/components/Preview_onlyoffice/index'
 Vue.use(Onlyoffice)
 import Video from '@/components/Preview_video/index'
 Vue.use(Video)
+import AGR from '@/components/AGR/index'
+Vue.use(AGR)
 import MFA from '@/components/MFA/index'
 Vue.use(MFA)
 import FB from '@/components/feedBack/index'
diff --git a/src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue b/src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue
new file mode 100644
index 00000000..d9a783cb
--- /dev/null
+++ b/src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue
@@ -0,0 +1,150 @@
+<template>
+  <el-form ref="sysAgreementFrom" v-loading="loading" :model="form" label-width="140px" size="small" :rules="rules"
+    class="upload-temporary-file">
+    <div class="base-dialog-body">
+      <el-form-item :label="$t('dictionary:agreement:table:UserAgreementTypeEnum')" prop="UserAgreementTypeEnum">
+        <el-select v-model="form.UserAgreementTypeEnum" style="width: 50%" size="small" filterable>
+          <el-option v-for="item of $d.UserAgreementType" :key="item.id" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:agreement:table:FileName')" prop="FileName">
+        <el-input v-model="form.FileName" clearable style="width: 50%" />
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:agreement:table:FileVersion')" prop="FileVersion">
+        <el-input v-model="form.FileVersion" clearable style="width: 50%" />
+      </el-form-item>
+
+      <el-form-item :label="$t('dictionary:agreement:table:FileContent')" prop="FileContent">
+        <div class="html_temp">
+          <prism-editor class="my-editor" v-model="form.FileContent" :highlight="highlighter" :line-numbers="true"
+            style="width: 50%;max-height: 300px;"></prism-editor>
+          <div v-html="form.FileContent" style="width: 45%;"></div>
+        </div>
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')" prop="UpdateDate">
+        <el-date-picker v-model="form.UpdateDate" type="datetime"
+          :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
+          format="yyyy-MM-dd HH:mm:ss" clearable style="width: 50%;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:agreement:table:EffectiveDate')" prop="EffectiveDate">
+        <el-date-picker v-model="form.EffectiveDate" type="datetime"
+          :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
+          format="yyyy-MM-dd HH:mm:ss" clearable style="width: 50%;">
+        </el-date-picker>
+      </el-form-item>
+    </div>
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <el-form-item style="text-align: right">
+        <el-button size="small" type="primary" :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save')
+        }}</el-button>
+      </el-form-item>
+    </div>
+  </el-form>
+</template>
+<script>
+import {
+  addOrUpdateUserAgreement,
+} from '@/api/dictionary'
+
+import { PrismEditor } from 'vue-prism-editor';
+import 'vue-prism-editor/dist/prismeditor.min.css';
+import { highlight, languages } from 'prismjs/components/prism-core';
+import 'prismjs/components/prism-clike';
+import 'prismjs/components/prism-javascript';
+import 'prismjs/themes/prism.css';
+export default {
+  name: 'TemplateForm',
+  props: {
+    data: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+  components: { PrismEditor },
+  data() {
+    return {
+      form: {
+        Id: '',
+        UserAgreementTypeEnum: '',
+        FileName: '',
+        FileVersion: null,
+        FileContent: '',
+        UpdateDate: '',
+        EffectiveDate: '',
+      },
+      rules: {
+        UserAgreementTypeEnum: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+        ],
+        FileName: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        FileVersion: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        FileContent: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        UpdateDate: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+        ],
+        EffectiveDate: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+        ],
+      },
+      saveBtnLoading: false,
+      loading: false,
+      dictionaryList: {},
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    highlighter(code) {
+      return highlight(code, languages.js);
+    },
+    async initForm() {
+      if (Object.keys(this.data).length > 0) {
+        for (const k in this.form) {
+          if (this.data.hasOwnProperty(k)) {
+            this.form[k] = this.data[k]
+          }
+        }
+      }
+    },
+    handleSave() {
+      this.$refs.sysAgreementFrom.validate((valid) => {
+        if (!valid) return
+        this.saveBtnLoading = true
+        addOrUpdateUserAgreement(this.form)
+          .then((res) => {
+            this.saveBtnLoading = false
+            this.$emit('closeDialog')
+            this.$emit('getList')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          })
+          .catch(() => {
+            this.saveBtnLoading = false
+          })
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.html_temp {
+  display: flex;
+  justify-content: space-between;
+  min-height: 300px;
+
+  .my-editor {
+    border: 1px solid #333;
+  }
+
+}
+</style>
diff --git a/src/views/dictionary/attachment/components/AgreementTemplate/index.vue b/src/views/dictionary/attachment/components/AgreementTemplate/index.vue
new file mode 100644
index 00000000..fa978fcb
--- /dev/null
+++ b/src/views/dictionary/attachment/components/AgreementTemplate/index.vue
@@ -0,0 +1,304 @@
+<template>
+  <BaseContainer>
+    <template slot="search-container">
+      <el-form :inline="true" size="small">
+        <!-- 文件类型 -->
+        <el-form-item :label="$t('dictionary:agreement:table:UserAgreementTypeEnum')">
+          <el-select v-model="searchData.UserAgreementTypeEnum" style="width: 150px">
+            <el-option v-for="item of $d.UserAgreementType" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:agreement:table:FileName')">
+          <el-input v-model="searchData.FileName" style="width: 130px" clearable />
+        </el-form-item>
+        <!-- 版本 -->
+        <el-form-item :label="$t('dictionary:agreement:table:FileVersion')">
+          <el-input v-model="searchData.FileVersion" style="width: 130px" clearable />
+        </el-form-item>
+        <!--更新日期-->
+        <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')">
+          <el-date-picker v-model="UpdateDate" @change="changeTimeList('UpdateDate')" value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']" type="datetimerange">
+          </el-date-picker>
+        </el-form-item>
+        <!--生效日期-->
+        <el-form-item :label="$t('dictionary:agreement:table:EffectiveDate')">
+          <el-date-picker v-model="EffectiveDate" @change="changeTimeList('EffectiveDate')"
+            value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']" type="datetimerange">
+          </el-date-picker>
+        </el-form-item>
+        <!-- 当前版本 -->
+        <el-form-item :label="$t('dictionary:agreement:table:IsCurrentVersion')">
+          <el-select v-model="searchData.IsCurrentVersion" style="width: 150px">
+            <el-option v-for="item of $d.YesOrNo" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <!-- 查询 -->
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <!-- 重置 -->
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+            {{ $t('common:button:reset') }}
+          </el-button>
+        </el-form-item>
+        <el-button type="primary" style="float: right" size="small" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
+      </el-form>
+    </template>
+    <template slot="main-container">
+      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
+        @sort-change="handleSortChange">
+        <el-table-column type="index" width="40" />
+        <!-- 文件类型 -->
+        <el-table-column prop="UserAgreementTypeEnum" :label="$t('dictionary:agreement:table:UserAgreementTypeEnum')"
+          show-overflow-tooltip sortable="custom">
+          <template slot-scope="scope">
+            {{
+              $fd(
+                'UserAgreementType',
+                scope.row.UserAgreementTypeEnum
+              )
+            }}
+          </template>
+        </el-table-column>
+        <!-- 文件名称 -->
+        <el-table-column prop="FileName" :label="$t('dictionary:agreement:table:FileName')" show-overflow-tooltip
+          sortable="custom" />
+        <!-- 版本 -->
+        <el-table-column prop="FileVersion" :label="$t('dictionary:agreement:table:FileVersion')" show-overflow-tooltip
+          sortable="custom" />
+        <!--内容-->
+        <el-table-column prop="FileContent" :label="$t('dictionary:agreement:table:FileContent')">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="view(scope.row)">{{ $t('dictionary:agreement:button:view')
+            }}</el-button>
+          </template>
+        </el-table-column>
+        <!-- 更新日期 -->
+        <el-table-column prop="UpdateDate" :label="$t('dictionary:agreement:table:UpdateDate')" show-overflow-tooltip
+          sortable="custom" />
+        <!-- 生效日期 -->
+        <el-table-column prop="EffectiveDate" :label="$t('dictionary:agreement:table:EffectiveDate')"
+          show-overflow-tooltip sortable="custom" />
+        <!-- 当前版本 -->
+        <el-table-column prop="IsCurrentVersion" :label="$t('dictionary:agreement:table:IsCurrentVersion')"
+          show-overflow-tooltip sortable="custom">
+          <template slot-scope="scope">
+            {{
+              $fd(
+                'YesOrNo',
+                scope.row.IsCurrentVersion
+              )
+            }}
+          </template>
+        </el-table-column>
+        <!-- 创建日期 -->
+        <el-table-column prop="CreateTime" :label="$t('dictionary:agreement:table:CreateTime')" show-overflow-tooltip
+          sortable="custom" />
+        <!-- 修改日期 -->
+        <el-table-column prop="UpdateTime" :label="$t('dictionary:agreement:table:UpdateTime')" show-overflow-tooltip
+          sortable="custom" />
+
+        <el-table-column :label="$t('common:action:action')" width="300">
+          <template slot-scope="scope">
+            <el-button type="text" :disabled="scope.row.IsCurrentVersion" @click="setCurrentVersion(scope.row)">
+              {{ $t('dictionary:agreement:button:setCurrentVersion') }}
+            </el-button>
+            <el-button type="text" @click="handleEdit(scope.row)">
+              {{ $t('common:button:edit') }}
+            </el-button>
+            <el-button type="text" @click="handleDelete(scope.row)">
+              {{ $t('common:button:delete') }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页组件 -->
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
+
+      <!-- 新增/编辑 -->
+      <el-dialog v-if="editDialog.visible" :visible.sync="editDialog.visible" :close-on-click-modal="false"
+        :title="editDialog.title" custom-class="base-dialog-wrapper" :fullscreen="true">
+        <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+      </el-dialog>
+    </template>
+  </BaseContainer>
+</template>
+<script>
+import {
+  getUserAgreementList,
+  deleteUserAgreement,
+  setCurrentVersion
+} from '@/api/dictionary'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import TemplateForm from './TemplateForm'
+const searchDataDefault = () => {
+  return {
+    StartEffectiveDate: null,
+    EndEffectiveDate: null,
+    FileName: null,
+    FileVersion: null,
+    IsCurrentVersion: null,
+    StartUpdateDate: null,
+    EndUpdateDate: null,
+    UserAgreementTypeEnum: null,
+    Asc: false,
+    SortField: "",
+    PageIndex: 1,
+    PageSize: 20,
+  }
+}
+export default {
+  name: 'AgreementTemplate',
+  components: { BaseContainer, Pagination, TemplateForm },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      currentRow: {},
+      editDialog: { title: '', visible: false },
+      loading: false,
+      UpdateDate: [],
+      EffectiveDate: []
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
+  methods: {
+    async setCurrentVersion(row) {
+      try {
+        let data = {
+          Id: row.Id
+        }
+        this.loading = true
+        let res = await setCurrentVersion(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.getList()
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    view(row) {
+      this.$AGR({
+        Id: row.Id
+      })
+    },
+    changeTimeList(key) {
+      if (this[key]) {
+        this.searchData[`Start${key}`] = this[key][0]
+        this.searchData[`End${key}`] = this[key][1]
+      } else {
+        this.searchData.BeginCreateTime = null
+        this.searchData.EndCreateTime = null
+      }
+    },
+    handleDelete(row) {
+      // 确定删除该模版？
+      this.$confirm(this.$t('dictionary:agreement:message:msg1')).then(() => {
+        deleteUserAgreement(row.Id).then(() => {
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          this.getList()
+        })
+      }).catch(() => { })
+    },
+    PreviewFile(row) {
+      let basePath = window.location.origin
+      if (window.location.protocol !== 'https:') {
+        basePath = 'https://irc.test.extimaging.com'
+      }
+      let data = {
+        name: row.NameCN,
+        path: basePath + row.Path,
+      }
+      this.$emit('PreviewFile', data)
+    },
+    getList() {
+      this.loading = true
+      getUserAgreementList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    // 新增
+    handleAdd() {
+      this.editDialog.title = this.$t('common:button:new')
+      this.currentRow = {}
+      this.editDialog.visible = true
+    },
+    // 下载
+    async handleDownload(row) {
+      try {
+        this.loading = true
+        let fileName = this.isEN ? row.Name : row.NameCN;
+        let type = fileName
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (!type) {
+          let extendName = row.Path
+            .substring(row.Path.lastIndexOf('.'))
+            .toLocaleLowerCase()
+          fileName += extendName
+        }
+        let res = await downLoadFile(this.OSSclientConfig.basePath + row.Path, fileName)
+        this.loading = false
+      } catch (err) {
+        this.loading = false
+      }
+    },
+    // 编辑
+    handleEdit(row) {
+      this.editDialog.title = this.$t('common:button:edit')
+      this.currentRow = { ...row }
+      this.editDialog.visible = true
+    },
+    handleSearch() {
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+    },
+    closeDialog() {
+      this.editDialog.visible = false
+    },
+    // 排序
+    handleSortChange(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .search {
+  display: block;
+}
+</style>
diff --git a/src/views/dictionary/attachment/index.vue b/src/views/dictionary/attachment/index.vue
index d5313858..9450d0ef 100644
--- a/src/views/dictionary/attachment/index.vue
+++ b/src/views/dictionary/attachment/index.vue
@@ -8,6 +8,7 @@
         <CommonTemplate v-if="activeTab === '4' && item.value == activeTab" />
         <SignatureTemplate v-if="activeTab === '5' && item.value == activeTab" />
         <ToolsTemplate v-if="activeTab === '0' && item.value == activeTab" />
+        <AgreementTemplate v-if="activeTab === '6' && item.value == activeTab" />
       </el-tab-pane>
     </el-tabs>
     <!-- 预览 -->
@@ -28,6 +29,7 @@ import EmailTemplate from './components/EmailTemplate'
 import CommonTemplate from './components/CommonTemplate'
 import SignatureTemplate from './components/SignatureTemplate'
 import ToolsTemplate from './components/ToolsTemplate'
+import AgreementTemplate from './components/AgreementTemplate'
 import VueOfficeDocx from '@vue-office/docx'
 import '@vue-office/docx/lib/index.css'
 import VueOfficeExcel from '@vue-office/excel'
@@ -44,7 +46,8 @@ export default {
     VueOfficeDocx,
     VueOfficeExcel,
     PreviewFile,
-    ToolsTemplate
+    ToolsTemplate,
+    AgreementTemplate
   },
   data() {
     return {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c3231d89..16a77aab 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -84,6 +84,14 @@
             " size="medium" @click.native.prevent="handleLogin">
             {{ $t('login:button:login') }}
           </el-button>
+          <div class="PrivacyPolicy" style="font-size: 14px;">
+            <span>{{ $t('login:message:PrivacyPolicy') }}</span>
+            <span style="cursor: pointer;color:#428bca" @click="viewAgreement(0)">{{ $t('login:message:UserAgreement')
+            }}</span>
+            <span>{{ $t('login:message:and') }}</span>
+            <span style="cursor: pointer;color:#428bca" @click="viewAgreement(1)">{{
+              $t('login:message:PrivacyPolicyName') }}</span>
+          </div>
           <div style="text-align: right">
             <TopLang v-if="
               VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
@@ -94,10 +102,6 @@
               {{ $t('login:button:forgetPassword') }}
             </el-button>
           </div>
-          <div class="PrivacyPolicy">
-            <span>{{ $t('login:message:PrivacyPolicy') }}</span>
-            <span style="cursor: pointer;color:#428bca">《{{ $t('login:message:PrivacyPolicyName') }}》</span>
-          </div>
         </el-form>
       </div>
     </div>
@@ -185,6 +189,9 @@ import Vcode from 'vue-puzzle-vcode'
 import browserTip from '@/views/dictionary/template/browser/tip.vue'
 import Img1 from '@/assets/pic-2.png'
 import toggleRole from '@/components/toggleRole'
+import {
+  getCurrentVersionUserAgreements,
+} from '@/api/dictionary'
 export default {
   name: 'Login',
   components: { TopLang, Vcode, browserTip, toggleRole },
@@ -232,6 +239,7 @@ export default {
       Img1,
       toggleRoleVisible: false,
       toggleRoleLoading: false,
+      Agreement: []
     }
   },
   computed: {
@@ -260,7 +268,6 @@ export default {
     zzSessionStorage.setItem('loginType', this.loginType)
     localStorage.setItem('location', this.location)
     // zh-CN navigator.language
-    console.log(navigator.language, 'navigator.language')
     if (navigator.language !== 'zh-CN' && navigator.language !== 'zh-TW') {
       this.$i18n.locale = 'en'
       this.setLanguage('en')
@@ -282,9 +289,29 @@ export default {
       }
     }
     this.$refs.browserTip.open()
+    this.getAgreementList()
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    viewAgreement(type) {
+      let find = this.Agreement.find(item => item.IsCurrentVersion && item.UserAgreementTypeEnum === type)
+      if (!find) return this.$confirm(this.$t('login:message:noAgreement').replace('xxx', this.$fd('UserAgreementType', type)))
+      this.$AGR({
+        Id: find.Id
+      })
+    },
+    getAgreementList() {
+      getCurrentVersionUserAgreements({
+        PageIndex: 1,
+        PageSize: 20,
+        IsCurrentVersion: true
+      })
+        .then((res) => {
+          this.Agreement = res.Result
+        })
+        .catch(() => {
+        })
+    },
     openAbout() {
       this.aboutVisible = true
     },
diff --git a/src/views/system/login-log/detail.vue b/src/views/system/login-log/detail.vue
index 162e1710..1c554693 100644
--- a/src/views/system/login-log/detail.vue
+++ b/src/views/system/login-log/detail.vue
@@ -2,26 +2,18 @@
   <base-model v-if="config.visible" :config="config">
     <template slot="dialog-body">
       <el-table :data="curData" border style="width: 100%" size="small">
-        <el-table-column
-          prop="key"
-          :label="$t('system:loginLog:table:cfgItem')"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          prop="value"
-          :label="$t('system:loginLog:table:cfgVal')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="key" :label="$t('system:loginLog:table:cfgItem')" show-overflow-tooltip />
+        <el-table-column prop="value" :label="$t('system:loginLog:table:cfgVal')" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="scope.row.prop !== 'UserRoleList'">{{
+            <el-button v-if="scope.row.prop === 'UserAgreementId'" type="text" size="small"
+              @click.stop="view(scope.row)">{{
+                $t('dictionary:agreement:button:view')
+              }}</el-button>
+            <span v-else-if="scope.row.prop !== 'UserRoleList'">{{
               scope.row.value
             }}</span>
             <template v-else>
-              <div
-                v-for="item in scope.row.value"
-                :key="item.UserTypeEnum"
-                style="margin: 0"
-              >
+              <div v-for="item in scope.row.value" :key="item.UserTypeEnum" style="margin: 0">
                 {{ item.UserTypeShortName
                 }}{{ $t('system:loginLog:form:symbol')
                 }}{{ $fd('IsEnable', !item.IsUserRoleDisabled) }}
@@ -74,6 +66,9 @@ export default {
         'PositionName',
         'DepartmentName',
         'UserRoleList',
+        'UserAgreementTypeEnum',
+        'FileVersion',
+        'UserAgreementId',
       ],
     }
   },
@@ -96,12 +91,22 @@ export default {
           if (key === 'Status') {
             o.value = this.$fd('IsUserEnable', obj[key])
           }
+          if (key === 'UserAgreementTypeEnum') {
+            o.value = this.$fd('UserAgreementType', obj[key])
+          }
           curData.push(o)
         }
       })
       return curData
     },
   },
+  methods: {
+    view(row) {
+      this.$AGR({
+        Id: row.value
+      })
+    },
+  }
 }
 </script>
 <style lang="scss" scoped>

From 06b505544b9527af44dca778ba5da811ab47bb73 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 16:09:39 +0800
Subject: [PATCH 033/333] 1

---
 .../trials-panel/reading/dicoms/components/ReportPage.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 86def2af..efec58d9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -145,7 +145,8 @@
                   <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 || scope.row.QuestionType === 39">
+                <template
+                  v-else-if="scope.row.QuestionType === 13 || scope.row.QuestionType === 42 || scope.row.QuestionType === 39">
                   <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">
@@ -813,9 +814,12 @@ export default {
     getWarningText() {
       var sysRes = ''
       var curRes = ''
-      if (this.CriterionType === 2 || this.CriterionType === 18) {
+      if (this.CriterionType === 2) {
         sysRes = this.$fd('ImagingOverallAssessment_Lugano', this.tumorEvaluate)
         curRes = this.$fd('ImagingOverallAssessment_Lugano', this.currentEvaluateResult)
+      } else if (this.CriterionType === 18) {
+        sysRes = this.$fd('CT-MRIOverallAssessment', this.tumorEvaluate)
+        curRes = this.$fd('CT-MRIOverallAssessment', this.currentEvaluateResult)
       } else {
         sysRes = this.$fd('OverallAssessment', this.tumorEvaluate)
         curRes = this.$fd('OverallAssessment', this.currentEvaluateResult)

From 8299fd89580e91f6338926a2e26028e3f0e1a8f4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 16:45:31 +0800
Subject: [PATCH 034/333] =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgreementTemplate/TemplateForm.vue           | 16 ++++++++--------
 .../components/AgreementTemplate/index.vue       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue b/src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue
index d9a783cb..f1372cfa 100644
--- a/src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue
+++ b/src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue
@@ -13,14 +13,6 @@
       <el-form-item :label="$t('dictionary:agreement:table:FileVersion')" prop="FileVersion">
         <el-input v-model="form.FileVersion" clearable style="width: 50%" />
       </el-form-item>
-
-      <el-form-item :label="$t('dictionary:agreement:table:FileContent')" prop="FileContent">
-        <div class="html_temp">
-          <prism-editor class="my-editor" v-model="form.FileContent" :highlight="highlighter" :line-numbers="true"
-            style="width: 50%;max-height: 300px;"></prism-editor>
-          <div v-html="form.FileContent" style="width: 45%;"></div>
-        </div>
-      </el-form-item>
       <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')" prop="UpdateDate">
         <el-date-picker v-model="form.UpdateDate" type="datetime"
           :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
@@ -33,6 +25,14 @@
           format="yyyy-MM-dd HH:mm:ss" clearable style="width: 50%;">
         </el-date-picker>
       </el-form-item>
+      <el-form-item :label="$t('dictionary:agreement:table:FileContent')" prop="FileContent">
+        <div class="html_temp">
+          <prism-editor class="my-editor" v-model="form.FileContent" :highlight="highlighter" :line-numbers="true"
+            style="width: 50%;max-height: 300px;"></prism-editor>
+          <div v-html="form.FileContent" style="width: 45%;"></div>
+        </div>
+      </el-form-item>
+
     </div>
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item style="text-align: right">
diff --git a/src/views/dictionary/attachment/components/AgreementTemplate/index.vue b/src/views/dictionary/attachment/components/AgreementTemplate/index.vue
index fa978fcb..40dd5c66 100644
--- a/src/views/dictionary/attachment/components/AgreementTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/AgreementTemplate/index.vue
@@ -111,9 +111,9 @@
             <el-button type="text" @click="handleEdit(scope.row)">
               {{ $t('common:button:edit') }}
             </el-button>
-            <el-button type="text" @click="handleDelete(scope.row)">
+            <!-- <el-button type="text" @click="handleDelete(scope.row)">
               {{ $t('common:button:delete') }}
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>

From 5456d7a40b3d65af6ddc2fbd41af0de1164bd38a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 16:46:01 +0800
Subject: [PATCH 035/333] =?UTF-8?q?=E9=98=85=E7=89=87=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=AA=97=E5=AE=BD=E7=AA=97=E4=BD=8D=E4=B8=8D=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=8D=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomCanvas.vue             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 7065d52c..8d7b0811 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -1307,6 +1307,9 @@ export default {
         this.isFirstLoadIns = false
         // this.initWwc()
         this.imageId = instanceId
+        if (this.isInitWwwc) {
+          this.resetWwwc()
+        }
       }
 
       this.stack.instanceId = instanceId
@@ -1326,9 +1329,6 @@ export default {
         this.scrollSyncInfo.offset = 0
       }
       this.renderMeasuredData(e)
-      if (this.isInitWwwc) {
-        this.resetWwwc()
-      }
     },
     getOrientationMarker(element) {
       const enabledElement = cornerstone.getEnabledElement(element)
@@ -1708,7 +1708,7 @@ export default {
     resetWwwc() {
       // console.log('resetWwwc')
       this.isInitWwwc = true
-      this.toolState.viewportInvert = false
+      // this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
       // viewport.invert = false
       var image = cornerstone.getImage(this.canvas)

From 2ce7fa75520ae4560e1a2d922abc9c7609fdb271 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Oct 2025 17:35:17 +0800
Subject: [PATCH 036/333] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E6=A0=B8?=
 =?UTF-8?q?=E6=9F=A5=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=9C=A8=E5=81=9A=E5=85=A8?=
 =?UTF-8?q?=E9=87=8F=E6=A0=B8=E6=9F=A5=E6=97=B6=EF=BC=8C=E5=AF=B9=E4=BA=8E?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=A0=B8=E6=9F=A5=E8=BF=87=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B9=9F=E8=BF=9B=E8=A1=8C=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  12 +-
 .../components/fullCheck.vue                  | 171 ++++++++++++++++++
 .../visit/consistency-check/index.vue         |  21 +++
 3 files changed, 201 insertions(+), 3 deletions(-)
 create mode 100644 src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index eed4f198..61611e95 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -1203,7 +1203,13 @@ export function getConsistencyVerificationList(param) {
     data: param
   })
 }
-
+export function getConsistencyCheckFileList(param) {
+  return request({
+    url: `/QCList/getConsistencyCheckFileList`,
+    method: 'post',
+    data: param
+  })
+}
 export function getCheckChallengeDialogList(subjectVisitId) {
   return request({
     url: `/QCList/getCheckChallengeDialogList/${subjectVisitId}`,
@@ -1256,11 +1262,11 @@ export function getCRCVisitChallengeAndDialog(subjectVisitId, trialQCProcess) {
   })
 }
 
-export function uploadVisitCheckExcel(trialId, file) {
+export function uploadVisitCheckExcel(trialId, file, isFullCheck = false) {
   const formData = new FormData()
   formData.append('file', file)
   return request({
-    url: `/QCOperation/UploadVisitCheckExcel/${trialId}`,
+    url: `/QCOperation/UploadVisitCheckExcel/${trialId}?isFullCheck=${isFullCheck}`,
     method: 'post',
     data: formData
   })
diff --git a/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue b/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue
new file mode 100644
index 00000000..125b836e
--- /dev/null
+++ b/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue
@@ -0,0 +1,171 @@
+<template>
+    <div class="FullCheck">
+        <div class="upload-container">
+            <p class="title">{{ $t('trials:consistencyCheck:fullCheck:title') }}</p>
+            <el-upload class="upload-demo" action accept=".xlsx,.xls" :before-upload="beforeUpload"
+                :http-request="handleUploadFile" :on-preview="handlePreview" :show-file-list="true" :limit="1"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary" :loading="loading">
+                    {{ $t('trials:consistencyCheck:dialogButton:upload') }}
+                </el-button>
+                <span slot="tip" style="margin-left:10px;" class="el-upload__tip">
+                    ({{ $t('trials:consistencyCheck:message:excelFileOnly') }})
+                </span>
+            </el-upload>
+        </div>
+        <el-table ref="consistencyTable" v-loading="loading" :element-loading-text="loadingText"
+            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)"
+            v-adaptive="{ bottomOffset: 60 }" :data="list" stripe height="100" @sort-change="handleSortByColumn">
+            <el-table-column type="index" width="40" />
+            <!-- 核查时间 -->
+            <el-table-column prop="CreateTime" :label="$t('trials:consistencyCheck:fullCheck:table:createTime')"
+                show-overflow-tooltip min-width="110" sortable="custom" />
+            <!-- 影像检查记录 -->
+            <el-table-column prop="FileName" :label="$t('trials:consistencyCheck:fullCheck:table:fileName')"
+                show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <el-button type="text" size="small" @click.stop="download(scope.row, 'RelativePath')">{{
+                        scope.row.FileName
+                        }}</el-button>
+                </template>
+            </el-table-column>
+            <!-- 核查状态 -->
+            <el-table-column prop="CheckState" :label="$t('trials:consistencyCheck:fullCheck:table:checkState')"
+                show-overflow-tooltip min-width="110" sortable="custom">
+                <template slot-scope="scope">
+                    <span>{{ $fd("fullCheckState", scope.row.CheckState) }}</span>
+                </template>
+            </el-table-column>
+            <!-- 核查记录 -->
+            <el-table-column prop="ResultPath" :label="$t('trials:consistencyCheck:fullCheck:table:resultPath')"
+                show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <el-button type="text" size="small" @click.stop="download(scope.row, 'ResultPath')">{{
+                        $t('trials:consistencyCheck:fullCheck:ResultPath')
+                        }}</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 分页组件 -->
+        <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+            @pagination="getList" />
+    </div>
+</template>
+<script>
+import { uploadVisitCheckExcel, getConsistencyCheckFileList } from '@/api/trials'
+import Pagination from '@/components/Pagination'
+import { downLoadFile } from '@/utils/stream.js'
+const searchDataDefault = () => {
+    return {
+        PageIndex: 1,
+        PageSize: 20,
+        SortField: '',
+        Asc: false
+    }
+}
+export default {
+    name: "FullCheck",
+    components: {
+        Pagination,
+    },
+    data() {
+        return {
+            loading: false,
+            trialId: this.$route.query.trialId,
+            searchData: searchDataDefault(),
+            total: 0,
+            list: [],
+            loadingText: ''
+        }
+    },
+    mounted() {
+        this.getList()
+    },
+    methods: {
+        async download(row, type) {
+            let url = this.OSSclientConfig.basePath + row[type]
+            let name = `DataReconciliation_${Date.now()}`
+            if (type === 'RelativePath') name = row.fileName
+            await downLoadFile(url, name)
+        },
+        // 获取质疑列表
+        getList() {
+            this.loading = true
+            this.searchData.TrialId = this.trialId
+            getConsistencyCheckFileList(this.searchData)
+                .then((res) => {
+                    this.loading = false
+                    this.list = res.Result.CurrentPageData
+                    this.total = res.Result.TotalCount
+                })
+                .catch(() => {
+                    this.loading = false
+                })
+        },
+        beforeUpload(file) {
+            // 检测文件类型是否符合要求
+            if (this.checkFileSuffix(file.name)) {
+                return true
+            } else {
+                // Must be xls or xlsx format
+                this.$alert(this.$t('trials:consistencyCheck:message:xlsx'))
+
+                return false
+            }
+        },
+        handleUploadFile(param) {
+            this.loading = true
+            this.loadingText = this.$t('trials:consistencyCheck:fullCheck:loading')
+            uploadVisitCheckExcel(this.trialId, param.file, true).then(res => {
+                this.loadingText = ''
+                this.loading = false
+                // this.$emit('refreshTable')
+                this.getList()
+            }).catch(() => {
+                this.loading = false
+            })
+        },
+        handlePreview(file) {
+            if (file.fullPath) {
+                window.open(file.fullPath, '_blank')
+            }
+        },
+        handleExceed(files, fileList) {
+            // Upload is currently limited to 1 file
+            this.$message.warning(this.$t('trials:consistencyCheck:message:onlyOneFile'))
+        },
+        checkFileSuffix(fileName) {
+            var typeArr = ['xls', 'xlsx']
+            var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+            if (typeArr.indexOf(extendName) !== -1) {
+                return true
+            } else {
+                return false
+            }
+        },
+        // 排序
+        handleSortByColumn(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.upload-container {
+    height: 100px;
+    display: flex;
+
+    .title {
+        margin: 0;
+        line-height: 30px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/visit/consistency-check/index.vue b/src/views/trials/trials-panel/visit/consistency-check/index.vue
index e92c61ae..3b402b96 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/index.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/index.vue
@@ -51,6 +51,11 @@
           icon="el-icon-download" @click="handleDownload">
           {{ $t('trials:consistencyCheck:button:download') }}
         </el-button>
+        <!-- 全量核查 -->
+        <el-button type="primary" v-hasPermi="['trials:trials-panel:visit:consistency-check:upload']"
+          @click="openFullCheck">
+          {{ $t('trials:consistencyCheck:button:FullCheck') }}
+        </el-button>
       </el-form>
       <!-- 上传 -->
       <span style="margin-left: auto">
@@ -358,6 +363,10 @@
         <UploadExcel @refreshTable="refreshTable" />
       </template>
     </base-model>
+    <el-dialog v-if="fullCheckDialog.visible" :visible.sync="fullCheckDialog.visible" :close-on-click-modal="false"
+      :title="fullCheckDialog.title" custom-class="base-dialog-wrapper" :fullscreen="true">
+      <FullCheck v-if="fullCheckDialog.visible" />
+    </el-dialog>
   </BaseContainer>
 </template>
 <script>
@@ -380,6 +389,7 @@ import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
 import ConsistencyCheckForm from './components/consistencyCheckForm'
 import UploadExcel from './components/uploadExcel'
+import FullCheck from './components/fullCheck'
 import SignForm from '@/views/trials/components/newSignForm'
 import Pagination from '@/components/Pagination'
 import const_ from '@/const/sign-code'
@@ -403,6 +413,7 @@ export default {
     UploadExcel,
     BaseModel,
     SignForm,
+    FullCheck
   },
   data() {
     return {
@@ -430,6 +441,10 @@ export default {
         width: '500px',
         showClose: true,
       },
+      fullCheckDialog: {
+        visible: false,
+        title: this.$t('trials:consistencyCheck:button:FullCheck'),
+      },
       rules: {
         Type: [
           {
@@ -469,6 +484,12 @@ export default {
     },
   },
   methods: {
+    openFullCheck() {
+      this.fullCheckDialog.visible = true
+    },
+    closeDialog() {
+      this.fullCheckDialog.visible = false
+    },
     beforeClose() {
       this.chatVisible = false
       this.$store.state.trials.checkTaskId = null

From c197c077a7ff48042f0c9634463a147a83a76d28 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 23 Oct 2025 15:49:59 +0800
Subject: [PATCH 037/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/toolConfig.js             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 0c495672..c9a56b15 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
@@ -317,7 +317,7 @@ const config = {
       'name': '矩形工具',
       'icon': 'rectangle',
       'toolName': 'RectangleROI',
-      'props': ['area', 'mean', 'max', 'stdDev'],
+      'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'],
       'i18nKey': 'trials:reading:button:rectangle',
       'isDisabled': false,
       'disabledReason': ''
@@ -335,7 +335,7 @@ const config = {
       'name': '圆形工具',
       'icon': 'oval',
       'toolName': 'CircleROI',
-      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
+      'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'],
       'i18nKey': 'trials:reading:button:Circle',
       'isDisabled': false,
       'disabledReason': ''
@@ -344,7 +344,7 @@ const config = {
       'name': '椭圆工具',
       'icon': 'elliptical',
       'toolName': 'EllipticalROI',
-      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
+      'props': ['area', 'mean', 'max', 'stdDev'],
       'i18nKey': 'trials:reading:button:Elliptical',
       'isDisabled': false,
       'disabledReason': ''
@@ -362,7 +362,7 @@ const config = {
       'name': '自由曲线',
       'icon': 'polygon',
       'toolName': 'PlanarFreehandROI',
-      'props': [],
+      'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'],
       'i18nKey': 'trials:reading:button:planarFreehandROI',
       'isDisabled': false,
       'disabledReason': ''

From 98757b6c06123355c8b5588220f8a63b493ddcc7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 23 Oct 2025 16:28:39 +0800
Subject: [PATCH 038/333] 1

---
 .../visit/consistency-check/components/fullCheck.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue b/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue
index 125b836e..4cc5595d 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue
@@ -85,7 +85,7 @@ export default {
     methods: {
         async download(row, type) {
             let url = this.OSSclientConfig.basePath + row[type]
-            let name = `DataReconciliation_${Date.now()}`
+            let name = `DataReconciliation_${Date.now()}.xlsx`
             if (type === 'RelativePath') name = row.fileName
             await downLoadFile(url, name)
         },

From 5d09bd2159c9df6c6f61b8eb2571972fbd5f055e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 24 Oct 2025 09:49:16 +0800
Subject: [PATCH 039/333] =?UTF-8?q?=E5=85=A8=E9=87=8F=E6=A0=B8=E6=9F=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/consistency-check/components/fullCheck.vue        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue b/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue
index 4cc5595d..ac8bf45a 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/components/fullCheck.vue
@@ -26,7 +26,7 @@
                 <template slot-scope="scope">
                     <el-button type="text" size="small" @click.stop="download(scope.row, 'RelativePath')">{{
                         scope.row.FileName
-                        }}</el-button>
+                    }}</el-button>
                 </template>
             </el-table-column>
             <!-- 核查状态 -->
@@ -42,7 +42,7 @@
                 <template slot-scope="scope">
                     <el-button type="text" size="small" @click.stop="download(scope.row, 'ResultPath')">{{
                         $t('trials:consistencyCheck:fullCheck:ResultPath')
-                        }}</el-button>
+                    }}</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -86,7 +86,7 @@ export default {
         async download(row, type) {
             let url = this.OSSclientConfig.basePath + row[type]
             let name = `DataReconciliation_${Date.now()}.xlsx`
-            if (type === 'RelativePath') name = row.fileName
+            if (type === 'RelativePath') name = row.FileName
             await downLoadFile(url, name)
         },
         // 获取质疑列表

From 0e029369a352a3260a7367e18d4ab7de61159799 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 24 Oct 2025 11:23:19 +0800
Subject: [PATCH 040/333] =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AGR/fun.js                     |  4 +-
 src/components/AGR/index.vue                  | 20 +++--
 src/views/dictionary/attachment/index.vue     |  5 +-
 .../agreement}/TemplateForm.vue               | 90 +++++++++++++------
 .../agreement}/index.vue                      |  5 +-
 src/views/dictionary/template/index.vue       | 55 ++++--------
 src/views/login/index.vue                     |  3 +-
 src/views/system/login-log/detail.vue         |  5 +-
 8 files changed, 106 insertions(+), 81 deletions(-)
 rename src/views/dictionary/{attachment/components/AgreementTemplate => template/agreement}/TemplateForm.vue (54%)
 rename src/views/dictionary/{attachment/components/AgreementTemplate => template/agreement}/index.vue (99%)

diff --git a/src/components/AGR/fun.js b/src/components/AGR/fun.js
index a7aca4f9..c6d05e73 100644
--- a/src/components/AGR/fun.js
+++ b/src/components/AGR/fun.js
@@ -4,7 +4,7 @@ import AGRCOMP from "./index.vue";
 const MFAConstructor = Vue.extend(AGRCOMP);
 let MFAINSTANCELIST = [];
 const AGR = options => {
-    const { Id, callBack, cancelBack } = options;
+    const { Id, IsEn_Us, callBack, cancelBack } = options;
     if (!Id) throw `Id is requred.but ${Id}`
     const id = `AGR${new Date().getTime()}`;
     const instance = new MFAConstructor();
@@ -13,7 +13,7 @@ const AGR = options => {
     instance.vm = instance.$mount();
     if (instance.vm.visible) return;
     document.body.appendChild(instance.vm.$el);
-    instance.vm.open({ Id });
+    instance.vm.open({ Id, IsEn_Us });
     instance.vm.$on("success", (Id) => {
         if (callBack) callBack(Id)
     });
diff --git a/src/components/AGR/index.vue b/src/components/AGR/index.vue
index 99abf7d2..298520ce 100644
--- a/src/components/AGR/index.vue
+++ b/src/components/AGR/index.vue
@@ -2,10 +2,11 @@
   <!--AGR-->
   <el-dialog v-if="visible" :visible.sync="visible" width="60%" :close-on-click-modal="false" append-to-body center
     :show-close="true" @close="cancel">
-    <div slot="title">
-      {{ agreement.FileName }}
-    </div>
-    <div v-html="agreement.FileContent"></div>
+    <!-- <div slot="title">
+      {{ agreement.FileName }} 
+    </div> -->
+    <div v-html="agreement.FileEnContent" class="content" v-if="IsEn_Us"></div>
+    <div v-html="agreement.FileContent" class="content" v-else></div>
   </el-dialog>
 </template>
 <script>
@@ -17,7 +18,8 @@ export default {
   data() {
     return {
       visible: false,
-      agreement: {}
+      agreement: {},
+      IsEn_Us: false
     }
   },
   mounted() {
@@ -38,7 +40,8 @@ export default {
       }
     },
     open(data) {
-      let { Id } = data;
+      let { Id, IsEn_Us } = data;
+      this.IsEn_Us = IsEn_Us
       this.getAgreement(Id)
       this.visible = true
     },
@@ -54,4 +57,9 @@ export default {
 ::v-deep .el-dialog__body {
   height: 500px;
 }
+
+.content {
+  height: 100%;
+  overflow-y: auto;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/dictionary/attachment/index.vue b/src/views/dictionary/attachment/index.vue
index 9450d0ef..d5313858 100644
--- a/src/views/dictionary/attachment/index.vue
+++ b/src/views/dictionary/attachment/index.vue
@@ -8,7 +8,6 @@
         <CommonTemplate v-if="activeTab === '4' && item.value == activeTab" />
         <SignatureTemplate v-if="activeTab === '5' && item.value == activeTab" />
         <ToolsTemplate v-if="activeTab === '0' && item.value == activeTab" />
-        <AgreementTemplate v-if="activeTab === '6' && item.value == activeTab" />
       </el-tab-pane>
     </el-tabs>
     <!-- 预览 -->
@@ -29,7 +28,6 @@ import EmailTemplate from './components/EmailTemplate'
 import CommonTemplate from './components/CommonTemplate'
 import SignatureTemplate from './components/SignatureTemplate'
 import ToolsTemplate from './components/ToolsTemplate'
-import AgreementTemplate from './components/AgreementTemplate'
 import VueOfficeDocx from '@vue-office/docx'
 import '@vue-office/docx/lib/index.css'
 import VueOfficeExcel from '@vue-office/excel'
@@ -46,8 +44,7 @@ export default {
     VueOfficeDocx,
     VueOfficeExcel,
     PreviewFile,
-    ToolsTemplate,
-    AgreementTemplate
+    ToolsTemplate
   },
   data() {
     return {
diff --git a/src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue b/src/views/dictionary/template/agreement/TemplateForm.vue
similarity index 54%
rename from src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue
rename to src/views/dictionary/template/agreement/TemplateForm.vue
index f1372cfa..015684ad 100644
--- a/src/views/dictionary/attachment/components/AgreementTemplate/TemplateForm.vue
+++ b/src/views/dictionary/template/agreement/TemplateForm.vue
@@ -2,34 +2,59 @@
   <el-form ref="sysAgreementFrom" v-loading="loading" :model="form" label-width="140px" size="small" :rules="rules"
     class="upload-temporary-file">
     <div class="base-dialog-body">
-      <el-form-item :label="$t('dictionary:agreement:table:UserAgreementTypeEnum')" prop="UserAgreementTypeEnum">
-        <el-select v-model="form.UserAgreementTypeEnum" style="width: 50%" size="small" filterable>
-          <el-option v-for="item of $d.UserAgreementType" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('dictionary:agreement:table:FileName')" prop="FileName">
-        <el-input v-model="form.FileName" clearable style="width: 50%" />
-      </el-form-item>
-      <el-form-item :label="$t('dictionary:agreement:table:FileVersion')" prop="FileVersion">
-        <el-input v-model="form.FileVersion" clearable style="width: 50%" />
-      </el-form-item>
-      <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')" prop="UpdateDate">
-        <el-date-picker v-model="form.UpdateDate" type="datetime"
-          :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
-          format="yyyy-MM-dd HH:mm:ss" clearable style="width: 50%;">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="$t('dictionary:agreement:table:EffectiveDate')" prop="EffectiveDate">
-        <el-date-picker v-model="form.EffectiveDate" type="datetime"
-          :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
-          format="yyyy-MM-dd HH:mm:ss" clearable style="width: 50%;">
-        </el-date-picker>
-      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:UserAgreementTypeEnum')" prop="UserAgreementTypeEnum"
+            style="width: 48%">
+            <el-select v-model="form.UserAgreementTypeEnum" style="width: 100%" size="small" filterable>
+              <el-option v-for="item of $d.UserAgreementType" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:FileName')" prop="FileName" style="width: 48%">
+            <el-input v-model="form.FileName" clearable style="width: 100%" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:FileVersion')" prop="FileVersion" style="width: 48%">
+            <el-input v-model="form.FileVersion" clearable style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')" prop="UpdateDate" style="width: 48%">
+            <el-date-picker v-model="form.UpdateDate" type="datetime"
+              :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%;">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:EffectiveDate')" prop="EffectiveDate" style="width: 48%">
+            <el-date-picker v-model="form.EffectiveDate" type="datetime"
+              :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%;">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-form-item :label="$t('dictionary:agreement:table:FileContent')" prop="FileContent">
         <div class="html_temp">
           <prism-editor class="my-editor" v-model="form.FileContent" :highlight="highlighter" :line-numbers="true"
-            style="width: 50%;max-height: 300px;"></prism-editor>
-          <div v-html="form.FileContent" style="width: 45%;"></div>
+            style="width: 50%;max-height: 350px;"></prism-editor>
+          <div v-html="form.FileContent" style="width: 45%;" class="content"></div>
+        </div>
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:agreement:table:FileContentEn')" prop="FileEnContent">
+        <div class="html_temp">
+          <prism-editor class="my-editor" v-model="form.FileEnContent" :highlight="highlighter" :line-numbers="true"
+            style="width: 50%;max-height: 350px;"></prism-editor>
+          <div v-html="form.FileEnContent" style="width: 45%;" class="content"></div>
         </div>
       </el-form-item>
 
@@ -71,7 +96,8 @@ export default {
         UserAgreementTypeEnum: '',
         FileName: '',
         FileVersion: null,
-        FileContent: '',
+        FileContent: '\n\n\n\n',
+        FileEnContent: `\n\n\n\n`,
         UpdateDate: '',
         EffectiveDate: '',
       },
@@ -88,6 +114,9 @@ export default {
         FileContent: [
           { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
         ],
+        FileEnContent: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
         UpdateDate: [
           { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
         ],
@@ -136,15 +165,20 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .html_temp {
   display: flex;
   justify-content: space-between;
-  min-height: 300px;
+  width: 100%;
 
   .my-editor {
     border: 1px solid #333;
   }
 
 }
+
+.content {
+  max-height: 350px;
+  overflow-y: auto;
+}
 </style>
diff --git a/src/views/dictionary/attachment/components/AgreementTemplate/index.vue b/src/views/dictionary/template/agreement/index.vue
similarity index 99%
rename from src/views/dictionary/attachment/components/AgreementTemplate/index.vue
rename to src/views/dictionary/template/agreement/index.vue
index 40dd5c66..90c93afb 100644
--- a/src/views/dictionary/attachment/components/AgreementTemplate/index.vue
+++ b/src/views/dictionary/template/agreement/index.vue
@@ -155,7 +155,7 @@ const searchDataDefault = () => {
   }
 }
 export default {
-  name: 'AgreementTemplate',
+  name: 'Agreement',
   components: { BaseContainer, Pagination, TemplateForm },
   data() {
     return {
@@ -196,7 +196,8 @@ export default {
     },
     view(row) {
       this.$AGR({
-        Id: row.Id
+        Id: row.Id,
+        IsEn_Us: this.isEN
       })
     },
     changeTimeList(key) {
diff --git a/src/views/dictionary/template/index.vue b/src/views/dictionary/template/index.vue
index 62f19a95..8cec0458 100644
--- a/src/views/dictionary/template/index.vue
+++ b/src/views/dictionary/template/index.vue
@@ -6,68 +6,45 @@
         <qc-questions v-if="activeTab == 'qc'" />
       </el-tab-pane>
       <!-- 阅片标准配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:criterionsConfig')"
-        name="criterions"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:criterionsConfig')" name="criterions">
         <criterions-tmp v-if="activeTab == 'criterions'" />
       </el-tab-pane>
       <!-- 临床数据配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:clinicalDataConfig')"
-        name="clinicalData"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:clinicalDataConfig')" name="clinicalData">
         <clinical-data v-if="activeTab == 'clinicalData'" />
       </el-tab-pane>
       <!-- 医学审核问题配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:medicalConfig')"
-        name="medicalAudit"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:medicalConfig')" name="medicalAudit">
         <medical-audit v-if="activeTab == 'medicalAudit'" />
       </el-tab-pane>
       <!-- DICOM字段匿名化配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:dicomTagConfig')"
-        name="anonymization"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagConfig')" name="anonymization">
         <Anonymization v-if="activeTab == 'anonymization'" />
       </el-tab-pane>
       <!-- DICOM字段新增配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:dicomTagAddConfig')"
-        name="increasefields"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagAddConfig')" name="increasefields">
         <IncreaseFields v-if="activeTab == 'increasefields'" />
       </el-tab-pane>
       <!-- 邮件管理 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:emailConfig')"
-        name="email"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:emailConfig')" name="email">
         <Email v-if="activeTab == 'email'" />
       </el-tab-pane>
       <!-- 签名管理 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:signConfig')"
-        name="sign"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:signConfig')" name="sign">
         <Sign v-if="activeTab == 'sign'" />
       </el-tab-pane>
       <!-- 浏览器推荐 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:browserConfig')"
-        name="browser"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:browserConfig')" name="browser">
         <Browser v-if="activeTab == 'browser'" />
       </el-tab-pane>
       <!-- 文件记录 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:fileConfig')"
-        name="file"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:fileConfig')" name="file">
         <File v-if="activeTab == 'file'" />
       </el-tab-pane>
+      <!-- 用户协议 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:agreement')" name="agreement">
+        <Agreement v-if="activeTab == 'agreement'" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -82,6 +59,7 @@ import Email from './email/index.vue'
 import Sign from './sign/index.vue'
 import Browser from './browser/index.vue'
 import File from './file/index.vue'
+import Agreement from './agreement/index.vue'
 export default {
   name: 'Questions',
   components: {
@@ -95,6 +73,7 @@ export default {
     MedicalAudit,
     Browser,
     File,
+    Agreement
   },
   data() {
     return {
@@ -122,16 +101,18 @@ export default {
     display: flex;
     flex-direction: column;
   }
+
   .el-tabs__header {
     height: 40px;
     margin-bottom: 5px;
   }
+
   .el-tabs__content {
     flex: 1;
+
     .el-tab-pane {
       height: 100%;
     }
   }
 }
 </style>
-
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 16a77aab..2a03c87e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -297,7 +297,8 @@ export default {
       let find = this.Agreement.find(item => item.IsCurrentVersion && item.UserAgreementTypeEnum === type)
       if (!find) return this.$confirm(this.$t('login:message:noAgreement').replace('xxx', this.$fd('UserAgreementType', type)))
       this.$AGR({
-        Id: find.Id
+        Id: find.Id,
+        IsEn_Us: this.$i18n.locale !== 'zh'
       })
     },
     getAgreementList() {
diff --git a/src/views/system/login-log/detail.vue b/src/views/system/login-log/detail.vue
index 1c554693..61c664f7 100644
--- a/src/views/system/login-log/detail.vue
+++ b/src/views/system/login-log/detail.vue
@@ -70,6 +70,7 @@ export default {
         'FileVersion',
         'UserAgreementId',
       ],
+      IsEn_Us: false
     }
   },
   computed: {
@@ -82,6 +83,7 @@ export default {
       let obj = JSON.parse(this.JsonObj)
       let curData = []
       Object.keys(obj).forEach((key) => {
+        if (key === 'IsEn_Us') this.IsEn_Us = obj[key]
         if (this.curKeys.includes(key)) {
           let o = {
             key: this.$t(`system:loginLog:form:${key}`),
@@ -103,7 +105,8 @@ export default {
   methods: {
     view(row) {
       this.$AGR({
-        Id: row.value
+        Id: row.value,
+        IsEn_Us: this.IsEn_Us
       })
     },
   }

From 5565b1389df49dfd9fe9bf5774d1df8c935cd20f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 24 Oct 2025 15:53:10 +0800
Subject: [PATCH 041/333] =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dictionary/template/agreement/TemplateForm.vue     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/dictionary/template/agreement/TemplateForm.vue b/src/views/dictionary/template/agreement/TemplateForm.vue
index 015684ad..7acfc29a 100644
--- a/src/views/dictionary/template/agreement/TemplateForm.vue
+++ b/src/views/dictionary/template/agreement/TemplateForm.vue
@@ -100,6 +100,7 @@ export default {
         FileEnContent: `\n\n\n\n`,
         UpdateDate: '',
         EffectiveDate: '',
+        IsCurrentVersion: false
       },
       rules: {
         UserAgreementTypeEnum: [
@@ -177,6 +178,15 @@ export default {
 
 }
 
+.base-dialog-body {
+  max-height: calc(100% - 60px);
+}
+
+.upload-temporary-file {
+  overflow-y: auto;
+  height: 100%;
+}
+
 .content {
   max-height: 350px;
   overflow-y: auto;

From 7426be2e50f9b9489f8d40bef6098918f6c71e7c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 24 Oct 2025 17:58:10 +0800
Subject: [PATCH 042/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=BB=91=E5=AE=9A=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js                            |   9 +
 .../components/customize/QuestionList.vue     | 345 ++++++------
 .../visit-review/components/FileViewer.vue    | 495 +++++++++++++++---
 .../visit-review/components/ReadPage.vue      | 109 +++-
 4 files changed, 687 insertions(+), 271 deletions(-)

diff --git a/src/api/reading.js b/src/api/reading.js
index 7a672889..fc50fe40 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -294,3 +294,12 @@ export function readingImport(param) {
     data: param
   })
 }
+
+// 非dicom阅片保存标记
+export function saveAnswerAndBindingNoneDicomMark(param) {
+  return request({
+    url: `/ReadingImageTask/saveAnswerAndBindingNoneDicomMark`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 8c4ac9f0..cd3db621 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -56,7 +56,7 @@
 <script>
 
 import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, verifyVisitTaskQuestions, getQuestionCalculateRelation, saveTaskQuestion } from '@/api/trials'
-import { setSkipReadingCache, resetReadingTask, saveTableQuestionMark } from '@/api/reading'
+import { setSkipReadingCache, resetReadingTask, saveTableQuestionMark, saveAnswerAndBindingNoneDicomMark } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import QuestionFormItem from './QuestionFormItem'
 import SignForm from '@/views/trials/components/newSignForm'
@@ -76,6 +76,10 @@ export default {
     readingTaskState: {
       type: Number,
       required: true
+    },
+    isNoneDicom: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -127,7 +131,8 @@ export default {
       this.loading = true
       try {
         const param = {
-          visitTaskId: this.visitTaskId
+          visitTaskId: this.visitTaskId,
+          IsDicomReading: !this.isNoneDicom
         }
         const res = await getCustomTableQuestionAnswer(param)
         if (res.IsSuccess) {
@@ -154,7 +159,11 @@ export default {
             }
           })
           this.questions = res.Result.SinglePage
+          if (this.isNoneDicom) {
+            this.$emit("setIsHaveBindingQuestion", res.OtherInfo.IsHaveBindingQuestion)
+          }
           this.questionsMarkStatus = {}
+          this.questionMarkInfoList = []
           this.questionMarkInfoList = res.OtherInfo.QuestionMarkInfoList.map(i => {
             if (i.RowId) {
               this.$set(this.questionsMarkStatus, `${i.RowId}_${i.TableQuestionId}`, { isMarked: i.MeasureData !== '', isSaved: true, OrderMarkName: i.OrderMarkName })
@@ -353,162 +362,6 @@ export default {
       const i = this.questionMarkInfoList.findIndex(i => i.MeasureData && i.MeasureData.annotationUID === annotation.annotationUID)
       return i > -1
     },
-    // async operateImageMarker(obj) {
-    //   this.operateStateEnum = obj.operateStateEnum
-    //   this.isTableQuestion = obj.question.IsTableQuestion ? true : false
-    //   this.imageTool = obj.question.ImageTool
-    //   this.imageToolAttribute = obj.question.ImageToolAttribute
-    //   this.operateQuestionId = obj.question.Id
-    //   this.operateRowId = obj.question.RowId
-    //   this.operateParentQsId = obj.question.ParentQsId
-    //   if (obj.operateStateEnum === 0) { 
-    //     // 绑定标记
-    //     this.$emit('setReadingToolPassive')
-    //   } else if (obj.operateStateEnum === 1) {
-    //     // 添加标记
-    //     this.$emit('setReadingToolActive', obj.question.ImageTool)
-    //   } else if (obj.operateStateEnum === 2) {
-    //     // 查看标记
-    //     let i = -1
-    //     if (this.isTableQuestion) {
-    //       if (this.operateRowId) {
-    //         i = this.questionMarkInfoList.findIndex(i => i.TableQuestionId === obj.question.Id && i.RowId === this.operateRowId)
-    //       } else {
-    //         i = this.questionMarkInfoList.findIndex(i => i.TableQuestionId === obj.question.Id && !i.RowId)
-    //       }
-    //     } else {
-    //       i = this.questionMarkInfoList.findIndex(i => i.QuestionId === obj.question.Id)
-    //     }
-    //     if (i > -1) {
-    //       const annotation = this.questionMarkInfoList[i].MeasureData
-    //       this.$emit('viewCustomAnnotationSeries', { visitTaskId: this.visitTaskId, annotation })
-    //     }
-    //   } else if (obj.operateStateEnum === 3) {
-    //     // 更改标记
-    //     this.$emit('setReadingToolPassive')
-    //   } else if (obj.operateStateEnum === 4) {
-    //     this.$emit('setReadingToolPassive')
-    //     // 移除标记
-    //     let i = -1
-    //     let questionMarkInfo = {}
-    //     if (this.isTableQuestion) {
-    //       if (this.operateRowId) {
-    //         i = this.questionMarkInfoList.findIndex(i => i.TableQuestionId === obj.question.Id && i.RowId === this.operateRowId)
-    //       } else {
-    //         i = this.questionMarkInfoList.findIndex(i => i.TableQuestionId === obj.question.Id && !i.RowId)
-    //       }
-    //     } else {
-    //       this.$set(this.questionForm, obj.question.Id, '')
-    //       i = this.questionMarkInfoList.findIndex(i => i.QuestionId === obj.question.Id)
-    //     }
-    //     if (i === -1) return
-    //     this.questionMarkInfoList[i].MeasureData = ''
-    //     this.questionMarkInfoList[i].StudyId = ''
-    //     this.questionMarkInfoList[i].SeriesId = ''
-    //     this.questionMarkInfoList[i].InstanceId = ''
-    //     questionMarkInfo = this.questionMarkInfoList[i]
-    //     questionMarkInfo.isMarked = false
-    //     questionMarkInfo.isSaved = false
-    //     this.$set(this.questionsMarkStatus, this.operateRowId ? `${this.operateRowId}_${obj.question.Id}` : obj.question.Id, questionMarkInfo)
-    //   } else if (obj.operateStateEnum === 5) {
-    //     // 保存外层标记
-    //     this.loading = true
-    //     try {
-    //       const answers = []
-    //       answers.push({ id: obj.question.Id, answer: this.questionForm[obj.question.Id] })
-    //       const markInfo = []
-    //       const i = this.questionMarkInfoList.findIndex(i => i.QuestionId === this.operateQuestionId)
-    //       if (i > -1) {
-    //         const obj = Object.assign({}, this.questionMarkInfoList[i])
-    //         obj.MeasureData = obj.MeasureData ? JSON.stringify(obj.MeasureData) : ''
-    //         markInfo.push(obj)
-    //       }
-    //       // 上传截图
-    //       const params = {
-    //         visitTaskId: this.visitTaskId,
-    //         answers: answers,
-    //         questionMarkInfoList: markInfo
-    //       }
-    //       await saveTaskQuestion(-10, params)
-
-    //       this.$set(this.questionsMarkStatus, obj.question.Id, {isMarked: this.questionMarkInfoList[i].MeasureData ? true : false, isSaved: true})
-    //       this.loading = false
-    //     } catch (e) {
-    //       console.log(e)
-    //       this.loading = false
-    //     }
-    //   } else if (obj.operateStateEnum === 6) {
-    //     // 更改数值内容
-    //     let questionMarkInfo = {}
-    //     if (this.isTableQuestion) {
-    //       questionMarkInfo.isMarked = false
-    //       questionMarkInfo.isSaved = false
-    //     } else {
-    //       questionMarkInfo.isMarked = false
-    //       questionMarkInfo.isSaved = false
-    //     }
-    //     this.$set(this.questionsMarkStatus, this.operateRowId ? `${this.operateRowId}_obj.question.Id` : obj.question.Id, questionMarkInfo)
-    //   } else if (obj.operateStateEnum === 7) {
-    //     // 保存表格问题标记
-    //     const loading = this.$loading({ fullscreen: true })
-    //     try {
-    //       let annotation = null
-    //       if (!this.operateRowId && obj.rowId && obj.question.ParentQsId) {
-    //         this.operateRowId = obj.rowId
-    //         this.questionMarkInfoList.forEach(item => {
-    //           if (item.QuestionId === obj.question.ParentQsId && !item.RowId) {
-    //             item.RowId = obj.rowId
-    //             let questionMarkStatus = Object.assign({}, this.questionsMarkStatus[item.TableQuestionId])
-    //             delete this.questionsMarkStatus[item.TableQuestionId]
-    //             if (item.TableQuestionId === this.operateQuestionId) {
-    //               annotation = item.MeasureData
-    //               this.$set(this.questionsMarkStatus, `${obj.rowId}_${item.TableQuestionId}`, questionMarkStatus)
-    //             } else {
-    //               this.$set(this.questionsMarkStatus, `${obj.rowId}_${item.TableQuestionId}`, {isMarked: item.MeasureData ? true : false, isSaved: false})
-    //             }
-
-    //           }
-    //         })
-    //       } else if (this.operateRowId && this.operateQuestionId) {
-    //         const i = this.questionMarkInfoList.findIndex(i => i.RowId === this.operateRowId && i.TableQuestionId === this.operateQuestionId)
-    //         if (i === -1) return
-    //         annotation = this.questionMarkInfoList[i].MeasureData
-    //       }
-    //       let picturePath = ''
-    //       if (annotation) {
-    //         // 上传截图
-    //         const base64Str = await this.getScreenshots({ visitTaskId: this.visitTaskId, annotation })
-    //         const pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, base64Str)
-    //         picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-    //       }
-    //       let params = {
-    //         Answer: obj.answer,
-    //         VisitTaskId: this.visitTaskId,
-    //         QuestionId: obj.question.ParentQsId,
-    //         InstanceId: annotation ? annotation.instanceId : '',
-    //         SeriesId: annotation ? annotation.seriesId : '',
-    //         StudyId: annotation ? annotation.studyId : '',
-    //         MarkTool: annotation ? annotation.markTool : '',
-    //         PicturePath: picturePath,
-    //         NumberOfFrames: annotation ? annotation.numberOfFrames : null,
-    //         MeasureData: annotation ? JSON.stringify(annotation) : '',
-    //         QuestionType: 0,
-    //         OrderMarkName: annotation ? annotation.data.label : '',
-    //         RowId: this.operateRowId,
-    //         TableQuestionId: this.operateQuestionId,
-    //         RowIndex: obj.rowIndex
-    //       }
-    //       // 保存标记
-    //       await saveTableQuestionMark(params, -10)
-    //       this.$set(this.questionsMarkStatus, `${this.operateRowId}_${this.operateQuestionId}`, {isMarked: annotation ? true : false, isSaved: true})
-    //       this.resetOperateState()
-    //       loading.close()
-    //     } catch(e) {
-    //       console.log(e)
-    //       loading.close()
-    //     }
-    //   }
-    // },
     async operateImageMarker(obj) {
       const STATE = {
         BIND: 0,       // 绑定标记
@@ -538,9 +391,9 @@ export default {
         [STATE.VIEW]: this.handleViewAnnotation,
         [STATE.CHANGE]: () => this.$emit('setReadingToolPassive'),
         [STATE.REMOVE]: this.handleRemoveAnnotation,
-        [STATE.SAVE_OUTER]: this.handleSaveOuterQuestions,
+        [STATE.SAVE_OUTER]: this.isNoneDicom ? this.handleSaveNoneDicomOuterQuestions : this.handleSaveOuterQuestions,
         [STATE.UPDATE]: this.handleUpdateValue,
-        [STATE.SAVE_TABLE]: this.handleSaveTableQuestions
+        [STATE.SAVE_TABLE]: this.isNoneDicom ? this.handleSaveNoneDicomTableQuestions : this.handleSaveTableQuestions
       }
 
       const handler = stateHandlers[operateStateEnum]
@@ -574,6 +427,73 @@ export default {
         isSaved: false,
       })
     },
+    async handleSaveNoneDicomOuterQuestions(obj) {
+      this.loading = true;
+      try {
+        const answers = [{ QuestionId: obj.question.Id, answer: this.questionForm[obj.question.Id] }]
+        const markInfo = []
+        const index = this.questionMarkInfoList.findIndex(
+          item => item.QuestionId === this.operateQuestionId
+        )
+
+        if (index > -1) {
+          const item = { ...this.questionMarkInfoList[index] }
+          item.MeasureData = item.MeasureData ? JSON.stringify(item.MeasureData) : ''
+          markInfo.push(item)
+          markInfo[0].PicturePath = ''
+        }
+        let annotation = null
+        if (!this.operateRowId && obj.rowId) {
+          this.operateRowId = obj.rowId
+          // this.updateQuestionsMarkStatus(obj)
+        }
+        annotation = this.getAnnotationByRow(obj.question.Id, false)
+        // 截图上传
+        let picturePath = obj.picturePath
+        if (annotation) {
+          const base64Str = await this.getScreenshots({
+            visitTaskId: this.visitTaskId,
+            annotation
+          })
+          if (!picturePath) {
+            const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str)
+            picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+          }
+          markInfo[0].PicturePath = picturePath
+        }
+        if (markInfo && markInfo.length > 0) {
+          markInfo[0].MarkId = annotation ? annotation.annotationUID : null
+        }
+        await saveAnswerAndBindingNoneDicomMark({
+          visitTaskId: this.visitTaskId,
+          StudyId: annotation.studyId,
+          NoneDicomFileId: annotation.noneDicomFileId,
+          ...answers[0],
+          ...markInfo[0]
+        })
+        this.loading = false
+        this.$set(this.questionsMarkStatus, obj.question.Id, {
+          isMarked: !!this.questionMarkInfoList[index]?.MeasureData,
+          isSaved: true,
+          OrderMarkName: index > -1 ? this.questionMarkInfoList[index].OrderMarkName : ''
+        })
+        this.resetOperateState()
+        if (annotation) {
+          for (let i = 0; i < this.questionMarkInfoList.length; i++) {
+            const item = this.questionMarkInfoList[i]
+            if (!item.MeasureData || item.MeasureData.annotationUID !== annotation.annotationUID) continue
+            const isTableMode = item.TableQuestionId
+            if (!isTableMode && this.questionsMarkStatus[item.QuestionId] && !this.questionsMarkStatus[item.QuestionId].isSaved && this.questionsMarkStatus[item.QuestionId].isMarked) {
+              DicomEvent.$emit('operateImageMarker', { QuestionId: item.QuestionId, operateStateEnum: 5, picturePath })
+              break
+            }
+          }
+        }
+      } catch (err) {
+        console.log(err)
+        this.loading = false
+      }
+    },
     async handleSaveOuterQuestions(obj) {
       this.loading = true;
       try {
@@ -647,6 +567,65 @@ export default {
         isSaved: false,
       })
     },
+    async handleSaveNoneDicomTableQuestions(obj) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        let annotation = null
+        if (!this.operateRowId && obj.rowId && obj.question.ParentQsId) {
+          this.operateRowId = obj.rowId
+          this.updateQuestionsMarkStatus(obj)
+        }
+        annotation = this.getAnnotationByRow(this.operateRowId)
+        // 截图上传
+        let picturePath = obj.picturePath
+        if (annotation && !picturePath) {
+          const base64Str = await this.getScreenshots({
+            visitTaskId: this.visitTaskId,
+            annotation
+          })
+          const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str)
+          picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+        }
+        await saveAnswerAndBindingNoneDicomMark({
+          Answer: obj.answer,
+          VisitTaskId: this.visitTaskId,
+          QuestionId: obj.question.ParentQsId,
+          ...(annotation ? {
+            StudyId: annotation.studyId,
+            MarkTool: annotation.markTool,
+            MeasureData: JSON.stringify(annotation),
+            OrderMarkName: annotation.data.label,
+            NoneDicomFileId: annotation.noneDicomFileId,
+          } : {}),
+          Path: picturePath ? picturePath : '',
+          QuestionType: 0,
+          RowId: this.operateRowId,
+          TableQuestionId: this.operateQuestionId,
+          RowIndex: obj.rowIndex,
+          MarkId: annotation ? annotation.annotationUID : null
+        })
+        this.$set(this.questionsMarkStatus,
+          `${this.operateRowId}_${this.operateQuestionId}`,
+          { isMarked: !!annotation, isSaved: true, OrderMarkName: annotation ? annotation.data.label : '' }
+        )
+        this.resetOperateState()
+        if (annotation) {
+          for (let i = 0; i < this.questionMarkInfoList.length; i++) {
+            const item = this.questionMarkInfoList[i]
+            if (!item.MeasureData || item.MeasureData.annotationUID !== annotation.annotationUID) continue
+            const isTableMode = item.TableQuestionId
+            if (isTableMode && ((this.questionsMarkStatus[`${item.RowId}_${item.TableQuestionId}`] && !this.questionsMarkStatus[`${item.RowId}_${item.TableQuestionId}`].isSaved && this.questionsMarkStatus[`${item.RowId}_${item.TableQuestionId}`].isMarked) || (this.questionsMarkStatus[`${item.TableQuestionId}`] && !this.questionsMarkStatus[`${item.TableQuestionId}`].isSaved && this.questionsMarkStatus[`${item.TableQuestionId}`].isMarked))) {
+              DicomEvent.$emit('operateImageMarkerTable', { QuestionId: item.TableQuestionId, operateStateEnum: 7, picturePath })
+              break
+            }
+          }
+        }
+      } catch (e) {
+        console.error('表格保存失败:', e)
+      } finally {
+        loading.close()
+      }
+    },
     async handleSaveTableQuestions(obj) {
       const loading = this.$loading({ fullscreen: true })
       try {
@@ -772,7 +751,6 @@ export default {
               && item.RowId !== this.operateRowId && item.RowId
           )
           // && this.operateRowId
-          console.log(conflictIndex)
           if (conflictIndex > -1) {
             //该标记已绑定到其他行，不能更改绑定！
             this.$alert(this.$t("dicom3D:CustomizeQuestionList:alert:markIsbind"))
@@ -808,6 +786,7 @@ export default {
             StudyId: annotation.studyId,
             MarkTool: annotation.metadata.toolName,
             PicturePath: '',
+            Path: annotation.path,
             NumberOfFrames: annotation.numberOfFrames,
             MeasureData: annotation,
             RowId: this.operateRowId || '',
@@ -956,11 +935,33 @@ export default {
       const hasProp = cachedStats
         && Object.prototype.hasOwnProperty.call(cachedStats, prop)
       if (!hasProp) return null
-      const value = cachedStats[prop]
+      let value = cachedStats[prop]
+      if (this.isNoneDicom && annotation.ps) {
+        let ps = annotation.ps
+        if (prop === 'area') value = this.reRound(value * ps * ps, this.digitPlaces)
+        if (prop === 'length' || prop === 'perimeter') value = this.reRound(value * ps, this.digitPlaces)
+      }
       return value !== null
         ? parseFloat(value).toFixed(this.digitPlaces)
         : value
     },
+    reRound(result, finalPrecision) {
+      if (typeof result === 'string' && result.includes(', ')) {
+        const numStrs = result.split(', ')
+        const processed = numStrs.map(str => this.processSingle(str, finalPrecision))
+        return processed.join(', ')
+      }
+      return this.processSingle(result, finalPrecision)
+    },
+    processSingle(str, precision) {
+      const num = parseFloat(str)
+      if (isNaN(num)) return 'NaN'
+
+      // 保留原极小值处理逻辑
+      if (Math.abs(num) < 0.0001) return str
+      const factor = 10 ** precision
+      return (Math.round(num * factor + 0.0000001) / factor).toFixed(precision)
+    },
     unBindAnnotationToQuestion(obj) {
       const { markTableQuestions = [], questionId } = obj || {}
       const { questionMarkInfoList, questionsMarkStatus } = this
@@ -1123,6 +1124,26 @@ export default {
         // this.setMeasuredData(event.data.data)
       }
     }
+  },
+  watch: {
+    questionsMarkStatus: {
+      handler() {
+        let saved = true
+        Object.keys(this.questionsMarkStatus).forEach(key => {
+          if (!this.questionsMarkStatus[key].isSaved) saved = false
+        })
+        this.$emit('setSaved', saved)
+      },
+      deep: true,
+      immediate: true
+    },
+    // questionMarkInfoList: {
+    //   handler() {
+    //     console.log(this.questionMarkInfoList, 'questionMarkInfoList')
+    //   },
+    //   deep: true,
+    //   immediate: true
+    // }
   }
 }
 </script>
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index f247960b..25cb8fa5 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -78,7 +78,7 @@
             </div>
             <div class="dropdown-content">
               <!--v-if="readingTaskState < 2"-->
-              <ul  style="width:100px;">
+              <ul style="width:100px;">
                 <li v-for="i in customizeStandardsNoneDicom" :key="i.toolName" style="text-align:left;">
                   <a href="#" @click.prevent="setAnnotateToolActive(i.toolName)">
                     <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />
@@ -234,6 +234,7 @@
 </template>
 <script>
 import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo } from '@/api/trials'
+import html2canvas from 'html2canvas'
 import {
   RenderingEngine,
   Enums,
@@ -296,6 +297,12 @@ export default {
       default() {
         return []
       }
+    },
+    ecrf: {
+      type: Object,
+      default() {
+        return {}
+      }
     }
   },
   data() {
@@ -342,7 +349,8 @@ export default {
       uploadStatus: 'upload',
       taskId: '',
       isReadingTaskViewInOrder: null,
-      trialCriterion: {}
+      trialCriterion: {},
+      saveCustomAnnotationTimer: null
     }
   },
   computed: {
@@ -607,7 +615,17 @@ export default {
         toolGroup.setToolPassive(EraserTool.toolName)
       })
     },
-
+    lengthscaleToolDisabled(saved) {
+      const viewportIds = ['canvas-0', 'canvas-1', 'canvas-2', 'canvas-3']
+      viewportIds.forEach(toolGroupId => {
+        const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+        if (saved) {
+          toolGroup.setToolPassive(LengthscaleTool.toolName)
+        } else {
+          toolGroup.setToolEnabled(LengthscaleTool.toolName)
+        }
+      })
+    },
     // 加载图片回调
     stackNewImage(e) {
       const { detail } = e
@@ -919,96 +937,201 @@ export default {
         toolsEvents.ANNOTATION_REMOVED,
         this.annotationRemovedListener
       )
+      eventTarget.addEventListener(
+        toolsEvents.ANNOTATION_SELECTION_CHANGE,
+        this.annotationSelectionChangeListener
+      )
     },
     async annotationRemovedListener(e) {
       const { annotation } = e.detail
       try {
-        if (!annotation) return
-        if (this.readingTaskState === 2 && !annotation.annotationId) {
-          cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
-          return false
+        // if ( this.resetAnnotation && this.isFusion ) return false
+        if (!annotation) return false
+        if (annotation.metadata.toolName === 'Lengthscale') {
+          await this.$confirm(
+            this.$t('trials:trials-list:table:LengthscaleIsDeleted')
+          )
+          const errorMsg = { message: 'Lengthscale Not delete' }
+          throw errorMsg
         }
+        if (this.readingTaskState === 2 && !annotation.data.label && annotation.metadata.toolName !== 'Lengthscale') return false
         if (this.readingTaskState === 2) {
           const errorMsg = { message: 'annotation Not allowed to operate' }
           throw errorMsg
         }
-        if (annotation.annotationId) {
-          await deleteTrialFileType(annotation.annotationId)
-        } else {
-          cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
+        const i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
+        if (i === -1 && annotation.metadata.toolName !== 'Lengthscale') {
+          // 临时标记
+          return
         }
-        const renderingEngine = getRenderingEngine(renderingEngineId)
-        const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
-        viewport.render()
-        const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
-        const imageId = annotation.metadata.referencedImageId
-        const path = imageId.split(`web:${this.OSSclientConfig.basePath}`)[1]
-        const fileList = this.viewportInfos[i].fileList
-        const fileIndex = fileList.findIndex(f => f.Path === path)
-        if (annotation.metadata.toolName === 'Lengthscale') {
-          this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: null })
+        if (annotation.visitTaskId === this.taskInfo.VisitTaskId) {
+          this.$emit('getEcrf', { type: "verifyAnnotationIsBound", VisitTaskId: annotation.visitTaskId, annotation })
+          this.$nextTick(async () => {
+            try {
+              const isBound = this.ecrf.isBound
+              if (isBound && this.activeTool === 'Eraser') {
+                // '该标记已与问题进行绑定，不允许删除！'
+                this.$alert(this.$t('dicom3D:ReadPage:alert:MarkToQuestionNoDel'))
+                const errorMsg = { message: 'annotation Not allowed to operate' }
+                throw errorMsg
+              } else if (this.activeTool === 'Eraser') {
+                await this.$confirm(
+                  this.$t('trials:trials-list:table:isDeleted') +
+                  annotation.data.label +
+                  '?'
+                )
+                if (annotation.id) {
+                  let res = await deleteTrialFileType(annotation.id)
+                  if (!res.IsSuccess) throw ''
+                }
+
+                const renderingEngine = getRenderingEngine(renderingEngineId)
+                for (let i = 0; i < this.cells.length; i++) {
+                  const viewportId = `canvas-${i}`
+                  const viewport = renderingEngine.getViewport(viewportId)
+                  viewport.render()
+                }
+              } else {
+                const errorMsg = { message: 'annotation Not allowed to operate' }
+                throw errorMsg
+              }
+            } catch (err) {
+              cornerstoneTools.annotation.state.addAnnotation(annotation)
+              const renderingEngine = getRenderingEngine(renderingEngineId)
+              for (let i = 0; i < this.cells.length; i++) {
+                const viewportId = `canvas-${i}`
+                const viewport = renderingEngine.getViewport(viewportId)
+                viewport.render()
+              }
+              console.log(e)
+            }
+          })
+
         }
       } catch (e) {
         cornerstoneTools.annotation.state.addAnnotation(annotation)
         const renderingEngine = getRenderingEngine(renderingEngineId)
-        const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
-        viewport.render()
+        for (let i = 0; i < this.cells.length; i++) {
+          const viewportId = `canvas-${i}`
+          const viewport = renderingEngine.getViewport(viewportId)
+          viewport.render()
+        }
         console.log(e)
       }
-
     },
     async annotationModifiedListener(e) {
       console.log('Modified')
       if (this.readingTaskState === 2) return
       const { annotation } = e.detail
+      if (!annotation.highlighted) return
       if (!annotation) return
-      if (!annotation.annotationId) return
-      if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
-      const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
-      if (i === -1) return
-      if (this.viewportInfos[i].taskInfo.VisitTaskId !== this.taskInfo.VisitTaskId) return
+      // if (!annotation.annotationId) return
+      let i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
+      if (i === -1 && annotation.metadata.toolName !== 'Lengthscale') {
+        this.setToolsPassive()
+        return
+      }
+      i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
       const imageId = annotation.metadata.referencedImageId
       const path = imageId.split(`web:${this.OSSclientConfig.basePath}`)[1]
       const fileList = this.viewportInfos[i].fileList
       const fileIndex = fileList.findIndex(f => f.Path === path)
       if (fileIndex === -1) return
+      annotation.path = path
+      let ps = null
+      let psIndex = this.psArr.findIndex(i => i.Path === path)
+      if (psIndex > -1 && this.psArr[i].PS) {
+        ps = parseFloat(this.psArr[i].PS).toFixed(3)
+      }
+      annotation.ps = ps
+      if (!annotation.data.label && annotation.metadata.toolName !== 'Lengthscale') return
+      if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
       if (annotation.metadata.toolName === 'Lengthscale') {
         const value = annotation.data.l
+        let ps = 1
         if (value) {
           const cachedStats = Object.keys(annotation.data.cachedStats)
-          const ps = value / annotation.data.cachedStats[cachedStats[0]].length
+          ps = value / annotation.data.cachedStats[cachedStats[0]].length
           annotation.data.ps = ps
-          this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: ps })
+          this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: ps, OldPS: 1 })
         }
         this.setToolsPassive()
+        if (this.customizeStandardsNoneDicom.find(item => item.toolName === annotation.metadata?.toolName)) return false
+        if (this.saveCustomAnnotationTimer) {
+          clearTimeout(this.saveCustomAnnotationTimer)
+          this.saveCustomAnnotationTimer = null
+        }
+        let psIndex = this.psArr.findIndex(p => p.NoneDicomFileId === fileList[fileIndex].Id)
+        let OldPS = 1
+        if (psIndex > -1) {
+          OldPS = this.psArr[i].OldPS
+        }
+        console.log(OldPS, ps)
+        let Proportion = ps / OldPS
+        return this.saveCustomAnnotationTimer = setTimeout(async () => {
+          console.log(this.ecrf.IsHaveBindingQuestion, 'this.ecrf.IsHaveBindingQuestion')
+          if (OldPS === ps || !this.ecrf.IsHaveBindingQuestion) {
+            this.saveCustomAnnotation(annotation)
+          } else {
+            await this.$confirm(
+              this.$t('trials:trials-list:table:allQuestionChange')
+            ).then(() => {
+              this.saveCustomAnnotation(annotation, Proportion)
+            })
+              .catch(action => {
+                this.saveCustomAnnotation(annotation, -1)
+              });
+          }
+        }, 500)
       }
-      if (this.customizeStandardsNoneDicom.find(item => item.toolName === annotation.metadata?.toolName)) return false
-      const params = {
-        id: annotation.annotationId,
-        visitTaskId: this.viewportInfos[i].taskInfo.VisitTaskId,
-        studyId: this.viewportInfos[i].studyId,
-        noneDicomFileId: fileList[fileIndex].Id,
-        path: fileList[fileIndex].Path,
-        measureData: JSON.stringify(annotation)
-      }
-      await addNoneDicomMark(params)
-      // 保存成功
-      // this.$message.success(this.$t('common:message:savedSuccessfully'))
+      this.$emit("getEcrf", { type: "getOperateStateEnum", VisitTaskId: this.taskInfo.VisitTaskId })
+      this.$emit('getEcrf', { type: "verifyAnnotationIsBound", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
+      this.$nextTick(() => {
+        const operateStateEnum = this.ecrf.operateStateEnum
+        const isBound = this.ecrf.isBound
+        if (isBound || this.isNumber(operateStateEnum)) {
+          console.log(isBound, this.isNumber(operateStateEnum))
+          this.$emit('getEcrf', { type: "updateAnnotationToQuestion", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
+        } else {
+          if (this.saveCustomAnnotationTimer) {
+            clearTimeout(this.saveCustomAnnotationTimer)
+            this.saveCustomAnnotationTimer = null
+          }
+          this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 1000)
+        }
+        this.setToolsPassive()
+      })
     },
     async annotationCompletedListener(e) {
       console.log('Completed')
       if (this.readingTaskState === 2) return
       const { annotation } = e.detail
       if (!annotation) return
-      if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
       const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
-      if (i === -1) return
+      let INDEX = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
+      if ((INDEX === -1 && annotation.metadata.toolName !== 'Lengthscale') || i === -1) {
+        this.setToolsPassive()
+        return
+      }
+
+      if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
       if (this.viewportInfos[i].taskInfo.VisitTaskId !== this.taskInfo.VisitTaskId) return
       const imageId = annotation.metadata.referencedImageId
       const path = imageId.split(`web:${this.OSSclientConfig.basePath}`)[1]
       const fileList = this.viewportInfos[i].fileList
       const fileIndex = fileList.findIndex(f => f.Path === path)
       if (fileIndex === -1) return
+      annotation.path = path
+      let ps = null
+      let psIndex = this.psArr.findIndex(i => i.Path === path)
+      if (psIndex > -1 && this.psArr[i].PS) {
+        ps = parseFloat(this.psArr[i].PS).toFixed(3)
+      }
+      annotation.ps = ps
+      annotation.markTool = annotation.metadata.toolName
+      annotation.visitTaskId = this.viewportInfos[i].taskInfo.VisitTaskId
+      annotation.studyId = this.viewportInfos[i].studyId
+      annotation.noneDicomFileId = this.viewportInfos[i].fileList[this.viewportInfos[i].currentImageIdIndex].Id
       if (annotation.metadata.toolName === 'Lengthscale') {
         this.form.annotationObj = {
           id: '',
@@ -1025,23 +1148,139 @@ export default {
         this.setToolsPassive()
         return
       }
-      if (this.customizeStandardsNoneDicom.find(item => item.toolName === annotation.metadata?.toolName)) return false
-      const params = {
-        id: '',
-        visitTaskId: this.viewportInfos[i].taskInfo.VisitTaskId,
-        studyId: this.viewportInfos[i].studyId,
-        noneDicomFileId: fileList[fileIndex].Id,
-        path: fileList[fileIndex].Path,
-        measureData: JSON.stringify(annotation)
-      }
-      const res = await addNoneDicomMark(params)
-      annotation.annotationId = res.Result
+      // this.markedSeriesIds.push(series.Id)
+      this.$emit('getEcrf', { type: "getOperateStateEnum", VisitTaskId: this.taskInfo.VisitTaskId })
 
-      const renderingEngine = getRenderingEngine(renderingEngineId)
-      const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
-      viewport.render()
-      // 保存成功
-      // this.$message.success(this.$t('common:message:savedSuccessfully'))
+      this.$nextTick(async () => {
+        const operateStateEnum = this.ecrf.operateStateEnum
+        const markName = await this.customPrompt(!this.isNumber(operateStateEnum))
+
+        if (markName) {
+          annotation.data.label = markName
+          if (annotation.metadata.toolName === 'ArrowAnnotate') {
+            annotation.data.text = markName
+          }
+          if (this.isNumber(operateStateEnum)) {
+            this.$emit('getEcrf', { type: "bindAnnotationToQuestion", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
+          } else {
+            if (this.saveCustomAnnotationTimer) {
+              clearTimeout(this.saveCustomAnnotationTimer)
+              this.saveCustomAnnotationTimer = null
+            }
+            this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 500)
+          }
+        } else {
+          // if (this.isNumber(operateStateEnum)) {
+          //   this.removeAnnotation(annotation)
+          // }  
+        }
+      })
+    },
+    annotationSelectionChangeListener(e) {
+      console.log('selection')
+      if (this.readingTaskState === 2) return
+      const { detail } = e
+      const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
+      const i = annotations.findIndex(i => i.annotationUID === detail.selection[0])
+      if (i > -1) {
+        if (annotations[i].visitTaskId !== this.taskInfo.VisitTaskId) {
+          return
+        } else {
+          this.$emit('getEcrf', { type: "bindAnnotationToQuestion", VisitTaskId: this.taskInfo.VisitTaskId, annotation: annotations[i] })
+        }
+      }
+    },
+    async saveCustomAnnotation(annotation, ps = null) {
+      try {
+        const measureData = Object.assign({}, annotation)
+        const params = {}
+        const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
+        await this.getScreenshots({
+          visitTaskId: this.taskInfo.VisitTaskId,
+          annotation
+        }, async (base64Str) => {
+          const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str)
+          let picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+          if (annotation.id) params.Id = annotation.id
+          if (!isNaN(parseFloat(ps))) params.Proportion = ps
+          params.PicturePath = picturePath
+          params.Path = annotation.path || ''
+          params.MarkTool = measureData.markTool
+          params.OrderMarkName = measureData.data.label
+          params.VisitTaskId = this.taskInfo.VisitTaskId
+          params.StudyId = annotation.studyId
+          params.NoneDicomFileId = annotation.noneDicomFileId
+          params.MeasureData = JSON.stringify(measureData)
+          params.MarkId = annotation.annotationUID
+          const res = await addNoneDicomMark(params)
+          annotation.markId = params.MarkId
+          annotation.id = res.Result
+          if (!isNaN(parseFloat(ps))) this.$emit('getEcrf', { type: "getQuestions", VisitTaskId: this.taskInfo.VisitTaskId })
+        })
+
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    async getScreenshots(measureData, callback) {
+      if (measureData) {
+        console.log(measureData, 'measureData')
+        // await this.imageLocation(measureData)
+        this.viewCustomAnnotation(measureData)
+        const divForDownloadViewport = document.querySelector(
+          `div[data-viewport-uid="canvas-${this.activeCanvasIndex}"]`
+        )
+        const canvas = await html2canvas(divForDownloadViewport)
+        const base64Str = canvas.toDataURL('image/png', 1)
+        callback(base64Str)
+      } else {
+        callback()
+      }
+    },
+    viewCustomAnnotation(obj) {
+      const i = this.viewportInfos.findIndex(i => i.taskInfo.VisitTaskId === obj.visitTaskId)
+      const imageId = obj.annotation.metadata.referencedImageId
+      const path = imageId.split(`web:${this.OSSclientConfig.basePath}`)[1]
+      const fileList = this.viewportInfos[i].fileList
+      const fileIndex = fileList.findIndex(f => f.Path === path)
+      let o = { fileInfo: fileList[fileIndex], fileList, visitTaskInfo: this.viewportInfos[i].taskInfo, studyId: this.viewportInfos[i].studyId }
+      this.setActiveCanvasImages(o)
+    },
+    async uploadScreenshots(fileName, file) {
+      try {
+        file = this.convertBase64ToBlob(file)
+        const trialId = this.$route.query.trialId
+        const taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+        const subjectId = taskInfo.SubjectId
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${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 })
+    },
+    isNumber(value) {
+      return typeof value === 'number' && value !== null && !isNaN(value)
     },
     async saveForm() {
       const validate = await this.$refs.lengthForm.validate()
@@ -1050,32 +1289,45 @@ export default {
       const annotation = this.form.annotationObj.annotation
       const fileList = this.form.annotationObj.fileList
       const fileIndex = this.form.annotationObj.fileIndex
+      let ps = 1
       if (value) {
         annotation.data.l = parseFloat(value)
         const cachedStats = Object.keys(annotation.data.cachedStats)
-        const ps = parseFloat(value) / annotation.data.cachedStats[cachedStats[0]].length
+        ps = parseFloat(value) / annotation.data.cachedStats[cachedStats[0]].length
         annotation.data.ps = ps
-        this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: ps })
+        this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: ps, OldPS: 1 })
       } else {
         cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
         return
       }
       if (this.customizeStandardsNoneDicom.find(item => item.toolName === annotation.metadata?.toolName)) return false
-      const params = {
-        id: '',
-        visitTaskId: this.form.annotationObj.visitTaskId,
-        studyId: this.form.annotationObj.studyId,
-        noneDicomFileId: this.form.annotationObj.noneDicomFileId,
-        path: this.form.annotationObj.path,
-        measureData: JSON.stringify(annotation)
-      }
-      const res = await addNoneDicomMark(params)
-      annotation.annotationId = res.Result
-
-      const renderingEngine = getRenderingEngine(renderingEngineId)
-      const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
-      viewport.render()
       this.dialogVisible = false
+      if (this.saveCustomAnnotationTimer) {
+        clearTimeout(this.saveCustomAnnotationTimer)
+        this.saveCustomAnnotationTimer = null
+      }
+      let psIndex = this.psArr.findIndex(p => p.NoneDicomFileId === fileList[fileIndex].Id)
+      let OldPS = 1
+      if (psIndex > -1) {
+        OldPS = this.psArr[psIndex].OldPS
+      }
+      console.log(OldPS, 'OldPS')
+      let Proportion = ps / OldPS
+      return this.saveCustomAnnotationTimer = setTimeout(async () => {
+        if (!this.ecrf.IsHaveBindingQuestion) {
+          this.saveCustomAnnotation(annotation)
+        } else {
+          await this.$confirm(
+            this.$t('trials:trials-list:table:allQuestionChange')
+          ).then(() => {
+            this.saveCustomAnnotation(annotation, Proportion)
+          })
+            .catch(action => {
+              this.saveCustomAnnotation(annotation, -1)
+            });
+        }
+      }, 500)
+      this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 500)
     },
     getLengthscaleToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]
@@ -1087,6 +1339,9 @@ export default {
         return
       }
       const textLines = []
+      if (data.label) {
+        textLines.push(data.label)
+      }
       textLines.push(`P: ${parseFloat(length).toFixed(this.digitPlaces)} ${unit}`)
       if (data.l) {
         textLines.push(`L: ${parseFloat(data.l).toFixed(this.digitPlaces)} mm`)
@@ -1097,7 +1352,7 @@ export default {
     // 直线工具注释
     getLengthToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]
-      const { length, unit } = cachedVolumeStats
+      let { length, unit } = cachedVolumeStats
       if (length === undefined || length === null || isNaN(length)) {
         return
       }
@@ -1108,6 +1363,9 @@ export default {
         ps = parseFloat(this.psArr[i].PS).toFixed(3)
       }
       const textLines = []
+      if (data.label) {
+        textLines.push(data.label)
+      }
       if (ps) {
         textLines.push(`${this.reRound(csUtils.roundNumber(length * ps), this.digitPlaces)} mm`)
       } else {
@@ -1131,6 +1389,9 @@ export default {
       } = cachedVolumeStats || {}
 
       const textLines = []
+      if (data.label) {
+        textLines.push(data.label)
+      }
       let ps = null
       const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
       const i = this.psArr.findIndex(i => i.Path === path)
@@ -1180,6 +1441,9 @@ export default {
       }
 
       const textLines = []
+      if (data.label) {
+        textLines.push(data.label)
+      }
       let ps = null
       const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
       const i = this.psArr.findIndex(i => i.Path === path)
@@ -1216,6 +1480,9 @@ export default {
       }
 
       const textLines = []
+      if (data.label) {
+        textLines.push(data.label)
+      }
       let ps = null
       const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
       const i = this.psArr.findIndex(i => i.Path === path)
@@ -1242,6 +1509,9 @@ export default {
       }
 
       const textLines = []
+      if (data.label) {
+        textLines.push(data.label)
+      }
       let ps = null
       const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
       const i = this.psArr.findIndex(i => i.Path === path)
@@ -1300,16 +1570,77 @@ export default {
       viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true })
       renderingEngine.render()
     },
-    // 箭头工具输入标记名称自定义弹窗
-    async customPrompt() {
+    resetAnnotations({ annotations, visitTaskId }) {
+      // 移除病灶
+      const arr = cornerstoneTools.annotation.state.getAllAnnotations()
+      arr.map(i => {
+        if (i.visitTaskId === visitTaskId) {
+          cornerstoneTools.annotation.state.removeAnnotation(i.annotationUID)
+        }
+      })
+      annotations.map(i => {
+        if (i.MeasureData) {
+          const annotation = i.MeasureData
+          cornerstoneTools.annotation.state.addAnnotation(annotation)
+        }
+      })
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      for (let i = 0; i < this.cells.length; i++) {
+        const viewportId = `canvas-${i}`
+        const viewport = renderingEngine.getViewport(viewportId)
+        viewport.render()
+      }
+    },
+    // 输入标记名称自定义弹窗
+    async customPrompt(isShowCancelButton = true) {
       try {
+        const that = this
         // 请输入标记名称
-        const { value } = await this.$prompt(this.$t('trials:noneDicom:message:msg1'))
+        let message = this.$t('trials:noneDicom:message:msg1')
+        // if (isShowCancelButton) {
+        //   message = `<div><p>${this.$t('trials:noneDicom:message:msg1')}</p><p style='font-size:12px' class='customPromptTip'>${this.$t('trials:noneDicom:message:saveTip')}</p></div>`
+        // }
+        const { value } = await this.$prompt(message, '', {
+          showClose: false,
+          cancelButtonText: isShowCancelButton ? this.$t('trials:reading:button:temporarySave') : this.$t('common:button:cancel'),
+          confirmButtonText: isShowCancelButton ? this.$t('trials:reading:button:enduringSave') : this.$t('trials:reading:button:relevancy'),
+          // showCancelButton: isShowCancelButton,
+          // dangerouslyUseHTMLString: isShowCancelButton,
+          inputValidator: (res) => {
+            if (!res) {
+              return isShowCancelButton ? this.$t('trials:noneDicom:message:saveTip') : this.$t('trials:noneDicom:message:saveTipByRelevancy')
+            }
+          },
+          inputErrorMessage: this.$t('trials:noneDicom:message:saveTip'),
+          showCancelButton: true,
+          closeOnClickModal: false,
+          closeOnPressEscape: false,
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              const value = instance.inputValue
+              if (!value) {
+                that.$message.error(this.$t('trials:customReading:error:validMarkName1'))
+              } else if (this.validMarkName(value)) {
+                that.$message.error(this.$t('trials:customReading:error:validMarkName'))
+              } else {
+                done()
+              }
+            } else {
+              done()
+            }
+          }
+        })
         return value
-      } catch {
+      } catch (err) {
+        console.log(err)
         return null
       }
     },
+    validMarkName(markName) {
+      const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
+      const i = annotations.findIndex(i => i.visitTaskId === this.taskInfo.VisitTaskId && i.data.label === markName)
+      return i > -1
+    },
     // 滚动条
     clickSlider(e, index) {
       const height = e.offsetY * 100 / this.$refs[`sliderBox-${index}`][0].clientHeight
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index 6eedab56..d6e72077 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -35,13 +35,13 @@
         @toggleTask="toggleTask"
         @toggleImage="toggleImage"
       /> -->
-      <file-viewer ref="fileViewer" :related-study-info="relatedStudyInfo" :ps-arr="psArr"
+      <file-viewer ref="fileViewer" :related-study-info="relatedStudyInfo" :ps-arr="psArr" :ecrf="ecrf"
         @toggleTaskByViewer="toggleTaskByViewer" @toggleTask="toggleTask" @toggleImage="toggleImage"
-        @previewCD="previewCD" @setPS="setPS" />
+        @previewCD="previewCD" @setPS="setPS" @getEcrf="getEcrf" />
     </div>
     <!-- 表单 -->
     <div class="right-panel">
-      <div v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo" class="text-info">
+      <!-- <div v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo" class="text-info">
         <h3>
           <span v-if="currentVisitInfo && currentVisitInfo.SubjectCode">
             {{ currentVisitInfo.SubjectCode }}
@@ -50,15 +50,20 @@
             {{ currentVisitInfo.TaskBlindName }}
           </span>
         </h3>
-      </div>
+      </div> -->
       <!-- <ecrf-list
         v-if="currentVisitInfo"
         :visit-task-info="currentVisitInfo"
       /> -->
-      <customize-question-list v-if="currentVisitInfo.VisitTaskId" :ref="`ecrf_1`" :reading-task-state="1"
-        :visit-info="currentVisitInfo" @resetAnnotations="resetAnnotations" @setReadingTaskState="setReadingTaskState"
-        @viewCustomAnnotationSeries="viewCustomAnnotationSeries" @getCustomScreenshots="getCustomScreenshots"
-        @setReadingToolActive="setReadingToolActive" @setReadingToolPassive="setReadingToolPassive" />
+      <div v-for="s in visitTaskList" v-show="lastViewportTaskId === s.VisitTaskId" :key="s.VisitTaskId"
+        style="height: 100%;">
+        <customize-question-list v-if="lastViewportTaskId" :ref="`ecrf_${s.VisitTaskId}`" :isNoneDicom="true"
+          :reading-task-state="readingTaskState" :visit-info="currentVisitInfo" @resetAnnotations="resetAnnotations"
+          @setReadingTaskState="setReadingTaskState" @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
+          @getCustomScreenshots="getCustomScreenshots" @setReadingToolActive="setReadingToolActive"
+          @setReadingToolPassive="setReadingToolPassive" @setSaved="setSaved"
+          @setIsHaveBindingQuestion="setIsHaveBindingQuestion" />
+      </div>
     </div>
 
     <el-dialog :visible.sync="clinicalDataVisible"
@@ -125,7 +130,11 @@ export default {
       isClinicalDataFullscreen: false,
       trialId: '',
       cdVisitTaskId: '',
-      psArr: []
+      psArr: [],
+      readingTaskState: 0,
+      ecrf: {
+        IsHaveBindingQuestion: false
+      }
     }
   },
   computed: {
@@ -147,29 +156,73 @@ export default {
   mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
     this.trialId = this.$route.query.trialId
+    this.readingTaskState = this.taskInfo.ReadingTaskState
     this.getRelatedTask()
   },
   methods: {
-    resetAnnotations() { },
-    setReadingTaskState() { },
-    viewCustomAnnotationSeries() { },
-    getCustomScreenshots() { },
-    setReadingToolPassive() { },
+    getEcrf(data) {
+      let { type } = data
+      if (type === 'getOperateStateEnum') {
+        this.ecrf.operateStateEnum = this.$refs[`ecrf_${data.VisitTaskId}`][0].operateStateEnum
+      }
+      if (type === 'bindAnnotationToQuestion') {
+        this.$refs[`ecrf_${data.VisitTaskId}`][0].bindAnnotationToQuestion(data.annotation)
+      }
+      if (type === 'updateAnnotationToQuestion') {
+        this.$refs[`ecrf_${data.VisitTaskId}`][0].updateAnnotationToQuestion(data.annotation)
+      }
+      if (type === 'verifyAnnotationIsBound') {
+        this.ecrf.isBound = this.$refs[`ecrf_${data.VisitTaskId}`][0].verifyAnnotationIsBound(data.annotation)
+      }
+      if (type === 'getQuestions') {
+        this.ecrf.isBound = this.$refs[`ecrf_${data.VisitTaskId}`][0].getQuestions()
+      }
+    },
+    setSaved(saved) {
+      this.$refs.fileViewer.lengthscaleToolDisabled(saved)
+    },
+    setIsHaveBindingQuestion(flag) {
+      this.ecrf.IsHaveBindingQuestion = flag
+    },
+    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
+      // 获取标注信息
+      let res = await getNoneDicomMarkListOutDto({ visitTaskId: visitTaskId })
+
+      const annotations = res.Result.NoneDicomMarkList.map(i => {
+        if (typeof i.MeasureData === 'string' && i.MeasureData) {
+          i.MeasureData = JSON.parse(i.MeasureData)
+          i.MeasureData.markId = i.MarkId
+          i.MeasureData.id = i.Id
+        }
+        this.psArr = []
+        if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
+          this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps, OldPS: i.MeasureData.data.ps })
+        }
+        return i
+      })
+      this.$set(this.visitTaskList[taskIdx], 'Annotations', annotations)
+      // this.$refs.fileViewer.resetAnnotations({ annotations, visitTaskId })
+    },
+    setReadingTaskState(state) {
+      this.readingTaskState = state
+    },
+    viewCustomAnnotationSeries(obj) {
+      this.$refs.fileViewer.viewCustomAnnotation(obj)
+    },
+    getCustomScreenshots(obj, callback) {
+      this.$refs.fileViewer.getScreenshots(obj, callback)
+    },
+    setReadingToolPassive() {
+      this.$refs.fileViewer.setToolsPassive()
+    },
     setReadingToolActive(toolName) {
       if (this.readingTaskState === 2) return
       if (this.activeTool === toolName) return
-      const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
-      if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
-        const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
-        const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
-        if (this.activeTool) {
-          toolGroup.setToolPassive(this.activeTool)
-        }
-        toolGroup.setToolActive(toolName, {
-          bindings: [{ mouseButton: MouseBindings.Primary }]
-        })
-        this.activeTool = toolName
-      }
+      this.$refs.fileViewer.setToolActive(toolName)
     },
     // 获取关联任务信息
     async getRelatedTask() {
@@ -254,9 +307,11 @@ export default {
           const arr = res.Result.NoneDicomMarkList.map(i => {
             if (typeof i.MeasureData === 'string') {
               i.MeasureData = JSON.parse(i.MeasureData)
+              i.MeasureData.markId = i.MarkId
+              i.MeasureData.id = i.Id
             }
             if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
-              this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps })
+              this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps, OldPS: i.MeasureData.data.ps })
             }
             return i
           })

From aee12347dc5465b91f42ed29824f82aee0b2a431 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 27 Oct 2025 15:25:13 +0800
Subject: [PATCH 043/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js                            |  8 +++
 .../components/customize/QuestionList.vue     | 68 +++++++++++++++++--
 .../visit-review/components/FileViewer.vue    |  9 +--
 .../visit-review/components/ReadPage.vue      |  7 +-
 4 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/src/api/reading.js b/src/api/reading.js
index fc50fe40..b2e7a1bb 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -303,3 +303,11 @@ export function saveAnswerAndBindingNoneDicomMark(param) {
     data: param
   })
 }
+// 非dicom按比例修改答案
+export function changePlottingScaleChangeAnswer(param) {
+  return request({
+    url: `/ReadingImageTask/changePlottingScaleChangeAnswer`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index cd3db621..7da89dc0 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -56,12 +56,16 @@
 <script>
 
 import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, verifyVisitTaskQuestions, getQuestionCalculateRelation, saveTaskQuestion } from '@/api/trials'
-import { setSkipReadingCache, resetReadingTask, saveTableQuestionMark, saveAnswerAndBindingNoneDicomMark } from '@/api/reading'
+import { setSkipReadingCache, resetReadingTask, saveTableQuestionMark, saveAnswerAndBindingNoneDicomMark, changePlottingScaleChangeAnswer } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import QuestionFormItem from './QuestionFormItem'
 import SignForm from '@/views/trials/components/newSignForm'
 import store from '@/store'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
+import {
+  utilities as csUtils
+  // getEnabledElementByIds
+} from '@cornerstonejs/core'
 export default {
   name: 'EcrfList',
   components: {
@@ -597,7 +601,8 @@ export default {
             OrderMarkName: annotation.data.label,
             NoneDicomFileId: annotation.noneDicomFileId,
           } : {}),
-          Path: picturePath ? picturePath : '',
+          Path: annotation.path,
+          PicturePath: picturePath ? picturePath : '',
           QuestionType: 0,
           RowId: this.operateRowId,
           TableQuestionId: this.operateQuestionId,
@@ -714,7 +719,6 @@ export default {
       })
     },
     getAnnotationByRow(rowId, isTable = true) {
-      console.log(this.questionMarkInfoList, 'this.questionMarkInfoList')
       let index = -1;
       if (isTable) {
         index = this.questionMarkInfoList.findIndex(
@@ -938,8 +942,8 @@ export default {
       let value = cachedStats[prop]
       if (this.isNoneDicom && annotation.ps) {
         let ps = annotation.ps
-        if (prop === 'area') value = this.reRound(value * ps * ps, this.digitPlaces)
-        if (prop === 'length' || prop === 'perimeter') value = this.reRound(value * ps, this.digitPlaces)
+        if (prop === 'area') value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
+        if (prop === 'length' || prop === 'perimeter') value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
       }
       return value !== null
         ? parseFloat(value).toFixed(this.digitPlaces)
@@ -1123,7 +1127,59 @@ export default {
       } else if (event.data.type === 'setMeasurement') {
         // this.setMeasuredData(event.data.data)
       }
-    }
+    },
+    async changePlottingScaleChangeAnswer(data) {
+      try {
+        let { noneDicomFileId, path, picturePath, isRemovePlottingScale, psArr } = data
+        let param = {
+          VisitTaskId: this.visitTaskId,
+          NoneDicomFileId: noneDicomFileId,
+          Path: path,
+          PicturePath: picturePath,
+          IsRemovePlottingScale: isRemovePlottingScale,
+          AnswerList: []
+        }
+        if (!isRemovePlottingScale) {
+          this.questionMarkInfoList.forEach(item => {
+            if (item.Path === path && ['Length', 'Perimeter', 'Area'].includes(item.MarkTool)) {
+              const referencedImageId = item?.MeasureData?.metadata?.referencedImageId
+              if (!referencedImageId) return null
+              const cacheKey = `imageId:${referencedImageId}`
+              const cachedStats = item?.MeasureData.data?.cachedStats?.[cacheKey]
+              let prop = item.MarkTool.toLowerCase();
+              const hasProp = cachedStats
+                && Object.prototype.hasOwnProperty.call(cachedStats, prop)
+              if (!hasProp) return null
+              let value = cachedStats[prop]
+              let ps = null
+              const i = psArr.findIndex(i => i.Path === path)
+              if (i > -1 && psArr[i].PS) {
+                ps = parseFloat(psArr[i].PS).toFixed(3)
+              }
+              if (ps) {
+                if (prop === 'area') value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
+                if (prop === 'length' || prop === 'perimeter') value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
+              }
+              let obj = {
+                QuestionId: item.QuestionId,
+                RowId: item.RowId,
+                TableQuestionId: item.TableQuestionId,
+                Answer: value
+              }
+              param.AnswerList.push(obj)
+            }
+          })
+        }
+        this.loading = true
+        let res = await changePlottingScaleChangeAnswer(param)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.getQuestions()
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
   },
   watch: {
     questionsMarkStatus: {
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 25cb8fa5..b489a584 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1066,10 +1066,8 @@ export default {
         if (psIndex > -1) {
           OldPS = this.psArr[i].OldPS
         }
-        console.log(OldPS, ps)
         let Proportion = ps / OldPS
         return this.saveCustomAnnotationTimer = setTimeout(async () => {
-          console.log(this.ecrf.IsHaveBindingQuestion, 'this.ecrf.IsHaveBindingQuestion')
           if (OldPS === ps || !this.ecrf.IsHaveBindingQuestion) {
             this.saveCustomAnnotation(annotation)
           } else {
@@ -1090,7 +1088,6 @@ export default {
         const operateStateEnum = this.ecrf.operateStateEnum
         const isBound = this.ecrf.isBound
         if (isBound || this.isNumber(operateStateEnum)) {
-          console.log(isBound, this.isNumber(operateStateEnum))
           this.$emit('getEcrf', { type: "updateAnnotationToQuestion", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
         } else {
           if (this.saveCustomAnnotationTimer) {
@@ -1215,7 +1212,7 @@ export default {
           const res = await addNoneDicomMark(params)
           annotation.markId = params.MarkId
           annotation.id = res.Result
-          if (!isNaN(parseFloat(ps))) this.$emit('getEcrf', { type: "getQuestions", VisitTaskId: this.taskInfo.VisitTaskId })
+          if (!isNaN(parseFloat(ps))) this.$emit('getEcrf', { type: "changePlottingScaleChangeAnswer", VisitTaskId: this.taskInfo.VisitTaskId, noneDicomFileId: annotation.noneDicomFileId, path: annotation.path || '', picturePath, psArr: this.psArr, isRemovePlottingScale: ps < 0 ? true : false })
         })
 
       } catch (e) {
@@ -1225,7 +1222,6 @@ export default {
     },
     async getScreenshots(measureData, callback) {
       if (measureData) {
-        console.log(measureData, 'measureData')
         // await this.imageLocation(measureData)
         this.viewCustomAnnotation(measureData)
         const divForDownloadViewport = document.querySelector(
@@ -1253,7 +1249,7 @@ export default {
         const trialId = this.$route.query.trialId
         const taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
         const subjectId = taskInfo.SubjectId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.taskInfo.VisitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)
@@ -1311,7 +1307,6 @@ export default {
       if (psIndex > -1) {
         OldPS = this.psArr[psIndex].OldPS
       }
-      console.log(OldPS, 'OldPS')
       let Proportion = ps / OldPS
       return this.saveCustomAnnotationTimer = setTimeout(async () => {
         if (!this.ecrf.IsHaveBindingQuestion) {
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index d6e72077..61bd51b8 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -174,8 +174,11 @@ export default {
       if (type === 'verifyAnnotationIsBound') {
         this.ecrf.isBound = this.$refs[`ecrf_${data.VisitTaskId}`][0].verifyAnnotationIsBound(data.annotation)
       }
-      if (type === 'getQuestions') {
-        this.ecrf.isBound = this.$refs[`ecrf_${data.VisitTaskId}`][0].getQuestions()
+      // if (type === 'getQuestions') {
+      //   this.ecrf.isBound = this.$refs[`ecrf_${data.VisitTaskId}`][0].getQuestions()
+      // }
+      if (type === 'changePlottingScaleChangeAnswer') {
+        this.ecrf.isBound = this.$refs[`ecrf_${data.VisitTaskId}`][0].changePlottingScaleChangeAnswer(data)
       }
     },
     setSaved(saved) {

From 9b67760ffdeb784625def87a036a44c0650d028b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 28 Oct 2025 15:35:54 +0800
Subject: [PATCH 044/333] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=AE=9A=E6=9C=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  24 +
 src/views/research/login.vue                  |  55 ++-
 .../personnel-manage/components/staff.vue     | 426 +++++-------------
 src/views/trials/trials-panel/site/index.vue  | 389 ++++++++++------
 4 files changed, 416 insertions(+), 478 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 61611e95..882dc72d 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -4317,4 +4317,28 @@ export function deleteAuditRecord(auditRecordId) {
     url: `/AuditDocument/deleteAuditRecord/${auditRecordId}`,
     method: 'delete'
   })
+}
+// 核对中心人员发送邮件
+export function sendCheckSiteSurveyUserEmail(data) {
+  return request({
+    url: `/TrialSiteSurvey/sendCheckSiteSurveyUserEmail`,
+    method: 'post',
+    data
+  })
+}
+// 更新中心人员发送邮件
+export function sendUpdateSiteSurveyUserEmail(data) {
+  return request({
+    url: `/TrialSiteSurvey/sendUpdateSiteSurveyUserEmail`,
+    method: 'post',
+    data
+  })
+}
+// 更新中心人员发送邮件
+export function getTrialSiteLatestSurvey(params) {
+  return request({
+    url: `/TrialSiteSurvey/getTrialSiteLatestSurvey`,
+    method: 'get',
+    params
+  })
 }
\ No newline at end of file
diff --git a/src/views/research/login.vue b/src/views/research/login.vue
index 4f249d01..8e56c895 100644
--- a/src/views/research/login.vue
+++ b/src/views/research/login.vue
@@ -7,16 +7,8 @@
         <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
       </h2>
       <el-card shadow="hover">
-        <el-form
-          ref="resetForm"
-          v-loading="loading"
-          :model="form"
-          label-width="150px"
-          style="width:80%;margin:0 auto;"
-          :rules="rules"
-          class="demo-ruleForm"
-          size="small"
-        >
+        <el-form ref="resetForm" v-loading="loading" :model="form" label-width="150px" style="width:80%;margin:0 auto;"
+          :rules="rules" class="demo-ruleForm" size="small">
           <!-- 项目编号 -->
           <el-form-item :label="$t('trials:researchForm:form:trialId')">
             <el-input v-model="form.TrialCode" disabled />
@@ -35,13 +27,10 @@
           </el-form-item>
           <!-- 中心名称 -->
           <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
-            <el-select v-model="form.TrialSiteId" filterable style="width:100%;" @change="handleSiteChange">
-              <el-option
-                v-for="(item,index) of siteOptions"
-                :key="index"
-                :label="item.TrialSiteAliasName"
-                :value="item.TrialSiteId"
-              />
+            <el-select v-model="form.TrialSiteId" filterable style="width:100%;" @change="handleSiteChange"
+              :disabled="isUpload">
+              <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteAliasName"
+                :value="item.TrialSiteId" />
             </el-select>
           </el-form-item>
           <!-- 中心编号 -->
@@ -54,13 +43,14 @@
               {{ $t('trials:researchForm:button:updateQsForm') }}
             </el-link>
             <!-- 取消更新调研表 -->
-            <el-link v-else type="primary" @click="form.IsUpdate = false;form.ReplaceUserEmailOrPhone=''">
+            <el-link v-else type="primary" @click="form.IsUpdate = false; form.ReplaceUserEmailOrPhone = ''">
               {{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
             </el-link>
           </el-form-item>
           <!-- 原调研表填写人邮箱 -->
-          <el-form-item v-if="form.IsUpdate" :label="$t('trials:researchForm:form:originalEmail')" prop="ReplaceUserEmailOrPhone">
-            <el-input v-model="form.ReplaceUserEmailOrPhone" autocomplete="new-password" />
+          <el-form-item v-if="form.IsUpdate" :label="$t('trials:researchForm:form:originalEmail')"
+            prop="ReplaceUserEmailOrPhone">
+            <el-input v-model="form.ReplaceUserEmailOrPhone" autocomplete="new-password" :disabled="isUpload" />
           </el-form-item>
           <!-- 联系邮箱 -->
           <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="EmailOrPhone">
@@ -74,13 +64,9 @@
               </el-form-item>
             </el-col>
             <el-col style="width: 120px;margin-left: 10px">
-              <el-button
-                size="small"
-                type="primary"
-                style="width:100%;"
-                :disabled="sendDisabled || !form.EmailOrPhone || count > 0"
-                @click="handleSendCode"
-              >{{ this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}</el-button>
+              <el-button size="small" type="primary" style="width:100%;"
+                :disabled="sendDisabled || !form.EmailOrPhone || count > 0" @click="handleSendCode">{{
+                  this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}</el-button>
             </el-col>
           </el-form-item>
           <el-form-item>
@@ -203,7 +189,8 @@ export default {
       timer: null,
       msg: '',
       lang: 'zh',
-      isHaveSiteSurveyRecord: false
+      isHaveSiteSurveyRecord: false,
+      isUpload: false
     }
   },
   computed: {
@@ -221,6 +208,14 @@ export default {
       this.trialId = this.$route.query.trialId
       this.initPage()
     }
+    if (this.$route.query.isUpload) {
+      this.isUpload = true
+      this.form.IsUpdate = true
+      let { email, oldEMail, trialSiteId } = this.$route.query
+      if (trialSiteId) this.form.TrialSiteId = trialSiteId
+      if (oldEMail) this.form.ReplaceUserEmailOrPhone = oldEMail
+      if (email) this.form.EmailOrPhone = email
+    }
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
@@ -235,6 +230,9 @@ export default {
             this.form[key] = Result[key]
           }
         })
+        if (this.isUpload) {
+          this.handleSiteChange(this.form.TrialSiteId)
+        }
         this.loading = false
       }).catch(() => { this.loading = false })
     },
@@ -347,6 +345,7 @@ export default {
 <style lang="scss" scoped>
 .question-login-wrapper {
   padding: 20px;
+
   .box-wrapper {
     width: 50%;
     margin: 20px auto;
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
index ed58b450..c2b4b529 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
@@ -14,18 +14,11 @@
         <!-- 用户类型 -->
         <el-form-item :label="$t('trials:staff:table:userType')">
           <el-select v-model="listQuery.UserTypeId" clearable class="mr">
-            <el-option
-              v-for="item of userTypeOptions"
-              v-show="
-                item.UserTypeEnum !== 8 &&
-                item.UserTypeEnum !== 31 &&
-                item.UserTypeEnum !== 26 &&
-                item.UserTypeEnum !== 27
-              "
-              :key="item.Id"
-              :label="item.UserTypeShortName"
-              :value="item.Id"
-            >
+            <el-option v-for="item of userTypeOptions" v-show="item.UserTypeEnum !== 8 &&
+              item.UserTypeEnum !== 31 &&
+              item.UserTypeEnum !== 26 &&
+              item.UserTypeEnum !== 27
+              " :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
               <span>{{ item.UserType }}</span>
             </el-option>
           </el-select>
@@ -37,12 +30,7 @@
         <!-- 状态 -->
         <el-form-item :label="$t('trials:staff:table:status')">
           <el-select v-model="listQuery.IsDeleted" clearable class="mr">
-            <el-option
-              v-for="item of $d.IsUserExitTrial"
-              :label="item.label"
-              :value="item.value"
-              :key="item.id"
-            />
+            <el-option v-for="item of $d.IsUserExitTrial" :label="item.label" :value="item.value" :key="item.id" />
             <!--            <el-option label="加入" :value="false" />-->
           </el-select>
         </el-form-item>
@@ -52,43 +40,23 @@
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t('common:button:reset') }}
           </el-button>
           <!-- 添加系统用户 -->
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:add-internal-staff',
-            ]"
-            type="primary"
-            style="margin-left: 10px"
-            icon="el-icon-plus"
-            @click="handleAdd('Add')"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:add-internal-staff',
+          ]" type="primary" style="margin-left: 10px" icon="el-icon-plus" @click="handleAdd('Add')">
             {{ $t('trials:staff:button:addInternalStaff') }}
           </el-button>
           <!-- 添加外部人员 -->
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:add-external-staff',
-            ]"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleAdd('External')"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:add-external-staff',
+          ]" type="primary" icon="el-icon-plus" @click="handleAdd('External')">
             {{ $t('trials:staff:button:addExternalStaff') }}
           </el-button>
           <!-- 导出 -->
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            :disabled="list.length === 0"
-            @click="handleExport"
-          >
+          <el-button type="primary" icon="el-icon-download" :disabled="list.length === 0" @click="handleExport">
             {{ $t('common:button:export') }}
           </el-button>
         </el-form-item>
@@ -96,30 +64,16 @@
     </div>
 
     <!-- 项目参与人员列表 -->
-    <el-table
-      ref="settingList"
-      v-loading="listLoading"
-      :data="list"
-      stripe
-      @sort-change="handleSortByColumn"
-    >
+    <el-table ref="settingList" v-loading="listLoading" :data="list" stripe @sort-change="handleSortByColumn">
       <el-table-column type="index" width="60">
         <template slot-scope="scope">
-          <span
-            style="
+          <span style="
               display: flex;
               align-items: center;
               justify-content: flex-end;
-            "
-          >
-            <el-tooltip
-              class="item"
-              effect="dark"
-              :content="$t('trials:staff:tip:userDisabled')"
-              placement="top"
-              style="margin-right: 3px"
-              v-if="!scope.row.Status"
-            >
+            ">
+            <el-tooltip class="item" effect="dark" :content="$t('trials:staff:tip:userDisabled')" placement="top"
+              style="margin-right: 3px" v-if="!scope.row.Status">
               <i v-if="!scope.row.Status" class="el-icon-warning icon-i"></i>
             </el-tooltip>
             <span>{{ scope.$index + 1 }}</span>
@@ -127,50 +81,25 @@
         </template>
       </el-table-column>
       <!-- 姓名 -->
-      <el-table-column
-        prop="FullName"
-        :label="$t('trials:staff:table:name')"
-        show-overflow-tooltip
-        sortable
-        min-width="40"
-      />
+      <el-table-column prop="FullName" :label="$t('trials:staff:table:name')" show-overflow-tooltip sortable
+        min-width="40" />
       <!-- 用户名 -->
-      <el-table-column
-        prop="UserName"
-        :label="$t('trials:staff:table:uid')"
-        show-overflow-tooltip
-        sortable
-        min-width="50"
-      />
+      <el-table-column prop="UserName" :label="$t('trials:staff:table:uid')" show-overflow-tooltip sortable
+        min-width="50" />
       <!-- 用户类型 -->
-      <el-table-column
-        prop="UserType"
-        :label="$t('trials:staff:table:userType')"
-        show-overflow-tooltip
-        width="160"
-      >
+      <el-table-column prop="UserType" :label="$t('trials:staff:table:userType')" show-overflow-tooltip width="160">
         <template slot-scope="scope">
-          <el-button
-            v-if="
-              Array.isArray(scope.row.TrialUserRoleList) &&
-              scope.row.TrialUserRoleList.length > 0 &&
-              hasPermi(['trials:trials-panel:setting:personnel-manage:status'])
-            "
-            type="text"
-            @click.stop="openRoleList(scope.row)"
-          >
-            <el-tooltip
-              class="item"
-              effect="dark"
-              :content="$t('trials:staff:tip:userTypeDisabled')"
-              placement="top"
-              style="margin-right: 2px"
-              v-if="
+          <el-button v-if="
+            Array.isArray(scope.row.TrialUserRoleList) &&
+            scope.row.TrialUserRoleList.length > 0 &&
+            hasPermi(['trials:trials-panel:setting:personnel-manage:status'])
+          " type="text" @click.stop="openRoleList(scope.row)">
+            <el-tooltip class="item" effect="dark" :content="$t('trials:staff:tip:userTypeDisabled')" placement="top"
+              style="margin-right: 2px" v-if="
                 scope.row.TrialUserRoleList.some(
                   (item) => item.IsDeleted || item.IsUserRoleDisabled
                 )
-              "
-            >
+              ">
               <i class="el-icon-warning icon-i"></i>
             </el-tooltip>
             <span>{{
@@ -179,24 +108,16 @@
               ).join(', ')
             }}</span>
           </el-button>
-          <div
-            v-else-if="
-              Array.isArray(scope.row.TrialUserRoleList) &&
-              scope.row.TrialUserRoleList.length > 0
-            "
-          >
-            <el-tooltip
-              class="item"
-              effect="dark"
-              :content="$t('trials:staff:tip:userTypeDisabled')"
-              placement="top"
-              style="margin-right: 2px"
-              v-if="
+          <div v-else-if="
+            Array.isArray(scope.row.TrialUserRoleList) &&
+            scope.row.TrialUserRoleList.length > 0
+          ">
+            <el-tooltip class="item" effect="dark" :content="$t('trials:staff:tip:userTypeDisabled')" placement="top"
+              style="margin-right: 2px" v-if="
                 scope.row.TrialUserRoleList.some(
                   (item) => item.IsDeleted || item.IsUserRoleDisabled
                 )
-              "
-            >
+              ">
               <i class="el-icon-warning icon-i"></i>
             </el-tooltip>
             <span>{{
@@ -208,37 +129,17 @@
         </template>
       </el-table-column>
       <!-- 联系电话 -->
-      <el-table-column
-        prop="Phone"
-        :label="$t('trials:staff:table:phone')"
-        show-overflow-tooltip
-        sortable
-        min-width="40"
-      />
+      <el-table-column prop="Phone" :label="$t('trials:staff:table:phone')" show-overflow-tooltip sortable
+        min-width="40" />
       <!-- 邮箱 -->
-      <el-table-column
-        prop="EMail"
-        :label="$t('trials:staff:table:email')"
-        show-overflow-tooltip
-        sortable
-        min-width="40"
-      />
+      <el-table-column prop="EMail" :label="$t('trials:staff:table:email')" show-overflow-tooltip sortable
+        min-width="40" />
       <!-- 单位 -->
-      <el-table-column
-        prop="OrganizationName"
-        :label="$t('trials:staff:table:organization')"
-        sortable
-        show-overflow-tooltip
-        min-width="50"
-      />
+      <el-table-column prop="OrganizationName" :label="$t('trials:staff:table:organization')" sortable
+        show-overflow-tooltip min-width="50" />
       <!-- 状态 -->
-      <el-table-column
-        prop="IsDeleted"
-        :label="$t('trials:staff:table:status')"
-        show-overflow-tooltip
-        sortable
-        min-width="40"
-      >
+      <el-table-column prop="IsDeleted" :label="$t('trials:staff:table:status')" show-overflow-tooltip sortable
+        min-width="40">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsDeleted" type="danger">{{
             $fd('IsUserExitTrial', scope.row.IsDeleted)
@@ -249,13 +150,8 @@
         </template>
       </el-table-column>
       <!-- 加入日期 -->
-      <el-table-column
-        prop="JoinTime"
-        :label="$t('trials:staff:table:joinTime')"
-        show-overflow-tooltip
-        sortable
-        width="160"
-      >
+      <el-table-column prop="JoinTime" :label="$t('trials:staff:table:joinTime')" show-overflow-tooltip sortable
+        width="160">
         <template slot-scope="scope">
           {{
             scope.row.JoinTime
@@ -265,13 +161,8 @@
         </template>
       </el-table-column>
       <!-- 退出日期 -->
-      <el-table-column
-        prop="RemoveTime"
-        :label="$t('trials:staff:table:exitTime')"
-        show-overflow-tooltip
-        sortable
-        width="160"
-      >
+      <el-table-column prop="RemoveTime" :label="$t('trials:staff:table:exitTime')" show-overflow-tooltip sortable
+        width="160">
         <template slot-scope="scope">
           {{
             scope.row.RemoveTime
@@ -297,130 +188,63 @@
         min-width="60"
       /> -->
 
-      <el-table-column
-        v-if="hasPermi(['trials:trials-panel:setting:personnel-manage:status'])"
-        :label="$t('common:action:action')"
-        width="150"
-      >
+      <el-table-column v-if="hasPermi(['trials:trials-panel:setting:personnel-manage:status'])"
+        :label="$t('common:action:action')" width="150">
         <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['trials:trials-panel:setting:personnel-manage:status']"
-            circle
-            :title="$t('trials:staff:action:status')"
-            icon="el-icon-edit-outline"
-            :disabled="
-              !!scope.row.TrialUserRoleList.find(
-                (item) => item.UserTypeEnum === 1
-              )
-            "
-            @click="handleStatus(scope.row)"
-          />
+          <el-button v-hasPermi="['trials:trials-panel:setting:personnel-manage:status']" circle
+            :title="$t('trials:staff:action:status')" icon="el-icon-edit-outline" :disabled="!!scope.row.TrialUserRoleList.find(
+              (item) => item.UserTypeEnum === 1
+            )
+              " @click="handleStatus(scope.row)" />
           <!---v-if="!scope.row.UserName"-->
-          <el-button
-            v-if="!scope.row.UserName"
-            circle
-            :title="$t('trials:staff:action:email')"
-            icon="el-icon-message"
-            @click="handleSendEmail(scope.row)"
-          />
+          <el-button v-if="!scope.row.UserName" circle :title="$t('trials:staff:action:email')" icon="el-icon-message"
+            @click="handleSendEmail(scope.row)" />
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页组件 -->
     <div class="pagination" style="text-align: right">
-      <pagination
-        :total="total"
-        :page.sync="listQuery.PageIndex"
-        :limit.sync="listQuery.PageSize"
-        @pagination="getList"
-      />
+      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize"
+        @pagination="getList" />
     </div>
 
     <!-- 分配参与人员模态框 -->
     <base-model v-if="staff_model.visible" :config="staff_model">
       <template slot="dialog-body">
         <StaffForm v-if="isAdd == 'Add'" @closeDialog="closeDialog" />
-        <StaffExternalForm
-          v-else
-          @closeDialog="closeDialog"
-          @getList="getList"
-        />
+        <StaffExternalForm v-else @closeDialog="closeDialog" @getList="getList" />
       </template>
     </base-model>
 
     <!-- 修改参与者人员状态 -->
     <base-model v-if="status_model.visible" :config="status_model">
       <template slot="dialog-body">
-        <el-form
-          ref="statusForm"
-          :model="statusForm"
-          label-width="110px"
-          size="small"
-          :rules="statusRules"
-        >
+        <el-form ref="statusForm" :model="statusForm" label-width="110px" size="small" :rules="statusRules">
           <!-- Status -->
-          <el-form-item
-            :label="$t('trials:staff:table:status')"
-            prop="isDeleted"
-          >
-            <el-radio-group
-              v-model="statusForm.isDeleted"
-              @change="handleIsDeletedChanged"
-            >
-              <el-radio
-                v-for="item of $d.IsUserExitTrial"
-                :label="item.value"
-                :key="item.id"
-                >{{ item.label }}</el-radio
-              >
+          <el-form-item :label="$t('trials:staff:table:status')" prop="isDeleted">
+            <el-radio-group v-model="statusForm.isDeleted" @change="handleIsDeletedChanged">
+              <el-radio v-for="item of $d.IsUserExitTrial" :label="item.value" :key="item.id">{{ item.label
+                }}</el-radio>
             </el-radio-group>
           </el-form-item>
           <!-- 退出日期 -->
-          <el-form-item
-            v-if="statusForm.isDeleted"
-            :label="$t('trials:staff:table:exitTime')"
-            prop="removeTime"
-          >
-            <el-date-picker
-              v-model="statusForm.removeTime"
-              type="date"
-              :picker-options="pickerOption"
-              value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
-            />
+          <el-form-item v-if="statusForm.isDeleted" :label="$t('trials:staff:table:exitTime')" prop="removeTime">
+            <el-date-picker v-model="statusForm.removeTime" type="date" :picker-options="pickerOption"
+              value-format="yyyy-MM-dd" format="yyyy-MM-dd" />
           </el-form-item>
           <!-- 加入日期 -->
-          <el-form-item
-            v-else
-            :label="$t('trials:staff:table:joinTime')"
-            prop="joinTime"
-          >
-            <el-date-picker
-              v-model="statusForm.joinTime"
-              type="date"
-              :picker-options="pickerOption"
-              value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
-            />
+          <el-form-item v-else :label="$t('trials:staff:table:joinTime')" prop="joinTime">
+            <el-date-picker v-model="statusForm.joinTime" type="date" :picker-options="pickerOption"
+              value-format="yyyy-MM-dd" format="yyyy-MM-dd" />
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="status_model.visible = false"
-        >
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="status_model.visible = false">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button
-          size="small"
-          type="primary"
-          :loading="btnLoading"
-          @click="saveStatus"
-        >
+        <el-button size="small" type="primary" :loading="btnLoading" @click="saveStatus">
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -431,99 +255,59 @@
         <el-table :data="roleList" style="width: 100%" max-height="300px">
           <el-table-column type="index" width="60">
             <template slot-scope="scope">
-              <span
-                style="
+              <span style="
                   display: flex;
                   align-items: center;
                   justify-content: flex-end;
-                "
-              >
-                <el-tooltip
-                  class="item"
-                  effect="dark"
-                  :content="$t('trials:staff:tip:userTypeSysDisabled')"
-                  placement="top"
-                  style="margin-right: 3px"
-                  v-if="scope.row.IsUserRoleDisabled"
-                >
-                  <i
-                    v-if="scope.row.IsUserRoleDisabled"
-                    class="el-icon-warning icon-i"
-                  ></i>
+                ">
+                <el-tooltip class="item" effect="dark" :content="$t('trials:staff:tip:userTypeSysDisabled')"
+                  placement="top" style="margin-right: 3px" v-if="scope.row.IsUserRoleDisabled">
+                  <i v-if="scope.row.IsUserRoleDisabled" class="el-icon-warning icon-i"></i>
                 </el-tooltip>
                 <span>{{ scope.$index + 1 }}</span>
               </span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="UserTypeShortName"
-            :label="
-              $t(
-                'trials:trials-panel:setting:personnel-manage:table:UserTypeShortName'
-              )
-            "
-          />
-          <el-table-column
-            prop="IsDeleted"
-            :label="
-              $t(
-                'trials:trials-panel:setting:personnel-manage:table:IsUserRoleDisabled'
-              )
-            "
-          >
+          <el-table-column prop="UserTypeShortName" :label="$t(
+            'trials:trials-panel:setting:personnel-manage:table:UserTypeShortName'
+          )
+            " />
+          <el-table-column prop="IsDeleted" :label="$t(
+            'trials:trials-panel:setting:personnel-manage:table:IsUserRoleDisabled'
+          )
+            ">
             <template slot-scope="scope">
               <span> {{ $fd('IsDisable', scope.row.IsDeleted) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="IsDeleted"
-            :label="
-              $t(
-                'trials:trials-panel:setting:personnel-manage:table:enableTime'
-              )
-            "
-            min-width="120px"
-          >
+          <el-table-column prop="IsDeleted" :label="$t(
+            'trials:trials-panel:setting:personnel-manage:table:enableTime'
+          )
+            " min-width="120px">
             <template slot-scope="scope">
               <span>
                 {{ scope.row.CreateTime }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="IsDeleted"
-            :label="
-              $t(
-                'trials:trials-panel:setting:personnel-manage:table:forbiddenTime'
-              )
-            "
-            min-width="120px"
-          >
+          <el-table-column prop="IsDeleted" :label="$t(
+            'trials:trials-panel:setting:personnel-manage:table:forbiddenTime'
+          )
+            " min-width="120px">
             <template slot-scope="scope">
               <span v-if="scope.row.IsDeleted">
                 {{ scope.row.UpdateTime }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column
-            :label="$t('common:action:action')"
-            min-width="120px"
-          >
+          <el-table-column :label="$t('common:action:action')" min-width="120px">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                :disabled="scope.row.IsDeleted || scope.row.UserTypeEnum === 1"
-                @click.stop="changeRoleStatus(scope.row, true)"
-              >
+              <el-button size="mini" type="text" :disabled="scope.row.IsDeleted || scope.row.UserTypeEnum === 1"
+                @click.stop="changeRoleStatus(scope.row, true)">
                 {{ $fd('IsDisable', true) }}
               </el-button>
-              <el-button
-                size="mini"
-                type="text"
-                :disabled="!scope.row.IsDeleted || scope.row.UserTypeEnum === 1"
-                @click.stop="changeRoleStatus(scope.row, false)"
-              >
+              <el-button size="mini" type="text" :disabled="!scope.row.IsDeleted || scope.row.UserTypeEnum === 1"
+                @click.stop="changeRoleStatus(scope.row, false)">
                 {{ $fd('IsDisable', false) }}
               </el-button>
             </template>
@@ -553,6 +337,7 @@ const getListQueryDefault = () => {
     UserName: '',
     UserTypeId: '',
     OrganizationName: '',
+    UserTypeList: [],
     IsDeleted: null,
     PageIndex: 1,
     PageSize: 20,
@@ -795,23 +580,28 @@ export default {
   .filter-box {
     display: flex;
     padding: 5px;
+
     .base-search-form {
       .el-form-item {
         margin-bottom: 0px;
       }
     }
+
     .mr {
       margin-right: 5px;
       width: 120px;
     }
   }
+
   .el-dialog__header {
     padding: 10px;
   }
+
   .el-dialog__body {
     padding: 10px;
   }
 }
+
 .icon-i {
   color: #e6a23c;
   cursor: pointer;
diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue
index bf9e1e62..c5d2bf0c 100644
--- a/src/views/trials/trials-panel/site/index.vue
+++ b/src/views/trials/trials-panel/site/index.vue
@@ -3,27 +3,15 @@
     <template slot="search-container">
       <el-form :inline="true">
         <el-form-item :label="$t('trials:site:table:siteId')">
-          <el-input
-            v-model="searchData.TrialSiteCode"
-            style="width: 130px"
-            clearable
-          />
+          <el-input v-model="searchData.TrialSiteCode" style="width: 130px" clearable />
         </el-form-item>
         <!-- 中心 -->
         <el-form-item :label="$t('trials:site:table:site')">
-          <el-input
-            v-model="searchData.SiteName"
-            style="width: 130px"
-            clearable
-          />
+          <el-input v-model="searchData.SiteName" style="width: 130px" clearable />
         </el-form-item>
         <!-- 参与者 -->
         <el-form-item :label="$t('trials:site:table:staff')">
-          <el-input
-            v-model="searchData.UserKeyInfo"
-            style="width: 130px"
-            clearable
-          />
+          <el-input v-model="searchData.UserKeyInfo" style="width: 130px" clearable />
         </el-form-item>
 
         <el-form-item>
@@ -32,95 +20,53 @@
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t('common:button:reset') }}
           </el-button>
+          <!-- 人员核对提醒 -->
+          <el-button type="primary" @click="openCheckRemind">
+            {{ $t('trials:site:button:checkRemind') }}
+          </el-button>
         </el-form-item>
       </el-form>
     </template>
     <template slot="main-container">
-      <el-table
-        v-adaptive="{ bottomOffset: 60 }"
-        v-loading="loading"
-        :data="list"
-        stripe
-        height="100"
-        @sort-change="handleSortChange"
-      >
+      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
+        @sort-change="handleSortChange">
         <el-table-column type="index" width="40" align="left" />
         <!-- 中心编号 -->
-        <el-table-column
-          prop="TrialSiteCode"
-          min-width="100"
-          :label="$t('trials:site:table:siteId')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column prop="TrialSiteCode" min-width="100" :label="$t('trials:site:table:siteId')"
+          show-overflow-tooltip sortable="custom" />
         <!-- 中心名称 -->
-        <el-table-column
-          prop="TrialSiteName"
-          min-width="100"
-          :label="$t('trials:site:table:site')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column prop="TrialSiteName" min-width="100" :label="$t('trials:site:table:site')"
+          show-overflow-tooltip sortable="custom" />
         <!-- 中心别名 -->
-        <el-table-column
-          prop="TrialSiteAliasName"
-          min-width="100"
-          :label="$t('trials:site:table:TrialSiteAliasName')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column prop="TrialSiteAliasName" min-width="100" :label="$t('trials:site:table:TrialSiteAliasName')"
+          show-overflow-tooltip sortable="custom" />
         <!-- Subjects -->
-        <el-table-column
-          prop="SubjectCount"
-          min-width="100"
-          :label="$t('trials:site:table:subjects')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+        <el-table-column prop="SubjectCount" min-width="100" :label="$t('trials:site:table:subjects')"
+          show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.SubjectCount > 0 && hasSubjectRoute"
-              type="text"
-              @click="jumpToSubjectList(scope.row.TrialSiteId)"
-            >
+            <el-button v-if="scope.row.SubjectCount > 0 && hasSubjectRoute" type="text"
+              @click="jumpToSubjectList(scope.row.TrialSiteId)">
               {{ scope.row.SubjectCount }}
             </el-button>
             <span v-else> {{ scope.row.SubjectCount }}</span>
           </template>
         </el-table-column>
         <!-- Visits -->
-        <el-table-column
-          prop="VisitCount"
-          min-width="100"
-          :label="$t('trials:site:table:visits')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+        <el-table-column prop="VisitCount" min-width="100" :label="$t('trials:site:table:visits')" show-overflow-tooltip
+          sortable="custom">
           <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.VisitCount > 0 && hasVisitRoute"
-              type="text"
-              @click="jumpToVisitList(scope.row.TrialSiteId)"
-            >
+            <el-button v-if="scope.row.VisitCount > 0 && hasVisitRoute" type="text"
+              @click="jumpToVisitList(scope.row.TrialSiteId)">
               {{ scope.row.VisitCount }}
             </el-button>
             <span v-else> {{ scope.row.VisitCount }}</span>
           </template>
         </el-table-column>
         <!-- Staff -->
-        <el-table-column
-          prop="UserCount"
-          min-width="150"
-          :label="$t('trials:site:table:staff')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="UserCount" min-width="150" :label="$t('trials:site:table:staff')" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="getStaffList(scope.row)">
               {{
@@ -131,54 +77,35 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column prop="" min-width="150" fixed="right" :label="$t('common:action:action')"
+          show-overflow-tooltip>
+          <template slot-scope="scope">
+            <!-- 详情 -->
+            <el-button icon="el-icon-message" circle :title="$t('trials:site:button:editEmail')"
+              :disabled="!scope.row.IsHaveSiteSurveyRecord" @click="openSiteEmail(scope.row)" />
+          </template>
+        </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
     </template>
     <base-model v-if="crc_model.visible" :config="crc_model">
       <template slot="dialog-body">
         <el-table v-loading="userListLoading" :data="userList" height="400">
           <!-- Name -->
-          <el-table-column
-            prop="FullName"
-            :label="$t('trials:site:table:name')"
-            width="150"
-          />
+          <el-table-column prop="FullName" :label="$t('trials:site:table:name')" width="150" />
           <!-- User Type -->
-          <el-table-column
-            prop="UserType"
-            :label="$t('trials:site:table:userType')"
-            width="120"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="UserType" :label="$t('trials:site:table:userType')" width="120"
+            show-overflow-tooltip />
           <!-- Organization -->
-          <el-table-column
-            prop="OrganizationName"
-            :label="$t('trials:site:table:organization')"
-            width="150"
-          />
+          <el-table-column prop="OrganizationName" :label="$t('trials:site:table:organization')" width="150" />
           <!-- Phone -->
-          <el-table-column
-            prop="Phone"
-            :label="$t('trials:site:table:phone')"
-            show-overflow-tooltip
-            sortable="custom"
-            width="150"
-          />
+          <el-table-column prop="Phone" :label="$t('trials:site:table:phone')" show-overflow-tooltip sortable="custom"
+            width="150" />
           <!-- Status -->
-          <el-table-column
-            prop="IsDeleted"
-            :label="$t('trials:site:table:status')"
-            show-overflow-tooltip
-            sortable
-            min-width="100"
-          >
+          <el-table-column prop="IsDeleted" :label="$t('trials:site:table:status')" show-overflow-tooltip sortable
+            min-width="100">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.IsDeleted" type="danger">{{
                 $fd('IsUserExitTrial', scope.row.IsDeleted)
@@ -189,28 +116,84 @@
             </template>
           </el-table-column>
           <!-- 授权时间 -->
-          <el-table-column
-            prop="UpdateTime"
-            :label="$t('trials:site:table:dataAssigned')"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="150"
-          />
+          <el-table-column prop="UpdateTime" :label="$t('trials:site:table:dataAssigned')" show-overflow-tooltip
+            sortable="custom" min-width="150" />
           <!-- 禁用时间 -->
-          <el-table-column
-            prop="DeletedTime"
-            :label="$t('trials:site:table:deletedTime')"
-            show-overflow-tooltip
-            sortable
-            min-width="150"
-          />
+          <el-table-column prop="DeletedTime" :label="$t('trials:site:table:deletedTime')" show-overflow-tooltip
+            sortable min-width="150" />
         </el-table>
       </template>
     </base-model>
+    <!--发送提醒核对中心人员邮件-->
+    <base-model :config="checkRemind_model" v-if="checkRemind_model.visible">
+      <template slot="dialog-body">
+        <div class="tip">{{ $t('trials:site:checkRemind_form:tip:top') }}</div>
+        <el-form ref="checkRemind_form" :model="checkRemind_form" :rules="rules" label-width="80px">
+          <el-form-item :label="$t('trials:site:form:UserId')" prop="UserId">
+            <el-select v-model="checkRemind_form.UserId" placeholder="" clearable style="width: 100%;"
+              @change="handleSelectChange">
+              <el-option v-for="item in checkUserList" :label="item.FullName" :key="item.Id" :value="item.Id">
+                <div style="display: flex;justify-content: space-between;">
+                  {{ item.FullName }}
+                  <span style="color:#909399">{{ item.UserName }}</span>
+                </div>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('trials:site:form:UserName')">
+            <el-input v-model="checkRemind_form.UserName" disabled />
+          </el-form-item>
+          <el-form-item :label="$t('trials:site:form:role')">
+            <el-input v-model="checkRemind_form.Role" disabled />
+          </el-form-item>
+          <el-form-item :label="$t('trials:site:form:email')" prop="EMail">
+            <el-input v-model="checkRemind_form.EMail" />
+          </el-form-item>
+          <el-form-item :label="$t('trials:site:form:phone')">
+            <el-input v-model="checkRemind_form.Phone" disabled />
+          </el-form-item>
+        </el-form>
+        <div class="tip">{{ $t('trials:site:checkRemind_form:tip:bottom') }}</div>
+      </template>
+      <template slot="dialog-footer">
+        <el-button type="primary" @click="sendEMail" :loading="loading">
+          {{ $t('common:button:confirm') }}
+        </el-button>
+        <el-button @click="checkRemind_model.visible = false" :loading="loading">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+      </template>
+    </base-model>
+    <!--发送中心人员更新邮件-->
+    <base-model :config="siteEmail_model" v-if="siteEmail_model.visible">
+      <template slot="dialog-body">
+        <div class="tip">{{ siteEmail_tip }}</div>
+        <el-form ref="siteEmail_form" :model="siteEmail_form" :rules="rules" label-width="80px">
+          <el-form-item :label="$t('trials:site:form:UserName')">
+            <el-input v-model="siteEmail_form.UserName" disabled />
+          </el-form-item>
+          <el-form-item :label="$t('trials:site:form:email')" prop="EMail">
+            <el-input v-model="siteEmail_form.EMail" />
+          </el-form-item>
+          <el-form-item :label="$t('trials:site:form:phone')">
+            <el-input v-model="siteEmail_form.Phone" disabled />
+          </el-form-item>
+        </el-form>
+        <div class="tip">{{ $t('trials:site:siteEmail_form:tip:bottom') }}</div>
+      </template>
+      <template slot="dialog-footer">
+        <el-button type="primary" @click="sendEMailTable" :loading="loading">
+          {{ $t('common:button:confirm') }}
+        </el-button>
+        <el-button @click="checkRemind_model.visible = false" :loading="loading">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+      </template>
+    </base-model>
   </BaseContainer>
 </template>
 <script>
-import { getSiteCRCList, getTrialSiteCRCList } from '@/api/trials'
+import { getSiteCRCList, getTrialSiteCRCList, getMaintenanceList, sendCheckSiteSurveyUserEmail, sendUpdateSiteSurveyUserEmail, getTrialSiteLatestSurvey } from '@/api/trials'
 import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
 import Pagination from '@/components/Pagination'
@@ -243,7 +226,41 @@ export default {
       userList: [],
       trialId: '',
       hasSubjectRoute: false,
-      hasVisitRoute: false
+      hasVisitRoute: false,
+      checkRemind_model: {
+        visible: false,
+        title: this.$t('trials:site:dialogTitle:checkRemind'),
+        width: '30%',
+      },
+      listLoading: false,
+      checkUserList: [],
+      checkRemind_form: { UserId: null, UserName: null, Role: null, EMail: null, Phone: null },
+      rules: {
+        UserId: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
+        ],
+        EMail: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            // type: 'email',
+            //'Please input the correct email address'
+            pattern: new RegExp(this.$reg().EmailRegexStr),
+            message: this.$t("trials:site:ruleMessage:correctEmail"),
+            trigger: ['blur'],
+          },
+        ]
+      },
+      siteEmail_model: {
+        visible: false,
+        title: this.$t('trials:site:dialogTitle:siteEmail'),
+        width: '30%',
+      },
+      siteEmail_form: { TrialSiteId: null, UserId: null, UserName: null, Role: null, EMail: null, OldEMail: null, Phone: null },
+      siteEmail_tip: null
     }
   },
   mounted() {
@@ -255,6 +272,109 @@ export default {
     this.getList()
   },
   methods: {
+    async sendEMail() {
+      try {
+        let validate = await this.$refs.checkRemind_form.validate()
+        if (!validate) return false
+        let data = {
+          Email: this.checkRemind_form.EMail,
+          FullName: this.checkRemind_form.FullName,
+          TrialId: this.trialId
+
+        }
+        this.loading = true
+        let res = await sendCheckSiteSurveyUserEmail(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("trials:site:message:sendEmailSuccess"))
+          this.checkRemind_model.visible = false
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    async sendEMailTable() {
+      try {
+        let validate = await this.$refs.siteEmail_form.validate()
+        if (!validate) return false
+        let data = {
+          url: `${location.protocol}//${location.host}/researchLogin?trialId=${this.trialId}&lang=${this.$i18n.locale}&isUpload=1&email=${this.siteEmail_form.EMail}&oldEMail=${this.siteEmail_form.OldEMail}&trialSiteId=${this.siteEmail_form.TrialSiteId}`,
+          Email: this.siteEmail_form.EMail,
+          FullName: this.siteEmail_form.UserName,
+          TrialSiteId: this.siteEmail_form.TrialSiteId
+
+        }
+        this.loading = true
+        let res = await sendUpdateSiteSurveyUserEmail(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("trials:site:message:sendEmailSuccess"))
+          this.siteEmail_model.visible = false
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    handleSelectChange(id) {
+      let find = this.checkUserList.find(item => item.Id === id)
+      this.checkRemind_form.FullName = find.FullName
+      this.checkRemind_form.UserName = find.UserName
+      this.checkRemind_form.Role = find.TrialUserRoleList.filter(item => item.UserTypeEnum === 10 || item.UserTypeEnum === 12).map(item => item.UserTypeShortName).join(", ")
+      this.checkRemind_form.EMail = find.EMail
+      this.checkRemind_form.Phone = find.Phone
+    },
+    openCheckRemind() {
+      this.getMaintenanceList()
+      Object.keys(this.checkRemind_form).forEach(key => {
+        this.checkRemind_form[key] = null
+      })
+      this.checkRemind_model.visible = true
+    },
+    openSiteEmail(row) {
+      // this.getMaintenanceList()
+      this.siteEmail_tip = this.$t('trials:site:siteEmail:tip:top').replace("xxx", `${row.TrialSiteCode}${row.TrialSiteName}`)
+      Object.keys(this.siteEmail_form).forEach(key => {
+        this.siteEmail_form[key] = null
+      })
+      this.getTrialSiteLatestSurvey(row.TrialSiteId)
+      this.siteEmail_form.TrialSiteId = row.TrialSiteId
+      this.siteEmail_model.visible = true
+    },
+    async getTrialSiteLatestSurvey(id) {
+      try {
+        let params = {
+          TrialSiteId: id
+        }
+        let res = await getTrialSiteLatestSurvey(params)
+        if (res.IsSuccess) {
+          this.siteEmail_form.UserName = res.Result.UserName
+          this.siteEmail_form.OldEMail = res.Result.Email
+          this.siteEmail_form.EMail = res.Result.Email
+          this.siteEmail_form.Phone = res.Result.Phone
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    getMaintenanceList() {
+      this.listLoading = true
+      let data = {
+        PageIndex: 1,
+        PageSize: 9999,
+      }
+      data.TrialId = this.trialId
+      data.UserTypeList = [12, 10]
+      getMaintenanceList(data)
+        .then((res) => {
+          this.listLoading = false
+          this.checkUserList = res.Result.CurrentPageData
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
+    },
     getList() {
       this.loading = true
       this.searchData.TrialId = this.trialId
@@ -323,3 +443,8 @@ export default {
   },
 }
 </script>
+<style lang="scss" scoped>
+.tip {
+  margin-bottom: 10px;
+}
+</style>

From b6bc22af72df344925c7e059762897fa751b4d6d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 28 Oct 2025 17:55:48 +0800
Subject: [PATCH 045/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/customize/QuestionList.vue     |   6 +
 .../visit-review/components/FileViewer.vue    | 198 +++++++++++-------
 .../visit-review/components/ReadPage.vue      |   7 +-
 3 files changed, 132 insertions(+), 79 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 7da89dc0..78ac9fa9 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -366,6 +366,10 @@ export default {
       const i = this.questionMarkInfoList.findIndex(i => i.MeasureData && i.MeasureData.annotationUID === annotation.annotationUID)
       return i > -1
     },
+    verifyFileIsBound(annotation) {
+      const i = this.questionMarkInfoList.findIndex(i => i.MeasureData && i.MeasureData.noneDicomFileId === annotation.noneDicomFileId)
+      return i > -1
+    },
     async operateImageMarker(obj) {
       const STATE = {
         BIND: 0,       // 绑定标记
@@ -1159,6 +1163,8 @@ export default {
               if (ps) {
                 if (prop === 'area') value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
                 if (prop === 'length' || prop === 'perimeter') value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
+              } else {
+                value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
               }
               let obj = {
                 QuestionId: item.QuestionId,
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index b489a584..f9f7a265 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -126,7 +126,8 @@
           @dblclick="toggleFullScreen($event, index)" @click="activeCanvas(index)"
           @mouseup="sliderMouseup($event, index)" @mousemove="sliderMousemove($event, index)"
           @mouseleave="sliderMouseleave($event, index)">
-          <div v-show="imageType.includes(v.fileType)" :ref="`canvas-${index}`" class="content">
+          <div v-show="imageType.includes(v.fileType)" :ref="`canvas-${index}`" class="content"
+            @mouseup="contentMouseup($event, index)">
             <div class="left-top-text">
               <div v-if="v.taskInfo.IsExistsClinicalData" class="cd-info"
                 :title="$t('trials:reading:button:clinicalData')">
@@ -350,7 +351,11 @@ export default {
       taskId: '',
       isReadingTaskViewInOrder: null,
       trialCriterion: {},
-      saveCustomAnnotationTimer: null
+      saveCustomAnnotationTimer: null,
+      curOperation: {
+        type: '',
+        annotation: null
+      }
     }
   },
   computed: {
@@ -544,11 +549,17 @@ export default {
         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())
+          // }
           changeTextCallback: async (data, eventData, doneChangingTextCallback) => {
-            return doneChangingTextCallback(await this.customPrompt())
+            return doneChangingTextCallback(data.text)
           },
           getTextCallback: async (doneChangingTextCallback) => {
-            return doneChangingTextCallback(await this.customPrompt())
+            return doneChangingTextCallback('Annotation')
           }
         })
         toolGroup.addTool(RectangleROITool.toolName, {
@@ -947,13 +958,13 @@ export default {
       try {
         // if ( this.resetAnnotation && this.isFusion ) return false
         if (!annotation) return false
-        if (annotation.metadata.toolName === 'Lengthscale') {
-          await this.$confirm(
-            this.$t('trials:trials-list:table:LengthscaleIsDeleted')
-          )
-          const errorMsg = { message: 'Lengthscale Not delete' }
-          throw errorMsg
-        }
+        // if (annotation.metadata.toolName === 'Lengthscale') {
+        //   await this.$confirm(
+        //     this.$t('trials:trials-list:table:LengthscaleIsDeleted')
+        //   )
+        //   const errorMsg = { message: 'Lengthscale Not delete' }
+        //   throw errorMsg
+        // }
         if (this.readingTaskState === 2 && !annotation.data.label && annotation.metadata.toolName !== 'Lengthscale') return false
         if (this.readingTaskState === 2) {
           const errorMsg = { message: 'annotation Not allowed to operate' }
@@ -975,16 +986,32 @@ export default {
                 const errorMsg = { message: 'annotation Not allowed to operate' }
                 throw errorMsg
               } else if (this.activeTool === 'Eraser') {
-                await this.$confirm(
-                  this.$t('trials:trials-list:table:isDeleted') +
-                  annotation.data.label +
-                  '?'
-                )
+                if (annotation.metadata.toolName === 'Lengthscale') {
+                  await this.$confirm(
+                    this.$t('trials:trials-list:table:isDeleted') +
+                    this.$t('trials:nondicom-show:scale') +
+                    '?'
+                  )
+                } else {
+                  await this.$confirm(
+                    this.$t('trials:trials-list:table:isDeleted') +
+                    annotation.data.label +
+                    '?'
+                  )
+                }
+
                 if (annotation.id) {
                   let res = await deleteTrialFileType(annotation.id)
                   if (!res.IsSuccess) throw ''
                 }
-
+                let psIndex = this.psArr.findIndex(item => item.Path === annotation.path)
+                if (psIndex > -1) {
+                  this.psArr.splice(psIndex, 1)
+                }
+                console.log(this.psArr, psIndex)
+                if (annotation.metadata.toolName === 'Lengthscale') {
+                  this.$emit('getEcrf', { type: "changePlottingScaleChangeAnswer", VisitTaskId: this.taskInfo.VisitTaskId, noneDicomFileId: annotation.noneDicomFileId, path: annotation.path || '', picturePath: null, psArr: this.psArr, isRemovePlottingScale: false })
+                }
                 const renderingEngine = getRenderingEngine(renderingEngineId)
                 for (let i = 0; i < this.cells.length; i++) {
                   const viewportId = `canvas-${i}`
@@ -1040,47 +1067,26 @@ export default {
       annotation.path = path
       let ps = null
       let psIndex = this.psArr.findIndex(i => i.Path === path)
-      if (psIndex > -1 && this.psArr[i].PS) {
-        ps = parseFloat(this.psArr[i].PS).toFixed(3)
+      if (psIndex > -1 && this.psArr[psIndex].PS) {
+        ps = parseFloat(this.psArr[psIndex].PS).toFixed(3)
       }
       annotation.ps = ps
       if (!annotation.data.label && annotation.metadata.toolName !== 'Lengthscale') return
       if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
       if (annotation.metadata.toolName === 'Lengthscale') {
         const value = annotation.data.l
+        if (isNaN(parseFloat(value))) return false
         let ps = 1
         if (value) {
           const cachedStats = Object.keys(annotation.data.cachedStats)
           ps = value / annotation.data.cachedStats[cachedStats[0]].length
           annotation.data.ps = ps
-          this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: ps, OldPS: 1 })
+          this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: ps })
         }
         this.setToolsPassive()
         if (this.customizeStandardsNoneDicom.find(item => item.toolName === annotation.metadata?.toolName)) return false
-        if (this.saveCustomAnnotationTimer) {
-          clearTimeout(this.saveCustomAnnotationTimer)
-          this.saveCustomAnnotationTimer = null
-        }
-        let psIndex = this.psArr.findIndex(p => p.NoneDicomFileId === fileList[fileIndex].Id)
-        let OldPS = 1
-        if (psIndex > -1) {
-          OldPS = this.psArr[i].OldPS
-        }
-        let Proportion = ps / OldPS
-        return this.saveCustomAnnotationTimer = setTimeout(async () => {
-          if (OldPS === ps || !this.ecrf.IsHaveBindingQuestion) {
-            this.saveCustomAnnotation(annotation)
-          } else {
-            await this.$confirm(
-              this.$t('trials:trials-list:table:allQuestionChange')
-            ).then(() => {
-              this.saveCustomAnnotation(annotation, Proportion)
-            })
-              .catch(action => {
-                this.saveCustomAnnotation(annotation, -1)
-              });
-          }
-        }, 500)
+        this.curOperation.type = 'Modified'
+        return this.curOperation.annotation = annotation
       }
       this.$emit("getEcrf", { type: "getOperateStateEnum", VisitTaskId: this.taskInfo.VisitTaskId })
       this.$emit('getEcrf', { type: "verifyAnnotationIsBound", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
@@ -1090,11 +1096,8 @@ export default {
         if (isBound || this.isNumber(operateStateEnum)) {
           this.$emit('getEcrf', { type: "updateAnnotationToQuestion", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
         } else {
-          if (this.saveCustomAnnotationTimer) {
-            clearTimeout(this.saveCustomAnnotationTimer)
-            this.saveCustomAnnotationTimer = null
-          }
-          this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 1000)
+          this.curOperation.type = 'Modified'
+          this.curOperation.annotation = annotation
         }
         this.setToolsPassive()
       })
@@ -1121,8 +1124,8 @@ export default {
       annotation.path = path
       let ps = null
       let psIndex = this.psArr.findIndex(i => i.Path === path)
-      if (psIndex > -1 && this.psArr[i].PS) {
-        ps = parseFloat(this.psArr[i].PS).toFixed(3)
+      if (psIndex > -1 && this.psArr[psIndex].PS) {
+        ps = parseFloat(this.psArr[psIndex].PS).toFixed(3)
       }
       annotation.ps = ps
       annotation.markTool = annotation.metadata.toolName
@@ -1183,7 +1186,16 @@ export default {
         if (annotations[i].visitTaskId !== this.taskInfo.VisitTaskId) {
           return
         } else {
-          this.$emit('getEcrf', { type: "bindAnnotationToQuestion", VisitTaskId: this.taskInfo.VisitTaskId, annotation: annotations[i] })
+          let annotation = annotations[i]
+          const imageId = annotation.metadata.referencedImageId
+          const path = imageId.split(`web:${this.OSSclientConfig.basePath}`)[1]
+          let psIndex = this.psArr.findIndex(i => i.Path === path)
+          let ps = null
+          if (psIndex > -1 && this.psArr[psIndex].PS) {
+            ps = parseFloat(this.psArr[psIndex].PS).toFixed(3)
+          }
+          annotation.ps = ps
+          this.$emit('getEcrf', { type: "bindAnnotationToQuestion", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
         }
       }
     },
@@ -1291,38 +1303,36 @@ export default {
         const cachedStats = Object.keys(annotation.data.cachedStats)
         ps = parseFloat(value) / annotation.data.cachedStats[cachedStats[0]].length
         annotation.data.ps = ps
-        this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: ps, OldPS: 1 })
+        this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: ps })
       } else {
         cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
         return
       }
       if (this.customizeStandardsNoneDicom.find(item => item.toolName === annotation.metadata?.toolName)) return false
       this.dialogVisible = false
-      if (this.saveCustomAnnotationTimer) {
-        clearTimeout(this.saveCustomAnnotationTimer)
-        this.saveCustomAnnotationTimer = null
-      }
-      let psIndex = this.psArr.findIndex(p => p.NoneDicomFileId === fileList[fileIndex].Id)
-      let OldPS = 1
-      if (psIndex > -1) {
-        OldPS = this.psArr[psIndex].OldPS
-      }
-      let Proportion = ps / OldPS
-      return this.saveCustomAnnotationTimer = setTimeout(async () => {
-        if (!this.ecrf.IsHaveBindingQuestion) {
-          this.saveCustomAnnotation(annotation)
-        } else {
-          await this.$confirm(
-            this.$t('trials:trials-list:table:allQuestionChange')
-          ).then(() => {
-            this.saveCustomAnnotation(annotation, Proportion)
-          })
-            .catch(action => {
-              this.saveCustomAnnotation(annotation, -1)
-            });
+      this.$emit('getEcrf', { type: "verifyFileIsBound", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
+      this.$nextTick(() => {
+        if (this.saveCustomAnnotationTimer) {
+          clearTimeout(this.saveCustomAnnotationTimer)
+          this.saveCustomAnnotationTimer = null
         }
-      }, 500)
-      this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 500)
+        return this.saveCustomAnnotationTimer = setTimeout(async () => {
+          if (!this.ecrf.IsHaveBindingQuestion || !this.ecrf.isFileBound) {
+            this.saveCustomAnnotation(annotation)
+          } else {
+            await this.$confirm(
+              this.$t('trials:trials-list:table:allQuestionChange')
+            ).then(() => {
+              this.saveCustomAnnotation(annotation, 1)
+            })
+              .catch(action => {
+                this.saveCustomAnnotation(annotation, -1)
+              });
+          }
+        }, 500)
+        this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 500)
+      })
+
     },
     getLengthscaleToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]
@@ -1696,6 +1706,40 @@ export default {
       e.stopPropagation()
       e.preventDefault()
     },
+    contentMouseup(e, index) {
+      console.log('contentMouseup')
+      const i = this.viewportInfos.findIndex(i => i.index === index)
+      if (i === -1) return
+      if (this.curOperation.type === 'Modified') {
+        let annotation = this.curOperation.annotation
+        if (annotation.metadata.toolName === 'Lengthscale') {
+          this.$emit('getEcrf', { type: "verifyFileIsBound", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
+          this.$nextTick(() => {
+            if (!this.ecrf.IsHaveBindingQuestion || !this.ecrf.isFileBound) {
+              this.saveCustomAnnotation(annotation)
+            } else {
+              this.$confirm(
+                this.$t('trials:trials-list:table:allQuestionChange')
+              ).then(() => {
+                this.saveCustomAnnotation(annotation, 1)
+              })
+                .catch(action => {
+                  this.saveCustomAnnotation(annotation, -1)
+                });
+            }
+          })
+        } else {
+          this.saveCustomAnnotation(annotation)
+        }
+      }
+      this.curOperation = {
+        type: '',
+        annotation: null
+      }
+      // e.stopImmediatePropagation()
+      // e.stopPropagation()
+      // e.preventDefault()
+    },
     handleIframeMessage(event) {
       if (event.data.type === 'pdf-clicked') {
         const baseUrl = event.data.data.baseUrl
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index 61bd51b8..eaa9ee44 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -180,6 +180,9 @@ export default {
       if (type === 'changePlottingScaleChangeAnswer') {
         this.ecrf.isBound = this.$refs[`ecrf_${data.VisitTaskId}`][0].changePlottingScaleChangeAnswer(data)
       }
+      if (type === 'verifyFileIsBound') {
+        this.ecrf.isFileBound = this.$refs[`ecrf_${data.VisitTaskId}`][0].verifyFileIsBound(data.annotation)
+      }
     },
     setSaved(saved) {
       this.$refs.fileViewer.lengthscaleToolDisabled(saved)
@@ -203,7 +206,7 @@ export default {
         }
         this.psArr = []
         if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
-          this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps, OldPS: i.MeasureData.data.ps })
+          this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps })
         }
         return i
       })
@@ -314,7 +317,7 @@ export default {
               i.MeasureData.id = i.Id
             }
             if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
-              this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps, OldPS: i.MeasureData.data.ps })
+              this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps })
             }
             return i
           })

From fe0ba42736bf9f913a4f48b018edd3db998e71bb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 29 Oct 2025 14:05:55 +0800
Subject: [PATCH 046/333] =?UTF-8?q?=E3=80=90=E9=9D=9Edicom=E3=80=91?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AEcrf=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=89=80=E6=9C=89=E6=A0=87=E8=AE=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=8C=85=E6=8B=AC=E6=A0=87=E5=B0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/visit-review/components/FileViewer.vue       | 9 +++++----
 .../reading/visit-review/components/ReadPage.vue         | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index f9f7a265..c70a2358 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1008,7 +1008,6 @@ export default {
                 if (psIndex > -1) {
                   this.psArr.splice(psIndex, 1)
                 }
-                console.log(this.psArr, psIndex)
                 if (annotation.metadata.toolName === 'Lengthscale') {
                   this.$emit('getEcrf', { type: "changePlottingScaleChangeAnswer", VisitTaskId: this.taskInfo.VisitTaskId, noneDicomFileId: annotation.noneDicomFileId, path: annotation.path || '', picturePath: null, psArr: this.psArr, isRemovePlottingScale: false })
                 }
@@ -1018,10 +1017,12 @@ export default {
                   const viewport = renderingEngine.getViewport(viewportId)
                   viewport.render()
                 }
-              } else {
-                const errorMsg = { message: 'annotation Not allowed to operate' }
-                throw errorMsg
               }
+              // else {
+              //   console.log(1234567)
+              //   const errorMsg = { message: 'annotation Not allowed to operate' }
+              //   throw errorMsg
+              // }
             } catch (err) {
               cornerstoneTools.annotation.state.addAnnotation(annotation)
               const renderingEngine = getRenderingEngine(renderingEngineId)
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index eaa9ee44..20ce1971 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -211,7 +211,7 @@ export default {
         return i
       })
       this.$set(this.visitTaskList[taskIdx], 'Annotations', annotations)
-      // this.$refs.fileViewer.resetAnnotations({ annotations, visitTaskId })
+      this.$refs.fileViewer.resetAnnotations({ annotations, visitTaskId })
     },
     setReadingTaskState(state) {
       this.readingTaskState = state

From 5394a2cde5eaa51268e750c4f09f24b50466f377 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 29 Oct 2025 16:04:08 +0800
Subject: [PATCH 047/333] =?UTF-8?q?=E9=9D=9Edicom=E8=A7=92=E5=BA=A6?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit-review/components/FileViewer.vue    | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index c70a2358..3d7b7156 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -574,7 +574,10 @@ export default {
           cachedStats: false,
           getTextLines: this.getCircleROIToolTextLines
         })
-        toolGroup.addTool(AngleTool.toolName)
+        toolGroup.addTool(AngleTool.toolName, {
+          cachedStats: false,
+          getTextLines: this.getAngleToolTextLines
+        })
         toolGroup.addTool(PlanarFreehandROITool.toolName, {
           allowOpenContours: false,
           cachedStats: false,
@@ -1541,6 +1544,25 @@ export default {
       }
       return textLines
     },
+    // 角度工具注释信息
+    getAngleToolTextLines(data, targetId) {
+      const cachedVolumeStats = data.cachedStats[targetId]
+      const { label } = data
+      const { angle } = cachedVolumeStats
+      if (angle === undefined) {
+        return
+      }
+
+      if (isNaN(angle)) {
+        return [`${angle}`]
+      }
+      const textLines = []
+      if (label) {
+        textLines.push(label)
+      }
+      textLines.push(`${angle.toFixed(this.digitPlaces)} ${String.fromCharCode(176)}`)
+      return textLines
+    },
     reRound(result, finalPrecision) {
       if (typeof result === 'string' && result.includes(', ')) {
         const numStrs = result.split(', ')

From 8590808cb925927b781f635821cd41bcd9ca677d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 29 Oct 2025 16:20:48 +0800
Subject: [PATCH 048/333] 1

---
 .../trials-panel/reading/visit-review/components/FileViewer.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 3d7b7156..fb9da17e 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1013,6 +1013,7 @@ export default {
                 }
                 if (annotation.metadata.toolName === 'Lengthscale') {
                   this.$emit('getEcrf', { type: "changePlottingScaleChangeAnswer", VisitTaskId: this.taskInfo.VisitTaskId, noneDicomFileId: annotation.noneDicomFileId, path: annotation.path || '', picturePath: null, psArr: this.psArr, isRemovePlottingScale: false })
+                  this.setToolsPassive()
                 }
                 const renderingEngine = getRenderingEngine(renderingEngineId)
                 for (let i = 0; i < this.cells.length; i++) {

From a7b9218952c323f70ce9748fa8389790873930de Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 Oct 2025 10:48:54 +0800
Subject: [PATCH 049/333] =?UTF-8?q?dicom=E9=98=85=E7=89=87=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B=E5=B0=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms3D/components/PetCtViewport.vue     |   1 +
 .../reading/dicoms3D/components/ReadPage.vue  |  68 ++-
 .../reading/dicoms3D/components/Viewport.vue  |   1 +
 .../components/tools/ScaleOverlayTool.js      | 409 ++++++++++++++++++
 4 files changed, 455 insertions(+), 24 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/dicoms3D/components/tools/ScaleOverlayTool.js

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
index 99b6222d..bc191c69 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
@@ -661,6 +661,7 @@ export default {
     },
     sliderMouseup(e) {
       this.sliderInfo.isMove = false
+      this.$emit('contentMouseup', e)
     },
     sliderMousedown(e) {
       const boxHeight = this.$refs['sliderBox'].clientHeight
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 c64aa02b..517db540 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -295,7 +295,7 @@
                   <Viewport :ref="`viewport-${index}`" :data-viewport-uid="`viewport-${index}`"
                     :rendering-engine-id="renderingEngineId" :viewport-id="`viewport-${index}`" :viewport-index="index"
                     @activeViewport="activeViewport" @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD"
-                    @renderAnnotations="renderAnnotations" />
+                    @renderAnnotations="renderAnnotations" @contentMouseup="contentMouseup" />
                 </div>
               </div>
               <div v-if="readingTool === 2" :class="['viewports-box', !isFusion ? 'viewports-box-down' : '']"
@@ -308,7 +308,8 @@
                     :rendering-engine-id="renderingEngineId" :viewport-id="`viewport-fusion-${index}`"
                     :viewport-index="index" @activeViewport="activeViewport"
                     @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD"
-                    @renderAnnotations="renderAnnotations" @upperRangeChange="upperRangeChange" />
+                    @renderAnnotations="renderAnnotations" @upperRangeChange="upperRangeChange"
+                    @contentMouseup="contentMouseup" />
                 </div>
               </div>
             </div>
@@ -361,7 +362,8 @@
         <!-- 手册 -->
         <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute;right: 20px;font-size: 20px;">
-          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'" style="margin-right:10px;cursor: pointer;"
+          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+            style="margin-right:10px;cursor: pointer;"
             @click="manualsDialog.isFullscreen = !manualsDialog.isFullscreen" />
           <svg-icon icon-class="close" style="cursor: pointer;" @click="manualsDialog.visible = false" />
         </span>
@@ -460,6 +462,7 @@ import ClinicalData from '@/views/trials/trials-panel/reading/clinical-data'
 import FusionForm from './FusionForm.vue'
 import colorMap from './colorMap.vue'
 import RectangleROITool from './tools/RectangleROITool'
+import ScaleOverlayTool from './tools/ScaleOverlayTool'
 import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import { getNetWorkSpeed, setNetWorkSpeedSizeAll, workSpeedclose } from "@/utils"
@@ -470,7 +473,7 @@ const {
   ToolGroupManager,
   Enums: csToolsEnums,
   StackScrollTool,
-  ScaleOverlayTool,
+  // ScaleOverlayTool,
   PanTool,
   ZoomTool,
   WindowLevelTool,
@@ -625,7 +628,12 @@ export default {
       uploadStatus: 'upload',
       taskId: '',
       isReadingTaskViewInOrder: null,
-      trialCriterion: {}
+      trialCriterion: {},
+
+      curOperation: {
+        type: '',
+        annotation: null
+      }
     }
   },
   computed: {
@@ -1479,11 +1487,8 @@ export default {
         if (isBound || this.isNumber(operateStateEnum)) {
           this.$refs[`ecrf_${series.TaskInfo.VisitTaskId}`][0].updateAnnotationToQuestion(annotation)
         } else {
-          if (this.saveCustomAnnotationTimer) {
-            clearTimeout(this.saveCustomAnnotationTimer)
-            this.saveCustomAnnotationTimer = null
-          }
-          this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 1000)
+          this.curOperation.type = 'Modified'
+          this.curOperation.annotation = annotation
         }
       }
       this.setToolsPassive()
@@ -1553,6 +1558,17 @@ export default {
         console.log(e)
       }
     },
+    contentMouseup(e) {
+      console.log('contentMouseup')
+      if (this.curOperation.type === 'Modified') {
+        let annotation = this.curOperation.annotation
+        this.saveCustomAnnotation(annotation)
+      }
+      this.curOperation = {
+        type: '',
+        annotation: null
+      }
+    },
     removeAnnotation(annotation) {
       cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
       const renderingEngine = getRenderingEngine(renderingEngineId)
@@ -3032,21 +3048,25 @@ export default {
         let volumeId = null; let volume = null
         const key = isFusion ? `fusion_${serie.SeriesInstanceUid}` : serie.SeriesInstanceUid
         if (!this.volumeData[key] || !cache.getVolume(this.volumeData[key].volumeId)) {
-          if (serie.Modality === 'PT' && !isFusion) {
-            serie.ImageIds.forEach(async id => {
-              const imageLoadObject = cache.getImage(id)
-              if (imageLoadObject) {
-                await new Promise(res => {
-                  cache.removeImageLoadObject(id, { force: true }) // 从缓存中删除
-                  res()
-                })
-              }
-            })
+          // if (serie.Modality === 'PT' && !isFusion) {
+          //   serie.ImageIds.forEach(async id => {
+          //     const imageLoadObject = cache.getImage(id)
+          //     if (imageLoadObject) {
+          //       await new Promise(res => {
+          //         cache.removeImageLoadObject(id, { force: true }) // 从缓存中删除
+          //         res()
+          //       })
+          //     }
+          //   })
+          // }
+          volumeId = `${isFusion ? 'fusion' : serie.Modality}Volume` + ':' + serie.SeriesInstanceUid
+          if (cache.getVolume(volumeId)) {
+            volume = cache.getVolume(volumeId)
+          } else {
+            await this.$refs[`viewport-fusion-0`][0].createImageIdsAndCacheMetaData(serie)
+            volume = await volumeLoader.createAndCacheVolume(volumeId, { imageIds: serie.ImageIds })
+            volume.load()
           }
-          await this.$refs[`viewport-fusion-0`][0].createImageIdsAndCacheMetaData(serie)
-          volumeId = `${isFusion ? 'fusion' : serie.Modality}Volume` + ':' + csUtils.uuidv4()
-          volume = await volumeLoader.createAndCacheVolume(volumeId, { imageIds: serie.ImageIds })
-          volume.load()
           this.volumeData[key] = {}
           this.volumeData[key].volumeId = volumeId
           this.volumeData[key].volume = volume
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 0a3adcd5..7698146c 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
@@ -481,6 +481,7 @@ export default {
     },
     sliderMouseup(e) {
       this.sliderInfo.isMove = false
+      this.$emit('contentMouseup', e)
     },
     sliderMousedown(e) {
       const boxHeight = this.$refs['sliderBox'].clientHeight
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/tools/ScaleOverlayTool.js b/src/views/trials/trials-panel/reading/dicoms3D/components/tools/ScaleOverlayTool.js
new file mode 100644
index 00000000..5c1611d9
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/tools/ScaleOverlayTool.js
@@ -0,0 +1,409 @@
+// import AnnotationDisplayTool from './base/AnnotationDisplayTool';
+import { vec3 } from 'gl-matrix';
+import { getEnabledElementByIds, getRenderingEngines, utilities as csUtils, } from '@cornerstonejs/core';
+// import { addAnnotation, getAnnotations, } from '../stateManagement/annotation/annotationState';
+// import { drawLine as drawLineSvg, drawTextBox as drawTextBoxSvg, } from '../drawingSvg';
+// import { getToolGroup } from '../store/ToolGroupManager';
+import * as cornerstoneTools from '@cornerstonejs/tools'
+const {
+    annotation,
+    drawing,
+    AnnotationDisplayTool,
+    ToolGroupManager,
+} = cornerstoneTools
+const { getAnnotations, addAnnotation } = annotation.state
+const { getToolGroup } = ToolGroupManager
+const { drawLine, drawTextBox } = drawing
+const drawLineSvg = drawLine
+const drawTextBoxSvg = drawTextBox
+const viewportsWithAnnotations = [];
+class ScaleOverlayTool extends AnnotationDisplayTool {
+    constructor(toolProps = {}, defaultToolProps = {
+        configuration: {
+            viewportId: '',
+            scaleLocation: 'bottom',
+        },
+    }) {
+        super(toolProps, defaultToolProps);
+        this.editData = null;
+        this._init = () => {
+            const renderingEngines = getRenderingEngines();
+            const renderingEngine = renderingEngines[0];
+            if (!renderingEngine) {
+                return;
+            }
+            const viewportIds = getToolGroup(this.toolGroupId).viewportsInfo;
+            if (!viewportIds) {
+                return;
+            }
+            const enabledElements = viewportIds.map((e) => getEnabledElementByIds(e.viewportId, e.renderingEngineId));
+            let { viewport } = enabledElements[0];
+            const { FrameOfReferenceUID } = enabledElements[0];
+            if (this.configuration.viewportId) {
+                enabledElements.forEach((element) => {
+                    if (element.viewport.id == this.configuration.viewportId) {
+                        viewport = element.viewport;
+                    }
+                });
+            }
+            if (!viewport) {
+                return;
+            }
+            const { viewUp, viewPlaneNormal } = viewport.getCamera();
+            const viewportCanvasCornersInWorld = csUtils.getViewportImageCornersInWorld(viewport);
+            let annotation = this.editData?.annotation;
+            const annotations = getAnnotations(this.getToolName(), viewport.element);
+            if (annotations.length) {
+                annotation = annotations.filter((thisAnnotation) => thisAnnotation.data.viewportId == viewport.id)[0];
+            }
+            enabledElements.forEach((element) => {
+                const { viewport } = element;
+                if (!viewportsWithAnnotations.includes(viewport.id) || annotations.length === 0) {
+                    const newAnnotation = {
+                        metadata: {
+                            toolName: this.getToolName(),
+                            viewPlaneNormal: [...viewPlaneNormal],
+                            viewUp: [...viewUp],
+                            FrameOfReferenceUID,
+                            referencedImageId: null,
+                        },
+                        data: {
+                            handles: {
+                                points: csUtils.getViewportImageCornersInWorld(viewport),
+                            },
+                            viewportId: viewport.id,
+                        },
+                    };
+                    viewportsWithAnnotations.push(viewport.id);
+                    addAnnotation(newAnnotation, viewport.element);
+                    annotation = newAnnotation;
+                }
+            });
+            if (this.editData?.annotation &&
+                this.editData.annotation.data.viewportId == viewport.id) {
+                this.editData.annotation.data.handles.points =
+                    viewportCanvasCornersInWorld;
+                this.editData.annotation.data.viewportId = viewport.id;
+            }
+            this.editData = {
+                viewport,
+                renderingEngine,
+                annotation,
+            };
+        };
+        this.onSetToolEnabled = () => {
+            this._init();
+        };
+        this.onCameraModified = (evt) => {
+            this.configuration.viewportId = evt.detail.viewportId;
+            this._init();
+        };
+        this.computeScaleSize = (worldWidthViewport, worldHeightViewport, location) => {
+            const scaleSizes = [
+                16000, 8000, 4000, 2000, 1000, 500, 250, 100, 50, 25, 10, 5, 2,
+            ];
+            let currentScaleSize;
+            if (location == 'top' || location == 'bottom') {
+                currentScaleSize = scaleSizes.filter((scaleSize) => scaleSize < worldWidthViewport * 0.6 &&
+                    scaleSize > worldWidthViewport * 0.2);
+            }
+            else {
+                currentScaleSize = scaleSizes.filter((scaleSize) => scaleSize < worldHeightViewport * 0.6 &&
+                    scaleSize > worldHeightViewport * 0.2);
+            }
+            return currentScaleSize[0];
+        };
+        this.computeEndScaleTicks = (canvasCoordinates, location) => {
+            const locationTickOffset = {
+                bottom: [
+                    [0, -10],
+                    [0, -10],
+                ],
+                top: [
+                    [0, 10],
+                    [0, 10],
+                ],
+                left: [
+                    [0, 0],
+                    [10, 0],
+                ],
+                right: [
+                    [0, 0],
+                    [-10, 0],
+                ],
+            };
+            const endTick1 = [
+                [
+                    canvasCoordinates[1][0] + locationTickOffset[location][0][0],
+                    canvasCoordinates[1][1] + locationTickOffset[location][0][0],
+                ],
+                [
+                    canvasCoordinates[1][0] + locationTickOffset[location][1][0],
+                    canvasCoordinates[1][1] + locationTickOffset[location][1][1],
+                ],
+            ];
+            const endTick2 = [
+                [
+                    canvasCoordinates[0][0] + locationTickOffset[location][0][0],
+                    canvasCoordinates[0][1] + locationTickOffset[location][0][0],
+                ],
+                [
+                    canvasCoordinates[0][0] + locationTickOffset[location][1][0],
+                    canvasCoordinates[0][1] + locationTickOffset[location][1][1],
+                ],
+            ];
+            return {
+                endTick1: endTick1,
+                endTick2: endTick2,
+            };
+        };
+        this.computeInnerScaleTicks = (scaleSize, location, annotationUID, leftTick, rightTick) => {
+            let canvasScaleSize;
+            if (location == 'bottom' || location == 'top') {
+                canvasScaleSize = rightTick[0][0] - leftTick[0][0];
+            }
+            else if (location == 'left' || location == 'right') {
+                canvasScaleSize = rightTick[0][1] - leftTick[0][1];
+            }
+            const tickIds = [];
+            const tickUIDs = [];
+            const tickCoordinates = [];
+            let numberSmallTicks = scaleSize;
+            if (scaleSize >= 50) {
+                numberSmallTicks = scaleSize / 10;
+            }
+            const tickSpacing = canvasScaleSize / numberSmallTicks;
+            for (let i = 0; i < numberSmallTicks - 1; i++) {
+                const locationOffset = {
+                    bottom: [
+                        [tickSpacing * (i + 1), 0],
+                        [tickSpacing * (i + 1), 5],
+                    ],
+                    top: [
+                        [tickSpacing * (i + 1), 0],
+                        [tickSpacing * (i + 1), -5],
+                    ],
+                    left: [
+                        [0, tickSpacing * (i + 1)],
+                        [-5, tickSpacing * (i + 1)],
+                    ],
+                    right: [
+                        [0, tickSpacing * (i + 1)],
+                        [5, tickSpacing * (i + 1)],
+                    ],
+                };
+                tickIds.push(`${annotationUID}-tick${i}`);
+                tickUIDs.push(`tick${i}`);
+                if ((i + 1) % 5 == 0) {
+                    tickCoordinates.push([
+                        [
+                            leftTick[0][0] + locationOffset[location][0][0],
+                            leftTick[0][1] + locationOffset[location][0][1],
+                        ],
+                        [
+                            leftTick[1][0] + locationOffset[location][0][0],
+                            leftTick[1][1] + locationOffset[location][0][1],
+                        ],
+                    ]);
+                }
+                else {
+                    tickCoordinates.push([
+                        [
+                            leftTick[0][0] + locationOffset[location][0][0],
+                            leftTick[0][1] + locationOffset[location][0][1],
+                        ],
+                        [
+                            leftTick[1][0] + locationOffset[location][1][0],
+                            leftTick[1][1] + locationOffset[location][1][1],
+                        ],
+                    ]);
+                }
+            }
+            return { tickIds, tickUIDs, tickCoordinates };
+        };
+        this.computeWorldScaleCoordinates = (scaleSize, location, pointSet) => {
+            let worldCoordinates;
+            let topBottomVec = vec3.subtract(vec3.create(), pointSet[0], pointSet[1]);
+            topBottomVec = vec3.normalize(vec3.create(), topBottomVec);
+            let topRightVec = vec3.subtract(vec3.create(), pointSet[2], pointSet[0]);
+            topRightVec = vec3.normalize(vec3.create(), topRightVec);
+            const midpointLocation = {
+                bottom: [pointSet[1], pointSet[2]],
+                top: [pointSet[0], pointSet[3]],
+                right: [pointSet[2], pointSet[3]],
+                left: [pointSet[0], pointSet[1]],
+            };
+            const midpoint = vec3
+                .add(vec3.create(), midpointLocation[location][0], midpointLocation[location][0])
+                .map((i) => i / 2);
+            const offset = scaleSize /
+                2 /
+                Math.sqrt(Math.pow(topBottomVec[0], 2) +
+                    Math.pow(topBottomVec[1], 2) +
+                    Math.pow(topBottomVec[2], 2));
+            if (location == 'top' || location == 'bottom') {
+                worldCoordinates = [
+                    vec3.subtract(vec3.create(), midpoint, topRightVec.map((i) => i * offset)),
+                    vec3.add(vec3.create(), midpoint, topRightVec.map((i) => i * offset)),
+                ];
+            }
+            else if (location == 'left' || location == 'right') {
+                worldCoordinates = [
+                    vec3.add(vec3.create(), midpoint, topBottomVec.map((i) => i * offset)),
+                    vec3.subtract(vec3.create(), midpoint, topBottomVec.map((i) => i * offset)),
+                ];
+            }
+            return worldCoordinates;
+        };
+        this.computeCanvasScaleCoordinates = (canvasSize, canvasCoordinates, vscaleBounds, hscaleBounds, location) => {
+            let scaleCanvasCoordinates;
+            if (location == 'top' || location == 'bottom') {
+                const worldDistanceOnCanvas = canvasCoordinates[0][0] - canvasCoordinates[1][0];
+                scaleCanvasCoordinates = [
+                    [canvasSize.width / 2 - worldDistanceOnCanvas / 2, vscaleBounds.height],
+                    [canvasSize.width / 2 + worldDistanceOnCanvas / 2, vscaleBounds.height],
+                ];
+            }
+            else if (location == 'left' || location == 'right') {
+                const worldDistanceOnCanvas = canvasCoordinates[0][1] - canvasCoordinates[1][1];
+                scaleCanvasCoordinates = [
+                    [hscaleBounds.width, canvasSize.height / 2 - worldDistanceOnCanvas / 2],
+                    [hscaleBounds.width, canvasSize.height / 2 + worldDistanceOnCanvas / 2],
+                ];
+            }
+            return scaleCanvasCoordinates;
+        };
+        this.computeScaleBounds = (canvasSize, horizontalReduction, verticalReduction, location) => {
+            const hReduction = horizontalReduction * Math.min(1000, canvasSize.width);
+            const vReduction = verticalReduction * Math.min(1000, canvasSize.height);
+            const locationBounds = {
+                bottom: [-vReduction, -hReduction],
+                top: [vReduction, hReduction],
+                left: [vReduction, hReduction],
+                right: [-vReduction, -hReduction],
+            };
+            const canvasBounds = {
+                bottom: [canvasSize.height, canvasSize.width],
+                top: [0, canvasSize.width],
+                left: [canvasSize.height, 0],
+                right: [canvasSize.height, canvasSize.width],
+            };
+            return {
+                height: canvasBounds[location][0] + locationBounds[location][0],
+                width: canvasBounds[location][1] + locationBounds[location][1],
+            };
+        };
+    }
+    renderAnnotation(enabledElement, svgDrawingHelper) {
+        if (!this.editData || !this.editData.viewport) {
+            return;
+        }
+        const location = this.configuration.scaleLocation;
+        const { viewport } = enabledElement;
+        const annotations = getAnnotations(this.getToolName(), viewport.element);
+        const annotation = annotations.filter((thisAnnotation) => thisAnnotation.data.viewportId == viewport.id)[0];
+        const canvas = enabledElement.viewport.canvas;
+        const renderStatus = false;
+        if (!viewport) {
+            return renderStatus;
+        }
+        const styleSpecifier = {
+            toolGroupId: this.toolGroupId,
+            toolName: this.getToolName(),
+            viewportId: enabledElement.viewport.id,
+        };
+        const canvasSize = {
+            width: canvas.width / window.devicePixelRatio || 1,
+            height: canvas.height / window.devicePixelRatio || 1,
+        };
+        const topLeft = annotation.data.handles.points[0];
+        const topRight = annotation.data.handles.points[1];
+        const bottomLeft = annotation.data.handles.points[2];
+        const bottomRight = annotation.data.handles.points[3];
+        const pointSet1 = [topLeft, bottomLeft, topRight, bottomRight];
+        const worldWidthViewport = vec3.distance(bottomLeft, bottomRight);
+        const worldHeightViewport = vec3.distance(topLeft, bottomLeft);
+        const hscaleBounds = this.computeScaleBounds(canvasSize, 0.05, 0.05, location);
+        const vscaleBounds = this.computeScaleBounds(canvasSize, 0.05, 0.05, location);
+        const scaleSize = this.computeScaleSize(worldWidthViewport, worldHeightViewport, location);
+        const canvasCoordinates = this.computeWorldScaleCoordinates(scaleSize, location, pointSet1).map((world) => viewport.worldToCanvas(world));
+        const scaleCanvasCoordinates = this.computeCanvasScaleCoordinates(canvasSize, canvasCoordinates, vscaleBounds, hscaleBounds, location);
+        const scaleTicks = this.computeEndScaleTicks(scaleCanvasCoordinates, location);
+        const { annotationUID } = annotation;
+        styleSpecifier.annotationUID = annotationUID;
+        const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
+        const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
+        const color = this.getStyle('color', styleSpecifier, annotation);
+        const shadow = this.getStyle('shadow', styleSpecifier, annotation);
+        const scaleId = `${annotationUID}-scaleline`;
+        const scaleLineUID = '1';
+        drawLineSvg(svgDrawingHelper, annotationUID, scaleLineUID, scaleCanvasCoordinates[0], scaleCanvasCoordinates[1], {
+            color,
+            width: lineWidth,
+            lineDash,
+            shadow,
+        }, scaleId);
+        const leftTickId = `${annotationUID}-left`;
+        const leftTickUID = '2';
+        drawLineSvg(svgDrawingHelper, annotationUID, leftTickUID, scaleTicks.endTick1[0], scaleTicks.endTick1[1], {
+            color,
+            width: lineWidth,
+            lineDash,
+            shadow,
+        }, leftTickId);
+        const rightTickId = `${annotationUID}-right`;
+        const rightTickUID = '3';
+        drawLineSvg(svgDrawingHelper, annotationUID, rightTickUID, scaleTicks.endTick2[0], scaleTicks.endTick2[1], {
+            color,
+            width: lineWidth,
+            lineDash,
+            shadow,
+        }, rightTickId);
+        const locationTextOffest = {
+            bottom: [-10, -42],
+            top: [-12, -35],
+            left: [-40, -20],
+            right: [-50, -20],
+        };
+        const textCanvasCoordinates = [
+            scaleCanvasCoordinates[0][0] + locationTextOffest[location][0],
+            scaleCanvasCoordinates[0][1] + locationTextOffest[location][1],
+        ];
+        const textBoxLines = this._getTextLines(scaleSize);
+        const { tickIds, tickUIDs, tickCoordinates } = this.computeInnerScaleTicks(scaleSize, location, annotationUID, scaleTicks.endTick1, scaleTicks.endTick2);
+        for (let i = 0; i < tickUIDs.length; i++) {
+            drawLineSvg(svgDrawingHelper, annotationUID, tickUIDs[i], tickCoordinates[i][0], tickCoordinates[i][1], {
+                color,
+                width: lineWidth,
+                lineDash,
+                shadow,
+            }, tickIds[i]);
+        }
+        const textUID = 'text0';
+        drawTextBoxSvg(svgDrawingHelper, annotationUID, textUID, textBoxLines, [textCanvasCoordinates[0], textCanvasCoordinates[1]], {
+            fontFamily: 'Helvetica Neue, Helvetica, Arial, sans-serif',
+            fontSize: '14px',
+            lineDash: '2,3',
+            lineWidth: '1',
+            shadow: true,
+            color: color,
+        });
+        return renderStatus;
+    }
+    _getTextLines(scaleSize) {
+        let scaleSizeDisplayValue;
+        let scaleSizeUnits;
+        if (scaleSize >= 50) {
+            scaleSizeDisplayValue = scaleSize / 10;
+            scaleSizeUnits = ' cm';
+        }
+        else {
+            scaleSizeDisplayValue = scaleSize;
+            scaleSizeUnits = ' mm';
+        }
+        const textLines = [scaleSizeDisplayValue.toString().concat(scaleSizeUnits)];
+        return textLines;
+    }
+}
+ScaleOverlayTool.toolName = 'ScaleOverlay';
+export default ScaleOverlayTool;

From 7f47936f8a069ad29c47e532e47203884fa05b96 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 Oct 2025 10:55:09 +0800
Subject: [PATCH 050/333] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=AE=9A=E4=B9=89dic?=
 =?UTF-8?q?om=E3=80=91=E6=95=B0=E5=80=BC=E9=97=AE=E9=A2=98=E4=B8=AD?=
 =?UTF-8?q?=E5=A4=9A=E8=BE=B9=E5=BD=A2=E5=B7=A5=E5=85=B7=E7=9A=84=E6=B5=8B?=
 =?UTF-8?q?=E9=87=8F=E5=80=BC=EF=BC=8C=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=9C=89?=
 =?UTF-8?q?radius=E5=92=8Cmax=EF=BC=8C=E7=BC=BA=E5=B0=91perimeter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms3D/components/toolConfig.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c9a56b15..e11c3cdf 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
@@ -297,7 +297,7 @@ const config = {
       'name': '自由曲线',
       'icon': 'polygon',
       'toolName': 'PlanarFreehandROI',
-      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
+      'props': ['area', 'mean', 'stdDev', 'perimeter'],
       'i18nKey': 'trials:reading:button:planarFreehandROI',
       'isDisabled': false,
       'disabledReason': ''

From 342f135d23ee534d5da0670a38e43a0e4252a9c1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 Oct 2025 10:58:29 +0800
Subject: [PATCH 051/333] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=9D=9Edicom=E3=80=91=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E5=B0=8F=E6=95=B0=E5=8F=96=E5=80=BC?=
 =?UTF-8?q?=E4=B8=8E=E6=A0=87=E8=AE=B0=E6=98=BE=E7=A4=BA=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=E6=9C=89=E5=B7=AE=E5=BC=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/customize/QuestionList.vue      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 78ac9fa9..3cf90213 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -948,6 +948,8 @@ export default {
         let ps = annotation.ps
         if (prop === 'area') value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
         if (prop === 'length' || prop === 'perimeter') value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
+      } else if (this.isNoneDicom && value !== null) {
+        value = this.reRound(csUtils.roundNumber(value))
       }
       return value !== null
         ? parseFloat(value).toFixed(this.digitPlaces)

From 42839a925d58a6e9d52f76109c175821b999605c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 Oct 2025 11:09:44 +0800
Subject: [PATCH 052/333] =?UTF-8?q?=E3=80=90=E9=98=85=E7=89=87=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E3=80=91=E6=95=B0=E5=80=BC=E9=97=AE=E9=A2=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B5=8B=E9=87=8F=E5=B7=A5=E5=85=B7=EF=BC=8C=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E4=B8=AD=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=9C=89=E7=AE=AD?=
 =?UTF-8?q?=E5=A4=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/setting/reading-unit/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index 23ceda7d..f6a65cd6 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -232,9 +232,9 @@ export default {
     setReadingTools(data) {
       let { readingTools, isNoneDicom } = data
       if (isNoneDicom) {
-        this.readingTools = getCustomizeStandardsNoneDicomTools(readingTools)
+        this.readingTools = getCustomizeStandardsNoneDicomTools(readingTools).filter(item => item.toolName !== 'ArrowAnnotate')
       } else {
-        this.readingTools = getCustomizeStandardsTools(readingTools)
+        this.readingTools = getCustomizeStandardsTools(readingTools).filter(item => item.toolName !== 'ArrowAnnotate')
       }
 
     },

From b6500c62c5ab5892d0d44bbc840e43ceef1c13c9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 Oct 2025 13:20:21 +0800
Subject: [PATCH 053/333] =?UTF-8?q?=E9=9D=9Edicom=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/visit-review/components/FileViewer.vue       | 9 ++++++---
 .../reading/visit-review/components/ReadPage.vue         | 5 ++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index fb9da17e..bb0d943b 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -119,7 +119,7 @@
       </div>
     </div>
     <!-- viewports -->
-    <div class="viewports-wrapper">
+    <div class="viewports-wrapper" v-loading="loading">
       <div class="grid-container" :style="gridStyle">
         <div v-for="(v, index) in viewportInfos" v-show="index < cells.length" :key="index" :style="cellStyle"
           :class="['grid-cell', index === activeCanvasIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
@@ -355,7 +355,8 @@ export default {
       curOperation: {
         type: '',
         annotation: null
-      }
+      },
+      loading: false
     }
   },
   computed: {
@@ -936,7 +937,7 @@ export default {
     addAnnotationListeners() {
       const debouncedCallback = this.debounce((evt) => {
         this.annotationModifiedListener(evt)
-      }, 100)
+      }, 0)
       eventTarget.addEventListener(
         toolsEvents.ANNOTATION_MODIFIED,
         (evt) => {
@@ -1209,10 +1210,12 @@ export default {
         const measureData = Object.assign({}, annotation)
         const params = {}
         const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
+        this.loading = true
         await this.getScreenshots({
           visitTaskId: this.taskInfo.VisitTaskId,
           annotation
         }, async (base64Str) => {
+          this.loading = false
           const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str)
           let picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           if (annotation.id) params.Id = annotation.id
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index 20ce1971..daf31b18 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -204,9 +204,8 @@ export default {
           i.MeasureData.markId = i.MarkId
           i.MeasureData.id = i.Id
         }
-        this.psArr = []
         if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
-          this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps })
+          this.setPS({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps })
         }
         return i
       })
@@ -317,7 +316,7 @@ export default {
               i.MeasureData.id = i.Id
             }
             if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
-              this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps })
+              this.setPS({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps })
             }
             return i
           })

From 383231204153d9f89e12b6852fc4cbf3a5ebd1af Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 Oct 2025 14:24:59 +0800
Subject: [PATCH 054/333] =?UTF-8?q?=E6=A0=87=E8=AE=B0=E5=80=BC=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/customize/QuestionList.vue       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 3cf90213..245a8aa9 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -944,12 +944,17 @@ export default {
         && Object.prototype.hasOwnProperty.call(cachedStats, prop)
       if (!hasProp) return null
       let value = cachedStats[prop]
-      if (this.isNoneDicom && annotation.ps) {
+      if (this.isNoneDicom && annotation.ps && value !== null) {
         let ps = annotation.ps
-        if (prop === 'area') value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
-        if (prop === 'length' || prop === 'perimeter') value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
+        if (prop === 'area') {
+          value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
+        } else if (prop === 'length' || prop === 'perimeter') {
+          value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
+        } else {
+          value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
+        }
       } else if (this.isNoneDicom && value !== null) {
-        value = this.reRound(csUtils.roundNumber(value))
+        value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
       }
       return value !== null
         ? parseFloat(value).toFixed(this.digitPlaces)
@@ -1147,12 +1152,12 @@ export default {
         }
         if (!isRemovePlottingScale) {
           this.questionMarkInfoList.forEach(item => {
-            if (item.Path === path && ['Length', 'Perimeter', 'Area'].includes(item.MarkTool)) {
+            let prop = this.questionImageToolAttributeInfo[item.QuestionId]
+            if (item.Path === path && ['length', 'perimeter', 'area'].includes(prop)) {
               const referencedImageId = item?.MeasureData?.metadata?.referencedImageId
               if (!referencedImageId) return null
               const cacheKey = `imageId:${referencedImageId}`
               const cachedStats = item?.MeasureData.data?.cachedStats?.[cacheKey]
-              let prop = item.MarkTool.toLowerCase();
               const hasProp = cachedStats
                 && Object.prototype.hasOwnProperty.call(cachedStats, prop)
               if (!hasProp) return null

From 273932f9ccd574d280a47b7a07c59fddcd242ed0 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 Oct 2025 14:32:33 +0800
Subject: [PATCH 055/333] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=AE=9A=E4=B9=89dic?=
 =?UTF-8?q?om=E3=80=91=E8=A1=A8=E6=A0=BC=E6=95=B0=E5=80=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=A7=BB=E9=99=A4=E6=A0=87=E8=AE=B0=E5=90=8E=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms3D/components/customize/QuestionList.vue    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 245a8aa9..1108fd44 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -600,12 +600,15 @@ export default {
           QuestionId: obj.question.ParentQsId,
           ...(annotation ? {
             StudyId: annotation.studyId,
-            MarkTool: annotation.markTool,
+            MarkTool: annotation.markTool || '',
             MeasureData: JSON.stringify(annotation),
-            OrderMarkName: annotation.data.label,
+            OrderMarkName: annotation.data.label || '',
             NoneDicomFileId: annotation.noneDicomFileId,
-          } : {}),
-          Path: annotation.path,
+          } : {
+            MarkTool: '',
+            OrderMarkName: ''
+          }),
+          Path: annotation.path || '',
           PicturePath: picturePath ? picturePath : '',
           QuestionType: 0,
           RowId: this.operateRowId,

From 199fe6aed33b45d1230fa81e943245e12a5427fa Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 Oct 2025 15:04:28 +0800
Subject: [PATCH 056/333] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=9D=9Edicom=E3=80=91=E6=A0=87=E8=AE=B0=E5=B7=B2=E4=B8=8E?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=BB=91=E5=AE=9A=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B=E5=B0=BA=E5=90=8E=EF=BC=8C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=80=BC=E5=BA=94=E8=AF=A5=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=BApx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/visit-review/components/FileViewer.vue        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index bb0d943b..89401e3b 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1008,11 +1008,11 @@ export default {
                   let res = await deleteTrialFileType(annotation.id)
                   if (!res.IsSuccess) throw ''
                 }
-                let psIndex = this.psArr.findIndex(item => item.Path === annotation.path)
-                if (psIndex > -1) {
-                  this.psArr.splice(psIndex, 1)
-                }
                 if (annotation.metadata.toolName === 'Lengthscale') {
+                  let psIndex = this.psArr.findIndex(item => item.Path === annotation.path)
+                  if (psIndex > -1) {
+                    this.psArr.splice(psIndex, 1)
+                  }
                   this.$emit('getEcrf', { type: "changePlottingScaleChangeAnswer", VisitTaskId: this.taskInfo.VisitTaskId, noneDicomFileId: annotation.noneDicomFileId, path: annotation.path || '', picturePath: null, psArr: this.psArr, isRemovePlottingScale: false })
                   this.setToolsPassive()
                 }

From 081263d34fc8ca299544789895420d4fa94dcdb2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 Oct 2025 15:28:48 +0800
Subject: [PATCH 057/333] 1

---
 .../trials-panel/reading/visit-review/components/FileViewer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 89401e3b..a916dead 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1564,7 +1564,7 @@ export default {
       if (label) {
         textLines.push(label)
       }
-      textLines.push(`${angle.toFixed(this.digitPlaces)} ${String.fromCharCode(176)}`)
+      textLines.push(`${this.reRound(csUtils.roundNumber(angle)).toFixed(this.digitPlaces)} ${String.fromCharCode(176)}`)
       return textLines
     },
     reRound(result, finalPrecision) {

From 746278681d64a87bc39e4f9296695a94139ffd10 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 31 Oct 2025 09:16:47 +0800
Subject: [PATCH 058/333] 1

---
 .../trials-panel/reading/visit-review/components/FileViewer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index a916dead..6d86e72e 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1564,7 +1564,7 @@ export default {
       if (label) {
         textLines.push(label)
       }
-      textLines.push(`${this.reRound(csUtils.roundNumber(angle)).toFixed(this.digitPlaces)} ${String.fromCharCode(176)}`)
+      textLines.push(`${this.reRound(csUtils.roundNumber(angle), this.digitPlaces)} ${String.fromCharCode(176)}`)
       return textLines
     },
     reRound(result, finalPrecision) {

From 134f2471a6646dfc0fe5107c7a22fc34985053b2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 31 Oct 2025 17:12:13 +0800
Subject: [PATCH 059/333] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=9D=9Edicom=E3=80=91=E5=A2=9E=E5=8A=A0=E6=AF=94=E4=BE=8B?=
 =?UTF-8?q?=E5=B0=BA=E5=90=8E=EF=BC=8C=E8=A1=A8=E6=A0=BC=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/customize/QuestionFormItem.vue | 54 +++++++++++++--
 .../components/customize/QuestionList.vue     | 68 ++-----------------
 2 files changed, 53 insertions(+), 69 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 10d132ef..b3139c5d 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -258,11 +258,12 @@
     <template
       v-if="question.Childrens && question.Childrens.length > 0 && question.Type !== 'table' && question.Type !== 'basicTable'">
       <QuestionFormItem v-for="(item) in question.Childrens" :key="item.Id" :question="item" :isBaseline="isBaseline"
-        :reading-task-state="readingTaskState" :question-form="questionForm" :visit-task-id="visitTaskId"
-        :criterion-id="criterionId" :calculationList="calculationList" :questionMarkInfoList="questionMarkInfoList"
-        :questionsMarkStatus="questionsMarkStatus" @formItemNumberChange="formItemNumberChange"
-        @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" @getQuestions="getQuestions"
-        @operateImageMarker="operateImageMarker" @unBindAnnotationToQuestion="unBindAnnotationToQuestion" />
+        :isNoneDicom="isNoneDicom" :reading-task-state="readingTaskState" :question-form="questionForm"
+        :visit-task-id="visitTaskId" :criterion-id="criterionId" :calculationList="calculationList"
+        :questionMarkInfoList="questionMarkInfoList" :questionsMarkStatus="questionsMarkStatus"
+        @formItemNumberChange="formItemNumberChange" @setFormItemData="setFormItemData"
+        @resetFormItemData="resetFormItemData" @getQuestions="getQuestions" @operateImageMarker="operateImageMarker"
+        @unBindAnnotationToQuestion="unBindAnnotationToQuestion" />
     </template>
 
     <!-- <base-model :config="addOrEdit"
@@ -291,6 +292,11 @@ import BaseModel from '@/components/BaseModel'
 // import PreviewFile from '@/components/PreviewFile/index'
 import { mapGetters } from 'vuex'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
+import {
+  utilities as csUtils
+  // getEnabledElementByIds
+} from '@cornerstonejs/core'
+import store from '@/store'
 export default {
   name: 'QuestionFormItem',
   components: {
@@ -340,6 +346,10 @@ export default {
       default() {
         return {}
       }
+    },
+    isNoneDicom: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -480,6 +490,9 @@ export default {
         }
       }
     })
+    DicomEvent.$on('closeAddTableCol', (data) => {
+      this.handleCancel()
+    })
     DicomEvent.$on('operateImageMarker', (data) => {
       let { operateStateEnum, QuestionId, picturePath } = data
       if (this.question.Id === QuestionId) {
@@ -1202,11 +1215,40 @@ export default {
       const hasProp = cachedStats
         && Object.prototype.hasOwnProperty.call(cachedStats, prop)
       if (!hasProp) return null
-      const value = cachedStats[prop]
+      let value = cachedStats[prop]
+      if (this.isNoneDicom && annotation.ps && value !== null) {
+        let ps = annotation.ps
+        if (prop === 'area') {
+          value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
+        } else if (prop === 'length' || prop === 'perimeter') {
+          value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
+        } else {
+          value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
+        }
+      } else if (this.isNoneDicom && value !== null) {
+        value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
+      }
       return value !== null
         ? parseFloat(value).toFixed(this.digitPlaces)
         : value
     },
+    reRound(result, finalPrecision) {
+      if (typeof result === 'string' && result.includes(', ')) {
+        const numStrs = result.split(', ')
+        const processed = numStrs.map(str => this.processSingle(str, finalPrecision))
+        return processed.join(', ')
+      }
+      return this.processSingle(result, finalPrecision)
+    },
+    processSingle(str, precision) {
+      const num = parseFloat(str)
+      if (isNaN(num)) return 'NaN'
+
+      // 保留原极小值处理逻辑
+      if (Math.abs(num) < 0.0001) return str
+      const factor = 10 ** precision
+      return (Math.round(num * factor + 0.0000001) / factor).toFixed(precision)
+    },
     async beforeClose(done) {
       try {
         // 判断是否有标记未保存
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 1108fd44..313457a5 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -16,8 +16,8 @@
       <el-form v-if="taskInfo && rerender" ref="questions" size="small" :model="questionForm" class="ecrf-form">
         <template v-if="rerender">
           <QuestionFormItem v-for="question of questions" :key="question.Id" :visit-task-id="visitTaskId"
-            :question="question" :question-form="questionForm" :reading-task-state="readingTaskState"
-            :criterion-id="criterionId" :calculation-list="calculationList"
+            :isNoneDicom="isNoneDicom" :question="question" :question-form="questionForm"
+            :reading-task-state="readingTaskState" :criterion-id="criterionId" :calculation-list="calculationList"
             :question-mark-info-list="questionMarkInfoList" :questions-mark-status="questionsMarkStatus"
             :is-baseline="isBaseLineTask" @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData"
             @getQuestions="getQuestions" @operateImageMarker="operateImageMarker"
@@ -200,6 +200,7 @@ export default {
               i.TableQuestions.Answers.forEach((ite, index) => {
                 this.$set(i.TableQuestions.Answers[index], o.Id, isNaN(parseFloat(i.TableQuestions.Answers[index][o.Id])) ? i.TableQuestions.Answers[index][o.Id] : parseFloat(i.TableQuestions.Answers[index][o.Id]).toFixed(this.digitPlaces))
               })
+              this.$set(this.questionImageToolAttributeInfo, o.Id, o.ImageToolAttribute)
             }
           })
           this.$set(this.questionForm, i.Id, i.TableQuestions.Answers)
@@ -1077,66 +1078,6 @@ export default {
     receiveMsg(event) {
       if (event.data.type === 'isCanActiveNoneDicomTool') {
         let obj = { isCanActiveTool: true, lesionName: '', reason: '', toolName: event.data.toolName }
-        // this.getUnSaveTarget()
-        // var obj = {}
-        // if (this.unSaveTargets.length > 0) {
-        //   var rowIndex = String(this.unSaveTargets[0].rowIndex)
-        //   var questionId = this.unSaveTargets[0].questionId
-        //   const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
-        //   if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
-        //     // 判断是否是靶病灶
-        //     //  questions.findIndex(i => i.QuestionMark === questionMark)
-        //     var lesionType = this.$refs[refName][0].questionForm.LesionType
-        //     if (lesionType === 0) {
-        //       // '当前病灶为靶病灶，不允许添加标记！'
-        //       obj = { isCanActiveTool: false, lesionName: '', reason: this.$t('trials:reading:warnning:msg18') }
-        //     } else {
-        //       obj = { isCanActiveTool: true, lesionName: this.$refs[refName][0].lesionMark, reason: '', toolName: event.data.toolName }
-        //     }
-        //   } else {
-        //     let msg = this.$t('trials:reading:warnning:msg5')
-        //     msg = msg.replace('xxx', this.unSaveTargets[0].lessionName)
-        //     obj = { isCanActiveTool: false, lesionName: '', reason: msg }
-        //   }
-        // } else {
-        //   if (this.activeItem.activeCollapseId) {
-        //     // 判断是否是靶病灶
-        //     const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
-        //     // obj = { isCanActiveTool: true, lesionName: this.$refs[refName][0].lesionMark, reason: '' }
-        //     const lesionType = this.$refs[refName][0].questionForm.LesionType
-        //     if (lesionType === 0) {
-        //       // 当前病灶为靶病灶，不允许添加标记！
-        //       obj = { isCanActiveTool: false, lesionName: '', reason: this.$t('trials:reading:warnning:msg18') }
-        //     } else {
-        //       obj = { isCanActiveTool: true, lesionName: this.$refs[refName][0].lesionMark, reason: '', toolName: event.data.toolName }
-        //     }
-        //   } else {
-        //     // 获取非靶病灶/新病灶的长度及标识
-        //     var qsObj = null
-        //     var lesionName = ''
-        //     if (this.isBaseLineTask) {
-        //       const idx = this.tableQuestions.findIndex(item => item.LesionType === 1)
-        //       if (idx > -1) {
-        //         qsObj = this.tableQuestions[idx]
-        //       }
-        //     } else {
-        //       const idx = this.tableQuestions.findIndex(item => item.LesionType === 2)
-        //       if (idx > -1) {
-        //         qsObj = this.tableQuestions[idx]
-        //       }
-        //     }
-
-        //     // var questions = qsObj.TableQuestions.Questions.find(item => item.QuestionMark === 3)
-        //     // if (questions) {
-        //     //   var maxIndex = this.getMaxRowIndex(qsObj.TableQuestions.Answers)
-        //     //   lesionName = `${qsObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
-        //     // }
-        //     var maxIndex = this.getMaxRowIndex(qsObj.TableQuestions.Answers)
-        //     lesionName = `${qsObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
-        //     obj = { isCanActiveTool: true, lesionName: lesionName, reason: '', toolName: event.data.toolName }
-        //   }
-        // }
-
         DicomEvent.$emit('isCanActiveNoneDicomTool', obj)
       } else if (event.data.type === 'setMeasurement') {
         // this.setMeasuredData(event.data.data)
@@ -1155,7 +1096,8 @@ export default {
         }
         if (!isRemovePlottingScale) {
           this.questionMarkInfoList.forEach(item => {
-            let prop = this.questionImageToolAttributeInfo[item.QuestionId]
+            DicomEvent.$emit('closeAddTableCol', { RowId: item.RowId })
+            let prop = this.questionImageToolAttributeInfo[item.QuestionId] || this.questionImageToolAttributeInfo[item.TableQuestionId]
             if (item.Path === path && ['length', 'perimeter', 'area'].includes(prop)) {
               const referencedImageId = item?.MeasureData?.metadata?.referencedImageId
               if (!referencedImageId) return null

From b6ee9d5f6255be9e6c15d0d8ec2255564eddd8bf Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 3 Nov 2025 14:10:05 +0800
Subject: [PATCH 060/333] =?UTF-8?q?=E3=80=90LiLi=E3=80=91=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E7=9A=84=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 14b93500..01fe7d65 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -88,10 +88,13 @@
                   <span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 150px">{{
                     user.RealName }}</span>
                 </div>
-                <div style="font-size: .75rem;line-height: 18px;color:#999">{{ new
+                <div style="font-size: .75rem;line-height: 18px;color:#999" v-if="NODE_ENV !== 'usa'">{{ new
                   Date().getFullYear() }}{{ $t('common:date:today') }}{{ new Date().getMonth() +
                     1 }}{{ $t('common:date:month') }}{{ new Date().getDate() }}{{ $t('common:date:day') }}，{{ dayOfWeek }}
                 </div>
+                <div style="font-size: .75rem;line-height: 18px;color:#999" v-else>{{ moment().format('DD/MMM/YYYY') }}，{{
+                  dayOfWeek }}
+                </div>
               </div>
             </div>
             <div class="user-status" style="display: flex">
@@ -587,7 +590,7 @@ import ReuploadAudit from "./components/ReuploadAudit"
 import inspectionManagement from "./components/inspectionManagement"
 import store from '@/store'
 import './index.css'
-
+import moment from "moment";
 import { getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList } from '@/api/trials'
 import { getUser } from '@/api/admin'
 import { mapGetters, mapState } from "vuex";
@@ -626,6 +629,8 @@ export default {
   },
   data() {
     return {
+      NODE_ENV: process.env.NODE_ENV, // process.env.NODE_ENV
+      moment,
       isSignSystemDoc: false,
       trialIdList: [],
       tabList: {},

From d13a5edfda1e2fe8f2053b5e54a4b646edd685fc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 3 Nov 2025 14:39:51 +0800
Subject: [PATCH 061/333] =?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E6=B2=A1=E6=9C=89=E4=BD=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Screenfull/index.vue | 6 +++---
 src/views/dashboard/bigdata.vue     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue
index 260c90de..ea128b21 100644
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@@ -22,7 +22,7 @@ export default {
   },
   methods: {
     click() {
-      if (!screenfull.enabled) {
+      if (!screenfull.isEnabled) {
         this.$message({
           message: 'you browser can not work',
           type: 'warning'
@@ -35,12 +35,12 @@ export default {
       this.isFullscreen = screenfull.isFullscreen
     },
     init() {
-      if (screenfull.enabled) {
+      if (screenfull.isEnabled) {
         screenfull.on('change', this.change)
       }
     },
     destroy() {
-      if (screenfull.enabled) {
+      if (screenfull.isEnabled) {
         screenfull.off('change', this.change)
       }
     }
diff --git a/src/views/dashboard/bigdata.vue b/src/views/dashboard/bigdata.vue
index adbfc643..a464c0dc 100644
--- a/src/views/dashboard/bigdata.vue
+++ b/src/views/dashboard/bigdata.vue
@@ -112,7 +112,7 @@ export default {
       this.currentTime = moment().format('YYYY-MM-DD HH:mm:ss')
     },
     handleTitleClick() {
-      if (!screenfull.enabled) {
+      if (!screenfull.isEnabled) {
         this.$message({
           message: 'Your browser can not work',
           type: 'warning'

From d4aa02e0e5461aa21cd542074c498ea0faba0f1c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 3 Nov 2025 15:59:50 +0800
Subject: [PATCH 062/333] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=B5=E9=9D=A2=E7=AB=96=E5=B1=8F=E9=80=82?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue | 1018 ++++++++---------
 .../reading/dicoms/components/ReadPage.vue    |   72 +-
 2 files changed, 561 insertions(+), 529 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 25ec4043..45712caf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -63,13 +63,8 @@
         <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:wwwc')}`" placement="bottom">
           <div class="tool-wrapper" @click.stop="showPanel($event)" @mouseleave="handleMouseout">
             <div class="dropdown">
-              <div
-                class="icon"
-                data-tool="Wwwc"
-                :class="[activeTool==='Wwwc'?'tool_active':'']"
-
-                @click.prevent="setToolActive('Wwwc',false)"
-              >
+              <div class="icon" data-tool="Wwwc" :class="[activeTool === 'Wwwc' ? 'tool_active' : '']"
+                @click.prevent="setToolActive('Wwwc', false)">
                 <svg-icon icon-class="reverse" class="svg-icon" />
                 <i class="el-icon-arrow-down" style="color:#fff;" />
               </div>
@@ -80,7 +75,8 @@
 
                   <li v-for="item in wwwcArr" :key="item.label">
                     <a href="#" @click.prevent="setDicomCanvasWwwc(item)">
-                      <div v-if="item.wc !== null" style="display:flex;flex-direction: row;justify-content: space-between;">
+                      <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>
@@ -94,7 +90,8 @@
                   >
                     W/L {{ $t('trials:reading:title:preset') }}
                   </div> -->
-                    <el-divider v-if="item.val === 1" class="divider" content-position="center">{{ ` ${$t('trials:reading:title:preset') }` }}</el-divider>
+                    <el-divider v-if="item.val === 1" class="divider" content-position="center">{{ `
+                      ${$t('trials:reading:title:preset')}` }}</el-divider>
                   </li>
 
                 </ul>
@@ -117,31 +114,25 @@
           <div class="text">区域调窗</div>
 
         </div> -->
-        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:reverseColor')}`" placement="bottom">
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:reverseColor')}`"
+          placement="bottom" v-if="AspectRatio >= 1">
           <div class="tool-wrapper">
 
-            <div
-              class="icon"
-              :class="[activeTool==='reversecolor'?'tool_active':'']"
-
-              @click.prevent="toggleInvert"
-            >
+            <div class="icon" :class="[activeTool === 'reversecolor' ? 'tool_active' : '']"
+              @click.prevent="toggleInvert">
               <svg-icon icon-class="reversecolor" class="svg-icon" />
             </div>
-          <!-- 反色 -->
-          <!-- <div class="text">{{ $t('trials:reading:button:reverseColor') }}</div> -->
+            <!-- 反色 -->
+            <!-- <div class="text">{{ $t('trials:reading:button:reverseColor') }}</div> -->
 
           </div>
         </el-tooltip>
 
-        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:zoom')}`" placement="bottom">
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:zoom')}`" placement="bottom"
+          v-if="AspectRatio >= 1">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              :class="[activeTool==='Zoom'?'tool_active':'']"
-              data-tool="Zoom"
-              @click.prevent="setToolActive('Zoom',false)"
-            >
+            <div class="icon" :class="[activeTool === 'Zoom' ? 'tool_active' : '']" data-tool="Zoom"
+              @click.prevent="setToolActive('Zoom', false)">
               <svg-icon icon-class="magnifier" class="svg-icon" />
             </div>
             <!-- 缩放 -->
@@ -149,14 +140,11 @@
           </div>
         </el-tooltip>
 
-        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:move')}`" placement="bottom">
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:move')}`" placement="bottom"
+          v-if="AspectRatio >= 1">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              :class="[activeTool==='Pan'?'tool_active':'']"
-              data-tool="Pan"
-              @click.prevent="setToolActive('Pan',false)"
-            >
+            <div class="icon" :class="[activeTool === 'Pan' ? 'tool_active' : '']" data-tool="Pan"
+              @click.prevent="setToolActive('Pan', false)">
               <svg-icon icon-class="move" class="svg-icon" />
             </div>
             <!-- 移动 -->
@@ -168,11 +156,7 @@
           <div class="tool-wrapper" @click.stop="showPanel($event)" @mouseleave="handleMouseout">
             <!-- @click.prevent="setToolActive('Rotate',false)" -->
             <div class="dropdown">
-              <div
-                class="icon"
-                data-tool="Rotate"
-                :class="[activeTool==='Rotate'?'tool_active':'']"
-              >
+              <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>
@@ -189,26 +173,24 @@
           </div>
         </el-tooltip>
 
-        <el-tooltip class="item" effect="dark" :content="fitType===1?`${$t('trials:reading:button:fitWindow')}`:`${$t('trials:reading:button:fitImage')}`" placement="bottom">
+        <el-tooltip class="item" effect="dark"
+          :content="fitType === 1 ? `${$t('trials:reading:button:fitWindow')}` : `${$t('trials:reading:button:fitImage')}`"
+          placement="bottom">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              @click.prevent="fitToType(fitType===1?'fitToWindow':'fitToImage')"
-            >
-              <svg-icon v-if="fitType===1" icon-class="fitToWindow" class="svg-icon" />
+            <div class="icon" @click.prevent="fitToType(fitType === 1 ? 'fitToWindow' : 'fitToImage')">
+              <svg-icon v-if="fitType === 1" icon-class="fitToWindow" class="svg-icon" />
               <svg-icon v-else icon-class="fitToImage" class="svg-icon" />
             </div>
-            <div class="text">{{ fitType===1?$t('trials:reading:button:fitWindow'):$t('trials:reading:button:fitImage') }}</div>
+            <div class="text">{{ fitType === 1 ? $t('trials:reading:button:fitWindow') :
+              $t('trials:reading:button:fitImage')
+            }}</div>
           </div>
         </el-tooltip>
 
-        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:imageIndexSync')}`" placement="bottom">
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:imageIndexSync')}`"
+          placement="bottom" v-if="AspectRatio >= 1">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              :class="[isScrollSync?'tool_active':'']"
-              @click.prevent="setImageIndexSync"
-            >
+            <div class="icon" :class="[isScrollSync ? 'tool_active' : '']" @click.prevent="setImageIndexSync">
               <i v-if="isScrollSync" class="el-icon-lock svg-icon" />
               <i v-else class="el-icon-unlock svg-icon" />
             </div>
@@ -226,12 +208,10 @@
           </div>
           <div class="text">适应图像</div>
         </div> -->
-        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:screenShot')}`" placement="bottom">
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:screenShot')}`" placement="bottom"
+          v-if="AspectRatio >= 1">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              @click.prevent="saveImage"
-            >
+            <div class="icon" @click.prevent="saveImage">
               <svg-icon icon-class="image" class="svg-icon" />
             </div>
             <!-- 截屏 -->
@@ -239,10 +219,7 @@
           </div>
         </el-tooltip>
 
-        <div
-          v-for="tool in measuredTools"
-          :key="tool.toolName"
-        >
+        <div v-for="tool in measuredTools" :key="tool.toolName">
           <el-tooltip class="item" effect="dark" placement="bottom">
             <div slot="content">
               <div v-if="tool.disabledReason">
@@ -253,14 +230,9 @@
 
             </div>
             <div class="tool-wrapper">
-              <div
-                class="icon"
-                :class="[activeTool===tool.toolName?'tool_active':'']"
-                :style="{cursor:tool.isDisabled?'not-allowed':'pointer'}"
-                :data-tool="tool.toolName"
-                @click.prevent="setToolActive(tool.toolName,true,$event)"
-                @mouseenter="enter($event,tool.toolName)"
-              >
+              <div class="icon" :class="[activeTool === tool.toolName ? 'tool_active' : '']"
+                :style="{ cursor: tool.isDisabled ? 'not-allowed' : 'pointer' }" :data-tool="tool.toolName"
+                @click.prevent="setToolActive(tool.toolName, true, $event)" @mouseenter="enter($event, tool.toolName)">
                 <svg-icon :icon-class="tool.icon" class="svg-icon" />
               </div>
               <div class="text">{{ tool.text }}</div>
@@ -280,12 +252,10 @@
             <div class="text">{{ tool.text }}</div>
           </div> -->
         </div>
-        <el-tooltip v-if="CriterionType === 2 && studyList.length > 0" class="item" effect="dark" :content="$t('trials:lugano:button:fusion')" placement="bottom">
+        <el-tooltip v-if="CriterionType === 2 && studyList.length > 0" class="item" effect="dark"
+          :content="$t('trials:lugano:button:fusion')" placement="bottom">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              @click.prevent="handleFusion"
-            >
+            <div class="icon" @click.prevent="handleFusion">
               <svg-icon icon-class="fusion" class="svg-icon" />
             </div>
             <!-- 截屏 -->
@@ -306,7 +276,8 @@
             </div>
           </el-tooltip>
           <!-- 播放/暂停 -->
-          <el-tooltip class="item" effect="dark" :content="clipPlaying?$t('trials:dicom-show:stop'):$t('trials:dicom-show:play')" placement="bottom">
+          <el-tooltip class="item" effect="dark"
+            :content="clipPlaying ? $t('trials:dicom-show:stop') : $t('trials:dicom-show:play')" placement="bottom">
             <div v-if="clipPlaying" class="icon" @click.prevent="toggleClipPlay(false)">
               <svg-icon icon-class="stop" class="svg-icon" />
             </div>
@@ -343,23 +314,64 @@
 
         <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:reset')" placement="bottom">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              @click.prevent="resetViewport"
-            >
+            <div class="icon" @click.prevent="resetViewport">
               <svg-icon icon-class="refresh" class="svg-icon" />
             </div>
             <div class="text">{{ $t('trials:reading:button:reset') }}</div>
           </div>
         </el-tooltip>
-        <el-tooltip
-          v-if="trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2"
-          v-hasPermi="['role:ir']"
-          class="item"
-          effect="dark"
-          :content="$t('trials:reading:button:upload')"
-          placement="bottom"
-        >
+        <div :title="$t('trials:reading:button:more')" :class="['tool-item']" @click.stop="showPanel($event)"
+          @mouseleave="toolMouseout" v-if="AspectRatio < 1">
+          <div class="dropdown">
+            <div class="icon" data-tool="more">
+              <svg-icon icon-class="more" class="svg-icon" style="color:#ddd;font-size: 20px;" />
+              <i class="el-icon-arrow-down" style="color:#fff;" />
+            </div>
+            <div class="dropdown-content">
+              <!--v-if="readingTaskState < 2"-->
+              <ul style="width:100px;">
+                <!--反色-->
+                <li style="text-align:left;" :class="[activeTool === 'reversecolor' ? 'tool_active' : '']">
+                  <a href="#" @click.prevent="toggleInvert">
+                    <svg-icon icon-class="reversecolor" class="svg-icon" style="margin-right: 5px;" />
+                    {{ $t('trials:reading:button:reverseColor') }}
+                  </a>
+                </li>
+                <!--缩放-->
+                <li style="text-align:left;" :class="[activeTool === 'Zoom' ? 'tool_active' : '']" data-tool="Zoom">
+                  <a href="#" @click.prevent="setToolActive('Zoom', false)">
+                    <svg-icon icon-class="magnifier" class="svg-icon" style="margin-right: 5px;" />
+                    {{ $t('trials:reading:button:zoom') }}
+                  </a>
+                </li>
+                <!--移动-->
+                <li style="text-align:left;" :class="[activeTool === 'Pan' ? 'tool_active' : '']" data-tool="Pan">
+                  <a href="#" @click.prevent="setToolActive('Pan', false)">
+                    <svg-icon icon-class="move" class="svg-icon" style="margin-right: 5px;" />
+                    {{ $t('trials:reading:button:move') }}
+                  </a>
+                </li>
+                <!--同步-->
+                <li style="text-align:left;" :class="[isScrollSync ? 'tool_active' : '']">
+                  <a href="#" @click.prevent="setImageIndexSync">
+                    <i v-if="isScrollSync" class="el-icon-lock svg-icon" style="margin-right: 5px;" />
+                    <i v-else class="el-icon-unlock svg-icon" style="margin-right: 5px;" />
+                    {{ $t('trials:reading:button:imageIndexSync') }}
+                  </a>
+                </li>
+                <!--截图-->
+                <li style="text-align:left;">
+                  <a href="#" @click.prevent="saveImage">
+                    <svg-icon icon-class="image" class="svg-icon" style="margin-right: 5px;" />
+                    {{ $t('trials:reading:button:screenShot') }}
+                  </a>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+        <el-tooltip v-if="trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2" v-hasPermi="['role:ir']"
+          class="item" effect="dark" :content="$t('trials:reading:button:upload')" placement="bottom">
           <div class="tool-wrapper">
             <div class="icon" @click.prevent="openUploadImage('upload')">
               <i class="el-icon-upload2 svg-icon" />
@@ -367,22 +379,15 @@
             <div class="text">{{ $t('trials:reading:button:upload') }}</div>
           </div>
         </el-tooltip>
-        <el-tooltip
-          v-if="trialCriterion.ImageDownloadEnum > 0"
-          v-hasPermi="[
-            'role:ir',
-            'role:mim',
-            'role:mc',
-            'role:pm',
-            'role:apm',
-            'role:ea',
-            'role:qa',
-          ]"
-          class="item"
-          effect="dark"
-          :content="$t('trials:reading:button:download')"
-          placement="bottom"
-        >
+        <el-tooltip v-if="trialCriterion.ImageDownloadEnum > 0" v-hasPermi="[
+          'role:ir',
+          'role:mim',
+          'role:mc',
+          'role:pm',
+          'role:apm',
+          'role:ea',
+          'role:qa',
+        ]" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
           <div class="tool-wrapper">
             <div class="icon" @click.prevent="openUploadImage('download')">
               <i class="el-icon-download svg-icon" />
@@ -393,9 +398,11 @@
         <div style="margin-left:auto;">
           <div style="padding:5px">
             <!-- 手册 -->
-            <el-button v-if="isExistsManual" type="text" @click="previewManuals">{{ $t('trials:reading:button:handbooks') }}</el-button>
+            <el-button v-if="isExistsManual" type="text" @click="previewManuals">{{
+              $t('trials:reading:button:handbooks') }}</el-button>
             <!-- 临床数据 -->
-            <el-button v-if="isExistsClinicalData" type="text" @click="previewCD">{{ $t('trials:reading:button:clinicalData') }}</el-button>
+            <el-button v-if="isExistsClinicalData" type="text" @click="previewCD">{{
+              $t('trials:reading:button:clinicalData') }}</el-button>
             <!-- 个性化配置 -->
             <el-button type="text" @click="previewConfig">{{ $t('trials:reading:button:customCfg') }}</el-button>
 
@@ -404,132 +411,73 @@
         </div>
       </div>
       <div class="dicom-viewers">
-        <div ref="container" class="viewer-container" :class="['box', `box_${layoutRow}_${layoutCol}`]">
-          <div
-            v-for="i in maxCanvas"
-            :key="i"
-            :class="['item', i-1===currentDicomCanvasIndex?'item_active':'']"
-            :data-index="i-1"
-            :style="i-1===currentDicomCanvasIndex ? cornerstoneStyle : {}"
-            @click="activateDicomCanvas(i-1)"
-          >
-            <dicom-canvas
-              v-if="canvasW"
-              :ref="`dicomCanvas${i-1}`"
-              :style="{width: fullScreenIndex === i-1 ? fullScreenWidth : canvasW,height: fullScreenIndex === i-1 ? fullScreenHeight : canvasH}"
-              :canvas-index="i-1"
-              :is-active="i-1===currentDicomCanvasIndex"
-              :is-scroll-sync="isScrollSync"
+        <div ref="container" class="viewer-container"
+          :class="['box', `box_${AspectRatio < 1 ? layoutCol : layoutRow}_${AspectRatio < 1 ? layoutRow : layoutCol}`]">
+          <div v-for="i in maxCanvas" :key="i" :class="['item', i - 1 === currentDicomCanvasIndex ? 'item_active' : '']"
+            :data-index="i - 1" :style="i - 1 === currentDicomCanvasIndex ? cornerstoneStyle : {}"
+            @click="activateDicomCanvas(i - 1)">
+            <dicom-canvas v-if="canvasW" :ref="`dicomCanvas${i - 1}`"
+              :style="{ width: fullScreenIndex === i - 1 ? fullScreenWidth : canvasW, height: fullScreenIndex === i - 1 ? fullScreenHeight : canvasH }"
+              :canvas-index="i - 1" :is-active="i - 1 === currentDicomCanvasIndex" :is-scroll-sync="isScrollSync"
               :is-reading-show-subject-info="isReadingShowSubjectInfo"
               :is-reading-task-view-in-order="isReadingTaskViewInOrder"
-              :current-dicom-canvas-index="currentDicomCanvasIndex"
-              :custom-wwc-tpl="customWwcTpl"
-              :data-canvas-uid="`dicomCanvas${i-1}`"
-              @setCornerstoneStyle="setCornerstoneStyle(i-1)"
-              @setMeasureData="setMeasureData"
-              @modifyMeasureData="modifyMeasureData"
-              @scrollSync="scrollSync"
-              @selectViewCanvas="selectViewCanvas"
-            />
+              :current-dicom-canvas-index="currentDicomCanvasIndex" :custom-wwc-tpl="customWwcTpl"
+              :data-canvas-uid="`dicomCanvas${i - 1}`" @setCornerstoneStyle="setCornerstoneStyle(i - 1)"
+              @setMeasureData="setMeasureData" @modifyMeasureData="modifyMeasureData" @scrollSync="scrollSync"
+              @selectViewCanvas="selectViewCanvas" />
           </div>
         </div>
-        <div ref="form-container" class="form-container">
-          <div class="form-wrapper">
-            <RecistBMQuestionList
-              v-if="CriterionType === 17"
-              ref="measurementList"
-              :question-form-change-state="questionFormChangeState"
-              :question-form-change-num="questionFormChangeNum"
-              :is-show="isShow"
-              :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            />
-            <IRecistQuestionList
-              v-else-if="CriterionType === 3"
-              ref="measurementList"
-              :question-form-change-state="questionFormChangeState"
-              :question-form-change-num="questionFormChangeNum"
-              :is-show="isShow"
-              :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            />
-            <PCWGQuestionList
-              v-else-if="CriterionType === 10"
-              ref="measurementList"
-              :question-form-change-state="questionFormChangeState"
-              :question-form-change-num="questionFormChangeNum"
-              :is-show="isShow"
-              :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            />
-            <LuganoQuestionList
-              v-else-if="CriterionType === 2"
-              ref="measurementList"
-              :question-form-change-state="questionFormChangeState"
-              :question-form-change-num="questionFormChangeNum"
-              :is-show="isShow"
-              :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            />
-            <LuganoWithoutPETQuestionList
-              v-else-if="CriterionType === 18"
-              ref="measurementList"
-              :question-form-change-state="questionFormChangeState"
-              :question-form-change-num="questionFormChangeNum"
-              :is-show="isShow"
-              :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            />
-            <RecistQuestionList
-              v-else-if="CriterionType === 1"
-              ref="measurementList"
-              :question-form-change-state="questionFormChangeState"
-              :question-form-change-num="questionFormChangeNum"
-              :is-show="isShow"
-              :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            />
+        <div ref="form-container" :class="{ 'form-container': true, listHide: !listShow }">
+          <div class="list_btn" @click.stop="clickShow"
+            :title="listShow ? $t('reading:dicom:dicom-list:hiden') : $t('reading:dicom:dicom-list:show')">
+            <i :class="listShow ? 'el-icon-s-unfold' : 'el-icon-s-fold'"></i>
+          </div>
+          <transition name="listBox">
+            <div class="form-wrapper" v-show="listShow">
+              <RecistBMQuestionList v-if="CriterionType === 17" ref="measurementList"
+                :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+              <IRecistQuestionList v-else-if="CriterionType === 3" ref="measurementList"
+                :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+              <PCWGQuestionList v-else-if="CriterionType === 10" ref="measurementList"
+                :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+              <LuganoQuestionList v-else-if="CriterionType === 2" ref="measurementList"
+                :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+              <LuganoWithoutPETQuestionList v-else-if="CriterionType === 18" ref="measurementList"
+                :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+              <RecistQuestionList v-else-if="CriterionType === 1" ref="measurementList"
+                :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+
+              <IVUSList v-else-if="CriterionType === 19" ref="measurementList"
+                :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+              <OCTList v-else-if="CriterionType === 20" ref="measurementList"
+                :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+              <MRIPDFF v-else-if="CriterionType === 21" ref="measurementList"
+                :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+              <h2 v-else style="color:#ddd">
+                Developing...
+              </h2>
+            </div>
+            <div v-if="iseCRFShowInDicomReading && currentReadingTaskState < 2" v-show="listShow" class="form-footer">
+              <el-button type="primary" size="small" @click="skipTask">
+                <!-- 跳过 -->
+                {{ $t('trials:readingReport:button:skip') }}
+              </el-button>
+              <el-button type="primary" size="small" @click="submit">
+                <!-- 提交 -->
+                {{ $t('common:button:submit') }}
+              </el-button>
+            </div>
+          </transition>
 
-            <IVUSList
-              v-else-if="CriterionType === 19"
-              ref="measurementList"
-              :question-form-change-state="questionFormChangeState"
-              :question-form-change-num="questionFormChangeNum"
-              :is-show="isShow"
-              :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            />
-            <OCTList
-              v-else-if="CriterionType === 20"
-              ref="measurementList"
-              :question-form-change-state="questionFormChangeState"
-              :question-form-change-num="questionFormChangeNum"
-              :is-show="isShow"
-              :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            />
-            <MRIPDFF
-              v-else-if="CriterionType === 21"
-              ref="measurementList"
-              :question-form-change-state="questionFormChangeState"
-              :question-form-change-num="questionFormChangeNum"
-              :is-show="isShow"
-              :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            />
-            <h2 v-else style="color:#ddd">
-              Developing...
-            </h2>
-          </div>
-          <div v-if="iseCRFShowInDicomReading && currentReadingTaskState < 2" class="form-footer">
-            <el-button
-              type="primary"
-              size="small"
-              @click="skipTask"
-            >
-              <!-- 跳过 -->
-              {{ $t('trials:readingReport:button:skip') }}
-            </el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click="submit"
-            >
-              <!-- 提交 -->
-              {{ $t('common:button:submit') }}
-            </el-button>
-          </div>
 
         </div>
       </div>
@@ -542,24 +490,13 @@
       </div> -->
     </div>
 
-    <el-dialog
-      v-if="customWwc.visible"
-      :visible.sync="customWwc.visible"
-      :close-on-click-modal="false"
-      :title="customWwc.title"
-      width="400px"
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="customWwc.visible" :visible.sync="customWwc.visible" :close-on-click-modal="false"
+      :title="customWwc.title" width="400px" custom-class="base-dialog-wrapper">
       <CustomWwwcForm :ww="activeCanvasWW" :wc="activeCanvasWC" @close="customWwc.visible = false" @setWwwc="setWwwc" />
     </el-dialog>
 
-    <el-dialog
-      v-if="personalConfigDialog.visible"
-      :visible.sync="personalConfigDialog.visible"
-      :close-on-click-modal="false"
-      :title="personalConfigDialog.title"
-      width="600px"
-    >
+    <el-dialog v-if="personalConfigDialog.visible" :visible.sync="personalConfigDialog.visible"
+      :close-on-click-modal="false" :title="personalConfigDialog.title" width="600px">
       <el-tabs v-model="activeName" class="personal_config">
         <!-- 热键 -->
         <el-tab-pane :label="$t('trials:reading:tab:hotkeys')" name="1">
@@ -577,19 +514,15 @@
 
     </el-dialog>
 
-    <el-dialog
-      v-if="manualsDialog.visible"
-      :visible.sync="manualsDialog.visible"
-      :custom-class="isFullscreen?'manuals-full-dialog-container':'manuals-dialog-container'"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :fullscreen="isFullscreen"
-    >
+    <el-dialog v-if="manualsDialog.visible" :visible.sync="manualsDialog.visible"
+      :custom-class="isFullscreen ? 'manuals-full-dialog-container' : 'manuals-dialog-container'" :show-close="false"
+      :close-on-click-modal="false" :fullscreen="isFullscreen">
       <span slot="title" class="dialog-footer">
         <!-- 手册 -->
         <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute;right: 20px;font-size: 20px;">
-          <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" style="margin-right:10px;cursor: pointer;" @click="isFullscreen=!isFullscreen" />
+          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+            style="margin-right:10px;cursor: pointer;" @click="isFullscreen = !isFullscreen" />
           <svg-icon icon-class="close" style="cursor: pointer;" @click="manualsDialog.visible = false" />
         </span>
       </span>
@@ -598,90 +531,46 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      v-if="fusionSeries.visible"
-      :visible.sync="fusionSeries.visible"
-      :close-on-click-modal="false"
-      :title="$t('trials:lugano:dialogTitle:fusion') "
-      width="850px"
-    >
+    <el-dialog v-if="fusionSeries.visible" :visible.sync="fusionSeries.visible" :close-on-click-modal="false"
+      :title="$t('trials:lugano:dialogTitle:fusion')" width="850px">
       <el-form ref="fusionForm" :model="fusionForm" label-width="120px" label-position="left">
         <!-- 任务名称 -->
-        <el-form-item
-          :label="$t('trials:lugano:fusionDialog:label:taskBlindName')"
-          prop="taskBlindName"
-        >
-          <el-input
-            v-model="fusionForm.taskBlindName"
-            :disabled="true"
-            style="width:200px"
-          />
+        <el-form-item :label="$t('trials:lugano:fusionDialog:label:taskBlindName')" prop="taskBlindName">
+          <el-input v-model="fusionForm.taskBlindName" :disabled="true" style="width:200px" />
         </el-form-item>
         <!-- 检查 -->
-        <el-form-item
-          :label="$t('trials:lugano:fusionDialog:label:study')"
-          prop="studyID"
-          :rules="[
-            { required: true, message: $t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-select
-            v-model="fusionForm.studyID"
-            clearable
-            @change="handleStudyIdChange"
-          >
-            <el-option
-              v-for="item in studyList"
-              :key="item.StudyId"
-              :label="item.StudyCode"
-              :value="item.StudyId"
-            />
+        <el-form-item :label="$t('trials:lugano:fusionDialog:label:study')" prop="studyID" :rules="[
+          { required: true, message: $t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-select v-model="fusionForm.studyID" clearable @change="handleStudyIdChange">
+            <el-option v-for="item in studyList" :key="item.StudyId" :label="item.StudyCode" :value="item.StudyId" />
           </el-select>
         </el-form-item>
         <!-- 融合图像 -->
-        <label style="color: #dfdfdf;line-height: 36px;vertical-align: middle;font-size: 14px;">{{ $t('trials:lugano:fusionDialog:label:fusionImages') }}</label>
-        <div style="display: flex;flex-direction: row;justify-content: space-between;margin-bottom:10px;" class="series-table">
+        <label style="color: #dfdfdf;line-height: 36px;vertical-align: middle;font-size: 14px;">{{
+          $t('trials:lugano:fusionDialog:label:fusionImages') }}</label>
+        <div style="display: flex;flex-direction: row;justify-content: space-between;margin-bottom:10px;"
+          class="series-table">
 
           <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
             <!-- CT/MRI序列 -->
             <h3 style="color:#ddd">{{ $t('trials:lugano:fusionDialog:label:ctSeries') }}</h3>
-            <el-table
-              ref="ctSeries"
-              :data="ctSeries"
-              :show-header="false"
-              style="width: 380px"
-              size="mini"
-              height="300"
-              :default-sort="{prop: 'instanceCount', order: 'descending'}"
-              @selection-change="handleCTSelectionChange"
-              @select="handleCTSelect"
-            >
+            <el-table ref="ctSeries" :data="ctSeries" :show-header="false" style="width: 380px" size="mini" height="300"
+              :default-sort="{ prop: 'instanceCount', order: 'descending' }" @selection-change="handleCTSelectionChange"
+              @select="handleCTSelect">
 
-              <el-table-column
-                type="selection"
-                width="30"
-              />
-              <el-table-column
-                label=""
-                width="100"
-              >
+              <el-table-column type="selection" width="30" />
+              <el-table-column label="" width="100">
                 <template slot-scope="scope">
-                  <el-image
-                    style="width: 60px; height: 60px"
-                    :src="scope.row.previewImageUrl"
-                    fit="fit"
-                    crossorigin="anonymous"
-                  />
+                  <el-image style="width: 60px; height: 60px" :src="scope.row.previewImageUrl" fit="fit"
+                    crossorigin="anonymous" />
                 </template>
               </el-table-column>
-              <el-table-column
-                label=""
-                min-width="50"
-                show-overflow-tooltip
-              >
+              <el-table-column label="" min-width="50" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div>#{{ scope.row.seriesNumber }} </div>
-                  <div>{{ scope.row.modality }}: {{ scope.row.instanceCount }} images  T: {{ parseFloat(scope.row.sliceThickness).toFixed(digitPlaces) }}</div>
+                  <div>{{ scope.row.modality }}: {{ scope.row.instanceCount }} images T: {{
+                    parseFloat(scope.row.sliceThickness).toFixed(digitPlaces) }}</div>
                   <div>{{ scope.row.description }}</div>
                 </template>
               </el-table-column>
@@ -692,41 +581,20 @@
           <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
             <!-- PET序列 -->
             <h3 style="color:#ddd">{{ $t('trials:lugano:fusionDialog:label:ptSeries') }}</h3>
-            <el-table
-              ref="petSeries"
-              :data="petSeries"
-              :show-header="false"
-              style="width: 380px"
-              size="mini"
-              height="300"
-              @selection-change="handlePTSelectionChange"
-              @select="handlePTSelect"
-            >
-              <el-table-column
-                type="selection"
-                width="30"
-              />
-              <el-table-column
-                label=""
-                width="100"
-              >
+            <el-table ref="petSeries" :data="petSeries" :show-header="false" style="width: 380px" size="mini"
+              height="300" @selection-change="handlePTSelectionChange" @select="handlePTSelect">
+              <el-table-column type="selection" width="30" />
+              <el-table-column label="" width="100">
                 <template slot-scope="scope">
-                  <el-image
-                    style="width: 60px; height: 60px"
-                    :src="scope.row.previewImageUrl"
-                    fit="fit"
-                    crossorigin="anonymous"
-                  />
+                  <el-image style="width: 60px; height: 60px" :src="scope.row.previewImageUrl" fit="fit"
+                    crossorigin="anonymous" />
                 </template>
               </el-table-column>
-              <el-table-column
-                label=""
-                min-width="50"
-                show-overflow-tooltip
-              >
+              <el-table-column label="" min-width="50" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div>#{{ scope.row.seriesNumber }} </div>
-                  <div>{{ scope.row.modality }}: {{ scope.row.instanceCount }} images  T: {{ parseFloat(scope.row.sliceThickness).toFixed(digitPlaces) }}</div>
+                  <div>{{ scope.row.modality }}: {{ scope.row.instanceCount }} images T: {{
+                    parseFloat(scope.row.sliceThickness).toFixed(digitPlaces) }}</div>
                   <div>{{ scope.row.description }}</div>
                 </template>
               </el-table-column>
@@ -737,43 +605,24 @@
           <!-- 取消 -->
           <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel') }}</el-button>
           <!-- 确认 -->
-          <el-button
-            type="primary"
-            size="mini"
-            @click="handleSubmitFusionSeries"
-          >
+          <el-button type="primary" size="mini" @click="handleSubmitFusionSeries">
             {{ $t('common:button:confirm') }}</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
-    <upload-dicom-and-nonedicom
-      v-if="uploadImageVisible"
-      :subject-id="uploadSubjectId"
-      :subject-code="uploadSubjectCode"
-      :criterion="uploadTrialCriterion"
-      :visible.sync="uploadImageVisible"
-      :visit-task-id="taskId"
-      :is-reading-task-view-in-order="isReadingTaskViewInOrder"
-    />
-    <download-dicom-and-nonedicom
-      v-if="downloadImageVisible"
-      :subject-id="uploadSubjectId"
-      :subject-code="uploadSubjectCode"
-      :criterion="uploadTrialCriterion"
-      :task-id="taskId"
-      :visible.sync="downloadImageVisible"
-    />
+    <upload-dicom-and-nonedicom v-if="uploadImageVisible" :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible"
+      :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" />
+    <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
+      :visible.sync="downloadImageVisible" />
     <!-- 签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
+    <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;user-select: text !important;">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+        <span style="font-size:12px;margin-left:5px;user-select: text !important;">{{
+          `(${$t('common:label:sign')}${currentUser})` }}</span>
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
@@ -881,6 +730,12 @@ export default {
       default() {
         return 0
       }
+    },
+    studyShow: {
+      type: Boolean,
+      default() {
+        return true
+      }
     }
   },
   data() {
@@ -999,6 +854,10 @@ export default {
       signCode: null,
       currentUser: zzSessionStorage.getItem('userName'),
       tmpData: null,
+
+      AspectRatio: 1,
+      listShow: true,
+
       fullScreenIndex: -1,
       fullScreenWidth: window.innerWidth - 570 + 'px',
       fullScreenHeight: window.innerHeight - 130 + 'px'
@@ -1056,7 +915,7 @@ export default {
     },
     imageQualityIssues: {
       immediate: true,
-      handler(v) {}
+      handler(v) { }
     },
     currentDicomCanvasIndex: {
       immediate: true,
@@ -1122,14 +981,14 @@ export default {
       }
       console.log('getMeasureData')
     })
-    DicomEvent.$on('getScreenshots', async(measuredData, callback) => {
+    DicomEvent.$on('getScreenshots', async (measuredData, callback) => {
       if (this.currentDicomCanvasIndex > -1) {
         await this.imageLocation(measuredData)
         if (!measuredData.isMarked) {
           callback()
           return
         }
-        setTimeout(async() => {
+        setTimeout(async () => {
           // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
           const divForDownloadViewport = document.querySelector(
             `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
@@ -1141,7 +1000,7 @@ export default {
         }, 50)
       }
     })
-    DicomEvent.$on('imageLocation', async(measuredData) => {
+    DicomEvent.$on('imageLocation', async (measuredData) => {
       return new Promise(async resolve => {
         if (!measuredData) return
         await this.imageLocation(measuredData)
@@ -1215,6 +1074,14 @@ export default {
         this.petctWindow.close()
       }
     })
+    let windowWidth = document.documentElement.clientWidth;
+    let windowHeight = document.documentElement.clientHeight;
+    this.AspectRatio = windowWidth / windowHeight
+    window.onresize = () => {
+      let windowWidth = document.documentElement.clientWidth;
+      let windowHeight = document.documentElement.clientHeight;
+      this.AspectRatio = windowWidth / windowHeight
+    };
   },
   beforeDestroy() {
     DicomEvent.$off('updateImage')
@@ -1238,6 +1105,17 @@ export default {
     })
   },
   methods: {
+    showPanel(e, toolName) {
+      if (toolName === 'layout') return false
+      e.currentTarget.firstChild.lastChild.style.display = 'block'
+    },
+    toolMouseout(e) {
+      e.currentTarget.firstChild.lastChild.style.display = 'none'
+    },
+    clickShow() {
+      this.listShow = !this.listShow;
+      this.changeLayout()
+    },
     getTrialCriterion() {
       getCriterionReadingInfo({
         TrialId: this.trialId || this.$route.query.trialId,
@@ -1246,7 +1124,7 @@ export default {
         .then((res) => {
           this.trialCriterion = res.Result
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     openUploadImage(status) {
       const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
@@ -1313,54 +1191,54 @@ export default {
         var shortcutKeyEnum = this.hotKeyList[idx].shortcutKeyEnum
 
         if (shortcutKeyEnum === 1) {
-        // 前一图像视口
+          // 前一图像视口
           this.selectViewCanvas(-1)
         } else if (shortcutKeyEnum === 2) {
-        // 后一图像视口
+          // 后一图像视口
           this.selectViewCanvas(1)
         } else if (shortcutKeyEnum === 3) {
-        // 上一个序列
+          // 上一个序列
           const series = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].series
           DicomEvent.$emit('selectSeries', { seriesId: series.seriesId, studyId: series.studyId, offset: -1 })
         } else if (shortcutKeyEnum === 4) {
-        // 下一个序列
+          // 下一个序列
           const series = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].series
           DicomEvent.$emit('selectSeries', { seriesId: series.seriesId, studyId: series.studyId, offset: 1 })
         } else if (shortcutKeyEnum === 5) {
-        // 上一张图像
+          // 上一张图像
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].scrollPage(-1)
         } else if (shortcutKeyEnum === 6) {
-        // 下一张图像
+          // 下一张图像
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].scrollPage(1)
         } else if (shortcutKeyEnum === 7) {
-        // 向左旋转
+          // 向左旋转
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setRotate(false, false, -90, 4)
         } else if (shortcutKeyEnum === 8) {
-        // 向右旋转
+          // 向右旋转
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setRotate(false, false, 90, 5)
         } else if (shortcutKeyEnum === 9) {
-        // 水平翻转
+          // 水平翻转
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setRotate(true, false, 0, 3)
         } else if (shortcutKeyEnum === 10) {
-        // 垂直翻转
+          // 垂直翻转
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setRotate(false, true, 0, 2)
         } else if (shortcutKeyEnum === 11) {
-        // 放大
+          // 放大
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setZoomScale(1)
         } else if (shortcutKeyEnum === 12) {
-        // 缩小
+          // 缩小
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setZoomScale(0)
         } else if (shortcutKeyEnum === 13) {
-        // 适应图像
+          // 适应图像
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].fitToImage()
         } else if (shortcutKeyEnum === 14) {
-        // 适应窗口
+          // 适应窗口
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].fitToWindow()
         } else if (shortcutKeyEnum === 15) {
-        // 截图
+          // 截图
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].saveImage()
         } else if (shortcutKeyEnum === 16) {
-        // 反色
+          // 反色
           this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleInvert()
         } else if (shortcutKeyEnum === 17) {
           // 窗宽/窗位
@@ -1408,6 +1286,10 @@ export default {
           zIndex: 10,
         }
         this.fullScreenIndex = this.currentDicomCanvasIndex
+        let w = 570
+        if (!this.studyShow) w -= 170
+        if (!this.listShow) w -= 330
+        this.fullScreenWidth = window.innerWidth - w + 'px'
       }
       this.$nextTick(() => {
         for (var i = 0; i < this.maxCanvas; i++) {
@@ -1628,14 +1510,14 @@ export default {
         var loadImagePromises = []
         var isScrollSync = this.isScrollSync
         if (this.isScrollSync) {
-        // 取消滚动同步
+          // 取消滚动同步
           this.isScrollSync = false
         }
 
         var activeCanvasTaskId = obj.visitTaskId
 
         var index = this.visitTaskList.findIndex(i => i.VisitTaskId === activeCanvasTaskId)
-        if (index === -1) { 
+        if (index === -1) {
           resolve()
           return
         }
@@ -1643,8 +1525,8 @@ export default {
         var firstAddSeries = null
         var currentAddSeries = null
         if (this.isReadingTaskViewInOrder === 1) {
-        // 有序
-        // 获取病灶第一次出现的访视序列
+          // 有序
+          // 获取病灶第一次出现的访视序列
           var firstAddVisitTaskId = null
 
           var idx = this.visitTaskList[index].MeasureData.findIndex(item => {
@@ -1702,10 +1584,10 @@ export default {
             }
           }
         } else {
-        // 无序
+          // 无序
           currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj)
           if (!currentAddSeries) {
-          // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息
+            // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息
             currentAddSeries = this.$refs[`dicomCanvas${this.maxCanvas - 1}`][0].series
           }
           firstAddSeries = currentAddSeries
@@ -1796,7 +1678,7 @@ export default {
               var series = studyList[studyIdx].SeriesList[seriesIdx]
               const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
               // const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
-              let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
+              let n = series.instanceInfoList.findIndex(k => k.Id === instanceId)
               let filterStr = ''
               if (n > -1 && series.isExistMutiFrames) {
                 if (series.instanceInfoList[n].NumberOfFrames > 0) {
@@ -1951,12 +1833,16 @@ export default {
 
     // 设置画布大小
     setCanvasStyle() {
-      this.canvasW = (window.innerWidth - 570) / this.layoutCol + 'px'
-      this.canvasH = (window.innerHeight - 130) / this.layoutRow + 'px'
+      let w = 570
+      if (!this.studyShow) w -= 170
+      if (!this.listShow) w -= 330
+      this.canvasW = (window.innerWidth - w) / (this.AspectRatio < 1 ? this.layoutRow : this.layoutCol) + 'px'
+      this.canvasH = (window.innerHeight - 130) / (this.AspectRatio < 1 ? this.layoutCol : this.layoutRow) + 'px'
     },
     // 切换布局
     changeLayout(name) {
       this.fullScreenIndex = -1
+      if (!name) name = this.layout ? this.layout : 'A'
       if (this.activeTool) {
         if (this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].isCurrentTask && this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].readingTaskState < 2) {
           this.$nextTick(() => {
@@ -2217,7 +2103,7 @@ export default {
         this.$refs['measurementList'].modifyMeasuredData(data)
       }
       this.activeTool = ''
-      
+
     },
     async saveImage() {
       // this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].saveImage()
@@ -2267,13 +2153,13 @@ export default {
       this.customWwc.visible = false
     },
     toggleInvert() {
-      // if (this.activeTool === 'reversecolor') {
-      //   this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].resetWwwc()
-      //   this.activeTool = ''
-      // } else {
-      //   this.activeTool = 'reversecolor'
-      //   this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleInvert()
-      // }
+      if (this.activeTool === 'reversecolor') {
+        // this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].resetWwwc()
+        this.activeTool = ''
+      } else {
+        this.activeTool = 'reversecolor'
+        // this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleInvert()
+      }
       this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleInvert()
     },
     setImageIndexSync() {
@@ -2487,7 +2373,7 @@ export default {
           this.$confirm(this.$t('trials:lugano:fusionDialog:message:checkSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
             showCancelButton: false,
             type: 'warning'
-          }).then(() => {}).catch(() => {})
+          }).then(() => { }).catch(() => { })
           return
         }
         var count = Math.abs(this.ctSeriesInfo.instanceCount - this.petSeriesInfo.instanceCount)
@@ -2497,7 +2383,7 @@ export default {
             type: 'warning'
           }).then(() => {
             this.fusion()
-          }).catch(() => {})
+          }).catch(() => { })
         } else {
           this.fusion()
         }
@@ -2523,11 +2409,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.dicom-viewer-wrapper{
+.dicom-viewer-wrapper {
   height: 100%;
   padding: 5px 0px 5px 5px;
   box-sizing: border-box;
-  .divider{
+
+  .divider {
     display: block;
     height: 1px;
     width: 100%;
@@ -2536,27 +2423,32 @@ export default {
     // color: #fff;
     // background-color: #DCDFE6;
   }
-  .el-divider__text{
+
+  .el-divider__text {
     padding: 0 10px;
     color: #fff;
     background-color: #383838;
     font-size: 12px;
     width: 80px;
   }
-  .dicom-viewer-container{
-    display:flex;
+
+  .dicom-viewer-container {
+    display: flex;
     flex-direction: column;
     height: 100%;
   }
+
   ::-webkit-scrollbar {
     width: 5px;
     height: 5px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  .dicom-tools{
+
+  .dicom-tools {
     box-sizing: border-box;
     width: 100%;
     height: 80px;
@@ -2566,23 +2458,27 @@ export default {
     flex-direction: row;
     justify-content: flex-start;
     align-items: center;
-    .tool-wrapper{
+
+    .tool-wrapper {
       display: flex;
       flex-direction: column;
       justify-content: center;
       align-items: center;
       margin-right: 20px;
-      .icon{
+
+      .icon {
         padding: 5px;
         border: 1px solid #404040;
         cursor: pointer;
         text-align: center;
-        .svg-icon{
-          font-size:20px;
-          color:#ddd;
+
+        .svg-icon {
+          font-size: 20px;
+          color: #ddd;
         }
       }
-      .text{
+
+      .text {
         position: relative;
         font-size: 12px;
         margin-top: 5px;
@@ -2590,24 +2486,28 @@ export default {
         display: none;
       }
     }
-    .tool-frame{
+
+    .tool-frame {
       display: flex;
       flex-direction: row;
       justify-content: flex-start;
       align-items: center;
       margin-right: 20px;
       border: 1px solid #404040;
-      .icon{
+
+      .icon {
         padding: 5px;
         border-right: 1px solid #404040;
         cursor: pointer;
         text-align: center;
-        .svg-icon{
-          font-size:20px;
-          color:#ddd;
+
+        .svg-icon {
+          font-size: 20px;
+          color: #ddd;
         }
       }
-      .select-wrapper{
+
+      .select-wrapper {
         width: 60px;
         background-color: black;
         color: #ddd;
@@ -2615,7 +2515,8 @@ export default {
         font-size: 13px;
         outline: none;
       }
-      .text{
+
+      .text {
         position: relative;
         font-size: 12px;
         margin-top: 5px;
@@ -2623,19 +2524,24 @@ export default {
         display: none;
       }
     }
-    .tool_active{
+
+    .tool_active {
       background-color: #607d8b;
     }
-    .tool_disabled{
-      cursor:not-allowed
+
+    .tool_disabled {
+      cursor: not-allowed
     }
-    .icon:hover{
+
+    .icon:hover {
       background-color: #607d8b;
     }
+
     .dropdown {
       position: relative;
       display: inline-block;
-      .text{
+
+      .text {
         text-align: center;
       }
     }
@@ -2645,22 +2551,25 @@ export default {
       position: absolute;
       background-color: #383838;
       color: #fff;
-      box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+      box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
       z-index: 9999;
       font-size: 12px;
-      ul{
+
+      ul {
         list-style: none;
         margin: 0;
         padding: 0;
         text-align: center;
-        li{
-          a{
+
+        li {
+          a {
             display: block;
             padding: 5px;
           }
         }
       }
-      ul li:hover{
+
+      ul li:hover {
         background-color: #727272;
       }
     }
@@ -2669,11 +2578,12 @@ export default {
     //   display: block;
 
     // }
-    .layout-content ul li{
-      border-top:1px solid #ddd;
-      border-left:1px solid #ddd;
+    .layout-content ul li {
+      border-top: 1px solid #ddd;
+      border-left: 1px solid #ddd;
     }
-    .layout-content ul  .flex_row{
+
+    .layout-content ul .flex_row {
       // border: 1px solid #ddd;
       display: flex;
       justify-content: space-between;
@@ -2682,36 +2592,41 @@ export default {
       // padding: 2px;
       margin-bottom: 2px;
     }
-    .layout-content ul .flex_column{
+
+    .layout-content ul .flex_column {
       display: flex;
       justify-content: space-between;
       flex-direction: column;
       align-items: center;
       margin-bottom: 2px;
     }
-    .layout_box_1_1{
-      flex:1;
+
+    .layout_box_1_1 {
+      flex: 1;
       // border: 1px solid #ddd;
       line-height: 30px;
       font-size: 12px;
       text-align: center;
-      border-bottom:1px solid #ddd;
-      border-right:1px solid #ddd;
+      border-bottom: 1px solid #ddd;
+      border-right: 1px solid #ddd;
       // padding: 0 5px;
     }
-    .layout_box_1_2{
-      flex:1;
+
+    .layout_box_1_2 {
+      flex: 1;
       // border: 1px solid #ddd;
       line-height: 15px;
       font-size: 10px;
       text-align: center;
-      border-bottom:1px solid #ddd;
-      border-right:1px solid #ddd;
+      border-bottom: 1px solid #ddd;
+      border-right: 1px solid #ddd;
       // padding: 0 5px;
     }
-    .layout-content li .layout_box_1_1 :last-child{
+
+    .layout-content li .layout_box_1_1 :last-child {
       color: red;
     }
+
     // .layout_li:last-child{
     //   .layout_box{
     //     border-bottom: none;
@@ -2723,7 +2638,8 @@ export default {
     }
 
   }
-  .dicom-viewers{
+
+  .dicom-viewers {
     box-sizing: border-box;
     flex: 1;
     // width: 100%;
@@ -2732,7 +2648,8 @@ export default {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
-    .form-container{
+
+    .form-container {
       // box-sizing: border-box;
       width: 350px;
       // height: 100vh;
@@ -2740,40 +2657,68 @@ export default {
       // position: relative;
       display: flex;
       flex-direction: column;
+      transition: .5s;
+      position: relative;
 
     }
-    .form-wrapper{
+
+    .list_btn {
+      position: absolute;
+      width: 25px;
+      height: 25px;
+      line-height: 25px;
+      text-align: center;
+      border: 1px solid #607d8b;
+      top: 0px;
+      left: -25px;
+      z-index: 99;
+      color: #d5d5d5;
+      background-color: #424242;
+      cursor: pointer;
+    }
+
+    .listHide {
+      width: 20px;
+      transition: .5s;
+    }
+
+    .form-wrapper {
       flex-grow: 1;
       height: 0;
       overflow: hidden;
     }
-    .form-footer{
+
+    .form-footer {
       background: #000;
       padding: 10px 0;
       text-align: center;
     }
-    .viewer-container{
+
+    .viewer-container {
       box-sizing: border-box;
       flex: 1;
       height: 100%;
       border: 1px solid #727272;
     }
 
-    .measurement-container{
+    .measurement-container {
       // height: 100%;
       overflow-y: auto;
     }
-    .box{
+
+    .box {
       display: grid;
       box-sizing: border-box;
       height: 100%;
       padding: 0;
-      .item{
+
+      .item {
         box-sizing: border-box;
         position: relative;
         border: 1px solid rgba(255, 255, 255, 0.21);
         position: relative;
-        &_active{
+
+        &_active {
           // border: 2px solid #ffeb3b;fff;#428bca
           // border: 1.5px dashed #ffeb3b;
           border: 1px dashed rgb(250, 250, 0);
@@ -2781,19 +2726,23 @@ export default {
         }
       }
     }
-    .box_1_1{
+
+    .box_1_1 {
       grid-template-columns: repeat(1, 100%); //1列，占100%
       grid-template-rows: repeat(1, 100%); //1行，占100%
     }
-    .box_1_2{
+
+    .box_1_2 {
       grid-template-columns: repeat(2, 50%); //1列，占50%
       grid-template-rows: repeat(1, 100%); //1行，占100%
     }
-    .box_2_1{
+
+    .box_2_1 {
       grid-template-columns: repeat(1, 100%); //1列，占100%
       grid-template-rows: repeat(2, 50%); //1行，占50%
     }
-    .box_2_2{
+
+    .box_2_2 {
       grid-template-columns: repeat(2, 50%); //1列，占50%
       grid-template-rows: repeat(2, 50%); //1行，占50%
     }
@@ -2812,70 +2761,103 @@ export default {
     // }
 
   }
+
   .personal_config {
-    ::v-deep .el-tabs__content{
+    ::v-deep .el-tabs__content {
       height: 450px;
       overflow-y: auto;
     }
   }
-::v-deep .manuals-dialog-container{
-  margin-top: 50px !important;
-  width:75%;
-  height:80%;
-  .el-dialog__body{
-    padding: 10px;
-    height: calc(100% - 50px) !important;
+
+  ::v-deep .manuals-dialog-container {
+    margin-top: 50px !important;
+    width: 75%;
+    height: 80%;
+
+    .el-dialog__body {
+      padding: 10px;
+      height: calc(100% - 50px) !important;
+    }
+
+    .el-dialog__header {
+      position: relative;
+    }
   }
-  .el-dialog__header{
-    position: relative;
+
+  ::v-deep .manuals-full-dialog-container {
+    .el-dialog__body {
+      padding: 10px;
+      height: calc(100% - 50px) !important;
+    }
+
+    .el-dialog__header {
+      position: relative;
+    }
   }
-}
-::v-deep .manuals-full-dialog-container{
-  .el-dialog__body{
-    padding: 10px;
-    height: calc(100% - 50px) !important;
+
+  .petct_wrapper {
+    position: absolute;
+    left: -205px;
+    right: 345px;
+    height: 100%;
+    background-color: #000000;
   }
-  .el-dialog__header{
-    position: relative;
-  }
-}
-.petct_wrapper{
-  position: absolute;
-  left: -205px;
-  right: 345px;
-  height: 100%;
-  background-color: #000000;
-}
-.series-table{
-  ::v-deep.el-table{
-    background-color:  #1e1e1e !important;
-    color: #dfdfdf;
-  }
-  ::v-deep.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
-    border-bottom: 1px solid #dfdfdf;
-  }
-  .el-table--border::after, .el-table--group::after, .el-table::before{
-    background-color: #1e1e1e;
-  }
-  ::v-deep.el-table__header-wrapper{
-      th{
-        background-color:  #1e1e1e !important;
+
+  .series-table {
+    ::v-deep.el-table {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    ::v-deep.el-table td.el-table__cell,
+    .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid #dfdfdf;
+    }
+
+    .el-table--border::after,
+    .el-table--group::after,
+    .el-table::before {
+      background-color: #1e1e1e;
+    }
+
+    ::v-deep.el-table__header-wrapper {
+      th {
+        background-color: #1e1e1e !important;
         color: #dfdfdf;
       }
     }
-    ::v-deep.el-table__body-wrapper{
-      tr{
-        background-color:  #1e1e1e !important;
+
+    ::v-deep.el-table__body-wrapper {
+      tr {
+        background-color: #1e1e1e !important;
         color: #dfdfdf;
       }
-      tr:hover > td{
-        background-color:  #1e1e1e !important;
+
+      tr:hover>td {
+        background-color: #1e1e1e !important;
       }
     }
-    ::v-deep.el-table__empty-block{
-      background-color:  #1e1e1e !important;
+
+    ::v-deep.el-table__empty-block {
+      background-color: #1e1e1e !important;
     }
   }
 }
 
+.listBox-leave-active,
+.listBox-enter-active {
+  transition: all 0.5s ease;
+}
+
+.listBox-leave-active,
+.listBox-enter {
+  // width: 0px !important;
+  flex-grow: 0 !important;
+}
+
+.listBox-leave,
+.listBox-enter-active {
+  // width: 350px;
+  flex-grow: 1;
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 5016e2ea..78bd94bc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dicom-container">
-    <div class="dicom-list">
+    <div :class="{ 'dicom-list': true, studyHide: !studyShow }">
       <div class="container">
         <div class="related-study-wrapper">
           <div class="left">
@@ -17,15 +17,22 @@
             </div>
 
           </div>
-          <div class="right">
-            <div v-for="s in visitTaskList" v-show="activeTaskVisitId === s.VisitTaskId" :key="s.VisitTaskId"
-              class="study-wrapper">
-              <StudyList v-if="selectArr.includes(s.VisitTaskId)" :ref="s.VisitTaskId" :visit-task-id="s.VisitTaskId"
-                :trial-id="trialId" :subject-visit-id="s.VisitId" :task-blind-name="s.TaskBlindName"
-                :is-reading-show-subject-info="isReadingShowSubjectInfo" @loadImageStack="loadImageStack"
-                @previewNoneDicoms="previewNoneDicoms" />
-            </div>
+          <div class="study_btn" @click.stop="clickShow"
+            :title="studyShow ? $t('reading:dicom:dicom-list:hiden') : $t('reading:dicom:dicom-list:show')">
+            <i :class="studyShow ? 'el-icon-s-fold' : 'el-icon-s-unfold'"></i>
           </div>
+          <transition name="studyBox">
+            <div class="right" v-show="studyShow">
+              <div v-for="s in visitTaskList" v-show="activeTaskVisitId === s.VisitTaskId" :key="s.VisitTaskId"
+                class="study-wrapper">
+                <StudyList v-if="selectArr.includes(s.VisitTaskId)" :ref="s.VisitTaskId" :visit-task-id="s.VisitTaskId"
+                  :trial-id="trialId" :subject-visit-id="s.VisitId" :task-blind-name="s.TaskBlindName"
+                  :is-reading-show-subject-info="isReadingShowSubjectInfo" @loadImageStack="loadImageStack"
+                  @previewNoneDicoms="previewNoneDicoms" />
+              </div>
+            </div>
+          </transition>
+
         </div>
       </div>
     </div>
@@ -34,7 +41,7 @@
         <DicomViewer v-if="activeTaskVisitId" ref="dicomViewer" :is-show="isShow"
           :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
           :is-exists-clinical-data="isExistsClinicalData" :is-exists-no-dicom-file="isExistsNoDicomFile"
-          :is-reading-show-subject-info="isReadingShowSubjectInfo"
+          :is-reading-show-subject-info="isReadingShowSubjectInfo" :studyShow="studyShow"
           :is-reading-task-view-in-order="isReadingTaskViewInOrder" :is-exists-manual="isExistsManual"
           :iseCRFShowInDicomReading="iseCRFShowInDicomReading" @previewCD="previewCD" />
       </div>
@@ -148,7 +155,8 @@ export default {
       activeTaskIsBaseline: false,
       activeTaskReadingTaskState: 2,
       readingTaskState: 2,
-      open: null
+      open: null,
+      studyShow: true,
     }
   },
   computed: {
@@ -229,6 +237,12 @@ export default {
     workSpeedclose(true)
   },
   methods: {
+    clickShow() {
+      this.studyShow = !this.studyShow
+      this.$nextTick(() => {
+        this.$refs.dicomViewer.changeLayout()
+      })
+    },
     async getVisitInfo() {
       const loading = this.$loading({ fullscreen: true })
 
@@ -685,6 +699,22 @@ export default {
       display: flex;
       flex-direction: row;
       justify-content: space-between;
+      position: relative;
+
+      .study_btn {
+        position: absolute;
+        width: 25px;
+        height: 25px;
+        line-height: 25px;
+        text-align: center;
+        border: 1px solid #607d8b;
+        top: 65px;
+        right: -25px;
+        z-index: 99;
+        color: #d5d5d5;
+        background-color: #424242;
+        cursor: pointer;
+      }
 
       .left {
         position: relative;
@@ -743,5 +773,25 @@ export default {
       }
     }
   }
+
+  .studyHide {
+    width: 30px;
+    transition: 0.5s;
+  }
+}
+
+.studyBox-leave-active,
+.studyBox-enter-active {
+  transition: all 0.5s ease;
+}
+
+.studyBox-leave-active,
+.studyBox-enter {
+  width: 0px !important;
+}
+
+.studyBox-leave,
+.studyBox-enter-active {
+  width: 170px;
 }
 </style>

From b88657fda0290d688475fcd43ae44d7feb011265 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 4 Nov 2025 09:14:52 +0800
Subject: [PATCH 063/333] 1

---
 src/views/trials/trials-workbench/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 01fe7d65..f2c463bc 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -88,11 +88,11 @@
                   <span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 150px">{{
                     user.RealName }}</span>
                 </div>
-                <div style="font-size: .75rem;line-height: 18px;color:#999" v-if="NODE_ENV !== 'usa'">{{ new
+                <!-- <div style="font-size: .75rem;line-height: 18px;color:#999" v-if="NODE_ENV !== 'usa'">{{ new
                   Date().getFullYear() }}{{ $t('common:date:today') }}{{ new Date().getMonth() +
                     1 }}{{ $t('common:date:month') }}{{ new Date().getDate() }}{{ $t('common:date:day') }}，{{ dayOfWeek }}
-                </div>
-                <div style="font-size: .75rem;line-height: 18px;color:#999" v-else>{{ moment().format('DD/MMM/YYYY') }}，{{
+                </div> -->
+                <div style="font-size: .75rem;line-height: 18px;color:#999">{{ moment().format('DD/MMM/YYYY') }}，{{
                   dayOfWeek }}
                 </div>
               </div>

From 181eaed3f55f26a6f9981cc446bbd6f9f2506cb9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 4 Nov 2025 16:17:39 +0800
Subject: [PATCH 064/333] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  16 +
 .../reading-period/components/AddOrEditPR.vue | 325 +++++-----
 .../reading-period/components/RPList.vue      | 205 ++----
 .../reading-period/components/ViewPeriod.vue  | 184 ++++++
 .../subject/reading-period/index.vue          | 608 ++++++------------
 5 files changed, 626 insertions(+), 712 deletions(-)
 create mode 100644 src/views/trials/trials-panel/subject/reading-period/components/ViewPeriod.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index 882dc72d..db4b751c 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -4341,4 +4341,20 @@ export function getTrialSiteLatestSurvey(params) {
     method: 'get',
     params
   })
+}
+// 阅片期计划列表
+export function getReadModulePageList(data) {
+  return request({
+    url: `/ReadModule/getReadModulePageList`,
+    method: 'post',
+    data
+  })
+}
+// 移除阅片期
+export function setBatchRemoveReadingPlan(data) {
+  return request({
+    url: `/ReadingPeriodSet/setBatchRemoveReadingPlan`,
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue
index e3597f0a..e0228a97 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue
@@ -1,50 +1,20 @@
 <template>
   <div v-loading="loading" class="add_reading-period-wrapper" style="display:flex;width: 100%;height: 100%;">
-    <div
-      class="reading-period-form"
-      style="width:450px;height:100%;margin-right: 10px;"
-    >
+    <div class="reading-period-form" style="width:450px;height:100%;margin-right: 10px;">
       <el-card shadow="never" style="height:571px;">
-        <el-form
-          ref="addOrUpdatePR"
-          :model="form"
-          size="small"
-          :rules="rules"
-          label-width="160px"
-        >
+        <el-form ref="addOrUpdatePR" :model="form" size="small" :rules="rules" label-width="120px">
           <!-- 阅片期类型 -->
           <el-form-item :label="$t('trials:rpManage:table:readingType')">
             <el-input v-model="form.ReadingSetTypeName" disabled style="width:100%;" />
           </el-form-item>
           <!-- 阅片期名称 -->
           <el-form-item :label="$t('trials:rpManage:table:readingName')" prop="ReadingPeriodName">
-            <el-input v-model="form.ReadingPeriodName" style="width:100%;" />
-          </el-form-item>
-          <!-- 受试者范围 -->
-          <el-form-item :label="$t('trials:rpManage:table:subjectRange')" prop="ReadingScope">
-            <el-select v-model="form.ReadingScope" style="width:100%;">
-              <el-option
-                v-for="(item,index) of $d.ReadingScopeEnum"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!-- 中心 -->
-          <el-form-item v-if="form.ReadingScope === 1" :label="$t('trials:addRP:form:sites')" prop="SiteIds">
-            <el-select v-model="form.SiteIds" filterable style="width:100%;" multiple>
-              <el-option
-                v-for="(item,index) of siteOptions"
-                :key="index"
-                :label="item.TrialSiteCode"
-                :value="item.TrialSiteId"
-              />
-            </el-select>
+            <el-input v-model="form.ReadingPeriodName" style="width:100%;" :disabled="data.IsTakeEffect === 1" />
           </el-form-item>
           <!-- 条件 -->
           <el-form-item :label="$t('trials:addRP:form:condition')" prop="DeadlineCondition">
-            <el-radio-group v-model="form.DeadlineCondition" style="width:100%;" @change="handleDeadlineCondition">
+            <el-radio-group v-model="form.DeadlineCondition" :disabled="data.IsTakeEffect === 1" style="width:100%;"
+              @change="handleDeadlineCondition">
               <!-- 截止日期 -->
               <el-radio :label="0">{{ $t('trials:rpManage:table:expirationDate') }}</el-radio>
               <!-- 截止访视 -->
@@ -52,125 +22,151 @@
             </el-radio-group>
           </el-form-item>
           <!-- 截止日期 -->
-          <el-form-item v-if="form.DeadlineCondition === 0" :label="$t('trials:rpManage:table:expirationDate')" prop="ExpirationDate">
-            <el-date-picker
-              v-model="form.ExpirationDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
-
-              style="width:100%;"
-            />
+          <el-form-item v-if="form.DeadlineCondition === 0" :label="$t('trials:rpManage:table:expirationDate')"
+            prop="ExpirationDate">
+            <el-date-picker v-model="form.ExpirationDate" :disabled="data.IsTakeEffect === 1" type="date"
+              value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width:100%;" />
           </el-form-item>
           <!-- 截止访视 -->
-          <el-form-item v-if="form.DeadlineCondition === 1" :label="$t('trials:rpManage:table:expirationVisit')" prop="VisitStageId">
-            <el-select
-              v-model="form.VisitStageId"
-              clearable
-              style="width:100%;"
-              @change="handleVisitChange"
-            >
-              <el-option
-                v-for="item of visitPlanOptions"
-                :key="item.VisitStageId"
-                :label="item.VisitName"
-                :value="item.VisitStageId"
-              >
+          <el-form-item v-if="form.DeadlineCondition === 1" :label="$t('trials:rpManage:table:expirationVisit')"
+            prop="VisitStageId">
+            <el-select v-model="form.VisitStageId" clearable style="width:100%;" :disabled="data.IsTakeEffect === 1"
+              @change="handleVisitChange">
+              <el-option v-for="item of visitPlanOptions" :key="item.VisitStageId" :label="item.VisitName"
+                :value="item.VisitStageId">
                 <span style="float: left">{{ item.VisitName }}</span>
               </el-option>
             </el-select>
           </el-form-item>
-          <div style="text-align:right;margin-top:10px;">
-            <el-form-item>
-              <!-- 生成阅片期 -->
-              <el-button size="small" type="primary" :loading="btnLoading" @click="getRPList">
-                {{ $t('trials:addRP:button:createPR') }}
-              </el-button>
-            </el-form-item>
-          </div>
-
         </el-form>
       </el-card>
 
     </div>
     <div class="result-table" style="flex:1;">
       <el-card shadow="never">
-
-        <el-table
-          ref="prList"
-          v-loading="listLoading"
-          :data="list"
-          stripe
-          height="455"
-          @selection-change="handleSelectChange"
-        >
-          <el-table-column type="selection" align="left" width="45" />
-          <el-table-column type="index" width="40" />
+        <div>
+          <el-form :inline="true">
+            <!-- 中心编号 -->
+            <el-form-item :label="$t('trials:linkedRP:table:siteCode')">
+              <el-select v-model="searchData.SiteId" placeholder="" style="width:100px;" clearable>
+                <el-option v-for="(site, index) of siteOptions" :key="index" :label="site.TrialSiteCode"
+                  :value="site.Id" />
+              </el-select>
+            </el-form-item>
+            <!-- 受试者编号 -->
+            <el-form-item :label="$t('trials:linkedRP:table:subjectCode')">
+              <el-input v-model="searchData.SubjectCode" style="width:100px;" clearable />
+            </el-form-item>
+            <!-- 已加入 -->
+            <el-form-item :label="$t('trials:linkedRP:table:IsJoin')">
+              <el-select v-model="searchData.IsJoin" placeholder="" style="width:100px;" clearable>
+                <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <!-- 生成阅片期 -->
+            <el-form-item :label="$t('trials:linkedRP:table:IsGenerate')">
+              <el-select v-model="searchData.IsGenerate" placeholder="" style="width:100px;" clearable>
+                <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="getRPList">
+                {{ $t('common:button:search') }}
+              </el-button>
+              <el-button type="primary" icon="el-icon-refresh-left" size="small" @click="handleReset">
+                {{ $t('common:button:reset') }}
+              </el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" size="small" :disabled="selectArr.length <= 0"
+                @click="handleConfirm(selectArr)">
+                {{ $t('trials:linkedRP:button:batchAdd') }}
+              </el-button>
+              <el-button type="primary" size="small" :disabled="selectArr.length <= 0" @click="handleDel(selectArr)">
+                {{ $t('trials:linkedRP:button:batchDel') }}
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <el-table ref="prList" v-loading="listLoading" :data="list" stripe height="400"
+          @selection-change="handleSelectChange">
+          <el-table-column type="selection" align="left" width="45" :selectable="handleSelectable" />
           <!-- 中心 -->
-          <el-table-column
-            prop="TrialSiteCode"
-            :label="$t('trials:linkedRP:table:siteCode')"
-          />
+          <el-table-column prop="TrialSiteCode" :label="$t('trials:linkedRP:table:siteCode')" />
           <!-- 受试者 -->
-          <el-table-column
-            prop="SubjectCode"
-            :label="$t('trials:linkedRP:table:subjectCode')"
-          />
+          <el-table-column prop="SubjectCode" :label="$t('trials:linkedRP:table:subjectCode')" />
           <!-- 截止访视 -->
-          <el-table-column
-            prop="SubjectVisitName"
-            :label="$t('trials:linkedRP:table:expirationVisit')"
-          />
+          <el-table-column prop="SubjectVisitName" :label="$t('trials:linkedRP:table:expirationVisit')" />
           <!-- 最晚拍片日期 -->
-          <el-table-column
-            prop="LatestScanDate"
-            :label="$t('trials:linkedRP:table:latestScanDate')"
-          >
+          <el-table-column prop="LatestScanDate" :label="$t('trials:linkedRP:table:latestScanDate')">
             <template slot-scope="scope">
-              {{ scope.row.LatestScanDate?moment(scope.row.LatestScanDate).format('YYYY-MM-DD'):'' }}
+              {{ scope.row.LatestScanDate ? moment(scope.row.LatestScanDate).format('YYYY-MM-DD') : '' }}
             </template>
           </el-table-column>
           <!-- 截止日期 -->
-          <el-table-column
-            prop="ExpirationDate"
-            :label="$t('trials:linkedRP:table:expirationDate')"
-          >
+          <el-table-column prop="ExpirationDate" :label="$t('trials:linkedRP:table:expirationDate')">
             <template slot-scope="scope">
-              {{ scope.row.ExpirationDate?moment(scope.row.ExpirationDate).format('YYYY-MM-DD'):'' }}
+              {{ scope.row.ExpirationDate ? moment(scope.row.ExpirationDate).format('YYYY-MM-DD') : '' }}
             </template>
           </el-table-column>
           <!-- 阅片期名称 -->
-          <el-table-column
-            prop="ReadingPeriodName"
-            :label="$t('trials:linkedRP:table:readingName')"
-          />
+          <el-table-column prop="ReadingPeriodName" :label="$t('trials:linkedRP:table:readingName')" />
+          <!-- 已加入 -->
+          <el-table-column prop="IsJoin" :label="$t('trials:linkedRP:table:IsJoin')">
+            <template slot-scope="scope">
+              <el-tag :type="scope.row.IsJoin ? 'success' : 'danger'">{{ $fd("YesOrNo", scope.row.IsJoin) }}</el-tag>
+            </template>
+          </el-table-column>
+          <!--生成阅片期 -->
+          <el-table-column prop="IsGenerate" :label="$t('trials:linkedRP:table:IsGenerate')">
+            <template slot-scope="scope">
+              <el-tag :type="scope.row.IsGenerate ? 'success' : 'danger'">{{ $fd("YesOrNo", scope.row.IsGenerate)
+              }}</el-tag>
+            </template>
+          </el-table-column>
+          <!-- 生成任务 -->
+          <el-table-column prop="IsGenerateTask" :label="$t('trials:linkedRP:table:IsGenerateTask')">
+            <template slot-scope="scope">
+              <el-tag :type="scope.row.IsGenerateTask ? 'success' : 'danger'">{{ $fd("YesOrNo",
+                scope.row.IsGenerateTask) }}</el-tag>
+            </template>
+          </el-table-column>
           <!-- 生效时间 -->
-          <el-table-column
-            prop="EffectOfTime"
-            :label="$t('trials:linkedRP:table:effectiveTime')"
-          />
+          <el-table-column prop="GeneratedTime" :label="$t('trials:linkedRP:table:effectiveTime')" />
+          <el-table-column :label="$t('common:action:action')" width="100" fixed="right">
+            <template slot-scope="scope">
+              <!-- 添加 -->
+              <el-button circle :title="$t('trials:linkedRP:button:add')" icon="el-icon-plus"
+                :disabled="scope.row.IsJoin" @click="handleConfirm([scope.row])" size="small" />
+              <!-- 移除 -->
+              <el-button circle :title="$t('trials:linkedRP:button:del')" icon="el-icon-minus"
+                :disabled="scope.row.IsGenerateTask || !scope.row.IsJoin" @click="handleDel([scope.row])"
+                size="small" />
+            </template>
+          </el-table-column>
         </el-table>
         <!-- 分页组件 -->
         <div style="text-align:right">
-          <pagination class="page" :total="total" :pageSizes="[10, 20, 30, 50, 100, 500, 1000]" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" :disabled="list.length === 0" @pagination="getReadingReriodList" />
-        </div>
-
-        <div style="text-align:right;padding-top: 10px;">
-          <!-- 确认添加 -->
-          <el-button size="small" type="primary" :disabled="selectArr.length === 0" @click="handleConfirm">
-            {{ $t('trials:addRP:button:confirmAddPR') }}
-          </el-button>
+          <pagination class="page" :total="total" :pageSizes="[10, 20, 30, 50, 100, 500, 1000]"
+            :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" :disabled="list.length === 0"
+            @pagination="getReadingReriodList" />
         </div>
       </el-card>
     </div>
   </div>
 </template>
 <script>
-import { getTrialSiteSelect, addOrUpdateReadingPeriodSet, getReadingVisitList, getPreviewTheReadingList, getPreviewTheReadingPlanList } from '@/api/trials'
+import { getTrialSiteSelect, addOrUpdateReadingPeriodSet, getReadingVisitList, getPreviewTheReadingList, getPreviewTheReadingPlanList, setBatchRemoveReadingPlan } from '@/api/trials'
 import Pagination from '@/components/Pagination'
 import moment from 'moment'
 const searchDataDefault = () => {
   return {
+    SiteId: null,
+    SubjectCode: null,
+    IsJoin: null,
+    IsGenerate: null,
     PageIndex: 1,
     PageSize: 20
   }
@@ -186,7 +182,13 @@ export default {
     data: {
       type: Object,
       default() { return {} }
-    }
+    },
+    siteOptions: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
   },
   data() {
     return {
@@ -200,7 +202,7 @@ export default {
         ReadingSetTypeName: '',
         DeadlineCondition: 0,
         ReadingPeriodName: '',
-        ReadingScope: null,
+        ReadingScope: 0,
         SiteIds: [],
         VisitStageId: '',
         ExpirationDate: '',
@@ -220,7 +222,7 @@ export default {
         VisitStageId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }]
         // Remark: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }]
       },
-      siteOptions: [],
+      // siteOptions: [],
       trialId: '',
       listLoading: false,
       list: [],
@@ -233,11 +235,15 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.initForm()
+    console.log(this.data, 'data')
   },
   methods: {
+    handleSelectable(row) {
+      return !row.IsGenerate
+    },
     async initForm() {
       this.loading = true
-      await this.getSite()
+      // await this.getSite()
       var param = {
         trialId: this.trialId,
         readingPeriodSetId: Object.keys(this.data).length > 0 ? this.data.Id : '',
@@ -256,7 +262,9 @@ export default {
 
         this.form.DeadlineCondition = this.data.SubjectVisitName ? 1 : 0
         if (this.form.Id) {
-          this.getReadingPeriodCheckedResult()
+          this.$nextTick(() => {
+            this.getRPList()
+          })
         }
       }
       this.form.TrialId = this.trialId
@@ -269,8 +277,12 @@ export default {
         this.getReadingPeriodResult()
       })
     },
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getRPList()
+    },
     getReadingReriodList() {
-      console.log(this.form)
+      return this.getReadingPeriodResult()
       if (this.form.Id === '') {
         this.getReadingPeriodResult()
       } else {
@@ -288,9 +300,10 @@ export default {
         ReadingPeriodName: this.form.ReadingPeriodName,
         ReadingSetType: this.form.ReadingSetType,
         ReadingScope: this.form.ReadingScope,
-        TrialReadingCriterionId: this.trialReadingCriterionId
+        TrialReadingCriterionId: this.trialReadingCriterionId,
       }
       Object.assign(this.searchData, param)
+      if (this.form.Id) this.searchData.ReadingPeriodSetId = this.form.Id
       getPreviewTheReadingList(this.searchData).then(res => {
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount
@@ -310,31 +323,49 @@ export default {
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount
         this.listLoading = false
-        this.$nextTick(() => {
-          for (let i = 0; i < this.list.length; i++) {
-            this.$refs['prList'].toggleRowSelection(this.list[i], true)
-          }
-        })
+        // this.$nextTick(() => {
+        //   for (let i = 0; i < this.list.length; i++) {
+        //     this.$refs['prList'].toggleRowSelection(this.list[i], true)
+        //   }
+        // })
       }).catch(() => {
         this.listLoading = false
       })
     },
     // 获取勾选行数据
     handleSelectChange(val) {
-      const arr = []
-      for (let index = 0; index < val.length; index++) {
-        arr.push(val[index].SubjectVisitId)
-      }
-      this.selectArr = arr
+      this.selectArr = val
     },
-    handleConfirm() {
+    async handleDel(arr) {
+      try {
+        let data = {
+          Id: this.form.Id,
+          SubjectVisitIdList: []
+        }
+        data.SubjectVisitIdList = arr.map(item => item.SubjectVisitId)
+        this.loading = true
+        let res = await setBatchRemoveReadingPlan(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.getReadingReriodList()
+          this.$emit('getList')
+          this.$message.success(this.$t('common:message:removedSuccessfully'))
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    handleConfirm(arr) {
       this.loading = true
       var params = Object.assign({}, this.form)
-      params.subjectVisitIds = this.selectArr
+      params.subjectVisitIds = arr.map(item => item.SubjectVisitId)
       params.TrialReadingCriterionId = this.trialReadingCriterionId
       addOrUpdateReadingPeriodSet(params).then(res => {
         this.loading = false
-        this.$emit('close')
+        // this.$emit('close')
+        this.form.Id = res.Result
+        this.getReadingReriodList()
         this.$emit('getList')
         this.$message.success(this.$t('common:message:savedSuccessfully'))
       }).catch(() => { this.loading = false })
@@ -357,17 +388,17 @@ export default {
       }
     },
     // 获取site下拉框数据
-    getSite() {
-      return new Promise((resolve, reject) => {
-        getTrialSiteSelect(this.trialId).then(res => {
-          this.siteOptions = res.Result
-          resolve()
-        }).catch(() => {
-          this.loading = false
-          reject()
-        })
-      })
-    },
+    // getSite() {
+    //   return new Promise((resolve, reject) => {
+    //     getTrialSiteSelect(this.trialId).then(res => {
+    //       this.siteOptions = res.Result
+    //       resolve()
+    //     }).catch(() => {
+    //       this.loading = false
+    //       reject()
+    //     })
+    //   })
+    // },
     close() {
       this.$emit('close')
     }
diff --git a/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue b/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
index b7fb2cf3..6a89ea01 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
@@ -4,17 +4,13 @@
       <el-form :inline="true">
         <!-- 阅片期名称 -->
         <el-form-item :label="$t('trials:rpManage:table:readingName')">
-          <el-input
-            v-model="searchData.ReadingPeriodName"
-            style="width:100px;"
-            clearable
-          />
+          <el-input v-model="searchData.ReadingPeriodName" style="width:100px;" clearable />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+          <el-button type="primary" icon="el-icon-search" size="small" @click="handleSearch">
             {{ $t('common:button:search') }}
           </el-button>
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button type="primary" icon="el-icon-refresh-left" size="small" @click="handleReset">
             {{ $t('common:button:reset') }}
           </el-button>
           <!--导出-->
@@ -22,23 +18,11 @@
             {{ $t('common:button:export') }}
           </el-button> -->
           <!-- 添加影像学阅片 -->
-          <el-button
-            v-if="isGlobalReading"
-            type="primary"
-            icon="el-icon-plus"
-            size="small"
-            @click="handleAdd(0)"
-          >
+          <el-button v-if="isGlobalReading" type="primary" icon="el-icon-plus" size="small" @click="handleAdd(0)">
             {{ $t('trials:rpManage:button:addImageReading') }}
           </el-button>
           <!-- 添加肿瘤学阅片 -->
-          <el-button
-            v-if="isClinicalReading"
-            type="primary"
-            icon="el-icon-plus"
-            size="small"
-            @click="handleAdd(1)"
-          >
+          <el-button v-if="isClinicalReading" type="primary" icon="el-icon-plus" size="small" @click="handleAdd(1)">
             {{ $t('trials:rpManage:button:addOncologyReading') }}
           </el-button>
         </el-form-item>
@@ -46,77 +30,44 @@
 
     </div>
     <div class="main-wrapper">
-      <el-table
-        v-loading="loading"
-        :data="list"
-        stripe
-        style="width: 100%"
-        height="500"
-        @sort-change="handleSortChange"
-      >
+      <el-table v-loading="loading" :data="list" stripe style="width: 100%" height="400"
+        @sort-change="handleSortChange">
         <el-table-column type="index" width="40" />
         <!-- 阅片期类型 -->
-        <el-table-column
-          prop="ReadingSetType"
-          :label="$t('trials:rpManage:table:readingType')"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="ReadingSetType" :label="$t('trials:rpManage:table:readingType')" sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ $fd('ReadingSetType',scope.row.ReadingSetType) }}
+            {{ $fd('ReadingSetType', scope.row.ReadingSetType) }}
           </template>
         </el-table-column>
         <!-- 阅片期名称 -->
-        <el-table-column
-          prop="ReadingPeriodName"
-          :label="$t('trials:rpManage:table:readingName')"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="ReadingPeriodName" :label="$t('trials:rpManage:table:readingName')" sortable="custom"
+          show-overflow-tooltip />
         <!-- 受试者范围 -->
-        <el-table-column
-          prop="ReadingScope"
-          :label="$t('trials:rpManage:table:subjectRange')"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="ReadingScope" :label="$t('trials:rpManage:table:subjectRange')" sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ $fd('ReadingScopeEnum',scope.row.ReadingScope) }}
+            {{ $fd('ReadingScopeEnum', scope.row.ReadingScope) }}
           </template>
         </el-table-column>
         <!-- 指定中心 -->
-        <el-table-column
-          prop="SiteCodes"
-          :label="$t('trials:rpManage:table:designatedSite')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="SiteCodes" :label="$t('trials:rpManage:table:designatedSite')" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.SiteCodes.length>0? scope.row.SiteCodes.join(', '):'' }}
+            {{ scope.row.SiteCodes.length > 0 ? scope.row.SiteCodes.join(', ') : '' }}
           </template>
         </el-table-column>
         <!-- 截止日期 -->
-        <el-table-column
-          prop="ExpirationDate"
-          :label="$t('trials:rpManage:table:expirationDate')"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="ExpirationDate" :label="$t('trials:rpManage:table:expirationDate')" sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.ExpirationDate?moment(scope.row.ExpirationDate).format('YYYY-MM-DD'):'' }}
+            {{ scope.row.ExpirationDate ? moment(scope.row.ExpirationDate).format('YYYY-MM-DD') : '' }}
           </template>
         </el-table-column>
         <!-- 截止访视 -->
-        <el-table-column
-          prop="SubjectVisitName"
-          :label="$t('trials:rpManage:table:expirationVisit')"
-        />
+        <el-table-column prop="SubjectVisitName" :label="$t('trials:rpManage:table:expirationVisit')" />
         <!-- 关联阅片期 -->
-        <el-table-column
-          prop="PlanCount"
-          :label="$t('trials:rpManage:table:linkedVisits')"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="PlanCount" :label="$t('trials:rpManage:table:linkedVisits')" sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.PlanCount === 0" @click="handleRelationPR(scope.row)">
               {{ scope.row.PlanCount }}
@@ -124,12 +75,8 @@
           </template>
         </el-table-column>
         <!-- 状态 -->
-        <el-table-column
-          prop="IsTakeEffect"
-          :label="$t('trials:rpManage:table:readingStatus')"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="IsTakeEffect" :label="$t('trials:rpManage:table:readingStatus')" sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsTakeEffect === 0" type="info">
               {{ $fd('TakeEffect', scope.row.IsTakeEffect) }}
@@ -143,87 +90,48 @@
           </template>
         </el-table-column>
         <!-- 生效时间 -->
-        <el-table-column
-          prop="EffectOfTime"
-          :label="$t('trials:rpManage:table:effectiveTime')"
-          sortable="custom"
-          show-overflow-tooltip
-          width="120"
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          width="200"
-        >
+        <el-table-column prop="EffectOfTime" :label="$t('trials:rpManage:table:effectiveTime')" sortable="custom"
+          show-overflow-tooltip width="120" />
+        <el-table-column :label="$t('common:action:action')" width="200">
           <template slot-scope="scope">
             <!-- 编辑 -->
-            <el-button
-              circle
-              :title="$t('trials:rpManage:action:edit')"
-              icon="el-icon-edit-outline"
-              :disabled="scope.row.IsTakeEffect === 1 || scope.row.IsGlobal"
-              @click="handleEdit(scope.row)"
-            />
+            <el-button circle :title="$t('trials:rpManage:action:edit')" icon="el-icon-tickets"
+              :disabled="scope.row.IsTakeEffect === 1 || scope.row.IsGlobal" @click="handleEdit(scope.row)" />
             <!-- 修改状态 -->
-            <el-button
-              circle
-              :title="$t('trials:rpManage:action:status')"
-              icon="el-icon-edit"
-              :disabled="scope.row.IsGlobal"
-              @click="handleEditStatus(scope.row)"
-            />
+            <el-button circle :title="$t('trials:rpManage:action:status')" icon="el-icon-edit"
+              :disabled="scope.row.IsGlobal" @click="handleEditStatus(scope.row)" />
 
             <!-- 删除 -->
-            <el-button
-              circle
-              :title="$t('trials:rpManage:action:delete')"
-              icon="el-icon-delete"
-              :disabled="scope.row.IsTakeEffect === 1 || scope.row.IsGlobal"
-              @click="handleDelete(scope.row)"
-            />
+            <el-button circle :title="$t('trials:rpManage:action:delete')" icon="el-icon-delete"
+              :disabled="scope.row.IsTakeEffect === 1 || scope.row.IsGlobal" @click="handleDelete(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
     </div>
     <!-- 新增/编辑 -->
-    <el-dialog
-      v-if="addOrEditPR.visible"
-      :visible.sync="addOrEditPR.visible"
-      :close-on-click-modal="false"
-      :before-close="beforePRClose"
-      :title="addOrEditPR.title"
-      width="80%"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <AddOrEditPR ref="addOrEditPR" :trial-reading-criterion-id="trialReadingCriterionId" :data="currentRow" @close="addOrEditPR.visible = false" @getList="getList" />
+    <el-dialog v-if="addOrEditPR.visible" :visible.sync="addOrEditPR.visible" :close-on-click-modal="false"
+      :before-close="beforePRClose" :title="addOrEditPR.title" width="1400px" append-to-body
+      custom-class="base-dialog-wrapper" v-dialogDrag>
+      <AddOrEditPR ref="addOrEditPR" :trial-reading-criterion-id="trialReadingCriterionId" :data="currentRow"
+        :siteOptions="siteOptions" @close="() => { addOrEditPR.visible = false }" @getList="getList"></AddOrEditPR>
     </el-dialog>
 
     <!-- 状态变更 -->
-    <el-dialog
-      v-if="editStatus.visible"
-      :visible.sync="editStatus.visible"
-      :close-on-click-modal="false"
-      :title="editStatus.title"
-      width="500px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <EditPRStatus :trial-reading-criterion-id="trialReadingCriterionId" :data="currentRow" @close="editStatus.visible = false" @getList="refresh" />
+    <el-dialog v-if="editStatus.visible" :visible.sync="editStatus.visible" :close-on-click-modal="false"
+      :title="editStatus.title" width="500px" append-to-body custom-class="base-dialog-wrapper">
+      <EditPRStatus :trial-reading-criterion-id="trialReadingCriterionId" :data="currentRow"
+        @close="() => { editStatus.visible = false }" @getList="refresh" />
     </el-dialog>
 
     <!-- 关联阅片期 -->
-    <el-dialog
-      v-if="relationPR.visible"
-      :visible.sync="relationPR.visible"
-      :close-on-click-modal="false"
-      :title="$t('trials:rpManage:dialogTitle:linkedRP')"
-      width="1000px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <RelationPRList :trial-reading-criterion-id="trialReadingCriterionId" :data="currentRow" @close="relationPR.visible = false" @getList="getList" />
+    <el-dialog v-if="relationPR.visible" :visible.sync="relationPR.visible" :close-on-click-modal="false"
+      :title="$t('trials:rpManage:dialogTitle:linkedRP')" width="1000px" append-to-body
+      custom-class="base-dialog-wrapper">
+      <RelationPRList :trial-reading-criterion-id="trialReadingCriterionId" :data="currentRow"
+        @close="() => { relationPR.visible = false }" @getList="getList" />
     </el-dialog>
   </div>
 </template>
@@ -257,7 +165,13 @@ export default {
     isGlobalReading: {
       type: Boolean,
       required: true
-    }
+    },
+    siteOptions: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
   },
   data() {
     return {
@@ -351,6 +265,7 @@ export default {
       this.getList()
     },
     beforePRClose(done) {
+      return done()
       // 新增且未勾选访视时提醒
       if (this.$refs['addOrEditPR'].list.length > 0 && this.$refs['addOrEditPR'].selectArr.length === 0) {
         this.$confirm(this.$t('trials:rpManage:message:closeDialog'), {
@@ -370,6 +285,4 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ViewPeriod.vue b/src/views/trials/trials-panel/subject/reading-period/components/ViewPeriod.vue
new file mode 100644
index 00000000..e0a10fd1
--- /dev/null
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ViewPeriod.vue
@@ -0,0 +1,184 @@
+<template>
+    <div class="ViewPeriod">
+        <div class="top-wrapper">
+            <el-form :inline="true">
+                <!-- 阅片期类型 -->
+                <el-form-item :label="$t('trials:rpManage:viewPeriod:table:ReadingSetType')">
+                    <el-select v-model="searchData.ReadingSetType" placeholder="" style="width:100px;" clearable>
+                        <el-option v-for="item in $d.ReadingSetType" :key="item.id" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <!-- 阅片期名称 -->
+                <el-form-item :label="$t('trials:rpManage:viewPeriod:table:ModuleName')">
+                    <el-input v-model="searchData.ModuleName" style="width:100px;" clearable />
+                </el-form-item>
+                <!-- 中心编号 -->
+                <el-form-item :label="$t('trials:rpManage:viewPeriod:table:TrialSiteId')">
+                    <el-select v-model="searchData.TrialSiteId" placeholder="" style="width:100px;" clearable>
+                        <el-option v-for="(site, index) of siteOptions" :key="index" :label="site.TrialSiteCode"
+                            :value="site.Id" />
+                    </el-select>
+                </el-form-item>
+                <!-- 受试者编号 -->
+                <el-form-item :label="$t('trials:rpManage:viewPeriod:table:SubjectCode')">
+                    <el-input v-model="searchData.SubjectCode" style="width:100px;" clearable />
+                </el-form-item>
+                <!-- 来源 -->
+                <el-form-item :label="$t('trials:rpManage:viewPeriod:table:ReadModuleAddTypeEnum')">
+                    <el-select v-model="searchData.ReadModuleAddTypeEnum" placeholder="" style="width:100px;" clearable>
+                        <el-option v-for="item in $d.ReadModuleAddType" :key="item.id" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="small" @click="getList">
+                        {{ $t('common:button:search') }}
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-refresh-left" size="small" @click="handleReset">
+                        {{ $t('common:button:reset') }}
+                    </el-button>
+                </el-form-item>
+            </el-form>
+
+        </div>
+        <div class="main-wrapper">
+            <el-table v-loading="loading" :data="list" stripe style="width: 100%" height="400"
+                @sort-change="handleSortChange">
+                <el-table-column type="index" width="40" />
+                <!-- 阅片期类型 -->
+                <el-table-column prop="ReadingSetType" :label="$t('trials:rpManage:viewPeriod:table:ReadingSetType')"
+                    sortable="custom" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        {{ $fd('ReadingSetType', scope.row.ReadingSetType) }}
+                    </template>
+                </el-table-column>
+                <!-- 阅片期名称 -->
+                <el-table-column prop="ModuleName" :label="$t('trials:rpManage:viewPeriod:table:ModuleName')"
+                    sortable="custom" show-overflow-tooltip />
+                <!-- 中心编号 -->
+                <el-table-column prop="SiteCode" :label="$t('trials:rpManage:viewPeriod:table:SiteCode')"
+                    sortable="custom" show-overflow-tooltip />
+                <!-- 受试者编号 -->
+                <el-table-column prop="SubjectCode" :label="$t('trials:rpManage:viewPeriod:table:SubjectCode')"
+                    sortable="custom" show-overflow-tooltip />
+                <!-- 截止访视 -->
+                <el-table-column prop="VisitName" :label="$t('trials:rpManage:viewPeriod:table:VisitName')"
+                    sortable="custom" show-overflow-tooltip />
+                <!-- 最晚拍片日期 -->
+                <el-table-column prop="LatestScanDate" :label="$t('trials:rpManage:viewPeriod:table:LatestScanDate')"
+                    sortable="custom" show-overflow-tooltip />
+                <!-- 来源 -->
+                <el-table-column prop="ReadModuleAddTypeEnum"
+                    :label="$t('trials:rpManage:viewPeriod:table:ReadModuleAddTypeEnum')" sortable="custom"
+                    show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span>{{ $fd('ReadModuleAddType', scope.row.ReadModuleAddTypeEnum) }}</span>
+                    </template>
+                </el-table-column>
+                <!-- 任务状态 -->
+                <el-table-column prop="IsGenerateTask" :label="$t('trials:rpManage:viewPeriod:table:IsGenerateTask')"
+                    show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span>{{ $fd('TrainingStatusEnum', scope.row.IsGenerateTask) }}</span>
+                    </template>
+                </el-table-column>
+                <!-- 生成时间 -->
+                <el-table-column prop="GenerateTaskTime"
+                    :label="$t('trials:rpManage::viewPeriod:table:GenerateTaskTime')" show-overflow-tooltip />
+            </el-table>
+            <!-- 分页组件 -->
+            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+                @pagination="getList" />
+        </div>
+    </div>
+</template>
+<script>
+import { getReadModulePageList } from '@/api/trials'
+import Pagination from '@/components/Pagination'
+const searchDataDefault = () => {
+    return {
+        TrialId: null,
+        TrialSiteId: null,
+        TrialReadingCriterionId: null,
+        ModuleName: null,
+        SubjectCode: null,
+        ReadingSetType: null,
+        VisitName: null,
+        ReadModuleAddTypeEnum: null,
+        PageIndex: 1,
+        PageSize: 20,
+        Asc: false,
+        SortField: ''
+    }
+}
+export default {
+    name: "ViewPeriod",
+    components: {
+        Pagination
+    },
+    props: {
+        siteOptions: {
+            type: Array,
+            default: () => {
+                return []
+            }
+        },
+        TrialReadingCriterionId: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            searchData: searchDataDefault(),
+            list: [],
+            total: 0,
+            loading: false,
+        }
+    },
+    mounted() {
+        this.getList()
+    },
+    methods: {
+        async getList() {
+            try {
+                this.searchData.TrialId = this.$route.query.TrialId
+                this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
+                this.loading = true
+                let res = await getReadModulePageList(this.searchData)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.list = res.Result.CurrentPageData
+                    this.total = res.Result.TotalCount
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        handleReset() {
+            this.searchData = searchDataDefault()
+            this.getList()
+        },
+        // 排序
+        handleSortChange(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.ViewPeriod {
+    margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 85c86e68..6b37f896 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -1,216 +1,103 @@
 <template>
   <BaseContainer class="reading-period">
     <el-tabs v-model="TrialReadingCriterionId" type="border-card">
-      <el-tab-pane
-        v-for="criterion of trialCriterionList"
-        :key="criterion.TrialReadingCriterionId"
-        :label="criterion.TrialReadingCriterionName"
-        :name="criterion.TrialReadingCriterionId"
-      >
-        <div
-          v-if="TrialReadingCriterionId === criterion.TrialReadingCriterionId"
-        >
+      <el-tab-pane v-for="criterion of trialCriterionList" :key="criterion.TrialReadingCriterionId"
+        :label="criterion.TrialReadingCriterionName" :name="criterion.TrialReadingCriterionId">
+        <div v-if="TrialReadingCriterionId === criterion.TrialReadingCriterionId">
           <div slot="search-container">
             <el-form :inline="true">
               <el-form-item :label="$t('trials:readingPeriod:table:siteCode')">
                 <!-- 中心编号 -->
-                <el-select
-                  v-model="searchData.TrialSiteCode"
-                  clearable
-                  filterable
-                  style="width: 120px"
-                >
-                  <el-option
-                    v-for="(site, index) of siteOptions"
-                    :key="index"
-                    :label="site.TrialSiteCode"
-                    :value="site.TrialSiteCode"
-                  />
+                <el-select v-model="searchData.TrialSiteCode" clearable filterable style="width: 120px">
+                  <el-option v-for="(site, index) of siteOptions" :key="index" :label="site.TrialSiteCode"
+                    :value="site.TrialSiteCode" />
                 </el-select>
               </el-form-item>
               <!-- 受试者编号 -->
-              <el-form-item
-                :label="$t('trials:readingPeriod:table:subjectCode')"
-              >
-                <el-input
-                  v-model="searchData.SubjectCode"
-                  style="width: 100px"
-                  clearable
-                />
+              <el-form-item :label="$t('trials:readingPeriod:table:subjectCode')">
+                <el-input v-model="searchData.SubjectCode" style="width: 100px" clearable />
               </el-form-item>
               <!-- 阅片类型 -->
-              <el-form-item
-                :label="$t('trials:readingPeriod:table:readingType')"
-              >
-                <el-select
-                  v-model="searchData.ModuleType"
-                  clearable
-                  style="width: 120px"
-                >
-                  <el-option
-                    v-for="item of $d.ModuleTypeEnum"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
-                  />
+              <el-form-item :label="$t('trials:readingPeriod:table:readingType')">
+                <el-select v-model="searchData.ModuleType" clearable style="width: 120px">
+                  <el-option v-for="item of $d.ModuleTypeEnum" :key="item.value" :value="item.value"
+                    :label="item.label" />
                 </el-select>
               </el-form-item>
               <!-- 进度 -->
-              <el-form-item
-                :label="$t('trials:readingPeriod:table:readingSchedule')"
-              >
-                <el-select
-                  v-model="searchData.ReadingStatus"
-                  clearable
-                  style="width: 120px"
-                >
-                  <el-option
-                    v-for="item of $d.ReadModuleEnum"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
-                  />
+              <el-form-item :label="$t('trials:readingPeriod:table:readingSchedule')">
+                <el-select v-model="searchData.ReadingStatus" clearable style="width: 120px">
+                  <el-option v-for="item of $d.ReadModuleEnum" :key="item.value" :value="item.value"
+                    :label="item.label" />
                 </el-select>
               </el-form-item>
               <!-- 阅片名称 -->
-              <el-form-item
-                :label="$t('trials:readingPeriod:table:readingName')"
-              >
-                <el-input
-                  v-model="searchData.Name"
-                  style="width: 100px"
-                  clearable
-                />
+              <el-form-item :label="$t('trials:readingPeriod:table:readingName')">
+                <el-input v-model="searchData.Name" style="width: 100px" clearable />
               </el-form-item>
 
-              <el-form-item
-                :label="$t('trials:readingPeriod:table:completeClinicalData')"
-              >
-                <el-select
-                  v-model="searchData.CompleteClinicalData"
-                  clearable
-                  style="width: 120px"
-                >
-                  <el-option
-                    v-for="item of $d.CompleteClinicalDataEnum"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
-                  />
+              <el-form-item :label="$t('trials:readingPeriod:table:completeClinicalData')">
+                <el-select v-model="searchData.CompleteClinicalData" clearable style="width: 120px">
+                  <el-option v-for="item of $d.CompleteClinicalDataEnum" :key="item.value" :value="item.value"
+                    :label="item.label" />
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="handleSearch"
-                >
+                <el-button type="primary" icon="el-icon-search" @click="handleSearch">
                   {{ $t('common:button:search') }}
                 </el-button>
-                <el-button
-                  type="primary"
-                  icon="el-icon-refresh-left"
-                  @click="handleReset"
-                >
+                <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
                   {{ $t('common:button:reset') }}
                 </el-button>
                 <!--导出受试者进展表-->
-                <el-button
-                  type="primary"
-                  icon="el-icon-download"
-                  @click="handleExportSubject"
-                >
+                <el-button type="primary" icon="el-icon-download" @click="handleExportSubject">
                   {{ $t('trials:readingPeriod:buttton:exportSubjectTbl') }}
                 </el-button>
                 <!--导出阅片期信息表-->
-                <el-button
-                  type="primary"
-                  icon="el-icon-download"
-                  @click="handleExportPeriod"
-                >
+                <el-button type="primary" icon="el-icon-download" @click="handleExportPeriod">
                   {{ $t('trials:readingPeriod:buttton:exportPeriodTbl') }}
                 </el-button>
                 <!-- 阅片期管理 -->
-                <el-button
-                  v-if="
-                    ReadingInfoSignTime &&
-                    (otherInfo.IsClinicalReading || otherInfo.IsReadingPeriod)
-                  "
-                  v-hasPermi="[
-                    'trials:trials-panel:subject:readingPeriod:edit',
-                  ]"
-                  type="primary"
-                  icon="el-icon-edit-outline"
-                  @click="handleReadingPeriod"
-                >
+                <el-button v-if="
+                  ReadingInfoSignTime &&
+                  (otherInfo.IsClinicalReading || otherInfo.IsReadingPeriod)
+                " v-hasPermi="[
+                  'trials:trials-panel:subject:readingPeriod:edit',
+                ]" type="primary" icon="el-icon-edit-outline" @click="handleReadingPeriod">
                   {{ $t('trials:readingPeriod:button:rpManage') }}
                 </el-button>
               </el-form-item>
             </el-form>
           </div>
           <div slot="main-container">
-            <el-table
-              ref="myTable"
-              v-adaptive="{ bottomOffset: 135 }"
-              v-loading="loading"
-              :data="list"
-              stripe
-              height="100"
-              :header-row-class-name="headerRowStyle"
-              :cell-style="cellStyle"
-              @sort-change="handleSortChange"
-            >
+            <el-table ref="myTable" v-adaptive="{ bottomOffset: 135 }" v-loading="loading" :data="list" stripe
+              height="100" :header-row-class-name="headerRowStyle" :cell-style="cellStyle"
+              @sort-change="handleSortChange">
               <el-table-column type="index" width="40" fixed="left" />
               <!-- 中心编号 -->
-              <el-table-column
-                prop="TrialSiteCode"
-                :label="$t('trials:readingPeriod:table:siteCode')"
-                min-width="110"
-                fixed="left"
-                sortable="custom"
-                show-overflow-tooltip
-              />
+              <el-table-column prop="TrialSiteCode" :label="$t('trials:readingPeriod:table:siteCode')" min-width="110"
+                fixed="left" sortable="custom" show-overflow-tooltip />
               <!-- 受试者编号 -->
-              <el-table-column
-                prop="SubjectCode"
-                :label="$t('trials:readingPeriod:table:subjectCode')"
-                min-width="120"
-                fixed="left"
-                sortable="custom"
-                show-overflow-tooltip
-              />
+              <el-table-column prop="SubjectCode" :label="$t('trials:readingPeriod:table:subjectCode')" min-width="120"
+                fixed="left" sortable="custom" show-overflow-tooltip />
               <!-- 阅片计划 -->
-              <el-table-column
-                :label="$t('trials:readingPeriod:table:readingPlan')"
-                align="center"
-                min-width="100"
-              >
-                <el-table-column
-                  v-for="i in maxLength"
-                  :key="`${i}`"
-                  :prop="`Plan${i - 1}`"
-                  label=""
-                  width="240"
-                >
+              <el-table-column :label="$t('trials:readingPeriod:table:readingPlan')" align="center" min-width="100">
+                <el-table-column v-for="i in maxLength" :key="`${i}`" :prop="`Plan${i - 1}`" label="" width="240">
                   <template slot-scope="scope">
                     <div v-if="i <= scope.row.Data.length">
                       <!--                      <div style="">-->
-                      <div
-                        style="
+                      <div style="
                           border-bottom: 1px solid #d9d9d9;
                           margin-bottom: 8px;
                           padding-bottom: 8px;
                           display: flex;
                           justify-content: space-between;
-                        "
-                      >
+                        ">
                         <div style="font-size: 16px; font-weight: 900">
                           {{ scope.row.Data[i - 1].Name }}
                         </div>
                         <div>
-                          <span
-                            v-if="scope.row.Data[i - 1].IsEnrollmentConfirm"
-                          >
+                          <span v-if="scope.row.Data[i - 1].IsEnrollmentConfirm">
                             | {{ $t('trials:readingPeriod:table:enroll') }}
                           </span>
                           <span v-if="scope.row.Data[i - 1].PDState">
@@ -224,15 +111,13 @@
                           </span>
                         </div>
                       </div>
-                      <div
-                        style="
+                      <div style="
                           display: flex;
                           justify-content: space-between;
                           border-bottom: 1px solid #d9d9d9;
                           margin-bottom: 8px;
                           padding-bottom: 8px;
-                        "
-                      >
+                        ">
                         <div>
                           {{
                             $fd(
@@ -241,21 +126,17 @@
                             )
                           }}
                         </div>
-                        <div
-                          style="
+                        <div style="
                             white-space: nowrap;
                             overflow: hidden;
                             text-overflow: ellipsis;
                             width: 110px;
                             text-align: right;
-                          "
-                          :title="
-                            $fd(
-                              'ReadModuleEnum',
-                              scope.row.Data[i - 1].ReadingStatus
-                            )
-                          "
-                        >
+                          " :title="$fd(
+                            'ReadModuleEnum',
+                            scope.row.Data[i - 1].ReadingStatus
+                          )
+                            ">
                           {{
                             $fd(
                               'ReadModuleEnum',
@@ -264,16 +145,13 @@
                           }}
                         </div>
                       </div>
-                      <div
-                        v-if="scope.row.Data[i - 1].ModuleType === 1"
-                        style="
+                      <div v-if="scope.row.Data[i - 1].ModuleType === 1" style="
                           display: flex;
                           justify-content: space-between;
                           border-bottom: 1px solid #d9d9d9;
                           margin-bottom: 8px;
                           padding-bottom: 8px;
-                        "
-                      >
+                        ">
                         <!-- 上一访视 -->
                         <div>
                           {{ $t('trials:readingPeriod:table:lastVisit') }}
@@ -282,36 +160,30 @@
                           {{ scope.row.Data[i - 1].OutPlanPreviousVisitName }}
                         </div>
                       </div>
-                      <div
-                        v-if="
-                          scope.row.Data[i - 1].ModuleType === 2 ||
-                          scope.row.Data[i - 1].ModuleType === 3 ||
-                          scope.row.Data[i - 1].ModuleType === 5
-                        "
-                        style="
+                      <div v-if="
+                        scope.row.Data[i - 1].ModuleType === 2 ||
+                        scope.row.Data[i - 1].ModuleType === 3 ||
+                        scope.row.Data[i - 1].ModuleType === 5
+                      " style="
                           display: flex;
                           justify-content: space-between;
                           border-bottom: 1px solid #d9d9d9;
                           margin-bottom: 8px;
                           padding-bottom: 8px;
-                        "
-                      >
+                        ">
                         <!-- 截止访视： -->
                         <div>
                           {{ $t('trials:readingPeriod:table:deadlineVisit') }}
                         </div>
                         <div>{{ scope.row.Data[i - 1].CutOffVisitName }}</div>
                       </div>
-                      <div
-                        v-if="scope.row.Data[i - 1].ModuleType === 4"
-                        style="
+                      <div v-if="scope.row.Data[i - 1].ModuleType === 4" style="
                           display: flex;
                           justify-content: space-between;
                           border-bottom: 1px solid #d9d9d9;
                           margin-bottom: 8px;
                           padding-bottom: 8px;
-                        "
-                      >
+                        ">
                         <!-- 对应阅片期： -->
                         <div>
                           {{
@@ -320,63 +192,47 @@
                         </div>
                         <div>{{ scope.row.Data[i - 1].ReadModuleName }}</div>
                       </div>
-                      <div
-                        v-if="otherInfo.ExistClinicalData"
-                        style="
+                      <div v-if="otherInfo.ExistClinicalData" style="
                           display: flex;
                           justify-content: space-between;
                           border-bottom: 1px solid #d9d9d9;
                           margin-bottom: 8px;
                           padding-bottom: 8px;
-                        "
-                      >
-                        <div
-                          style="
+                        ">
+                        <div style="
                             display: flex;
                             justify-content: space-between;
                             width: 100%;
-                          "
-                        >
+                          ">
                           <!-- 临床资料 -->
                           <div>
-                            <el-tooltip
-                              v-if="
-                                scope.row.Data[i - 1].CompleteClinicalData === 0
-                              "
-                              class="item"
-                              effect="dark"
-                              :content="
-                                $t(
-                                  'trials:readingPeriod:table:clinicalDataNotComplete'
-                                )
-                              "
-                              placement="bottom"
-                            >
+                            <el-tooltip v-if="
+                              scope.row.Data[i - 1].CompleteClinicalData === 0
+                            " class="item" effect="dark" :content="$t(
+                              'trials:readingPeriod:table:clinicalDataNotComplete'
+                            )
+                              " placement="bottom">
                               <i class="el-icon-warning" style="color: red" />
                             </el-tooltip>
                             {{ $t('trials:readingPeriod:table:clinicalInfo2') }}
                           </div>
-                          <el-link
-                            type="danger"
-                            v-if="
-                              (scope.row.Data[i - 1].IsVisit &&
-                                otherInfo.IsExistsSubjectClinicalData &&
-                                scope.row.Data[i - 1].IsBaseLine) ||
-                              (scope.row.Data[i - 1].IsVisit &&
-                                otherInfo.IsExistsVisitClinicalData) ||
-                              (scope.row.Data[i - 1].IsVisit &&
-                                otherInfo.IsExistsStudyClinicalData) ||
-                              (!scope.row.Data[i - 1].IsVisit &&
-                                otherInfo.IsExistsReadingClinicalData &&
-                                scope.row.Data[i - 1].ModuleType === 3) ||
-                              (!scope.row.Data[i - 1].IsVisit &&
-                                otherInfo.IsExistsOncologyReadClinicalData &&
-                                scope.row.Data[i - 1].ModuleType === 5)
-                            "
-                            @click="
-                              handleView(scope.row, scope.row.Data[i - 1])
-                            "
-                          >
+                          <el-link type="danger" v-if="
+                            (scope.row.Data[i - 1].IsVisit &&
+                              otherInfo.IsExistsSubjectClinicalData &&
+                              scope.row.Data[i - 1].IsBaseLine) ||
+                            (scope.row.Data[i - 1].IsVisit &&
+                              otherInfo.IsExistsVisitClinicalData) ||
+                            (scope.row.Data[i - 1].IsVisit &&
+                              otherInfo.IsExistsStudyClinicalData) ||
+                            (!scope.row.Data[i - 1].IsVisit &&
+                              otherInfo.IsExistsReadingClinicalData &&
+                              scope.row.Data[i - 1].ModuleType === 3) ||
+                            (!scope.row.Data[i - 1].IsVisit &&
+                              otherInfo.IsExistsOncologyReadClinicalData &&
+                              scope.row.Data[i - 1].ModuleType === 5)
+                          " @click="
+                            handleView(scope.row, scope.row.Data[i - 1])
+                            ">
                             {{ $t('trials:readingPeriod:button:view') }}
                           </el-link>
                           <span v-else>{{
@@ -385,33 +241,23 @@
                         </div>
                       </div>
                       <div>
-                        <el-link
-                          style="color: #428bca; margin-right: 5px"
-                          @click="
-                            handleDetail(scope.row, scope.row.Data[i - 1])
-                          "
-                        >
+                        <el-link style="color: #428bca; margin-right: 5px" @click="
+                          handleDetail(scope.row, scope.row.Data[i - 1])
+                          ">
                           {{ $t('trials:readingPeriod:button:detail') }}
                         </el-link>
-                        <el-link
-                          style="color: #428bca; margin-right: 5px"
+                        <el-link style="color: #428bca; margin-right: 5px"
                           v-if="scope.row.Data[i - 1].IsCanChangeCutOffVisit"
-                          @click="handleEdit(scope.row, scope.row.Data[i - 1])"
-                        >
+                          @click="handleEdit(scope.row, scope.row.Data[i - 1])">
                           {{ $t('common:button:edit') }}
                         </el-link>
-                        <el-link
-                          style="color: #428bca; margin-right: 5px"
-                          v-if="
-                            (scope.row.Data[i - 1].ModuleType === 3 ||
-                              scope.row.Data[i - 1].ModuleType === 5) &&
-                            scope.row.Data[i - 1].ReadingStatus < 4
-                          "
-                          v-hasPermi="[
-                            'trials:trials-panel:subject:readingPeriod:edit',
-                          ]"
-                          @click="handleDelete(scope.row.Data[i - 1])"
-                        >
+                        <el-link style="color: #428bca; margin-right: 5px" v-if="
+                          (scope.row.Data[i - 1].ModuleType === 3 ||
+                            scope.row.Data[i - 1].ModuleType === 5) &&
+                          scope.row.Data[i - 1].ReadingStatus < 4
+                        " v-hasPermi="[
+                          'trials:trials-panel:subject:readingPeriod:edit',
+                        ]" @click="handleDelete(scope.row.Data[i - 1])">
                           {{ $t('trials:readingPeriod:button:delete') }}
                         </el-link>
                       </div>
@@ -419,127 +265,79 @@
                   </template>
                 </el-table-column>
               </el-table-column>
-              <el-table-column
-                v-if="
-                  hasPermi([
-                    'trials:trials-panel:subject:readingPeriod:edit',
-                  ]) && ReadingInfoSignTime
-                "
-                :fixed="
-                  (otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) &&
-                  ReadingInfoSignTime &&
-                  hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])
-                    ? 'right'
-                    : false
-                "
-                :label="
-                  (otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) &&
-                  ReadingInfoSignTime &&
-                  hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])
-                    ? $t('common:action:action')
-                    : ''
-                "
-                :width="
-                  (otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) &&
+              <el-table-column v-if="
+                hasPermi([
+                  'trials:trials-panel:subject:readingPeriod:edit',
+                ]) && ReadingInfoSignTime
+              " :fixed="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) &&
+                ReadingInfoSignTime &&
+                hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])
+                ? 'right'
+                : false
+                " :label="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) &&
                   ReadingInfoSignTime &&
                   hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])
+                  ? $t('common:action:action')
+                  : ''
+                  " :width="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) &&
+                    ReadingInfoSignTime &&
+                    hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])
                     ? '150px'
                     : '80px'
-                "
-              >
+                    ">
                 <template slot-scope="scope">
-                  <el-button
-                    v-if="otherInfo.IsReadingPeriod"
-                    circle
-                    :title="
-                      $t('trials:readingPeriod:buttton:addSubjectImageRP')
-                    "
-                    icon="el-icon-plus"
-                    @click="handleAdd(scope.row, 0)"
-                  />
-                  <el-button
-                    v-if="isClinicalReading"
-                    circle
-                    :title="
-                      $t('trials:readingPeriod:buttton:addSubjectOncologyRP')
-                    "
-                    icon="el-icon-plus"
-                    @click="handleAdd(scope.row, 1)"
-                  />
+                  <el-button v-if="otherInfo.IsReadingPeriod" circle :title="$t('trials:readingPeriod:buttton:addSubjectImageRP')
+                    " icon="el-icon-plus" @click="handleAdd(scope.row, 0)" />
+                  <el-button v-if="isClinicalReading" circle :title="$t('trials:readingPeriod:buttton:addSubjectOncologyRP')
+                    " icon="el-icon-plus" @click="handleAdd(scope.row, 1)" />
                 </template>
               </el-table-column>
             </el-table>
             <!-- 分页组件 -->
-            <pagination
-              class="page"
-              :total="total"
-              :page.sync="searchData.PageIndex"
-              :limit.sync="searchData.PageSize"
-              @pagination="getList"
-            />
+            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+              @pagination="getList" />
             <!-- 详情 -->
-            <el-dialog
-              v-if="dialogVisible"
-              :title="$t('trials:rpDetail:dialogTitle:detail')"
-              :visible.sync="dialogVisible"
-              width="600px"
-              :close-on-click-modal="false"
-            >
+            <el-dialog v-if="dialogVisible" :title="$t('trials:rpDetail:dialogTitle:detail')"
+              :visible.sync="dialogVisible" width="600px" :close-on-click-modal="false">
               <el-descriptions :column="2" border>
                 <!-- 阅片期名称 -->
-                <el-descriptions-item
-                  :label="$t('trials:readingPeriod:table:readingName')"
-                >
+                <el-descriptions-item :label="$t('trials:readingPeriod:table:readingName')">
                   {{ currentData.Name }}
                 </el-descriptions-item>
                 <!-- 阅片期类型 -->
-                <el-descriptions-item
-                  :label="$t('trials:readingPeriod:table:readingType')"
-                >
+                <el-descriptions-item :label="$t('trials:readingPeriod:table:readingType')">
                   {{ $fd('ModuleTypeEnum', currentData.ModuleType) }}
                 </el-descriptions-item>
                 <!-- 是否加急 -->
                 <!-- <el-descriptions-item label="是否加急"> <el-tag size="small">{{ $fd('YesOrNo',currentData.IsUrgent) }}</el-tag></el-descriptions-item> -->
                 <!-- 进度 -->
-                <el-descriptions-item
-                  :label="$t('trials:readingPeriod:table:readingSchedule')"
-                >
+                <el-descriptions-item :label="$t('trials:readingPeriod:table:readingSchedule')">
                   {{ $fd('ReadModuleEnum', currentData.ReadingStatus) }}
                 </el-descriptions-item>
-                <el-descriptions-item
-                  v-if="currentData.CutOffVisitName"
-                  :label="$t('trials:readingPeriod:table:deadlineVisit')"
-                >
+                <el-descriptions-item v-if="currentData.CutOffVisitName"
+                  :label="$t('trials:readingPeriod:table:deadlineVisit')">
                   {{ currentData.CutOffVisitName }}
                 </el-descriptions-item>
-                <el-descriptions-item
-                  v-if="currentData.OutPlanPreviousVisitName"
-                  :label="$t('trials:readingPeriod:table:lastVisit')"
-                >
+                <el-descriptions-item v-if="currentData.OutPlanPreviousVisitName"
+                  :label="$t('trials:readingPeriod:table:lastVisit')">
                   {{ currentData.OutPlanPreviousVisitName }}
                 </el-descriptions-item>
-                <el-descriptions-item
-                  v-if="currentData.ReadModuleName"
-                  :label="$t('trials:readingPeriod:table:correspondVisit')"
-                >
+                <el-descriptions-item v-if="currentData.ReadModuleName"
+                  :label="$t('trials:readingPeriod:table:correspondVisit')">
                   {{ currentData.ReadModuleName }}
                 </el-descriptions-item>
                 <!-- 临床资料 -->
-                <el-descriptions-item
-                  v-if="otherInfo.ExistClinicalData"
-                  :label="$t('trials:readingPeriod:table:clinicalInfo')"
-                >
-                  <template
-                    v-if="
-                      (currentData.IsVisit &&
-                        otherInfo.IsExistsSubjectClinicalData &&
-                        currentData.IsBaseLine) ||
-                      (currentData.IsVisit &&
-                        otherInfo.IsExistsVisitClinicalData) ||
-                      (!currentData.IsVisit &&
-                        otherInfo.IsExistsReadingClinicalData)
-                    "
-                  >
+                <el-descriptions-item v-if="otherInfo.ExistClinicalData"
+                  :label="$t('trials:readingPeriod:table:clinicalInfo')">
+                  <template v-if="
+                    (currentData.IsVisit &&
+                      otherInfo.IsExistsSubjectClinicalData &&
+                      currentData.IsBaseLine) ||
+                    (currentData.IsVisit &&
+                      otherInfo.IsExistsVisitClinicalData) ||
+                    (!currentData.IsVisit &&
+                      otherInfo.IsExistsReadingClinicalData)
+                  ">
                     <el-link @click="view">{{
                       $t('trials:readingPeriod:button:view')
                     }}</el-link>
@@ -549,86 +347,49 @@
                   </template>
                 </el-descriptions-item>
                 <!-- 当前干系人 -->
-                <el-descriptions-item
-                  :label="$t('trials:readingPeriod:table:stakeholder')"
-                  :span="2"
-                >
+                <el-descriptions-item :label="$t('trials:readingPeriod:table:stakeholder')" :span="2">
                   {{ currentData.Stakeholders }}
                 </el-descriptions-item>
               </el-descriptions>
             </el-dialog>
 
             <!-- 设置阅片期 -->
-            <el-dialog
-              v-if="readPeriodVisible"
-              :title="$t('trials:rpManage:dialogTitle:setRP')"
-              :visible.sync="readPeriodVisible"
-              width="1400px"
-              :close-on-click-modal="false"
-            >
-              <ReadingPeriod
-                :trial-id="trialId"
-                :trial-reading-criterion-id="TrialReadingCriterionId"
-                :is-clinical-reading="isClinicalReading"
-                :is-global-reading="otherInfo.IsReadingPeriod"
-                @getList="getList"
-              />
+            <el-dialog v-if="readPeriodVisible" :title="$t('trials:rpManage:dialogTitle:setRP')"
+              :visible.sync="readPeriodVisible" width="1400px" :close-on-click-modal="false" v-dialogDrag>
+              <el-tabs v-model="activeName" @tab-click="handleClick">
+                <el-tab-pane :label="$t('trials:rpManage:tab:title:ViewPeriod')" name="ViewPeriod">
+                  <ViewPeriod v-if="activeName === 'ViewPeriod'" :siteOptions="siteOptions"
+                    :TrialReadingCriterionId="TrialReadingCriterionId" />
+                </el-tab-pane>
+                <el-tab-pane :label="$t('trials:rpManage:tab:title:ReadingPeriod')" name="ReadingPeriod">
+                  <ReadingPeriod v-if="activeName === 'ReadingPeriod'" :trial-id="trialId" :siteOptions="siteOptions"
+                    :trial-reading-criterion-id="TrialReadingCriterionId" :is-clinical-reading="isClinicalReading"
+                    :is-global-reading="otherInfo.IsReadingPeriod" @getList="getList" />
+                </el-tab-pane>
+
+              </el-tabs>
             </el-dialog>
 
             <!-- 临床资料 -->
-            <el-dialog
-              v-if="clinicalDataVisible"
-              :title="`${$t(
-                'trials:readingPeriod:dialogTitle:clinicalData'
-              )}（${currentData.SubjectCode}|${currentData.Name}|${
-                currentData.CriterionName
-              }）`"
-              :visible.sync="clinicalDataVisible"
-              :close-on-click-modal="false"
-              append-to-body
-              width="70%"
-            >
-              <ClinicalData
-                :trial-reading-criterion-id="TrialReadingCriterionId"
-                :trial-id="trialId"
-                :data="currentData"
-                @getList="getList"
-              />
+            <el-dialog v-if="clinicalDataVisible" :title="`${$t(
+              'trials:readingPeriod:dialogTitle:clinicalData'
+            )}（${currentData.SubjectCode}|${currentData.Name}|${currentData.CriterionName
+              }）`" :visible.sync="clinicalDataVisible" :close-on-click-modal="false" append-to-body width="70%">
+              <ClinicalData :trial-reading-criterion-id="TrialReadingCriterionId" :trial-id="trialId"
+                :data="currentData" @getList="getList" />
             </el-dialog>
             <!-- 添加受试者阅片期 -->
-            <el-dialog
-              v-if="subjectPeriod.visible"
-              :title="subjectPeriod.title"
-              :visible.sync="subjectPeriod.visible"
-              width="500px"
-              custom-class="base-dialog-wrapper"
-              :close-on-click-modal="false"
-            >
-              <SubjectPR
-                :trial-reading-criterion-id="TrialReadingCriterionId"
-                :trial-id="trialId"
-                :data="param"
-                @close="subjectPeriod.visible = false"
-                @getList="getList"
-              />
+            <el-dialog v-if="subjectPeriod.visible" :title="subjectPeriod.title" :visible.sync="subjectPeriod.visible"
+              width="500px" custom-class="base-dialog-wrapper" :close-on-click-modal="false">
+              <SubjectPR :trial-reading-criterion-id="TrialReadingCriterionId" :trial-id="trialId" :data="param"
+                @close="() => { subjectPeriod.visible = false }" @getList="getList" />
             </el-dialog>
             <!-- 编辑受试者阅片期 -->
-            <el-dialog
-              v-if="subjectPeriodEdit.visible"
-              :title="subjectPeriodEdit.title"
-              :visible.sync="subjectPeriodEdit.visible"
-              width="500px"
-              custom-class="base-dialog-wrapper"
-              :close-on-click-modal="false"
-            >
-              <SubjectPR
-                :type="'edit'"
-                :trial-reading-criterion-id="TrialReadingCriterionId"
-                :trial-id="trialId"
-                :data="param"
-                @close="subjectPeriodEdit.visible = false"
-                @getList="getList"
-              />
+            <el-dialog v-if="subjectPeriodEdit.visible" :title="subjectPeriodEdit.title"
+              :visible.sync="subjectPeriodEdit.visible" width="500px" custom-class="base-dialog-wrapper"
+              :close-on-click-modal="false">
+              <SubjectPR :type="'edit'" :trial-reading-criterion-id="TrialReadingCriterionId" :trial-id="trialId"
+                :data="param" @close="() => { subjectPeriodEdit.visible = false }" @getList="getList" />
             </el-dialog>
           </div>
         </div>
@@ -651,6 +412,7 @@ import {
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import ReadingPeriod from './components/RPList'
+import ViewPeriod from './components/ViewPeriod'
 import ClinicalData from './components/ClinicalData'
 import SubjectPR from './components/AddSubjectRP'
 const searchDataDefault = () => {
@@ -672,6 +434,7 @@ export default {
     BaseContainer,
     Pagination,
     ReadingPeriod,
+    ViewPeriod,
     ClinicalData,
     SubjectPR,
   },
@@ -702,6 +465,7 @@ export default {
       trialCriterionList: [],
       TrialReadingCriterionId: '0',
       ReadingInfoSignTime: null,
+      activeName: 'ReadingPeriod', // ViewPeriod ReadingPeriod
     }
   },
   watch: {
@@ -719,6 +483,9 @@ export default {
     this.getTrialCriterionList()
   },
   methods: {
+    handleClick(a) {
+      this.activeName = a.name
+    },
     getList() {
       this.searchData.TrialId = this.$route.query.trialId
       this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
@@ -827,13 +594,13 @@ export default {
     },
     handleExportSubject() {
       getSubjectProgress_Export(this.searchData)
-        .then((res) => {})
-        .catch(() => {})
+        .then((res) => { })
+        .catch(() => { })
     },
     handleExportPeriod() {
       getReadingPeriodList_Export(this.searchData)
-        .then((res) => {})
-        .catch(() => {})
+        .then((res) => { })
+        .catch(() => { })
     },
     getTrialCriterionList() {
       getTrialCriterionList(this.trialId, false)
@@ -842,7 +609,7 @@ export default {
           this.TrialReadingCriterionId =
             this.trialCriterionList[0].TrialReadingCriterionId
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     handleSearch() {
       this.searchData.PageIndex = 1
@@ -926,12 +693,15 @@ export default {
     padding: 0px !important;
   }
 }
+
 ::v-deep .hidden-row {
   display: none;
 }
+
 ::v-deep .el-dialog__body {
   padding: 0px 20px;
 }
+
 ::v-deep .el-dialog__header {
   padding: 10px 20px;
 }

From 9c0ca0a8311a7b6c55cc29586f9624d8958640bd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 4 Nov 2025 16:46:07 +0800
Subject: [PATCH 065/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9F=A9=E5=BD=A2=E6=A0=87=E8=AE=B0=E5=8F=AF?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=A1=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms3D/components/toolConfig.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e11c3cdf..b0048654 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
@@ -317,7 +317,7 @@ const config = {
       'name': '矩形工具',
       'icon': 'rectangle',
       'toolName': 'RectangleROI',
-      'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'],
+      'props': ['area', 'mean', 'max', 'stdDev'],
       'i18nKey': 'trials:reading:button:rectangle',
       'isDisabled': false,
       'disabledReason': ''

From 5cd5e3c34dc1e43e1da785a92d5346cfecc1a577 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 5 Nov 2025 13:18:12 +0800
Subject: [PATCH 066/333] 1

---
 .../trials-panel/subject/reading-period/components/RPList.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue b/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
index 6a89ea01..577661ea 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
@@ -114,7 +114,7 @@
     <!-- 新增/编辑 -->
     <el-dialog v-if="addOrEditPR.visible" :visible.sync="addOrEditPR.visible" :close-on-click-modal="false"
       :before-close="beforePRClose" :title="addOrEditPR.title" width="1400px" append-to-body
-      custom-class="base-dialog-wrapper" v-dialogDrag>
+      custom-class="base-dialog-wrapper" :fullscreen="true">
       <AddOrEditPR ref="addOrEditPR" :trial-reading-criterion-id="trialReadingCriterionId" :data="currentRow"
         :siteOptions="siteOptions" @close="() => { addOrEditPR.visible = false }" @getList="getList"></AddOrEditPR>
     </el-dialog>

From 0002bd01658b88af8ec31820029d39c493606568 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 5 Nov 2025 13:58:12 +0800
Subject: [PATCH 067/333] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B9=E6=8C=87=E5=AE=9A=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/subject/reading-period/components/RPList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue b/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
index 577661ea..c35f0fc5 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
@@ -51,11 +51,11 @@
           </template>
         </el-table-column>
         <!-- 指定中心 -->
-        <el-table-column prop="SiteCodes" :label="$t('trials:rpManage:table:designatedSite')" show-overflow-tooltip>
+        <!-- <el-table-column prop="SiteCodes" :label="$t('trials:rpManage:table:designatedSite')" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.SiteCodes.length > 0 ? scope.row.SiteCodes.join(', ') : '' }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <!-- 截止日期 -->
         <el-table-column prop="ExpirationDate" :label="$t('trials:rpManage:table:expirationDate')" sortable="custom"
           show-overflow-tooltip>

From 5f89d7d10c622c6c0ef61d3428fa497ac0c4f1eb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 5 Nov 2025 14:21:23 +0800
Subject: [PATCH 068/333] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=E5=8F=8C=E5=B1=8F=E3=80=81?=
 =?UTF-8?q?=E7=AB=96=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/screen.pdf                             | Bin 0 -> 632169 bytes
 src/utils/splitScreen.js                      |  88 ++++
 .../reading/dicoms/components/Others.vue      |  29 +-
 .../reading/dicoms/components/ReportPage.vue  |  23 +-
 .../dicoms/customize/CustomizeReportPage.vue  |  32 +-
 .../dicoms3D/components/ReportPage.vue        |  23 +-
 .../components/customize/ReportPage.vue       |  23 +-
 .../trials-panel/reading/read-task/index.vue  | 400 +++++++-----------
 .../reading/reading-task/index.vue            | 341 +++++----------
 .../visit-review/components/ReportPage.vue    |  92 ++--
 10 files changed, 521 insertions(+), 530 deletions(-)
 create mode 100644 public/screen.pdf
 create mode 100644 src/utils/splitScreen.js

diff --git a/public/screen.pdf b/public/screen.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b759276c677615fde791c5d343238918198dd468
GIT binary patch
literal 632169
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%0D8=RfRIvFPEIH{Fkv6aG<lgi-#7>Vt0o%j
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
Mx{0%3Zg=AU2E{%Q2LJ#7

literal 0
HcmV?d00001

diff --git a/src/utils/splitScreen.js b/src/utils/splitScreen.js
new file mode 100644
index 00000000..1112c68a
--- /dev/null
+++ b/src/utils/splitScreen.js
@@ -0,0 +1,88 @@
+async function queryWindowManagement() {
+    return await navigator.permissions.query({ name: 'window-management' });;
+}
+async function getPermission() {
+    const permission = await queryWindowManagement();
+    console.log(permission.state, 'permission.state')
+    if (permission.state === "granted") { // 已经授权
+        return true
+    } else if (permission.state === "prompt") { // 询问是否授权
+        // 请求授权
+        if (navigator.permissions.request) {
+            navigator.permissions.request({ name: 'window-management' })
+        }
+        return false
+    } else if (permission.state === "denied") {
+        // 权限被拒绝
+        return false
+    }
+}
+function getScreen() {
+    return new Promise((resolve, reject) => {
+        let multiScreen = []
+        if (window.getScreenDetails) {
+            let getScreensProsime1 = window.getScreenDetails();
+            getScreensProsime1.then((c) => {
+                if (c instanceof Array) {
+                    multiScreen = c
+                } else if (c instanceof Object) {
+                    multiScreen = c.screens
+                } else {
+                    multiScreen = []
+                }
+                resolve(multiScreen)
+            }).catch((err) => {
+                reject(err)
+            });
+        } else if (window.getScreens) {
+            let getScreensProsime = window.getScreens();
+            getScreensProsime.then((c) => {
+                if (c instanceof Array) {
+                    multiScreen = c
+                } else if (c instanceof Object) {
+                    multiScreen = c.screens
+                } else {
+                    multiScreen = []
+                }
+                resolve(multiScreen)
+            }).catch((err) => {
+                reject(err)
+            })
+        }
+    })
+
+}
+export async function openWindow(url, name, Skip = false) {
+    // 判断浏览器是否兼容
+    // 高版本的谷歌，edge不支持跨屏，需要降低浏览器版本86.0版
+    if (!window.getScreens && !window.getScreenDetails) {
+        console.log('你的浏览器版本不支持多屏展示功能！');
+        return window.open(url, name);
+    }
+    let permission = await getPermission()
+    if (!permission) {
+        // alert('使用多屏功能请先进行授权')
+        if (Skip) {
+            return window.open(url, name);
+        }
+        return false
+    }
+    let multiScreen = await getScreen()
+    console.log(multiScreen, 'multiScreen')
+    // 判断是否2个屏幕
+    if (multiScreen.length < 2) {
+        console.log('请接入多个显示屏！');
+        return window.open(url, name);
+    }
+    console.log(screen, 'screen')
+    // 获取当前屏幕availLeft信息和所有信息比对，取另一个屏幕数据
+    let currentAvailLeft = screen.availLeft ? screen.availLeft : '0'
+    let newCurr = multiScreen.find((t) => t.availLeft != currentAvailLeft)
+    console.log(newCurr, 'newCurr')
+    let fulls = ''
+    for (let key in newCurr) {
+        fulls += `${key}=${(newCurr[key] || newCurr[key] === 0) ? newCurr[key] : 0},`
+    }
+    console.log(fulls, 'fulls')
+    return window.open(url, name, fulls);
+}
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Others.vue b/src/views/trials/trials-panel/reading/dicoms/components/Others.vue
index c987a2a3..771cb03e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Others.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Others.vue
@@ -3,15 +3,22 @@
     <div class="base-dialog-body" style="height:380px;overflow-y: auto;">
       <el-form ref="otherForm" :model="form">
         <!-- 自动切换下一个任务不必提示 -->
-        <el-form-item
-          :label="$t('trials:reading:label:autoSwitch')"
-          prop="AutoCutNextTask"
-          :rules="[
-            { required: true, message: $t('common:ruleMessage:select')}
-          ]"
-        >
+        <el-form-item :label="$t('trials:reading:label:autoSwitch')" prop="AutoCutNextTask" :rules="[
+          { required: true, message: $t('common:ruleMessage:select') }
+        ]">
           <el-switch v-model="form.AutoCutNextTask" />
         </el-form-item>
+        <el-form-item :label="$t('trials:reading:label:MultiScreen')" prop="IsDoubleScreen" :rules="[
+          { required: true, message: $t('common:ruleMessage:select') }
+        ]">
+          <el-switch v-model="form.IsDoubleScreen" />
+        </el-form-item>
+        <el-form-item>
+          <div><span>{{ $t("trials:reading:tip:MultiScreen") }}</span><a style="color:#409EFF" href="/screen.pdf"
+              target="blank">{{
+                $t("trials:reading:tip:openFile")
+              }}</a></div>
+        </el-form-item>
       </el-form>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@@ -27,7 +34,8 @@ export default {
   data() {
     return {
       form: {
-        AutoCutNextTask: false
+        AutoCutNextTask: false,
+        IsDoubleScreen: false
       },
       loading: false
     }
@@ -42,6 +50,7 @@ export default {
         const res = await getAutoCutNextTask()
         if (res.IsSuccess) {
           this.form.AutoCutNextTask = res.Result.AutoCutNextTask
+          this.form.IsDoubleScreen = res.Result.IsDoubleScreen
         }
         this.loading = false
       } catch (e) {
@@ -66,6 +75,4 @@ export default {
 }
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index efec58d9..b4a47e17 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -220,6 +220,7 @@ import store from '@/store'
 import { mapGetters } from 'vuex'
 import { changeURLStatic } from '@/utils/history.js'
 import AdditionalAssessment from './AdditionalAssessment'
+import { openWindow } from "@/utils/splitScreen";
 export default {
   name: 'ReportPage',
   components: { SignForm, AdditionalAssessment },
@@ -726,7 +727,7 @@ export default {
         }
       }
     },
-    previewDicoms(task) {
+    async previewDicoms(task) {
       if (this.openWindow) {
         this.openWindow.close()
       }
@@ -741,7 +742,25 @@ export default {
       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')
+      const res = await getAutoCutNextTask()
+      let IsDoubleScreen = false
+      if (res.IsSuccess) {
+        IsDoubleScreen = res.Result.IsDoubleScreen
+      }
+      if (IsDoubleScreen) {
+        this.openWindow = await openWindow(routeData.href)
+        if (!this.openWindow) {
+          let html = `<div><span>${this.$t("trials:reading:tip:MultiScreen2")}</span><a style="color:#409EFF"
+              href="/screen.pdf"
+              target="blank">${this.$t("trials:reading:tip:openFile")}</a></div>`
+          let confirm = await this.$confirm(html, '', { dangerouslyUseHTMLString: true })
+          if (!confirm) return false
+          this.openWindow = await openWindow(routeData.href, '', true)
+        }
+      } else {
+        this.openWindow = window.open(routeData.href, "_blank");
+      }
+      // this.openWindow = window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
       return new Promise(async (resolve, reject) => {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
index 2820690e..ee1a2f81 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
@@ -280,7 +280,8 @@ export default {
       tableAnswers: {},
       questionForm: {},
       questionId: null,
-      digitPlaces: 2
+      digitPlaces: 2,
+      openWindow: null
     }
   },
   watch: {
@@ -408,7 +409,7 @@ export default {
         }
         if (v.Type === 'number') {
           // this.$set(this.questionForm, v.QuestionId, v.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : v.Answers[this.visitTaskId])
-          this.$set(this.questionForm, v.QuestionId,  v.Answers[this.visitTaskId])
+          this.$set(this.questionForm, v.QuestionId, v.Answers[this.visitTaskId])
         }
         if (v.Childrens.length > 0) {
           this.setChild(v.Childrens)
@@ -427,7 +428,7 @@ export default {
         }
         if (i.Type === 'number') {
           // this.$set(this.questionForm, i.QuestionId, i.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : i.Answers[this.visitTaskId])
-          this.$set(this.questionForm, i.QuestionId,  i.Answers[this.visitTaskId])
+          this.$set(this.questionForm, i.QuestionId, i.Answers[this.visitTaskId])
         }
         if (i.Childrens && i.Childrens.length > 0 && i.Type !== 'table' && i.Type !== 'basicTable') {
           this.setChild(i.Childrens)
@@ -826,7 +827,10 @@ export default {
         }
       }
     },
-    previewDicoms(task) {
+    async previewDicoms(task) {
+      if (this.openWindow) {
+        this.openWindow.close()
+      }
       var token = getToken()
       // var subjectCode = this.$router.currentRoute.query.subjectCode
       var subjectCode = localStorage.getItem('subjectCode')
@@ -838,7 +842,25 @@ export default {
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       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 })
-      window.open(routeData.href, '_blank')
+      const res = await getAutoCutNextTask()
+      let IsDoubleScreen = false
+      if (res.IsSuccess) {
+        IsDoubleScreen = res.Result.IsDoubleScreen
+      }
+      if (IsDoubleScreen) {
+        this.openWindow = await openWindow(routeData.href)
+        if (!this.openWindow) {
+          let html = `<div><span>${this.$t("trials:reading:tip:MultiScreen2")}</span><a style="color:#409EFF"
+              href="/screen.pdf"
+              target="blank">${this.$t("trials:reading:tip:openFile")}</a></div>`
+          let confirm = await this.$confirm(html, '', { dangerouslyUseHTMLString: true })
+          if (!confirm) return false
+          this.openWindow = await openWindow(routeData.href, '', true)
+        }
+      } else {
+        this.openWindow = window.open(routeData.href, "_blank");
+      }
+      // window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
       return new Promise((resolve, reject) => {
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 821b3aa8..9807d7fc 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -218,6 +218,7 @@ import { getToken } from '@/utils/auth'
 import { mapGetters } from 'vuex'
 import { changeURLStatic } from '@/utils/history.js'
 import AdditionalAssessment from '@/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment'
+import { openWindow } from "@/utils/splitScreen";
 export default {
   name: 'ReportPage',
   components: { SignForm, AdditionalAssessment },
@@ -673,7 +674,7 @@ export default {
         }
       }
     },
-    previewDicoms(task) {
+    async previewDicoms(task) {
       if (this.openWindow) {
         this.openWindow.close()
       }
@@ -688,7 +689,25 @@ export default {
       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')
+      const res = await getAutoCutNextTask()
+      let IsDoubleScreen = false
+      if (res.IsSuccess) {
+        IsDoubleScreen = res.Result.IsDoubleScreen
+      }
+      if (IsDoubleScreen) {
+        this.openWindow = await openWindow(routeData.href)
+        if (!this.openWindow) {
+          let html = `<div><span>${this.$t("trials:reading:tip:MultiScreen2")}</span><a style="color:#409EFF"
+              href="/screen.pdf"
+              target="blank">${this.$t("trials:reading:tip:openFile")}</a></div>`
+          let confirm = await this.$confirm(html, '', { dangerouslyUseHTMLString: true })
+          if (!confirm) return false
+          this.openWindow = await openWindow(routeData.href, '', true)
+        }
+      } else {
+        this.openWindow = window.open(routeData.href, "_blank");
+      }
+      // this.openWindow = window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
       return new Promise(async (resolve, reject) => {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
index f5642050..3871653a 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
@@ -215,6 +215,7 @@ import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
 import SignForm from '@/views/trials/components/newSignForm'
 import { getToken } from '@/utils/auth'
+import { openWindow } from "@/utils/splitScreen";
 export default {
   name: 'CustomizeReportPage',
   components: { SignForm },
@@ -734,7 +735,7 @@ export default {
         }
       }
     },
-    previewDicoms(task) {
+    async previewDicoms(task) {
       if (this.openWindow) {
         this.openWindow.close()
       }
@@ -749,7 +750,25 @@ export default {
       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')
+      const res = await getAutoCutNextTask()
+      let IsDoubleScreen = false
+      if (res.IsSuccess) {
+        IsDoubleScreen = res.Result.IsDoubleScreen
+      }
+      if (IsDoubleScreen) {
+        this.openWindow = await openWindow(routeData.href)
+        if (!this.openWindow) {
+          let html = `<div><span>${this.$t("trials:reading:tip:MultiScreen2")}</span><a style="color:#409EFF"
+              href="/screen.pdf"
+              target="blank">${this.$t("trials:reading:tip:openFile")}</a></div>`
+          let confirm = await this.$confirm(html, '', { dangerouslyUseHTMLString: true })
+          if (!confirm) return false
+          this.openWindow = await openWindow(routeData.href, '', true)
+        }
+      } else {
+        this.openWindow = window.open(routeData.href, "_blank");
+      }
+      // this.openWindow = window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
       return new Promise((resolve, reject) => {
diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 77c36598..9806866a 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -1,7 +1,8 @@
 <template>
   <BaseContainer v-loading="loading" class="read-task">
     <el-tabs v-model="TrialReadingCriterionId" type="border-card">
-      <el-tab-pane v-for="item of trialCriterionList" :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
+      <el-tab-pane v-for="item of trialCriterionList" :key="item.TrialReadingCriterionId"
+        :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
         <div v-if="TrialReadingCriterionId === item.TrialReadingCriterionId">
           <div slot="search-container" style="position:relative;">
             <el-form :inline="true">
@@ -13,11 +14,7 @@
               </el-form-item>
               <!-- 受试者编号 -->
               <el-form-item :label="$t('trials:readTask:table:subjectCode')">
-                <el-input
-                  v-model="searchData.SubjectCode"
-                  style="width:130px;"
-                  clearable
-                />
+                <el-input v-model="searchData.SubjectCode" style="width:130px;" clearable />
               </el-form-item>
               <!-- 任务状态 -->
               <el-form-item style="margin-bottom:10px" :label="$t('trials:readTask:table:taskState')">
@@ -28,10 +25,11 @@
               <!-- 任务类型 -->
               <el-form-item style="margin-bottom:10px" :label="$t('trials:readTask:table:readingCategory')">
                 <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
-                  <el-option v-for="i of $d.ReadingCategory" :key="'ReadingCategory' + i.label" :value="i.value" :label="i.label" />
+                  <el-option v-for="i of $d.ReadingCategory" :key="'ReadingCategory' + i.label" :value="i.value"
+                    :label="i.label" />
                 </el-select>
               </el-form-item>
-              
+
               <el-form-item>
                 <!-- 查询 -->
                 <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -45,34 +43,19 @@
 
             </el-form>
             <span style="position: absolute;right: 0;top: 0;">
-              <el-button
-                v-hasPermi="['trials:readTask:reread']"
-                :disabled="list.length ===0"
-                type="primary"
-                icon="el-icon-refresh-right"
-                @click="handleReread"
-              >
+              <el-button v-hasPermi="['trials:readTask:reread']" :disabled="list.length === 0" type="primary"
+                icon="el-icon-refresh-right" @click="handleReread">
                 {{ $t('trials:readTask:button:reread') }}
               </el-button>
             </span>
           </div>
           <div slot="main-container">
-            <el-table
-              v-adaptive="{bottomOffset:75}"
-              :data="list"
-              stripe
-              height="100"
-              @sort-change="handleSortChange"
-            >
+            <el-table v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100"
+              @sort-change="handleSortChange">
               <el-table-column type="index" width="40" align="left" />
               <!-- 是否加急 -->
-              <el-table-column
-                prop="IsUrgent"
-                min-width="100"
-                :label="$t('trials:readTask:table:isUrgent')"
-                sortable="custom"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="IsUrgent" min-width="100" :label="$t('trials:readTask:table:isUrgent')"
+                sortable="custom" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-tag v-if="scope.row.IsUrgent" type="danger">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
                   <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
@@ -87,21 +70,11 @@
                 show-overflow-tooltip
               /> -->
               <!-- 受试者编号 -->
-              <el-table-column
-                prop="SubjectCode"
-                min-width="100"
-                :label="$t('trials:readTask:table:subjectCode')"
-                sortable="custom"
-                show-overflow-tooltip
-              />
+              <el-table-column prop="SubjectCode" min-width="100" :label="$t('trials:readTask:table:subjectCode')"
+                sortable="custom" show-overflow-tooltip />
               <!-- 盲态任务标识 -->
-              <el-table-column
-                prop="TaskBlindName"
-                min-width="100"
-                :label="$t('trials:readTask:table:blindName')"
-                sortable="custom"
-                show-overflow-tooltip
-              />
+              <el-table-column prop="TaskBlindName" min-width="100" :label="$t('trials:readTask:table:blindName')"
+                sortable="custom" show-overflow-tooltip />
               <!-- 阅片标准 -->
               <!-- <el-table-column
                 prop="TrialReadingCriterionName"
@@ -111,34 +84,33 @@
                 sortable="custom"
               /> -->
               <!-- 任务状态 -->
-              <el-table-column
-                prop="TaskState"
-                :label="$t('trials:readTask:table:taskState')"
-                min-width="100"
-                sortable="custom"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="TaskState" :label="$t('trials:readTask:table:taskState')" min-width="100"
+                sortable="custom" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                  <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState)
+                  }}</el-tag>
+                  <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState)
+                  }}</el-tag>
+                  <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState)
+                  }}</el-tag>
+                  <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState)
+                  }}</el-tag>
+                  <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState)
+                  }}</el-tag>
                 </template>
               </el-table-column>
               <!-- 任务类型 -->
-              <el-table-column
-                prop="ReadingCategory"
-                min-width="90"
-                :label="$t('trials:readTask:table:readingCategory')"
-                sortable="custom"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="ReadingCategory" min-width="90"
+                :label="$t('trials:readTask:table:readingCategory')" sortable="custom" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
-                  <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
-                  <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
-                  <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                  <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory',
+                    scope.row.ReadingCategory) }}</el-tag>
+                  <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory',
+                    scope.row.ReadingCategory) }}</el-tag>
+                  <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory',
+                    scope.row.ReadingCategory) }}</el-tag>
+                  <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory',
+                    scope.row.ReadingCategory) }}</el-tag>
                 </template>
               </el-table-column>
               <!-- 阅片状态 -->
@@ -162,94 +134,55 @@
               <!--                show-overflow-tooltip-->
               <!--              />-->
               <!-- 签名时间 -->
-              <el-table-column
-                prop="SignTime"
-                min-width="120"
-                :label="$t('trials:readTask:table:signTime')"
-                sortable="custom"
-                show-overflow-tooltip
-              />
+              <el-table-column prop="SignTime" min-width="120" :label="$t('trials:readTask:table:signTime')"
+                sortable="custom" show-overflow-tooltip />
               <!-- 申请状态 -->
-              <el-table-column
-                v-if="!hasPermi(['role:air'])"
-                prop="ReReadingApplyState"
-                :label="$t('trials:readTask:table:reReadingApplyState')"
-                min-width="140"
-                sortable="custom"
-                show-overflow-tooltip
-              >
+              <el-table-column v-if="!hasPermi(['role:air'])" prop="ReReadingApplyState"
+                :label="$t('trials:readTask:table:reReadingApplyState')" min-width="140" sortable="custom"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <el-tag v-if="scope.row.ReReadingApplyState === 4 || scope.row.ReReadingApplyState === 5" type="danger">{{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }}</el-tag>
-                  <el-tag v-if="scope.row.ReReadingApplyState === 2" type="primary">{{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }}</el-tag>
-                  <el-tag v-if="scope.row.ReReadingApplyState === 3" type="warning">{{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }}</el-tag>
+                  <el-tag v-if="scope.row.ReReadingApplyState === 4 || scope.row.ReReadingApplyState === 5"
+                    type="danger">{{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }}</el-tag>
+                  <el-tag v-if="scope.row.ReReadingApplyState === 2" type="primary">{{ $fd('ReReadingApplyState',
+                    scope.row.ReReadingApplyState) }}</el-tag>
+                  <el-tag v-if="scope.row.ReReadingApplyState === 3" type="warning">{{ $fd('ReReadingApplyState',
+                    scope.row.ReReadingApplyState) }}</el-tag>
                 </template>
               </el-table-column>
-              <el-table-column
-                :label="$t('common:action:action')"
-                width="250"
-                fixed="right"
-              >
+              <el-table-column :label="$t('common:action:action')" width="250" fixed="right">
                 <template slot-scope="scope">
                   <!-- 查看 -->
-                  <el-button
-                    circle
-                    :title="$t('trials:readTask:button:view')"
-                    icon="el-icon-view"
-                    @click="handleReadImage(scope.row)"
-                  />
+                  <el-button circle :title="$t('trials:readTask:button:view')" icon="el-icon-view"
+                    @click="handleReadImage(scope.row)" />
                   <!-- 申请重阅 -->
-                  <el-button
-                    v-hasPermi="['trials:readTask:apply']"
+                  <el-button v-hasPermi="['trials:readTask:apply']"
                     :disabled="(scope.row.TaskState !== 0 && scope.row.TaskState !== 5) || scope.row.ReadingTaskState !== 2 || scope.row.ReReadingApplyState === 2 || scope.row.ReReadingApplyState === 4 || scope.row.ReReadingApplyState === 5"
-                    icon="el-icon-collection"
-                    circle
-                    :title="$t('trials:readTask:button:apply')"
-                    @click="openApplyReReading(scope.row)"
-                  />
-                  <el-button
-                    v-hasPermi="['trials:readTask:backwardHistory']"
-                    :disabled="!scope.row.ReReadingApplyState"
-                    icon="el-icon-toilet-paper"
-                    circle
-                    :title="$t('trials:readTask:button:backward')"
-                    @click="reReadingHistory(scope.row, 1)"
-                  />
+                    icon="el-icon-collection" circle :title="$t('trials:readTask:button:apply')"
+                    @click="openApplyReReading(scope.row)" />
+                  <el-button v-hasPermi="['trials:readTask:backwardHistory']" :disabled="!scope.row.ReReadingApplyState"
+                    icon="el-icon-toilet-paper" circle :title="$t('trials:readTask:button:backward')"
+                    @click="reReadingHistory(scope.row, 1)" />
                 </template>
               </el-table-column>
             </el-table>
             <!-- 分页组件 -->
-            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+              @pagination="getList" />
           </div>
         </div>
       </el-tab-pane>
     </el-tabs>
-    <el-dialog
-      v-if="ApplyforReasonVisible"
-      :title="$t('trials:readTask:dagTitle:apply')"
-      :visible.sync="ApplyforReasonVisible"
-      width="1460px"
-      append-to-body
-      :close-on-click-modal="false"
-      custom-class="base-dialog-wrapper"
-    >
-      <el-form
-        ref="reasonForm"
-        :rules="rules"
-        :model="ApplyforReasonForm"
-        class="demo-ruleForm"
-        size="small"
-        label-width="380px"
-      >
+    <el-dialog v-if="ApplyforReasonVisible" :title="$t('trials:readTask:dagTitle:apply')"
+      :visible.sync="ApplyforReasonVisible" width="1460px" append-to-body :close-on-click-modal="false"
+      custom-class="base-dialog-wrapper">
+      <el-form ref="reasonForm" :rules="rules" :model="ApplyforReasonForm" class="demo-ruleForm" size="small"
+        label-width="380px">
         <!-- 申请原因 -->
         <el-divider content-position="left">{{ $t('trials:readTask:title:applyReason') }}</el-divider>
         <!-- 申请原因 -->
-        <el-form-item
-          :label="$t('trials:readTask:title:applyReason')"
-          prop="Type"
-          :rules="[
-            { required: true, message: $t('common:ruleMessage:select')},
-          ]"
-        >
+        <el-form-item :label="$t('trials:readTask:title:applyReason')" prop="Type" :rules="[
+          { required: true, message: $t('common:ruleMessage:select') },
+        ]">
           <el-radio-group v-model="ApplyforReasonForm.Type">
             <!-- 阅片记录错误 -->
             <el-radio :label="1">{{ $t('trials:readTask:option:errorRecords') }}</el-radio>
@@ -258,61 +191,35 @@
           </el-radio-group>
         </el-form-item>
         <!-- 备注 -->
-        <el-form-item v-if="ApplyforReasonForm.Type === 2" :label="$t('trials:readTask:title:remark')" prop="RequestReReadingReason">
-          <el-input
-            v-model="ApplyforReasonForm.RequestReReadingReason"
-            type="textarea"
-            style="width: 400px"
-            :autosize="{ minRows: 2, maxRows: 4}"
-            :placeholder="$t('common:ruleMessage:specify')"
-            maxlength="500"
-            show-word-limit
-          />
+        <el-form-item v-if="ApplyforReasonForm.Type === 2" :label="$t('trials:readTask:title:remark')"
+          prop="RequestReReadingReason">
+          <el-input v-model="ApplyforReasonForm.RequestReReadingReason" type="textarea" style="width: 400px"
+            :autosize="{ minRows: 2, maxRows: 4 }" :placeholder="$t('common:ruleMessage:specify')" maxlength="500"
+            show-word-limit />
         </el-form-item>
         <!-- 是否复制阅片表单 -->
-        <el-form-item
-          :label="$t('trials:readTask:title:copyForm')"
-          prop="IsCopyOrigenalForms"
-          :rules="[
-            { required: true, message: $t('common:ruleMessage:select')},
-          ]"
-        >
+        <el-form-item :label="$t('trials:readTask:title:copyForm')" prop="IsCopyOrigenalForms" :rules="[
+          { required: true, message: $t('common:ruleMessage:select') },
+        ]">
           <el-radio-group v-model="ApplyforReasonForm.IsCopyOrigenalForms">
-            <el-radio v-for="item of $d.YesOrNo" :key="`IsCopyOrigenalForms${item.raw.Id}`" :label="item.value">{{ item.label }}</el-radio>
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsCopyOrigenalForms${item.raw.Id}`" :label="item.value">{{
+              item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
       <!-- 影响的任务列表 -->
       <el-divider content-position="left">{{ $t('trials:readTask:title:influenceList') }}</el-divider>
       <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
-        <el-table
-          v-loading="loading"
-          :data="InfluenceTaskList"
-          stripe
-          height="100"
-          style="min-height: 400px;"
-        >
+        <el-table v-loading="loading" :data="InfluenceTaskList" stripe height="100" style="min-height: 400px;">
           <!-- 任务编号 -->
-          <el-table-column
-            prop="TaskCode"
-            :label="$t('trials:readTask:table:taskCode')"
-            min-width="100"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="TaskCode" :label="$t('trials:readTask:table:taskCode')" min-width="100"
+            show-overflow-tooltip />
           <!-- 中心编号 -->
-          <el-table-column
-            prop="TrialSiteCode"
-            :label="$t('trials:readTask:table:siteCode')"
-            min-width="100"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="TrialSiteCode" :label="$t('trials:readTask:table:siteCode')" min-width="100"
+            show-overflow-tooltip />
           <!-- 受试者编号 -->
-          <el-table-column
-            prop="SubjectCode"
-            :label="$t('trials:readTask:table:subjectCode')"
-            min-width="120"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="SubjectCode" :label="$t('trials:readTask:table:subjectCode')" min-width="120"
+            show-overflow-tooltip />
           <!-- <el-table-column
             prop="VisitTaskNum"
             label="访视/阅片期名称"
@@ -324,80 +231,64 @@
             </template>
           </el-table-column> -->
           <!-- 盲态任务标识 -->
-          <el-table-column
-            prop="TaskBlindName"
-            :label="$t('trials:readTask:table:blindName')"
-            min-width="120"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="TaskBlindName" :label="$t('trials:readTask:table:blindName')" min-width="120"
+            show-overflow-tooltip />
           <!-- 阅片标准 -->
-          <el-table-column
-            prop="TrialReadingCriterionName"
-            :label="$t('trials:readTask:table:criterionName')"
-            min-width="100"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="TrialReadingCriterionName" :label="$t('trials:readTask:table:criterionName')"
+            min-width="100" show-overflow-tooltip />
           <!-- 任务状态 -->
-          <el-table-column
-            prop="TaskState"
-            :label="$t('trials:readTask:table:taskState')"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="TaskState" :label="$t('trials:readTask:table:taskState')" min-width="100"
+            show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+              <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState)
+              }}</el-tag>
               <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-              <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-              <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-              <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+              <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState)
+              }}</el-tag>
+              <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState)
+              }}</el-tag>
+              <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState)
+              }}</el-tag>
             </template>
           </el-table-column>
           <!-- 任务类型 -->
-          <el-table-column
-            prop="ReadingCategory"
-            min-width="100"
-            :label="$t('trials:readTask:table:readingCategory')"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="ReadingCategory" min-width="100" :label="$t('trials:readTask:table:readingCategory')"
+            show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
-              <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
-              <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
-              <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+              <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory',
+                scope.row.ReadingCategory) }}</el-tag>
+              <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory',
+                scope.row.ReadingCategory) }}</el-tag>
+              <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory',
+                scope.row.ReadingCategory) }}</el-tag>
+              <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory',
+                scope.row.ReadingCategory) }}</el-tag>
             </template>
           </el-table-column>
           <!-- 阅片状态 -->
-          <el-table-column
-            prop="ReadingTaskState"
-            :label="$t('trials:readTask:table:readingTaskState')"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="ReadingTaskState" :label="$t('trials:readTask:table:readingTaskState')" min-width="100"
+            show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
+              <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState',
+                scope.row.ReadingTaskState) }}</el-tag>
               <el-tag v-else type="danger">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
             </template>
           </el-table-column>
           <!-- 生效后影响 -->
-          <el-table-column
-            prop="OptType"
-            :label="$t('trials:readTask:table:optType')"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="OptType" :label="$t('trials:readTask:table:optType')" min-width="100"
+            show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.OptType === 0" type="primary">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
-              <el-tag v-if="scope.row.OptType === 1" type="danger">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
-              <el-tag v-if="scope.row.OptType === 2" type="warning">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
+              <el-tag v-if="scope.row.OptType === 0" type="primary">{{ $fd('ReReadingOrBackOptType', scope.row.OptType)
+              }}</el-tag>
+              <el-tag v-if="scope.row.OptType === 1" type="danger">{{ $fd('ReReadingOrBackOptType', scope.row.OptType)
+              }}</el-tag>
+              <el-tag v-if="scope.row.OptType === 2" type="warning">{{ $fd('ReReadingOrBackOptType', scope.row.OptType)
+              }}</el-tag>
             </template>
           </el-table-column>
           <!-- 阅片人 -->
-          <el-table-column
-            prop="UserName"
-            :label="$t('trials:readTask:table:reader')"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="UserName" :label="$t('trials:readTask:table:reader')" min-width="160"
+            show-overflow-tooltip>
             <template v-if="scope.row.DoctorUser" slot-scope="scope">
               {{ scope.row.DoctorUser.UserName }}({{ scope.row.DoctorUser.FullName }})
             </template>
@@ -406,7 +297,8 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <!-- 取消 -->
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="ApplyforReasonVisible = false;ApplyforReasonForm = { Type: null, RequestReReadingReason: null }">
+        <el-button :disabled="btnLoading" size="small" type="primary"
+          @click="ApplyforReasonVisible = false; ApplyforReasonForm = { Type: null, RequestReReadingReason: null }">
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
@@ -420,10 +312,11 @@
 <script>
 import { getIRHaveReadTaskList, aIRReReading } from '@/api/trials'
 import { applyReReading, getReReadingOrBackInfluenceTaskList, getTrialCriterionList } from '@/api/trials/reading'
-
+import { getAutoCutNextTask } from '@/api/user'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
+import { openWindow } from "@/utils/splitScreen";
 const searchDataDefault = () => {
   return {
     SubjectCode: '',
@@ -485,7 +378,7 @@ export default {
       getTrialCriterionList(this.trialId).then(res => {
         this.trialCriterionList = res.Result
         this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 重阅历史
     reReadingHistory(row) {
@@ -509,7 +402,7 @@ export default {
       this.searchData = searchDataDefault()
       this.getList()
     },
-    handleReadImage(row) {
+    async handleReadImage(row) {
       if (this.openWindow) {
         this.openWindow.close()
       }
@@ -521,13 +414,31 @@ export default {
       window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
       var token = getToken()
       var path = ''
-      if (row.ReadingTool === 0 || row.ReadingTool === 2 ) {
+      if (row.ReadingTool === 0 || row.ReadingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`
       }
       var routeData = this.$router.resolve({ path })
-      this.openWindow = window.open(routeData.href, '_blank')
+      const res = await getAutoCutNextTask()
+      let IsDoubleScreen = false
+      if (res.IsSuccess) {
+        IsDoubleScreen = res.Result.IsDoubleScreen
+      }
+      if (IsDoubleScreen) {
+        this.openWindow = await openWindow(routeData.href)
+        if (!this.openWindow) {
+          let html = `<div><span>${this.$t("trials:reading:tip:MultiScreen2")}</span><a style="color:#409EFF"
+              href="/screen.pdf"
+              target="blank">${this.$t("trials:reading:tip:openFile")}</a></div>`
+          let confirm = await this.$confirm(html, '', { dangerouslyUseHTMLString: true })
+          if (!confirm) return false
+          this.openWindow = await openWindow(routeData.href, '', true)
+        }
+      } else {
+        this.openWindow = window.open(routeData.href, "_blank");
+      }
+      // this.openWindow = window.open(routeData.href, '_blank')
     },
     openApplyReReading(row) {
       this.rowData = { ...row }
@@ -608,11 +519,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .read-task{
-    height: 100%;
-    background-color: #fff;
-    ::v-deep.search {
-      padding: 0px !important;
-    }
+.read-task {
+  height: 100%;
+  background-color: #fff;
+
+  ::v-deep.search {
+    padding: 0px !important;
   }
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index a9cbff5b..d3b50bbc 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -1,272 +1,147 @@
 <template>
-  <BaseContainer
-    v-loading="loading"
-    class="reading-task"
-  >
-    <el-tabs
-      v-if="TrialReadingCriterionId"
-      v-model="TrialReadingCriterionId"
-      type="border-card"
-    >
-      <el-tab-pane
-        v-for="item of trialCriterionList"
-        :key="item.TrialReadingCriterionId"
-        :label="item.TrialReadingCriterionName"
-        :name="item.TrialReadingCriterionId"
-      >
-        <div
-          v-if="
-            (isReadingTaskViewInOrder === 1 ||
-              isReadingTaskViewInOrder === 2) &&
-            TrialReadingCriterionId === item.TrialReadingCriterionId
-          "
-        >
+  <BaseContainer v-loading="loading" class="reading-task">
+    <el-tabs v-if="TrialReadingCriterionId" v-model="TrialReadingCriterionId" type="border-card">
+      <el-tab-pane v-for="item of trialCriterionList" :key="item.TrialReadingCriterionId"
+        :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
+        <div v-if="
+          (isReadingTaskViewInOrder === 1 ||
+            isReadingTaskViewInOrder === 2) &&
+          TrialReadingCriterionId === item.TrialReadingCriterionId
+        ">
           <div slot="search-container">
             <el-form :inline="true">
               <!-- 受试者编号 -->
-              <el-form-item
-                :label="$t('trials:pendingReadingTasks:table:subjectCode')"
-              >
-                <el-input
-                  v-model="searchData.SubjectCode"
-                  style="width: 130px"
-                  clearable
-                />
+              <el-form-item :label="$t('trials:pendingReadingTasks:table:subjectCode')">
+                <el-input v-model="searchData.SubjectCode" style="width: 130px" clearable />
               </el-form-item>
 
               <el-form-item>
                 <!-- 查询 -->
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="handleSearch"
-                >
+                <el-button type="primary" icon="el-icon-search" @click="handleSearch">
                   {{ $t('common:button:search') }}
                 </el-button>
                 <!-- 重置 -->
-                <el-button
-                  type="primary"
-                  icon="el-icon-refresh-left"
-                  @click="handleReset"
-                >
+                <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
                   {{ $t('common:button:reset') }}
                 </el-button>
               </el-form-item>
             </el-form>
           </div>
           <div slot="main-container">
-            <el-table
-              v-adaptive="{ bottomOffset: 75 }"
-              :data="list"
-              stripe
-              height="100"
-              @sort-change="handleSortChange"
-            >
+            <el-table v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100"
+              @sort-change="handleSortChange">
               <el-table-column type="index" width="40" align="left" />
-              <el-table-column
-                prop="IsUrgent"
-                :label="$t('trials:consistencyCheck:table:isUrgent')"
-                show-overflow-tooltip
-                min-width="100"
-              >
+              <el-table-column prop="IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
+                show-overflow-tooltip min-width="100">
                 <template slot-scope="scope">
-                  <el-tooltip
-                    class="item"
-                    effect="dark"
-                    :content="$t('trials:pendingReadingTasks:table:feedbackmsg')"
-                    placement="bottom"
-                    v-if="scope.row.IsExistUnprocessedFeedback"
-                  >
-                    <i
-                      v-if="scope.row.IsExistUnprocessedFeedback"
-                      class="el-icon-warning"
-                      style="color: #f44336; font-size: 16px"
-                    />
+                  <el-tooltip class="item" effect="dark" :content="$t('trials:pendingReadingTasks:table:feedbackmsg')"
+                    placement="bottom" v-if="scope.row.IsExistUnprocessedFeedback">
+                    <i v-if="scope.row.IsExistUnprocessedFeedback" class="el-icon-warning"
+                      style="color: #f44336; font-size: 16px" />
                   </el-tooltip>
-                  <el-tag
-                    :type="
-                      scope.row.UrgentColor === 1
-                        ? 'danger'
-                        : scope.row.UrgentColor === 2
-                        ? 'warning'
-                        : 'primary'
-                    "
-                    >{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag
-                  >
+                  <el-tag :type="scope.row.UrgentColor === 1
+                    ? 'danger'
+                    : scope.row.UrgentColor === 2
+                      ? 'warning'
+                      : 'primary'
+                    ">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
                 </template>
               </el-table-column>
               <!-- 受试者编号 -->
-              <el-table-column
-                prop="SubjectCode"
-                min-width="100"
-                :label="$t('trials:pendingReadingTasks:table:subjectCode')"
-                show-overflow-tooltip
-                sortable="custom"
-              />
+              <el-table-column prop="SubjectCode" min-width="100"
+                :label="$t('trials:pendingReadingTasks:table:subjectCode')" show-overflow-tooltip sortable="custom" />
               <!-- 剩余阅片量 -->
-              <el-table-column
-                prop="UnReadCanReadTaskCount"
-                min-width="100"
-                :label="
-                  $t('trials:pendingReadingTasks:table:remainingReadingVolume')
-                "
-                show-overflow-tooltip
-                sortable="custom"
-              />
-              <el-table-column
-                prop="UrgentCount"
-                :label="$t('trials:sysDocBeSigned:table:UrgentCount')"
-                show-overflow-tooltip
-                min-width="100"
-                sortable="custom"
-              >
+              <el-table-column prop="UnReadCanReadTaskCount" min-width="100" :label="$t('trials:pendingReadingTasks:table:remainingReadingVolume')
+                " show-overflow-tooltip sortable="custom" />
+              <el-table-column prop="UrgentCount" :label="$t('trials:sysDocBeSigned:table:UrgentCount')"
+                show-overflow-tooltip min-width="100" sortable="custom">
                 <template slot-scope="scope">
-                  <span
-                    :style="{
-                      color:
-                        scope.row.UrgentColor === 1
-                          ? '#F56C6C'
-                          : scope.row.UrgentColor === 2
+                  <span :style="{
+                    color:
+                      scope.row.UrgentColor === 1
+                        ? '#F56C6C'
+                        : scope.row.UrgentColor === 2
                           ? '#E6A23C'
                           : '#409EFF',
-                    }"
-                    >{{ scope.row.UrgentCount }}</span
-                  >
+                  }">{{ scope.row.UrgentCount }}</span>
                 </template>
               </el-table-column>
               <!-- 建议完成时间 -->
-              <el-table-column
-                prop="SuggesteFinishedTime"
-                min-width="100"
-                :label="
-                  $t('trials:pendingReadingTasks:table:suggestedCompletionTime')
-                "
-                show-overflow-tooltip
-                sortable="custom"
-              >
+              <el-table-column prop="SuggesteFinishedTime" min-width="100" :label="$t('trials:pendingReadingTasks:table:suggestedCompletionTime')
+                " show-overflow-tooltip sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.SuggesteFinishedTime.split(':')[0] + ':00:00' }}
                 </template>
               </el-table-column>
-              <el-table-column
-                :label="$t('common:action:action')"
-                width="250"
-                fixed="right"
-              >
+              <el-table-column :label="$t('common:action:action')" width="250" fixed="right">
                 <template slot-scope="scope">
                   <!-- 阅片 -->
-                  <el-button
-                    :disabled="scope.row.ExistReadingApply"
-                    circle
-                    :title="
-                      scope.row.ExistReadingApply
-                        ? $t(
-                            'trials:pendingReadingTasks:button:ExistReadingApply'
-                          )
-                        : $t('trials:pendingReadingTasks:button:review')
-                    "
-                    icon="el-icon-edit-outline"
-                    @click="handleReadImage(scope.row)"
-                  />
+                  <el-button :disabled="scope.row.ExistReadingApply" circle :title="scope.row.ExistReadingApply
+                    ? $t(
+                      'trials:pendingReadingTasks:button:ExistReadingApply'
+                    )
+                    : $t('trials:pendingReadingTasks:button:review')
+                    " icon="el-icon-edit-outline" @click="handleReadImage(scope.row)" />
                   <!-- 上传 -->
-                  <el-button
-                    v-if="
-                      item.ImageUploadEnum > 0 &&
-                      item.IsReadingTaskViewInOrder > 1 &&
-                      !scope.row.IsSubjectJudge
-                    "
-                    v-hasPermi="['role:ir']"
-                    circle
-                    icon="el-icon-upload2"
+                  <el-button v-if="
+                    item.ImageUploadEnum > 0 &&
+                    item.IsReadingTaskViewInOrder > 1 &&
+                    !scope.row.IsSubjectJudge
+                  " v-hasPermi="['role:ir']" circle icon="el-icon-upload2"
                     :title="$t('trials:pendingReadingTasks:button:upload')"
-                    @click="openUploadImage(scope.row, item, 'upload')"
-                  />
+                    @click="openUploadImage(scope.row, item, 'upload')" />
                   <!-- 下载 -->
-                  <el-button
-                    v-if="
-                      item.ImageDownloadEnum > 0 &&
-                      item.IsReadingTaskViewInOrder > 1 &&
-                      !scope.row.IsSubjectJudge
-                    "
-                    v-hasPermi="['role:ir']"
-                    circle
-                    icon="el-icon-download"
+                  <el-button v-if="
+                    item.ImageDownloadEnum > 0 &&
+                    item.IsReadingTaskViewInOrder > 1 &&
+                    !scope.row.IsSubjectJudge
+                  " v-hasPermi="['role:ir']" circle icon="el-icon-download"
                     :title="$t('trials:pendingReadingTasks:button:download')"
-                    @click="openUploadImage(scope.row, item, 'download')"
-                  />
+                    @click="openUploadImage(scope.row, item, 'download')" />
                 </template>
               </el-table-column>
             </el-table>
-            <pagination
-              class="page"
-              :total="total"
-              :page.sync="searchData.PageIndex"
-              :limit.sync="searchData.PageSize"
-              @pagination="getList"
-            />
+            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+              @pagination="getList" />
           </div>
         </div>
-        <div
-          v-else-if="
-            isReadingTaskViewInOrder === 0 &&
-            TrialReadingCriterionId === item.TrialReadingCriterionId
-          "
-        >
+        <div v-else-if="
+          isReadingTaskViewInOrder === 0 &&
+          TrialReadingCriterionId === item.TrialReadingCriterionId
+        ">
           <el-descriptions :column="2" border style="width: 800px">
             <!-- 剩余任务量 -->
-            <el-descriptions-item
-              :label="
-                $t('trials:pendingReadingTasks:table:remainingTaskVolume')
-              "
-              :label-style="{ width: '200px' }"
-            >
+            <el-descriptions-item :label="$t('trials:pendingReadingTasks:table:remainingTaskVolume')
+              " :label-style="{ width: '200px' }">
               <el-tag size="small" type="danger">{{
                 randomReadInfo.UnReadTaskCount
               }}</el-tag>
             </el-descriptions-item>
             <!-- 剩余裁判量 -->
-            <el-descriptions-item
-              :label="
-                $t('trials:pendingReadingTasks:table:amountOfJudgesRemaining')
-              "
-              :label-style="{ width: '200px' }"
-            >
+            <el-descriptions-item :label="$t('trials:pendingReadingTasks:table:amountOfJudgesRemaining')
+              " :label-style="{ width: '200px' }">
               <el-tag size="small" type="danger">{{
                 randomReadInfo.UnReadJudgeTaskCount
               }}</el-tag>
             </el-descriptions-item>
             <!-- 已完成任务量 -->
-            <el-descriptions-item
-              :label="
-                $t('trials:pendingReadingTasks:table:amountOfCompletedTasks')
-              "
-              :label-style="{ width: '200px' }"
-            >
+            <el-descriptions-item :label="$t('trials:pendingReadingTasks:table:amountOfCompletedTasks')
+              " :label-style="{ width: '200px' }">
               <el-tag size="small">{{ randomReadInfo.FinishTaskCount }}</el-tag>
             </el-descriptions-item>
             <!-- 已完成裁判量 -->
-            <el-descriptions-item
-              :label="
-                $t('trials:pendingReadingTasks:table:numberOfJudgesCompleted')
-              "
-              :label-style="{ width: '200px' }"
-            >
+            <el-descriptions-item :label="$t('trials:pendingReadingTasks:table:numberOfJudgesCompleted')
+              " :label-style="{ width: '200px' }">
               <el-tag size="small">{{
                 randomReadInfo.FinishJudgeTaskCount
               }}</el-tag>
             </el-descriptions-item>
             <el-descriptions-item>
               <!-- 开始随机阅片 -->
-              <el-button
-                type="primary"
-                size="small"
-                :disabled="
-                  randomReadInfo.UnReadTaskCount +
-                    randomReadInfo.UnReadJudgeTaskCount ===
-                  0
-                "
-                @click="handleOutOfOrderReading"
-              >
+              <el-button type="primary" size="small" :disabled="randomReadInfo.UnReadTaskCount +
+                randomReadInfo.UnReadJudgeTaskCount ===
+                0
+                " @click="handleOutOfOrderReading">
                 {{ $t('trials:pendingReadingTasks:button:beginRandomReview') }}
               </el-button>
             </el-descriptions-item>
@@ -282,21 +157,11 @@
       :status="uploadStatus"
       @getList="getList"
     /> -->
-    <upload-dicom-and-nonedicom
-      v-if="uploadImageVisible"
-      :SubjectId="uploadSubjectId"
-      :SubjectCode="uploadSubjectCode"
-      :Criterion="uploadTrialCriterion"
-      :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
-      :visible.sync="uploadImageVisible"
-    />
-    <download-dicom-and-nonedicom
-      v-if="downloadImageVisible"
-      :SubjectId="uploadSubjectId"
-      :SubjectCode="uploadSubjectCode"
-      :Criterion="uploadTrialCriterion"
-      :visible.sync="downloadImageVisible"
-    />
+    <upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId" :SubjectCode="uploadSubjectCode"
+      :Criterion="uploadTrialCriterion" :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
+      :visible.sync="uploadImageVisible" />
+    <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
+      :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="downloadImageVisible" />
   </BaseContainer>
 </template>
 <script>
@@ -308,6 +173,8 @@ import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
+import { getAutoCutNextTask } from '@/api/user'
+import { openWindow } from "@/utils/splitScreen";
 const searchDataDefault = () => {
   return {
     SubjectCode: '',
@@ -438,7 +305,7 @@ export default {
         var path = ''
         if (this.readingTool === 0 || this.readingTool === 2) {
           if (this.criterionType === 0 && this.trialId === '08dd28b3-6843-fc05-0242-ac1301000000') {
-             path = `/fusion?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&studyId=62b3dfc4-1e04-4180-910d-fe595f398361&ctseriesId=1bd24f53-d419-32e5-92d4-2b04640aaa65&ptseriesId=2b7b128d-8c3f-8357-ad14-e38f3acbbdff&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&TokenKey=${token}&lang=${this.$i18n.locale}`
+            path = `/fusion?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&studyId=62b3dfc4-1e04-4180-910d-fe595f398361&ctseriesId=1bd24f53-d419-32e5-92d4-2b04640aaa65&ptseriesId=2b7b128d-8c3f-8357-ad14-e38f3acbbdff&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&TokenKey=${token}&lang=${this.$i18n.locale}`
           } else {
             path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
           }
@@ -446,8 +313,25 @@ export default {
           path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
         }
         var routeData = this.$router.resolve({ path })
-
-        this.openWindow = window.open(routeData.href, '_blank')
+        const res = await getAutoCutNextTask()
+        let IsDoubleScreen = false
+        if (res.IsSuccess) {
+          IsDoubleScreen = res.Result.IsDoubleScreen
+        }
+        if (IsDoubleScreen) {
+          this.openWindow = await openWindow(routeData.href)
+          if (!this.openWindow) {
+            let html = `<div><span>${this.$t("trials:reading:tip:MultiScreen2")}</span><a style="color:#409EFF"
+              href="/screen.pdf"
+              target="blank">${this.$t("trials:reading:tip:openFile")}</a></div>`
+            let confirm = await this.$confirm(html, '', { dangerouslyUseHTMLString: true })
+            if (!confirm) return false
+            this.openWindow = await openWindow(routeData.href, '', true)
+          }
+        } else {
+          this.openWindow = window.open(routeData.href, "_blank");
+        }
+        // this.openWindow = window.open(routeData.href, '_blank')
       } catch (e) {
         this.loading = false
         console.log(e)
@@ -468,7 +352,7 @@ export default {
         )
         var token = getToken()
         var path = ''
-        if (this.readingTool === 0 || this.readingTool === 2 ) {
+        if (this.readingTool === 0 || this.readingTool === 2) {
           path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
         } else {
           path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
@@ -500,11 +384,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .reading-task{
-    height: 100%;
-    background-color: #fff;
-    ::v-deep.search {
-      padding: 0px !important;
-    }
+.reading-task {
+  height: 100%;
+  background-color: #fff;
+
+  ::v-deep.search {
+    padding: 0px !important;
   }
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
index d953d6c4..62b91fa5 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
@@ -217,6 +217,7 @@ import SignForm from '@/views/trials/components/newSignForm'
 import PreviewFile from '@/components/PreviewFile/index'
 import { getToken } from '@/utils/auth'
 import store from '@/store'
+import { openWindow } from "@/utils/splitScreen";
 export default {
   name: 'CustomizeReportPage',
   components: { SignForm, PreviewFile },
@@ -246,7 +247,8 @@ export default {
       taskInfo: null,
       previewVisible: false,
       currentPath: '',
-      currentType: ''
+      currentType: '',
+      openWindow: null
     }
   },
   watch: {
@@ -512,37 +514,37 @@ export default {
                   num = arr1.length === 0 ? 0 : Math.min(...arr1)
                   break
                 case 10:
-                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                }
-                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
+                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                  }
+                  num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
                     return acc + (typeof curr === "number" ? curr : 0);
                   }, 0) / dataArr.length;
-                break;
-              case 11:
-                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                }
-                num = dataArr.length > 0 ? Math.max(...dataArr) : 0;
-                break;
-              case 12:
-                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                }
-                num = dataArr.length > 0 ? Math.min(...dataArr) : 0;
-                break;
-              case 13:
-               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                }
-                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
-                break;
-              case 14:
-                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                }
-                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc || curr, 0) ? 1 : 0;
-                break;
+                  break;
+                case 11:
+                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                  }
+                  num = dataArr.length > 0 ? Math.max(...dataArr) : 0;
+                  break;
+                case 12:
+                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                  }
+                  num = dataArr.length > 0 ? Math.min(...dataArr) : 0;
+                  break;
+                case 13:
+                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                  }
+                  num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
+                  break;
+                case 14:
+                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                  }
+                  num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc || curr, 0) ? 1 : 0;
+                  break;
               }
             } else {
               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -580,13 +582,13 @@ export default {
 
                 // num /= parseFloat(this.questionForm[o.TableQuestionId])
                 break
-                case 10:
+              case 10:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
-                    return acc + (typeof curr === "number" ? curr : 0);
-                  }, 0) / dataArr.length;
+                  return acc + (typeof curr === "number" ? curr : 0);
+                }, 0) / dataArr.length;
                 break;
               case 11:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -601,7 +603,7 @@ export default {
                 num = dataArr.length > 0 ? Math.min(...dataArr) : 0;
                 break;
               case 13:
-               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
@@ -770,7 +772,7 @@ export default {
         }
       }
     },
-    previewDicoms(task) {
+    async previewDicoms(task) {
       var token = getToken()
       // var subjectCode = this.$router.currentRoute.query.subjectCode
       var subjectCode = localStorage.getItem('subjectCode')
@@ -782,7 +784,25 @@ export default {
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = `/noneDicomReading?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 })
-      window.open(routeData.href, '_blank')
+      const res = await getAutoCutNextTask()
+      let IsDoubleScreen = false
+      if (res.IsSuccess) {
+        IsDoubleScreen = res.Result.IsDoubleScreen
+      }
+      if (IsDoubleScreen) {
+        this.openWindow = await openWindow(routeData.href)
+        if (!this.openWindow) {
+          let html = `<div><span>${this.$t("trials:reading:tip:MultiScreen2")}</span><a style="color:#409EFF"
+              href="/screen.pdf"
+              target="blank">${this.$t("trials:reading:tip:openFile")}</a></div>`
+          let confirm = await this.$confirm(html, '', { dangerouslyUseHTMLString: true })
+          if (!confirm) return false
+          this.openWindow = await openWindow(routeData.href, '', true)
+        }
+      } else {
+        this.openWindow = window.open(routeData.href, "_blank");
+      }
+      // window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
       return new Promise((resolve, reject) => {

From 4f5fb17bb875194b5be1870f539f2eec03114ce6 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 5 Nov 2025 14:45:42 +0800
Subject: [PATCH 069/333] =?UTF-8?q?=E5=B7=B2=E6=9C=89=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=9C=9F=E4=BF=AE=E6=94=B9=E5=B7=A6=E4=BE=A7=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8F=B3=E4=BE=A7=E6=9F=A5=E8=AF=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E9=9C=80=E8=A6=81=E6=B8=85=E7=A9=BA=E6=88=96=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-period/components/AddOrEditPR.vue | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue
index e0228a97..286b7db7 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditPR.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" class="add_reading-period-wrapper" style="display:flex;width: 100%;height: 100%;">
     <div class="reading-period-form" style="width:450px;height:100%;margin-right: 10px;">
-      <el-card shadow="never" style="height:571px;">
+      <el-card shadow="never" style="height:100%">
         <el-form ref="addOrUpdatePR" :model="form" size="small" :rules="rules" label-width="120px">
           <!-- 阅片期类型 -->
           <el-form-item :label="$t('trials:rpManage:table:readingType')">
@@ -43,7 +43,7 @@
 
     </div>
     <div class="result-table" style="flex:1;">
-      <el-card shadow="never">
+      <el-card shadow="never" style="height:100%">
         <div>
           <el-form :inline="true">
             <!-- 中心编号 -->
@@ -91,7 +91,7 @@
           </el-form>
         </div>
         <el-table ref="prList" v-loading="listLoading" :data="list" stripe height="400"
-          @selection-change="handleSelectChange">
+          v-adaptive="{ bottomOffset: 60 }" @selection-change="handleSelectChange">
           <el-table-column type="selection" align="left" width="45" :selectable="handleSelectable" />
           <!-- 中心 -->
           <el-table-column prop="TrialSiteCode" :label="$t('trials:linkedRP:table:siteCode')" />
@@ -190,6 +190,40 @@ export default {
       }
     },
   },
+  watch: {
+    'form.ReadingPeriodName': {
+      handler() {
+        this.list = []
+        this.searchData.PageIndex = 1
+        this.total = 0
+      },
+      deep: true
+    },
+    'form.DeadlineCondition': {
+      handler() {
+        this.list = []
+        this.searchData.PageIndex = 1
+        this.total = 0
+      },
+      deep: true
+    },
+    'form.ExpirationDate': {
+      handler() {
+        this.list = []
+        this.searchData.PageIndex = 1
+        this.total = 0
+      },
+      deep: true
+    },
+    'form.VisitStageId': {
+      handler() {
+        this.list = []
+        this.searchData.PageIndex = 1
+        this.total = 0
+      },
+      deep: true
+    },
+  },
   data() {
     return {
       loading: false,
@@ -235,7 +269,6 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.initForm()
-    console.log(this.data, 'data')
   },
   methods: {
     handleSelectable(row) {

From 6c02793d2fe3423c3c097390955fa59bc5790fe9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 5 Nov 2025 16:33:03 +0800
Subject: [PATCH 070/333] =?UTF-8?q?=E3=80=90LiLi=E3=80=91=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=BD=B1=E5=83=8F=E6=8B=96=E6=8B=BD=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.js                            |  26 +
 .../trial-document/components/uploadFiles.vue | 119 +++--
 .../components/uploadClinicalData.vue         |  88 ++--
 .../components/uploadDicomFiles2.vue          | 489 ++++++++++--------
 .../components/uploadNonDicomFiles.vue        | 120 +++--
 5 files changed, 492 insertions(+), 350 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 792ed76a..2cf77d16 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -196,4 +196,30 @@ export function workSpeedclose(isForce = false) {
   lastPercentage = 0;
   imageId = null;
   percentageById = {};
+}
+export async function readEntry(entry) {
+  const files = [];
+
+  // 如果是文件夹，创建读取器并递归读取其内容
+  if (entry.isDirectory) {
+    const directoryReader = entry.createReader();
+    const entries = await new Promise((resolve, reject) => {
+      directoryReader.readEntries(resolve, reject); // readEntries是异步的
+    });
+
+    // 递归读取文件夹内的每一项
+    for (const subEntry of entries) {
+      const subFiles = await readEntry(subEntry);
+      files.push(...subFiles);
+    }
+  }
+  // 如果是文件，则将其转换为File对象
+  else if (entry.isFile) {
+    const file = await new Promise((resolve, reject) => {
+      entry.file(resolve, reject); // entry.file()是异步的
+    });
+    files.push(file);
+  }
+
+  return files;
 }
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue b/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue
index 7a61f8f9..22cfa3d6 100644
--- a/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue
+++ b/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue
@@ -30,49 +30,52 @@
           </div>
         </div>
       </form>
-      <!-- 文件列表 -->
-      <el-table ref="filesTable" :data="fileList" class="dicomFiles-table" height="300"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" :selectable="(row, index) => row.status !== 2 && !loading" />
-        <el-table-column type="index" width="50" />
-        <!-- 文件名称 -->
-        <el-table-column prop="name" :label="$t('trials:trialDocument:table:fileName')" min-width="100" />
-        <!-- 文件大小 -->
-        <el-table-column prop="size" :label="$t('trials:trialDocument:table:fileSize')">
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.size && scope.row.size > 0
-                ? `${(scope.row.size / 1024 / 1024).toFixed(3)}MB`
-                : '0MB'
-            }}</span>
-          </template>
-        </el-table-column>
-        <!-- 文件类型 -->
-        <el-table-column prop="type" :label="$t('trials:trialDocument:table:fileType')" />
-        <!-- 上传状态 -->
-        <el-table-column prop="status" :label="$t('trials:trialDocument:table:uploadStatus')" min-width="100">
-          <template slot-scope="scope">
-            <el-tag :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
-              v-if="scope.row.status || scope.row.status === 0">{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('trials:trialDocument:table:failedFileCount')" min-width="150"
-          show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-progress color="#409eff" :percentage="scope.row.size && scope.row.size > 0 ? ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
-              1
-              : ((scope.row.uploadFileSize * 100) / 1).toFixed(2) *
-              1" />
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('common:action:action')">
-          <template slot-scope="scope">
-            <el-button size="mini" icon="el-icon-delete" circle :disabled="loading"
-              :title="$t('trials:trialDocument:action:delete')" @click="handleRemoveFile(scope.row)" />
-          </template>
-        </el-table-column>
-      </el-table>
+      <div class="drag" ref="drag" @dragover="handleDragover" @drop="handleDrop">
+        <!-- 文件列表 -->
+        <el-table ref="filesTable" :data="fileList" class="dicomFiles-table" height="300"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" :selectable="(row, index) => row.status !== 2 && !loading" />
+          <el-table-column type="index" width="50" />
+          <!-- 文件名称 -->
+          <el-table-column prop="name" :label="$t('trials:trialDocument:table:fileName')" min-width="100" />
+          <!-- 文件大小 -->
+          <el-table-column prop="size" :label="$t('trials:trialDocument:table:fileSize')">
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.size && scope.row.size > 0
+                  ? `${(scope.row.size / 1024 / 1024).toFixed(3)}MB`
+                  : '0MB'
+              }}</span>
+            </template>
+          </el-table-column>
+          <!-- 文件类型 -->
+          <el-table-column prop="type" :label="$t('trials:trialDocument:table:fileType')" />
+          <!-- 上传状态 -->
+          <el-table-column prop="status" :label="$t('trials:trialDocument:table:uploadStatus')" min-width="100">
+            <template slot-scope="scope">
+              <el-tag :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
+                v-if="scope.row.status || scope.row.status === 0">{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('trials:trialDocument:table:failedFileCount')" min-width="150"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-progress color="#409eff" :percentage="scope.row.size && scope.row.size > 0 ? ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
+                1
+                : ((scope.row.uploadFileSize * 100) / 1).toFixed(2) *
+                1" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('common:action:action')">
+            <template slot-scope="scope">
+              <el-button size="mini" icon="el-icon-delete" circle :disabled="loading"
+                :title="$t('trials:trialDocument:action:delete')" @click="handleRemoveFile(scope.row)" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
     </div>
     <div slot="dialog-footer">
       <div style="text-align: right; padding: 10px 0px">
@@ -91,6 +94,7 @@
 import baseModel from '@/components/BaseModel'
 import { deepClone } from '@/utils/index.js'
 import store from '@/store'
+import { readEntry } from '@/utils/index'
 export default {
   name: 'uploadFiles',
   props: {
@@ -131,16 +135,41 @@ export default {
     }
   },
   methods: {
+    handleDragover(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    handleDrop(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      this.beginScanFiles(e, true)
+    },
     // 获取待上传文件信息
     handleSelectionChange(selection) {
       this.selectArr = selection
     },
     // 扫描待上传文件
-    beginScanFiles(e) {
+    async beginScanFiles(e, isDrop = false) {
       if (this.fileInput) {
         this.fileInput = null
       }
-      var files = [...e.target.files]
+      var files = []
+      if (isDrop) {
+        const items = e.dataTransfer.items;
+        const allFiles = []; // 用于存储所有找到的文件
+
+        // 遍历拖拽项
+        for (const item of items) {
+          const entry = item.webkitGetAsEntry(); // 获取文件系统入口
+          if (entry) {
+            const files = await readEntry(entry); // 递归读取入口内容
+            allFiles.push(...files);
+          }
+        }
+        files = allFiles
+      } else {
+        files = [...e.target.files]
+      }
       if (this.limitLength && this.fileList.length >= this.limitLength)
         return this.$message.warning(
           this.$t('trials:trialDocument:message:limitLength')
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
index 28c0101b..dbbc8e51 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
@@ -2,8 +2,8 @@
   <div v-loading="loading" class="clinical-data-wrapper">
     <el-tabs type="border-card">
       <el-tab-pane v-for="cd in clinicalDatas" :key="cd.ClinicalDataTrialSetId" :label="$i18n.locale === 'zh'
-          ? cd.ClinicalDataSetName
-          : cd.ClinicalDataSetEnName
+        ? cd.ClinicalDataSetName
+        : cd.ClinicalDataSetEnName
         ">
         <!-- 格式化录入 -->
         <div v-if="cd.ClinicalUploadType === 0">
@@ -180,32 +180,36 @@
                 " />
             </div>
           </div>
-          <el-table :data="cd.PDFFileList" style="width: 100%">
-            <el-table-column type="index" width="50" />
-            <!-- 文件名称 -->
-            <el-table-column prop="FileName" :label="$t('trials:uploadClinicalData:table:fileName')" width="250" />
-            <!-- 文件大小 -->
-            <el-table-column prop="Size" :label="$t('trials:uploadClinicalData:table:fileSize')" width="150">
-              <template slot-scope="scope">
-                <span>{{
-                  $FormatSize(scope.row.Size)
+          <div class="drag" ref="drag" @dragover="handleDragover"
+            @drop="(e) => handleDrop(e, cd.Id, cd.ClinicalDataTrialSetId)">
+            <el-table :data="cd.PDFFileList" style="width: 100%">
+              <el-table-column type="index" width="50" />
+              <!-- 文件名称 -->
+              <el-table-column prop="FileName" :label="$t('trials:uploadClinicalData:table:fileName')" width="250" />
+              <!-- 文件大小 -->
+              <el-table-column prop="Size" :label="$t('trials:uploadClinicalData:table:fileSize')" width="150">
+                <template slot-scope="scope">
+                  <span>{{
+                    $FormatSize(scope.row.Size)
                   }}</span>
-              </template>
-            </el-table-column>
-            <!-- 上传时间 -->
-            <el-table-column prop="CreateTime" :label="$t('trials:uploadClinicalData:table:uploadedTime')"
-              width="200" />
-            <el-table-column :label="$t('common:action:action')" width="200">
-              <template slot-scope="scope">
-                <!-- 预览 -->
-                <el-button icon="el-icon-view" circle :title="$t('trials:uploadClinicalData:action:preview')"
-                  size="small" @click.native.prevent="preview(scope.row)" />
-                <!-- 移除 -->
-                <el-button v-if="allowAddOrEdit" icon="el-icon-delete" circle :title="$t('common:button:delete')"
-                  size="small" @click.native.prevent="deleteFile(scope.row.Id)" />
-              </template>
-            </el-table-column>
-          </el-table>
+                </template>
+              </el-table-column>
+              <!-- 上传时间 -->
+              <el-table-column prop="CreateTime" :label="$t('trials:uploadClinicalData:table:uploadedTime')"
+                width="200" />
+              <el-table-column :label="$t('common:action:action')" width="200">
+                <template slot-scope="scope">
+                  <!-- 预览 -->
+                  <el-button icon="el-icon-view" circle :title="$t('trials:uploadClinicalData:action:preview')"
+                    size="small" @click.native.prevent="preview(scope.row)" />
+                  <!-- 移除 -->
+                  <el-button v-if="allowAddOrEdit" icon="el-icon-delete" circle :title="$t('common:button:delete')"
+                    size="small" @click.native.prevent="deleteFile(scope.row.Id)" />
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+
         </div>
         <!-- PDF录入 -->
         <div v-if="cd.ClinicalUploadType === 2">
@@ -274,6 +278,7 @@ import PreviousFiles from "./previousFiles";
 import clinicalDataQuestions from "@/components/clinicalDataQuestions";
 import PreviewFile from "@/components/PreviewFile/index";
 import moment from "moment";
+import { readEntry } from '@/utils/index'
 export default {
   name: "ClinicalData",
   components: {
@@ -333,14 +338,39 @@ export default {
     this.getClinicalData();
   },
   methods: {
-    beginScanFiles(e, id, clinicalDataTrialSetId) {
+    handleDragover(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    handleDrop(e, id, clinicalDataTrialSetId) {
+      e.stopPropagation();
+      e.preventDefault();
+      this.beginScanFiles(e, id, clinicalDataTrialSetId, true)
+    },
+    async beginScanFiles(e, id, clinicalDataTrialSetId, isDrop = false) {
       this.currentRow = {
         Id: id,
         ClinicalDataTrialSetId: clinicalDataTrialSetId,
         SubjectId: this.data.SubjectId,
       };
       this.currentRow.TrialId = this.$route.query.trialId;
-      var files = e.target.files;
+      var files = [];
+      if (isDrop) {
+        const items = e.dataTransfer.items;
+        const allFiles = []; // 用于存储所有找到的文件
+
+        // 遍历拖拽项
+        for (const item of items) {
+          const entry = item.webkitGetAsEntry(); // 获取文件系统入口
+          if (entry) {
+            const files = await readEntry(entry); // 递归读取入口内容
+            allFiles.push(...files);
+          }
+        }
+        files = allFiles
+      } else {
+        files = e.target.files
+      }
       this.fileList = [];
       for (var i = 0; i < files.length; ++i) {
         const fileName = files[i].name;
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 839190c1..cb076822 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -142,257 +142,259 @@
             </div>
           </div>
         </form>
-
-        <!-- 文件列表 -->
-        <el-table ref="dicomFilesTable" :data="uploadQueues" :row-key="(row) => row.studyIndex" class="dicomFiles-table"
-          @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" :selectable="handleSelectable" />
-          <el-table-column type="index" width="40" />
-          <el-table-column min-width="200" show-overflow-tooltip>
-            <template slot="header">
-              <el-tooltip placement="top-start">
-                <div slot="content">
-                  {{ $t('trials:uploadDicomList:table:studyDetail1') }}<br />
-                  {{ $t('trials:uploadDicomList:table:studyDetail2') }}<br />
-                  {{ $t('trials:uploadedDicoms:table:studyDate') }}
-                </div>
-                <span>{{ $t('trials:uploadDicomList:table:studyInfo') }}</span>
-              </el-tooltip>
-            </template>
-            <template slot-scope="scope">
-              <div style="line-height: 15px">
-                <div>
+        <div class="drag" ref="drag" @dragover="handleDragover" @drop="handleDrop">
+          <!-- 文件列表 -->
+          <el-table ref="dicomFilesTable" :data="uploadQueues" :row-key="(row) => row.studyIndex"
+            class="dicomFiles-table" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" :selectable="handleSelectable" />
+            <el-table-column type="index" width="40" />
+            <el-table-column min-width="200" show-overflow-tooltip>
+              <template slot="header">
+                <el-tooltip placement="top-start">
+                  <div slot="content">
+                    {{ $t('trials:uploadDicomList:table:studyDetail1') }}<br />
+                    {{ $t('trials:uploadDicomList:table:studyDetail2') }}<br />
+                    {{ $t('trials:uploadedDicoms:table:studyDate') }}
+                  </div>
+                  <span>{{ $t('trials:uploadDicomList:table:studyInfo') }}</span>
+                </el-tooltip>
+              </template>
+              <template slot-scope="scope">
+                <div style="line-height: 15px">
                   <div>
-                    <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight: 500">Acc:</span>
-                      {{ scope.row.dicomInfo.accNumber }}</span>
-                    <span v-else style="color: #f44336">N/A</span>
+                    <div>
+                      <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight: 500">Acc:</span>
+                        {{ scope.row.dicomInfo.accNumber }}</span>
+                      <span v-else style="color: #f44336">N/A</span>
+                    </div>
+                    <div style="display: inline-block; margin-right: 2px">
+                      <span v-if="scope.row.dicomInfo.modality.length > 0">
+                        {{ scope.row.dicomInfo.modality.join('、') }},</span>
+                      <span v-else style="color: #f44336">N/A,</span>
+                    </div>
+                    <div style="display: inline-block; margin-right: 2px">
+                      <span v-if="scope.row.seriesList.length">{{ scope.row.seriesList.length }} Series,</span>
+                      <span v-else style="color: #f44336">N/A,</span>
+                    </div>
+                    <div style="display: inline-block">
+                      <span v-if="scope.row.fileList.length">{{ scope.row.fileList.length }} Instances</span>
+                      <span v-else style="color: #f44336">N/A</span>
+                    </div>
                   </div>
-                  <div style="display: inline-block; margin-right: 2px">
-                    <span v-if="scope.row.dicomInfo.modality.length > 0">
-                      {{ scope.row.dicomInfo.modality.join('、') }},</span>
-                    <span v-else style="color: #f44336">N/A,</span>
+
+                  <div>
+                    <div style="display: inline-block; margin-right: 2px">
+                      <span v-if="scope.row.dicomInfo.bodyPart">
+                        {{ scope.row.dicomInfo.bodyPart }},
+                      </span>
+                      <span v-else style="color: #f44336">N/A, </span>
+                    </div>
+                    <div style="display: inline-block">
+                      <span v-if="scope.row.dicomInfo.description">
+                        {{ scope.row.dicomInfo.description }}</span>
+                      <span v-else style="color: #f44336">N/A</span>
+                    </div>
                   </div>
-                  <div style="display: inline-block; margin-right: 2px">
-                    <span v-if="scope.row.seriesList.length">{{ scope.row.seriesList.length }} Series,</span>
-                    <span v-else style="color: #f44336">N/A,</span>
-                  </div>
-                  <div style="display: inline-block">
-                    <span v-if="scope.row.fileList.length">{{ scope.row.fileList.length }} Instances</span>
-                    <span v-else style="color: #f44336">N/A</span>
+                  <div>
+                    {{ scope.row.dicomInfo.studyTime }}
                   </div>
                 </div>
-
-                <div>
-                  <div style="display: inline-block; margin-right: 2px">
-                    <span v-if="scope.row.dicomInfo.bodyPart">
-                      {{ scope.row.dicomInfo.bodyPart }},
+              </template>
+            </el-table-column>
+            <el-table-column min-width="130" show-overflow-tooltip>
+              <template slot="header">
+                <el-tooltip placement="top">
+                  <div slot="content">
+                    {{ $t('trials:uploadDicomList:table:pId') }}<br />
+                    {{ $t('trials:uploadDicomList:table:patientName') }}<br />
+                    {{ $t('trials:uploadDicomList:table:pInfo') }}
+                  </div>
+                  <span>{{
+                    $t('trials:uploadDicomList:table:patientInfo')
+                  }}</span>
+                </el-tooltip>
+              </template>
+              <template slot-scope="scope">
+                <div style="line-height: 15px">
+                  <div>
+                    <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight: 500">PID: </span>{{
+                      scope.row.dicomInfo.patientId }}</span>
+                    <span v-else style="color: #f44336">N/A</span>
+                  </div>
+                  <div>
+                    <span :class="[
+                      scope.row.dicomInfo.patientName ? '' : 'colorOfRed',
+                    ]">
+                      {{
+                        scope.row.dicomInfo.patientName
+                          ? scope.row.dicomInfo.patientName
+                          : 'N/A'
+                      }}
                     </span>
-                    <span v-else style="color: #f44336">N/A, </span>
                   </div>
-                  <div style="display: inline-block">
-                    <span v-if="scope.row.dicomInfo.description">
-                      {{ scope.row.dicomInfo.description }}</span>
-                    <span v-else style="color: #f44336">N/A</span>
+                  <div>
+                    <span :class="[
+                      scope.row.dicomInfo.patientSex ? '' : 'colorOfRed',
+                    ]">
+                      {{
+                        scope.row.dicomInfo.patientSex
+                          ? scope.row.dicomInfo.patientSex
+                          : 'N/A'
+                      }},
+                    </span>
+
+                    <span :class="[
+                      scope.row.dicomInfo.patientAge ? '' : 'colorOfRed',
+                    ]">
+                      {{
+                        scope.row.dicomInfo.patientAge
+                          ? scope.row.dicomInfo.patientAge
+                          : 'N/A'
+                      }},
+                    </span>
+
+                    <span :class="[
+                      scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+                    ]">
+                      {{
+                        scope.row.dicomInfo.patientBirthDate
+                          ? scope.row.dicomInfo.patientBirthDate
+                          : 'N/A'
+                      }}
+                    </span>
                   </div>
                 </div>
-                <div>
-                  {{ scope.row.dicomInfo.studyTime }}
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column min-width="130" show-overflow-tooltip>
-            <template slot="header">
-              <el-tooltip placement="top">
-                <div slot="content">
-                  {{ $t('trials:uploadDicomList:table:pId') }}<br />
-                  {{ $t('trials:uploadDicomList:table:patientName') }}<br />
-                  {{ $t('trials:uploadDicomList:table:pInfo') }}
-                </div>
-                <span>{{
-                  $t('trials:uploadDicomList:table:patientInfo')
-                }}</span>
-              </el-tooltip>
-            </template>
-            <template slot-scope="scope">
-              <div style="line-height: 15px">
-                <div>
-                  <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight: 500">PID: </span>{{
-                    scope.row.dicomInfo.patientId }}</span>
-                  <span v-else style="color: #f44336">N/A</span>
-                </div>
-                <div>
-                  <span :class="[
-                    scope.row.dicomInfo.patientName ? '' : 'colorOfRed',
-                  ]">
-                    {{
-                      scope.row.dicomInfo.patientName
-                        ? scope.row.dicomInfo.patientName
-                        : 'N/A'
-                    }}
-                  </span>
-                </div>
-                <div>
-                  <span :class="[
-                    scope.row.dicomInfo.patientSex ? '' : 'colorOfRed',
-                  ]">
-                    {{
-                      scope.row.dicomInfo.patientSex
-                        ? scope.row.dicomInfo.patientSex
-                        : 'N/A'
-                    }},
-                  </span>
-
-                  <span :class="[
-                    scope.row.dicomInfo.patientAge ? '' : 'colorOfRed',
-                  ]">
-                    {{
-                      scope.row.dicomInfo.patientAge
-                        ? scope.row.dicomInfo.patientAge
-                        : 'N/A'
-                    }},
-                  </span>
-
-                  <span :class="[
-                    scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
-                  ]">
-                    {{
-                      scope.row.dicomInfo.patientBirthDate
-                        ? scope.row.dicomInfo.patientBirthDate
-                        : 'N/A'
-                    }}
-                  </span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('trials:uploadDicomList:table:failedFileCount')" min-width="150"
-            show-overflow-tooltip>
-            <!--:percentage="
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('trials:uploadDicomList:table:failedFileCount')" min-width="150"
+              show-overflow-tooltip>
+              <!--:percentage="
                   (scope.row.dicomInfo.failedFileCount * 100) /
                   scope.row.dicomInfo.fileCount
                 "
                 :show-text="false"--->
-            <template slot-scope="scope">
-              <el-progress color="#409eff" :percentage="(
-                (scope.row.dicomInfo.uploadFileSize * 100) /
-                (scope.row.dicomInfo.fileSize ? scope.row.dicomInfo.fileSize : 1)
-              ).toFixed(2) * 1
-                " />
-              <span>
-                {{ $t('trials:uploadDicomList:table:uploadNow')
-                }}{{ scope.row.dicomInfo.failedFileCount }}/{{
-                  scope.row.dicomInfo.fileCount
-                }}
-                ({{
-                  (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(3)
-                }}MB/{{
-                  (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(3)
-                }}MB)
-              </span>
-            </template>
-          </el-table-column>
+              <template slot-scope="scope">
+                <el-progress color="#409eff" :percentage="(
+                  (scope.row.dicomInfo.uploadFileSize * 100) /
+                  (scope.row.dicomInfo.fileSize ? scope.row.dicomInfo.fileSize : 1)
+                ).toFixed(2) * 1
+                  " />
+                <span>
+                  {{ $t('trials:uploadDicomList:table:uploadNow')
+                  }}{{ scope.row.dicomInfo.failedFileCount }}/{{
+                    scope.row.dicomInfo.fileCount
+                  }}
+                  ({{
+                    (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(3)
+                  }}MB/{{
+                    (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(3)
+                  }}MB)
+                </span>
+              </template>
+            </el-table-column>
 
-          <el-table-column :label="$t('trials:uploadDicomList:table:status')" min-width="140" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span v-if="
-                !scope.row.dicomInfo.failedFileCount &&
-                !scope.row.dicomInfo.isInit
-              ">
-                {{ $t('trials:uploadDicomList:table:status1') }}</span>
-              <span style="color: #409eff" v-else-if="
-                !scope.row.dicomInfo.failedFileCount &&
-                scope.row.dicomInfo.isInit &&
-                btnLoading
-              ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-              <span style="color: #409eff" v-else-if="
-                scope.row.dicomInfo.failedFileCount <
-                scope.row.dicomInfo.fileCount &&
-                !scope.row.uploadState.record
-              ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-              <span style="color: #2cc368" v-else-if="
-                scope.row.dicomInfo.failedFileCount ===
-                scope.row.dicomInfo.fileCount
-              ">{{ $t('trials:uploadDicomList:table:status3') }}</span>
-              <span style="color: #f66" v-else-if="
-                scope.row.uploadState.record &&
-                scope.row.uploadState.record.fileCount === 0
-              ">{{ $t('trials:uploadDicomList:table:status5') }}</span>
-              <span style="color: #f66" v-else>{{
-                $t('trials:uploadDicomList:table:Failed')
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('trials:uploadDicomList:table:record')" min-width="140" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <el-tooltip placement="top" v-if="scope.row.uploadState.record">
-                <div slot="content">
-                  <div style="max-height: 500px; overflow-y: auto">
-                    {{ $t('trials:uploadDicomList:table:Existed') }}:
-                    <div v-if="scope.row.uploadState.record.Existed.length">
-                      <div v-for="item of scope.row.uploadState.record.Existed" :key="item"
-                        style="font-size: 12px; color: #baa72a">
-                        {{ item }}
+            <el-table-column :label="$t('trials:uploadDicomList:table:status')" min-width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span v-if="
+                  !scope.row.dicomInfo.failedFileCount &&
+                  !scope.row.dicomInfo.isInit
+                ">
+                  {{ $t('trials:uploadDicomList:table:status1') }}</span>
+                <span style="color: #409eff" v-else-if="
+                  !scope.row.dicomInfo.failedFileCount &&
+                  scope.row.dicomInfo.isInit &&
+                  btnLoading
+                ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
+                <span style="color: #409eff" v-else-if="
+                  scope.row.dicomInfo.failedFileCount <
+                  scope.row.dicomInfo.fileCount &&
+                  !scope.row.uploadState.record
+                ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
+                <span style="color: #2cc368" v-else-if="
+                  scope.row.dicomInfo.failedFileCount ===
+                  scope.row.dicomInfo.fileCount
+                ">{{ $t('trials:uploadDicomList:table:status3') }}</span>
+                <span style="color: #f66" v-else-if="
+                  scope.row.uploadState.record &&
+                  scope.row.uploadState.record.fileCount === 0
+                ">{{ $t('trials:uploadDicomList:table:status5') }}</span>
+                <span style="color: #f66" v-else>{{
+                  $t('trials:uploadDicomList:table:Failed')
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('trials:uploadDicomList:table:record')" min-width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tooltip placement="top" v-if="scope.row.uploadState.record">
+                  <div slot="content">
+                    <div style="max-height: 500px; overflow-y: auto">
+                      {{ $t('trials:uploadDicomList:table:Existed') }}:
+                      <div v-if="scope.row.uploadState.record.Existed.length">
+                        <div v-for="item of scope.row.uploadState.record.Existed" :key="item"
+                          style="font-size: 12px; color: #baa72a">
+                          {{ item }}
+                        </div>
                       </div>
-                    </div>
-                    <div v-else>&nbsp;</div>
-                    {{ $t('trials:uploadDicomList:table:Uploaded') }}:
-                    <div v-if="scope.row.uploadState.record.Uploaded.length">
-                      <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item"
-                        style="font-size: 12px; color: #24b837">
-                        {{ item }}
+                      <div v-else>&nbsp;</div>
+                      {{ $t('trials:uploadDicomList:table:Uploaded') }}:
+                      <div v-if="scope.row.uploadState.record.Uploaded.length">
+                        <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item"
+                          style="font-size: 12px; color: #24b837">
+                          {{ item }}
+                        </div>
                       </div>
-                    </div>
-                    <div v-else>&nbsp;</div>
-                    <br />
-                    {{ $t('trials:uploadDicomList:table:Failed') }}:
-                    <div v-if="scope.row.uploadState.record.Failed.length">
-                      <div v-for="item of scope.row.uploadState.record.Failed" :key="item"
-                        style="font-size: 12px; color: #f66">
-                        {{ item }}
+                      <div v-else>&nbsp;</div>
+                      <br />
+                      {{ $t('trials:uploadDicomList:table:Failed') }}:
+                      <div v-if="scope.row.uploadState.record.Failed.length">
+                        <div v-for="item of scope.row.uploadState.record.Failed" :key="item"
+                          style="font-size: 12px; color: #f66">
+                          {{ item }}
+                        </div>
                       </div>
+                      <div v-else>&nbsp;</div>
                     </div>
-                    <div v-else>&nbsp;</div>
                   </div>
-                </div>
-                <el-button size="mini" style="cursor: pointer">
-                  <span style="font-size: 12px; color: #baa72a">{{
-                    scope.row.uploadState.record.Existed.length
-                  }}</span>
-                  /
-                  <span style="font-size: 12px; color: #24b837">{{
-                    scope.row.uploadState.record.Uploaded.length
-                  }}</span>
-                  /
-                  <span style="font-size: 12px; color: #f66">{{
-                    scope.row.uploadState.record.Failed.length
-                  }}</span>
-                </el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column v-show="isScan" :label="$t('common:action:action')" width="200">
-            <template slot-scope="scope">
-              <!-- 预览 -->
-              <!--          :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"-->
-              <el-button icon="el-icon-view" circle :disabled="(scope.row.uploadState.stateCode !== '' &&
-                scope.row.dicomInfo.failedFileCount <
-                scope.row.dicomInfo.fileCount &&
-                !scope.row.uploadState.record) ||
-                btnLoading
-                " :title="$t('trials:uploadedDicoms:action:preview')" size="small"
-                @click="handlePreview(scope.row.dicomInfo.studyUid)" />
-              <!-- 移除 -->
-              <el-button icon="el-icon-delete" circle :title="$t('trials:uploadedDicoms:action:delete')" size="small"
-                :disabled="(scope.row.uploadState.stateCode !== '' &&
+                  <el-button size="mini" style="cursor: pointer">
+                    <span style="font-size: 12px; color: #baa72a">{{
+                      scope.row.uploadState.record.Existed.length
+                    }}</span>
+                    /
+                    <span style="font-size: 12px; color: #24b837">{{
+                      scope.row.uploadState.record.Uploaded.length
+                    }}</span>
+                    /
+                    <span style="font-size: 12px; color: #f66">{{
+                      scope.row.uploadState.record.Failed.length
+                    }}</span>
+                  </el-button>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column v-show="isScan" :label="$t('common:action:action')" width="200">
+              <template slot-scope="scope">
+                <!-- 预览 -->
+                <!--          :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"-->
+                <el-button icon="el-icon-view" circle :disabled="(scope.row.uploadState.stateCode !== '' &&
                   scope.row.dicomInfo.failedFileCount <
                   scope.row.dicomInfo.fileCount &&
                   !scope.row.uploadState.record) ||
                   btnLoading
-                  " @click="handleDelete(scope.$index, scope.row)" />
-            </template>
-          </el-table-column>
-        </el-table>
+                  " :title="$t('trials:uploadedDicoms:action:preview')" size="small"
+                  @click="handlePreview(scope.row.dicomInfo.studyUid)" />
+                <!-- 移除 -->
+                <el-button icon="el-icon-delete" circle :title="$t('trials:uploadedDicoms:action:delete')" size="small"
+                  :disabled="(scope.row.uploadState.stateCode !== '' &&
+                    scope.row.dicomInfo.failedFileCount <
+                    scope.row.dicomInfo.fileCount &&
+                    !scope.row.uploadState.record) ||
+                    btnLoading
+                    " @click="handleDelete(scope.$index, scope.row)" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+
         <div style="text-align: right; padding: 10px 0px">
           <!-- 关闭 -->
           <!-- <el-button :disabled="btnLoading" size="small" type="primary" @click="cancel">
@@ -567,6 +569,7 @@ import DicomPreview from '@/views/dicom-show/dicom-preview'
 import uploadPetClinicalData from './uploadPetClinicalData.vue'
 import dicomStore from '@/utils/dicom-store'
 import { getToken } from '@/utils/auth'
+import { readEntry } from '@/utils/index'
 import { dcmUpload } from '@/utils/dcmUpload/dcmUpload'
 import { convertBytes } from '@/utils/dicom-character-set'
 import moment from 'moment'
@@ -676,6 +679,15 @@ export default {
     this.OSSclient.close()
   },
   methods: {
+    handleDragover(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    handleDrop(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      this.beginScanFiles(e, true)
+    },
     getParentList() {
       this.getStudyInfo()
       this.$emit('getList')
@@ -802,8 +814,24 @@ export default {
       window.open(routeData.href, '_blank')
     },
     // 扫描待上传文件
-    beginScanFiles(e) {
-      var files = e.target.files
+    async beginScanFiles(e, isDrop = false) {
+      var files = []
+      if (isDrop) {
+        const items = e.dataTransfer.items;
+        const allFiles = []; // 用于存储所有找到的文件
+
+        // 遍历拖拽项
+        for (const item of items) {
+          const entry = item.webkitGetAsEntry(); // 获取文件系统入口
+          if (entry) {
+            const files = await readEntry(entry); // 递归读取入口内容
+            allFiles.push(...files);
+          }
+        }
+        files = allFiles
+      } else {
+        files = e.target.files
+      }
       if (files.length > 0) {
         var checkFiles = [...files]
         let max = checkFiles.some((item) => item.size > 20 * 1024 * 1024 * 1024)
@@ -1098,6 +1126,7 @@ export default {
           }
         }
         reader.onerror = function (e) {
+          console.log(e, 'err')
           resolve()
         }
         reader.readAsArrayBuffer(file)
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index e30ebdc4..fc357961 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -230,50 +230,52 @@
           </div>
         </div>
       </form>
-      <!-- 文件列表 -->
-      <el-table ref="filesTable" :data="fileList" class="dicomFiles-table" height="300"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" :selectable="(row, index) => row.status !== 2 && !btnLoading" />
-        <el-table-column type="index" width="50" />
-        <!-- 文件名称 -->
-        <el-table-column prop="name" :label="$t('trials:uploadNonDicoms:table:fileName')" min-width="100" />
-        <!-- 文件大小 -->
-        <el-table-column prop="size" :label="$t('trials:uploadNonDicoms:table:fileSize')">
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.size && scope.row.size > 0
-                ? `${(scope.row.size / 1024 / 1024).toFixed(3)}MB`
-                : '0MB'
-            }}</span>
-          </template>
-        </el-table-column>
-        <!-- 文件类型 -->
-        <el-table-column prop="type" :label="$t('trials:uploadNonDicoms:table:fileType')" />
-        <!-- 上传状态 -->
-        <el-table-column prop="status" :label="$t('trials:uploadNonDicoms:table:uploadStatus')" min-width="100">
-          <template slot-scope="scope">
-            <el-tag :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
-              v-if="scope.row.status || scope.row.status === 0">{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('trials:uploadNonDicoms:table:failedFileCount')" min-width="150"
-          show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-progress color="#409eff" :percentage="scope.row.size && scope.row.size > 0 ? ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
-              1
-              : ((scope.row.uploadFileSize * 100) / 1).toFixed(2) *
-              1
-              " />
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('common:action:action')">
-          <template slot-scope="scope">
-            <el-button size="mini" icon="el-icon-delete" circle :disabled="btnLoading"
-              :title="$t('trials:crcUpload:action:delete')" @click="handleRemoveFile(scope.row)" />
-          </template>
-        </el-table-column>
-      </el-table>
+      <div class="drag" ref="drag" @dragover="handleDragover" @drop="handleDrop">
+        <!-- 文件列表 -->
+        <el-table ref="filesTable" :data="fileList" class="dicomFiles-table" height="300"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" :selectable="(row, index) => row.status !== 2 && !btnLoading" />
+          <el-table-column type="index" width="50" />
+          <!-- 文件名称 -->
+          <el-table-column prop="name" :label="$t('trials:uploadNonDicoms:table:fileName')" min-width="100" />
+          <!-- 文件大小 -->
+          <el-table-column prop="size" :label="$t('trials:uploadNonDicoms:table:fileSize')">
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.size && scope.row.size > 0
+                  ? `${(scope.row.size / 1024 / 1024).toFixed(3)}MB`
+                  : '0MB'
+              }}</span>
+            </template>
+          </el-table-column>
+          <!-- 文件类型 -->
+          <el-table-column prop="type" :label="$t('trials:uploadNonDicoms:table:fileType')" />
+          <!-- 上传状态 -->
+          <el-table-column prop="status" :label="$t('trials:uploadNonDicoms:table:uploadStatus')" min-width="100">
+            <template slot-scope="scope">
+              <el-tag :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
+                v-if="scope.row.status || scope.row.status === 0">{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('trials:uploadNonDicoms:table:failedFileCount')" min-width="150"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-progress color="#409eff" :percentage="scope.row.size && scope.row.size > 0 ? ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
+                1
+                : ((scope.row.uploadFileSize * 100) / 1).toFixed(2) *
+                1
+                " />
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('common:action:action')">
+            <template slot-scope="scope">
+              <el-button size="mini" icon="el-icon-delete" circle :disabled="btnLoading"
+                :title="$t('trials:crcUpload:action:delete')" @click="handleRemoveFile(scope.row)" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <div style="text-align: right; padding: 10px 0px">
         <span style="margin-right: 10px">{{
           $store.state.trials.uploadTip
@@ -334,6 +336,7 @@ import {
   deleteNoneDicomStudyFile,
 } from '@/api/trials'
 import { getToken } from '@/utils/auth'
+import { readEntry } from '@/utils/index'
 // import PreviewFiles from './previewFiles'
 // import uploadVideos from '@/components/videos'
 import moment from 'moment'
@@ -454,6 +457,15 @@ export default {
     },
   },
   methods: {
+    handleDragover(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    handleDrop(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      this.beginScanFiles(e, true)
+    },
     // 初始化非Dicom列表数据
     getNoneDicomList() {
       this.loading = true
@@ -634,8 +646,24 @@ export default {
       }
     },
     // 扫描待上传文件
-    beginScanFiles(e) {
-      var files = [...e.target.files]
+    async beginScanFiles(e, isDrop = false) {
+      var files = []
+      if (isDrop) {
+        const items = e.dataTransfer.items;
+        const allFiles = []; // 用于存储所有找到的文件
+
+        // 遍历拖拽项
+        for (const item of items) {
+          const entry = item.webkitGetAsEntry(); // 获取文件系统入口
+          if (entry) {
+            const files = await readEntry(entry); // 递归读取入口内容
+            allFiles.push(...files);
+          }
+        }
+        files = allFiles
+      } else {
+        files = [...e.target.files]
+      }
       var sameFiles = []
       files.forEach((file) => {
         var extendName = file.name

From bbd8e8b5107f7c9ce825b10c994357bd40558527 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 6 Nov 2025 10:04:14 +0800
Subject: [PATCH 071/333] 1

---
 .../visit/crc-upload/components/uploadClinicalData.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
index dbbc8e51..9f708c14 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
@@ -182,7 +182,7 @@
           </div>
           <div class="drag" ref="drag" @dragover="handleDragover"
             @drop="(e) => handleDrop(e, cd.Id, cd.ClinicalDataTrialSetId)">
-            <el-table :data="cd.PDFFileList" style="width: 100%">
+            <el-table :data="cd.PDFFileList" style="width: 100%;min-height: 300px;">
               <el-table-column type="index" width="50" />
               <!-- 文件名称 -->
               <el-table-column prop="FileName" :label="$t('trials:uploadClinicalData:table:fileName')" width="250" />

From 5dd13b58c543c15b506909662b0751f9fa1b34c6 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 6 Nov 2025 13:43:11 +0800
Subject: [PATCH 072/333] 1

---
 .../trials-panel/subject/reading-period/index.vue      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 6b37f896..f460719e 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -357,15 +357,15 @@
             <el-dialog v-if="readPeriodVisible" :title="$t('trials:rpManage:dialogTitle:setRP')"
               :visible.sync="readPeriodVisible" width="1400px" :close-on-click-modal="false" v-dialogDrag>
               <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane :label="$t('trials:rpManage:tab:title:ViewPeriod')" name="ViewPeriod">
-                  <ViewPeriod v-if="activeName === 'ViewPeriod'" :siteOptions="siteOptions"
-                    :TrialReadingCriterionId="TrialReadingCriterionId" />
-                </el-tab-pane>
-                <el-tab-pane :label="$t('trials:rpManage:tab:title:ReadingPeriod')" name="ReadingPeriod">
+                <el-tab-pane :label="$t('trials:rpManage:tab:title:ViewPeriod')" name="ReadingPeriod">
                   <ReadingPeriod v-if="activeName === 'ReadingPeriod'" :trial-id="trialId" :siteOptions="siteOptions"
                     :trial-reading-criterion-id="TrialReadingCriterionId" :is-clinical-reading="isClinicalReading"
                     :is-global-reading="otherInfo.IsReadingPeriod" @getList="getList" />
                 </el-tab-pane>
+                <el-tab-pane :label="$t('trials:rpManage:tab:title:ReadingPeriod')" name="ViewPeriod">
+                  <ViewPeriod v-if="activeName === 'ViewPeriod'" :siteOptions="siteOptions"
+                    :TrialReadingCriterionId="TrialReadingCriterionId" />
+                </el-tab-pane>
 
               </el-tabs>
             </el-dialog>

From 795423182d552e2bae301284ab2884bbd70bbe1c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 6 Nov 2025 16:07:07 +0800
Subject: [PATCH 073/333] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=8F=8A=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.js                              |  32 +++
 src/views/system/email/components/detail.vue  | 228 +++++++++++++++
 src/views/system/email/index.vue              | 271 ++++++++++++++++++
 .../setting/email-manage/config.vue           | 242 ++++++++++++++++
 .../setting/email-manage/index.vue            | 271 ++----------------
 5 files changed, 796 insertions(+), 248 deletions(-)
 create mode 100644 src/views/system/email/components/detail.vue
 create mode 100644 src/views/system/email/index.vue
 create mode 100644 src/views/trials/trials-panel/setting/email-manage/config.vue

diff --git a/src/api/admin.js b/src/api/admin.js
index 75b8844f..f0cece3c 100644
--- a/src/api/admin.js
+++ b/src/api/admin.js
@@ -350,3 +350,35 @@ export function getUserJoinedTrialList(data) {
     data
   })
 }
+// 邮件日志-日志列表
+export function getEmailLogList(data) {
+  return request({
+    url: `/EmailLog/getEmailLogList`,
+    method: 'post',
+    data
+  })
+}
+// 邮件日志-日志详情
+export function getEmailInfo(data) {
+  return request({
+    url: `/EmailLog/getEmailInfo`,
+    method: 'post',
+    data
+  })
+}
+// 邮件日志-重发邮件
+export function resendEmail(data) {
+  return request({
+    url: `/EmailLog/resendEmail`,
+    method: 'post',
+    data
+  })
+}
+// 邮件日志-同步邮件
+export function synchronizationEmail(data) {
+  return request({
+    url: `/EmailLog/synchronizationEmail`,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/views/system/email/components/detail.vue b/src/views/system/email/components/detail.vue
new file mode 100644
index 00000000..93e1ad2d
--- /dev/null
+++ b/src/views/system/email/components/detail.vue
@@ -0,0 +1,228 @@
+<template>
+    <div class="detail">
+        <div class="attachment" v-if="Array.isArray(info.AttachmentList) && info.AttachmentList.length > 0">
+            <div class="box" v-for="item of info.AttachmentList" :key="item.AttachmentPath" @click="perview(item)">
+                <i :class="`icon icon_file icon_${item.type}`" />
+                <span>{{ item.AttachmentName }}</span>
+            </div>
+            <span class="downLoadTip" @click="downloadFile">{{ $t('system:email:tip:allDownLoad') }}</span>
+        </div>
+        <div class="content" v-html="info.Content"></div>
+        <viewer ref="picture_perview" style="margin: 0 10px"
+            v-if="rowData.type && ['png', 'jpg', 'jpeg'].includes(rowData.type.toLowerCase())"
+            :images="[`${OSSclientConfig.basePath}${rowData.AttachmentPath}`]" :options="viewerOptions">
+
+            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowData.AttachmentPath}`" alt="Image" />
+        </viewer>
+    </div>
+</template>
+<script>
+import { downLoadFile } from '@/utils/stream.js'
+export default {
+    name: "emailDetail",
+    props: {
+        info: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        }
+    },
+    data() {
+        return {
+            rowData: {},
+            viewerOptions: {
+                toolbar: {
+                    zoomIn: true,
+                    zoomOut: true,
+                    reset: true,
+                    prev: false,
+                    next: false,
+                    rotateLeft: true,
+                    rotateRight: true,
+                    flipHorizontal: true,
+                    flipVertical: true,
+                }
+            }
+        }
+    },
+    methods: {
+        //预览
+        perview(data) {
+            this.rowData = data
+            if (['.ppt',
+                '.pptx',
+                '.doc',
+                '.docx',
+                '.xls',
+                '.xlsx'].includes(`.${data.type.toLowerCase()}`)) {
+                this.$onlyOffice({
+                    path: data.AttachmentPath,
+                    type: data.type,
+                    title: data.AttachmentName
+                })
+            }
+            if (['.jpg',
+                '.jpeg',
+                '.png'].includes(`.${data.type.toLowerCase()}`)) {
+                this.$refs['picture_perview'].$viewer.show()
+            }
+            if (['.pdf'].includes(`.${data.type.toLowerCase()}`)) {
+                this.$preview({
+                    path: data.Path || data.AttachmentPath,
+                    type: 'pdf',
+                    title: data.AttachmentName,
+                })
+            }
+        },
+        async downloadFile() {
+            try {
+                let { files, name } = this.formatDownloadFile(this.info.AttachmentList)
+                let res = await downLoadFile(files, name, 'zip')
+            } catch (err) {
+                console.log(err)
+            }
+        },
+        // 格式化下载文件路径
+        formatDownloadFile(list) {
+            let files = [],
+                name = `Attachment_${new Date().getTime()}.zip`
+            list.forEach(item => {
+                let obj = {
+                    name: item.AttachmentName,
+                    url: this.OSSclientConfig.basePath + item.AttachmentPath,
+                }
+                files.push(obj)
+            })
+            return { files, name }
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.attachment {
+    border-bottom: 1px solid #EBEEF5;
+    padding: 10px 0 0 0;
+    display: flex;
+
+    .box {
+        padding: 5px 10px;
+        display: flex;
+        align-items: center;
+        max-width: 400px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        border-radius: 5px;
+        background-color: #E4E7ED;
+        cursor: pointer;
+        margin-right: 10px;
+        margin-bottom: 10px;
+
+        i {
+            margin-right: 5px;
+        }
+    }
+
+    .downLoadTip {
+        cursor: pointer;
+        font-size: 14px;
+        color: #409EFF;
+    }
+}
+
+.content {
+    width: 100%;
+    overflow: hidden;
+}
+
+.icon {
+    height: 20px;
+    width: 20px;
+    padding: 0px;
+    line-height: 20px;
+    margin-right: 6px;
+    margin-top: 6px;
+}
+
+/*文件*/
+.icon_file {
+    width: 16px !important;
+    height: 16px !important;
+    margin-right: 6px;
+    background-size: inherit;
+    background-image: url(@/assets/0.file-16.png);
+    background-position: 0 0;
+    margin-top: -2px;
+    background-repeat: no-repeat;
+    font-style: normal;
+    display: inline-block;
+    pointer-events: none;
+    font-size: 85%;
+}
+
+/*文件夹*/
+.icon_folder {
+    background-image: url(@/assets/folder_win11_small.png);
+    margin-top: -6px;
+    margin-left: 2px;
+    margin-right: 6px;
+    background-repeat: no-repeat;
+}
+
+/*docx*/
+.icon_docx {
+    background-position: -81px -560px !important;
+    margin-top: 0;
+    margin-left: 2px;
+}
+
+/*doc*/
+.icon_doc {
+    background-position: -81px -592px !important;
+    margin-top: 0;
+    margin-left: 2px;
+}
+
+/*xlsx*/
+.icon_xlsx {
+    background-position: -81px -48px !important;
+    margin-top: 0;
+    margin-left: 2px;
+}
+
+/*pdf*/
+.icon_pdf {
+    background-position: -81px -352px !important;
+    margin-top: 0;
+    margin-left: 2px;
+}
+
+/*pptx*/
+.icon_pptx {
+    background-position: -81px -288px !important;
+    margin-top: 0;
+    margin-left: 2px;
+}
+
+/*zip*/
+.icon_zip {
+    background-position: 0 0 !important;
+    margin-top: -2px;
+    margin-left: 2px;
+}
+
+/*ppt*/
+.icon_ppt {
+    background-position: -81px -304px !important;
+    margin-top: 0;
+    margin-left: 2px;
+}
+
+/*xls*/
+.icon_xls {
+    background-position: -81px -96px !important;
+    margin-top: 0;
+    margin-left: 2px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/email/index.vue b/src/views/system/email/index.vue
new file mode 100644
index 00000000..830ee4d9
--- /dev/null
+++ b/src/views/system/email/index.vue
@@ -0,0 +1,271 @@
+<template>
+    <div class="event">
+        <div ref="leftContainer" class="left">
+            <el-form :inline="true">
+                <el-form-item :label="$t('system:email:search:ToRecipientName')">
+                    <el-input v-model="searchData.ToRecipientName" clearable />
+                </el-form-item>
+                <el-form-item :label="$t('system:email:search:CcRecipientName')">
+                    <el-input v-model="searchData.CcRecipientName" clearable />
+                </el-form-item>
+                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
+                    <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
+                        <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
+                    <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
+                        <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="$t('system:email:search:emailDate')">
+                    <el-date-picker v-model="datetimerange" type="datetimerange"
+                        :default-time="['00:00:00', '23:59:59']" :start-placeholder="$t('feedBack:search:beginTime')"
+                        :end-placeholder="$t('feedBack:search:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
+                        @change="handleDatetimeChange" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="small" @click="getList">
+                        {{ $t('common:button:search') }}
+                    </el-button>
+                    <el-button icon="el-icon-refresh-left" size="small" @click="handleReset">
+                        {{ $t('common:button:reset') }}
+                    </el-button>
+                    <el-button type="primary" size="small" @click="synchronizationEmail">
+                        {{ $t('system:email:button:sync') }}
+                    </el-button>
+                </el-form-item>
+            </el-form>
+            <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" height="100" :data="list" class="table"
+                @sort-change="handleSortByColumn">
+                <el-table-column type="index" width="50" />
+                <el-table-column :label="$t('system:email:table:messageId')" prop="MessageId" show-overflow-tooltip
+                    sortable="custom" />
+                <el-table-column :label="$t('system:email:table:emailSubject')" prop="EmailSubject"
+                    show-overflow-tooltip />
+                <el-table-column :label="$t('system:email:table:ToRecipientName')" prop="ToRecipientName"
+                    show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
+                            ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
+                                item.RecipientName).join(", ") : ''
+                        }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="$t('system:email:table:CcRecipientName')" prop="CcRecipientName"
+                    show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
+                            ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
+                                item.RecipientName).join(", ") : ''
+                        }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="$t('system:email:table:emailDate')" prop="EmailDate" show-overflow-tooltip
+                    sortable="custom" />
+                <el-table-column :label="$t('system:email:table:emailStateEnum')" prop="EmailStateEnum"
+                    show-overflow-tooltip sortable="custom">
+                    <template slot-scope="scope">
+                        <el-tag :type="scope.row.EmailStateEnum === 1 ? 'danger' : ''">{{ $fd("EmailState",
+                            scope.row.EmailStateEnum) }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="$t('system:email:table:errorInfo')" prop="ErrorInfo" show-overflow-tooltip />
+                <el-table-column :label="$t('common:action:action')" fixed="right" prop="" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <el-button type="text" @click="view(scope.row)">
+                            {{ $t('common:button:view') }}
+                        </el-button>
+                        <el-button type="text" @click="resendEmail(scope.row)">
+                            {{ $t('system:email:button:resendEmail') }}
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="pagination" style="text-align: right; margin-top: 5px">
+                <pagination :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+                    @pagination="getList" />
+            </div>
+        </div>
+        <base-model v-if="model_cfg.visible" :config="model_cfg">
+            <template slot="dialog-body">
+                <emailDetail :info="info" />
+            </template>
+        </base-model>
+    </div>
+</template>
+<script>
+import { getEmailLogList, resendEmail, getEmailInfo, synchronizationEmail } from '@/api/admin'
+import Pagination from '@/components/Pagination'
+import BaseModel from '@/components/BaseModel'
+import emailDetail from "./components/detail"
+const searchDataDefault = () => {
+    return {
+        TrialId: null,
+        EmailStartDate: null,
+        EmailEndDate: null,
+        EmailStateEnum: null,
+        ToRecipientName: null,
+        CcRecipientName: null,
+        Asc: false,
+        SortField: 'CreateTime',
+        PageIndex: 1,
+        PageSize: 20,
+    }
+}
+export default {
+    name: 'emailLog',
+    components: { Pagination, BaseModel, emailDetail },
+    props: {
+        isSystem: {
+            type: Boolean,
+            default: true
+        }
+    },
+    data() {
+        return {
+            searchData: searchDataDefault(),
+            list: [],
+            total: 0,
+            loading: false,
+            datetimerange: [],
+            model_cfg: { visible: false, title: '', width: '500px', fullscreen: true },
+            info: null,
+        }
+    },
+    mounted() {
+        this.getList()
+    },
+    methods: {
+        getList() {
+            this.loading = true
+            if (!this.isSystem) this.searchData.TrialId = this.$route.query.trialId
+            getEmailLogList(this.searchData)
+                .then((res) => {
+                    this.loading = false
+                    this.list = res.Result.CurrentPageData
+                    this.total = res.Result.TotalCount
+                })
+                .catch(() => {
+                    this.loading = false
+                })
+        },
+        // 查看详情
+        async view(row) {
+            try {
+                let data = {
+                    Id: row.Id
+                    // Id: "EC660000-BA37-5C60-8680-08DE1CD6931B"
+                }
+                let res = await getEmailInfo(data)
+                if (res.IsSuccess) {
+                    this.info = res.Result
+                    if (Array.isArray(this.info.AttachmentList) && this.info.AttachmentList.length > 0) {
+                        this.info.AttachmentList.forEach(item => {
+                            var type = item.AttachmentName
+                                .substring(item.AttachmentName.lastIndexOf('.'))
+                                .toLocaleLowerCase().split('.')[1];
+                            item.type = type
+                        })
+                    }
+                    this.model_cfg.visible = true
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        },
+        // 同步邮件
+        async synchronizationEmail() {
+            try {
+                this.loading = true
+                let res = await synchronizationEmail()
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getList()
+                    this.$message.success(this.$t("system:email:message:syncSuccessfully"))
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        // 重发邮件
+        async resendEmail(row) {
+            try {
+                let data = {
+                    Id: row.Id
+                }
+                this.loading = true
+                let res = await resendEmail(data)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getList()
+                    this.$message.success(this.$t("system:email:message:resendSuccessfully"))
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        // 重置列表查询
+        handleReset() {
+            this.searchData = searchDataDefault()
+            this.getList()
+        },
+        // 排序
+        handleSortByColumn(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+        handleDatetimeChange(val) {
+            if (val) {
+                this.searchData.EmailStartDate = val[0]
+                this.searchData.EmailEndDate = val[1]
+            } else {
+                this.searchData.EmailStartDate = ''
+                this.searchData.EmailEndDate = ''
+            }
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.event {
+    height: 100%;
+    box-sizing: border-box;
+    display: flex;
+    padding: 10px;
+    border-radius: 5px;
+
+    .left {
+        display: flex;
+        flex-direction: column;
+        width: 0;
+        flex-grow: 4;
+
+        // border-right: 1px solid #ccc;
+        .filter-container {
+            display: flex;
+            align-items: center;
+            margin: 5px;
+        }
+
+        .data-table {
+            flex: 1;
+            padding: 5px 0px;
+        }
+
+        .pagination-container {
+            text-align: right;
+        }
+    }
+}
+</style>
diff --git a/src/views/trials/trials-panel/setting/email-manage/config.vue b/src/views/trials/trials-panel/setting/email-manage/config.vue
new file mode 100644
index 00000000..e0d74985
--- /dev/null
+++ b/src/views/trials/trials-panel/setting/email-manage/config.vue
@@ -0,0 +1,242 @@
+<template>
+    <div v-loading="loading" class="email-wrapper">
+        <el-collapse v-model="activeCollapse" class="setting-config">
+            <!-- 发件箱配置 -->
+            <el-collapse-item :title="$t('trials:emailManageCfg:title:sendEmailCfg')" name="1">
+                <!-- 配置信息表单 -->
+                <el-form ref="emailRulesForm" v-loading="loading" :model="form" style="width:800px;margin-top: 10px;"
+                    :rules="rules" label-width="230px" size="small">
+                    <!-- 发件箱账号 -->
+                    <el-form-item :label="$t('trials:emailManageCfg:title:sendEmailAccount')" prop="EmailFromEmail">
+                        <el-input v-model="form.EmailFromEmail" :disabled="!isEdit" />
+                    </el-form-item>
+                    <!-- 发件人 -->
+                    <el-form-item :label="$t('trials:emailManageCfg:title:fromName')" prop="EmailFromName">
+                        <el-input v-model="form.EmailFromName" :disabled="!isEdit" />
+                    </el-form-item>
+                    <!-- 密码/授权码 -->
+                    <el-form-item :label="$t('trials:emailManageCfg:title:password')" prop="EmailAuthorizationCode">
+                        <el-input v-model="form.EmailAuthorizationCode" :disabled="!isEdit" />
+                    </el-form-item>
+                    <!-- SMTP服务器 -->
+                    <el-form-item :label="$t('trials:emailManageCfg:title:SMTPServerAddress')"
+                        prop="EmailSMTPServerAddress">
+                        <el-input v-model="form.EmailSMTPServerAddress" :disabled="!isEdit" />
+                    </el-form-item>
+                    <!-- SMTP端口 -->
+                    <el-form-item :label="$t('trials:emailManageCfg:title:SMTPServerPort')" prop="EmailSMTPServerPort">
+                        <el-input v-model.number="form.EmailSMTPServerPort" type="number" :disabled="!isEdit" />
+                    </el-form-item>
+                    <el-form-item v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])">
+                        <el-button v-if="isEdit" size="small" type="primary" @click="setTrialEmail">
+                            {{ $t('common:button:confirm') }}
+                        </el-button>
+                        <el-button v-else size="small" type="primary" @click="isEdit = true">
+                            {{ $t('trials:trialCfg:button:update') }}
+                        </el-button>
+                    </el-form-item>
+                </el-form>
+            </el-collapse-item>
+            <!-- 自动邮件模版 -->
+            <el-collapse-item :title="$t('trials:emailManageCfg:title:emailTpl')" name="2">
+                <el-tabs v-model="activeTab" type="border-card">
+                    <!-- 通用 -->
+                    <el-tab-pane :label="$t('trials:emailManageCfg:title:commom')" name="0">
+                        <EmailList v-if="activeTab === '0'" ref="emailList" :is-distinguish-criteria="false"
+                            :is-edit="isEdit" />
+                    </el-tab-pane>
+                    <!-- 标准相关 -->
+                    <el-tab-pane :label="$t('trials:emailManageCfg:title:criterions')" name="1">
+                        <EmailList v-if="activeTab === '1'" ref="emailList" :is-distinguish-criteria="true"
+                            :is-edit="isEdit" />
+                    </el-tab-pane>
+                </el-tabs>
+            </el-collapse-item>
+        </el-collapse>
+    </div>
+</template>
+<script>
+import EmailList from './components/EmailList'
+import { getTrialCriterionList } from '@/api/trials/reading'
+import { setTrialEmail, getTrialEmail } from '@/api/trials'
+export default {
+    name: 'emailConfig',
+    components: {
+        EmailList
+    },
+    data() {
+        return {
+            activeCollapse: ['1', '2'],
+            trialId: '',
+            activeTab: '0',
+            trialCriterionList: [],
+            loading: false,
+            isEdit: true,
+            form: {
+                EmailFromEmail: '',
+                EmailFromName: '',
+                EmailAuthorizationCode: '',
+                EmailSMTPServerAddress: '',
+                EmailSMTPServerPort: null,
+                IsConfigureEmail: true
+            },
+            rules: {
+                EmailFromEmail: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
+                EmailFromName: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
+                EmailAuthorizationCode: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
+                EmailSMTPServerAddress: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
+                EmailSMTPServerPort: [{ required: true, message: this.$t('common:ruleMessage:specify') }, {
+                    type: "number",
+                    min: 1,
+                    max: 65535,
+                    message: this.$t("common:ruleMessage:portPattern"),
+                    trigger: "blur",
+                },
+                {
+                    validator: (rule, value, callback) => {
+                        if (
+                            value &&
+                            (String(value).includes(".") ||
+                                new RegExp(/\D/g).test(String(value)))
+                        ) {
+                            callback(new Error(this.$t("common:ruleMessage:portPattern")));
+                        } else {
+                            callback();
+                        }
+                    },
+                    trigger: "blur",
+                },]
+            },
+            NODE_ENV: process.env.NODE_ENV,
+            VUE_APP_OSS_PATH: process.env.VUE_APP_OSS_PATH,
+        }
+    },
+    // watch: {
+    //   activeTab(v) {
+    //     console.log(v)
+    //   }
+    // },
+    created() {
+        if (this.VUE_APP_OSS_PATH === '/uat/dist') {
+            this.form = {
+                EmailFromEmail: 'uat@extimaging.com',
+                EmailFromName: 'Uat IRC Imaging System',
+                EmailAuthorizationCode: 'SHzyyl2021',
+                EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
+                EmailSMTPServerPort: 465,
+                IsConfigureEmail: true
+            };
+        }
+        if (this.VUE_APP_OSS_PATH === '/test/dist') {
+            this.form = {
+                EmailFromEmail: 'test@extimaging.com',
+                EmailFromName: 'Test IRC Imaging System',
+                EmailAuthorizationCode: 'SHzyyl2021',
+                EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
+                EmailSMTPServerPort: 465,
+                IsConfigureEmail: true
+            };
+        }
+    },
+    mounted() {
+        this.trialId = this.$route.query.trialId
+        this.getTrialEmail()
+        this.getTrialCriterionList()
+    },
+    methods: {
+        handleClick(a) {
+            this.activeName = a.name
+        },
+        setTrialEmail() {
+            this.$refs['emailRulesForm'].validate((valid) => {
+                if (!valid) {
+                    // resolve(false)
+                } else {
+                    this.form.TrialId = this.trialId
+                    setTrialEmail(this.form).then(res => {
+                        this.$message.success(this.$t('common:message:savedSuccessfully'))
+                        this.isEdit = false
+                        this.$refs['emailList'].getList()
+                    })
+                }
+            })
+        },
+        getTrialEmail() {
+            getTrialEmail({
+                TrialId: this.trialId
+            }).then(res => {
+                if (res.Result.IsConfigureEmail) {
+                    this.form = Object.assign(this.form, res.Result)
+                    this.isEdit = false
+                }
+            })
+        },
+        getTrialCriterionList() {
+            this.loading = true
+            getTrialCriterionList(this.trialId, false).then(res => {
+                this.trialCriterionList = res.Result
+                // this.activeTab = this.trialCriterionList[0].TrialReadingCriterionId
+                this.loading = false
+            }).catch(() => {
+                this.loading = false
+            })
+        }
+    }
+}
+</script>
+<style lang="scss">
+.email-wrapper {
+    height: 100%;
+    background-color: #fff;
+
+    .el-tabs {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .el-tabs__header {
+        height: 40px;
+        margin-bottom: 5px;
+    }
+
+    .el-tabs__content {
+        flex: 1;
+
+        .el-tab-pane {
+            height: 100%;
+        }
+    }
+}
+</style>
+<style lang="scss" scoped>
+.email-wrapper {
+    height: 100%;
+    background-color: #fff;
+    display: flex;
+    flex-direction: column;
+
+    .content {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    ::v-deep.el-collapse-item__header {
+        background: #e5ecef;
+        padding-left: 10px;
+    }
+
+    ::v-deep.el-collapse-item__content {
+        padding: 10px;
+    }
+
+    .bottom {
+        height: 50px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        text-align: center;
+        border-top: 1px solid #e1e1e1;
+    }
+}
+</style>
diff --git a/src/views/trials/trials-panel/setting/email-manage/index.vue b/src/views/trials/trials-panel/setting/email-manage/index.vue
index 2e9e1082..f4167034 100644
--- a/src/views/trials/trials-panel/setting/email-manage/index.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/index.vue
@@ -1,268 +1,43 @@
 <template>
-  <div v-loading="loading" class="email-wrapper">
-    <el-collapse v-model="activeCollapse" class="setting-config">
-      <!-- 发件箱配置 -->
-      <el-collapse-item :title="$t('trials:emailManageCfg:title:sendEmailCfg')" name="1">
-        <!-- 配置信息表单 -->
-        <el-form
-          ref="emailRulesForm"
-          v-loading="loading"
-          :model="form"
-          style="width:800px;margin-top: 10px;"
-          :rules="rules"
-          label-width="230px"
-          size="small"
-        >
-          <!-- 发件箱账号 -->
-          <el-form-item
-            :label="$t('trials:emailManageCfg:title:sendEmailAccount')"
-            prop="EmailFromEmail"
-          >
-            <el-input v-model="form.EmailFromEmail" :disabled="!isEdit" />
-          </el-form-item>
-          <!-- 发件人 -->
-          <el-form-item
-            :label="$t('trials:emailManageCfg:title:fromName')"
-            prop="EmailFromName"
-          >
-            <el-input v-model="form.EmailFromName" :disabled="!isEdit" />
-          </el-form-item>
-          <!-- 密码/授权码 -->
-          <el-form-item
-            :label="$t('trials:emailManageCfg:title:password')"
-            prop="EmailAuthorizationCode"
-          >
-            <el-input v-model="form.EmailAuthorizationCode" :disabled="!isEdit" />
-          </el-form-item>
-          <!-- SMTP服务器 -->
-          <el-form-item
-            :label="$t('trials:emailManageCfg:title:SMTPServerAddress')"
-            prop="EmailSMTPServerAddress"
-          >
-            <el-input v-model="form.EmailSMTPServerAddress" :disabled="!isEdit" />
-          </el-form-item>
-          <!-- SMTP端口 -->
-          <el-form-item
-            :label="$t('trials:emailManageCfg:title:SMTPServerPort')"
-            prop="EmailSMTPServerPort"
-          >
-          <el-input v-model.number="form.EmailSMTPServerPort" type="number" :disabled="!isEdit" />
-          </el-form-item>
-          <el-form-item v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])">
-            <el-button v-if="isEdit" size="small" type="primary" @click="setTrialEmail">
-              {{ $t('common:button:confirm') }}
-            </el-button>
-            <el-button v-else size="small" type="primary" @click="isEdit = true">
-              {{ $t('trials:trialCfg:button:update') }}
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </el-collapse-item>
-      <!-- 自动邮件模版 -->
-      <el-collapse-item :title="$t('trials:emailManageCfg:title:emailTpl')" name="2">
-        <el-tabs v-model="activeTab" type="border-card">
-          <!-- 通用 -->
-          <el-tab-pane
-            :label="$t('trials:emailManageCfg:title:commom')"
-            name="0"
-          >
-            <EmailList
-              v-if="activeTab === '0'"
-              ref="emailList"
-              :is-distinguish-criteria="false"
-              :is-edit="isEdit"
-            />
-          </el-tab-pane>
-          <!-- 标准相关 -->
-          <el-tab-pane
-            :label="$t('trials:emailManageCfg:title:criterions')"
-            name="1"
-          >
-            <EmailList
-              v-if="activeTab === '1'"
-              ref="emailList"
-              :is-distinguish-criteria="true"
-              :is-edit="isEdit"
-            />
-          </el-tab-pane>
-        </el-tabs>
-      </el-collapse-item>
-    </el-collapse>
+  <div style="background-color: #fff;height: 100%;">
+    <el-tabs v-model="activeName" @tab-click="handleClick" style="height: 100%;">
+      <el-tab-pane :label="$t('trials:emailManageCfg:tab:title:emailManageCfg')" name="emailManageCfg">
+        <emailConfig v-if="activeName === 'emailManageCfg'" />
+      </el-tab-pane>
+      <el-tab-pane :label="$t('trials:emailManageCfg:tab:title:emailLog')" name="emailLog">
+        <emailLog :isSystem="false" v-if="activeName === 'emailLog'" />
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 <script>
-import EmailList from './components/EmailList'
-import { getTrialCriterionList } from '@/api/trials/reading'
-import { setTrialEmail, getTrialEmail } from '@/api/trials'
+import emailConfig from './config.vue'
+import emailLog from "@/views/system/email"
 export default {
   name: 'EmailManage',
   components: {
-    EmailList
+    emailConfig,
+    emailLog
   },
   data() {
     return {
-      activeCollapse: ['1', '2'],
-      trialId: '',
-      activeTab: '0',
-      trialCriterionList: [],
-      loading: false,
-      isEdit: true,
-      form: {
-        EmailFromEmail: '',
-        EmailFromName: '',
-        EmailAuthorizationCode: '',
-        EmailSMTPServerAddress: '',
-        EmailSMTPServerPort: null,
-        IsConfigureEmail: true
-      },
-      rules: {
-        EmailFromEmail: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
-        EmailFromName: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
-        EmailAuthorizationCode: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
-        EmailSMTPServerAddress: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
-        EmailSMTPServerPort: [{ required: true, message: this.$t('common:ruleMessage:specify') },{
-            type: "number",
-            min: 1,
-            max: 65535,
-            message: this.$t("common:ruleMessage:portPattern"),
-            trigger: "blur",
-          },
-          {
-            validator: (rule, value, callback) => {
-              if (
-                value &&
-                (String(value).includes(".") ||
-                  new RegExp(/\D/g).test(String(value)))
-              ) {
-                callback(new Error(this.$t("common:ruleMessage:portPattern")));
-              } else {
-                callback();
-              }
-            },
-            trigger: "blur",
-          },]
-      },
-      NODE_ENV: process.env.NODE_ENV,
-      VUE_APP_OSS_PATH: process.env.VUE_APP_OSS_PATH,
+      activeName: 'emailManageCfg', // emailLog emailManageCfg
     }
   },
-  // watch: {
-  //   activeTab(v) {
-  //     console.log(v)
-  //   }
-  // },
-  created() {
-    if(this.VUE_APP_OSS_PATH === '/uat/dist'){
-      this.form= {
-        EmailFromEmail: 'uat@extimaging.com',
-        EmailFromName: 'Uat IRC Imaging System',
-        EmailAuthorizationCode: 'SHzyyl2021',
-        EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
-        EmailSMTPServerPort: 465,
-        IsConfigureEmail: true
-      };
-    }
-    if(this.VUE_APP_OSS_PATH === '/test/dist'){
-      this.form= {
-        EmailFromEmail: 'test@extimaging.com',
-        EmailFromName: 'Test IRC Imaging System',
-        EmailAuthorizationCode: 'SHzyyl2021',
-        EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
-        EmailSMTPServerPort: 465,
-        IsConfigureEmail: true
-      };
-    }
-  },
-  mounted() {
-    this.trialId = this.$route.query.trialId
-    this.getTrialEmail()
-    this.getTrialCriterionList()
-  },
   methods: {
-    setTrialEmail() {
-      this.$refs['emailRulesForm'].validate((valid) => {
-        if (!valid) {
-          // resolve(false)
-        } else {
-          this.form.TrialId = this.trialId
-          setTrialEmail(this.form).then(res => {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.isEdit = false
-            this.$refs['emailList'].getList()
-          })
-        }
-      })
+    handleClick(a) {
+      this.activeName = a.name
     },
-    getTrialEmail() {
-      getTrialEmail({
-        TrialId: this.trialId
-      }).then(res => {
-        if (res.Result.IsConfigureEmail) {
-          this.form = Object.assign(this.form, res.Result)
-          this.isEdit = false
-        }
-      })
-    },
-    getTrialCriterionList() {
-      this.loading = true
-      getTrialCriterionList(this.trialId, false).then(res => {
-        this.trialCriterionList = res.Result
-        // this.activeTab = this.trialCriterionList[0].TrialReadingCriterionId
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
-    }
   }
 }
 </script>
-<style lang="scss">
-.email-wrapper{
-  height: 100%;
-  background-color: #fff;
-  .el-tabs{
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-  .el-tabs__header {
-    height: 40px;
-    margin-bottom:5px;
-  }
-  .el-tabs__content{
-    flex: 1;
-    .el-tab-pane{
-      height: 100%;
-    }
-  }
-}
-</style>
 <style lang="scss" scoped>
-.email-wrapper{
-  height: 100%;
-  background-color: #fff;
-  display: flex;
-  flex-direction: column;
-  .content{
-    flex: 1;
-    overflow-y: auto;
-  }
-  ::v-deep.el-collapse-item__header{
-    background:#e5ecef;
-    padding-left:10px;
-  }
-  ::v-deep.el-collapse-item__content{
-    padding: 10px;
-  }
-  .bottom{
-    height: 50px;
-    display:flex;
-    align-items:center;
-    justify-content:center;
-    text-align: center;
-    border-top: 1px solid #e1e1e1;
+::v-deep .el-tabs__content {
+  height: calc(100% - 60px);
+
+  .el-tab-pane {
+    height: 100%;
+    overflow: auto;
   }
 }
-
-</style>
-
+</style>
\ No newline at end of file

From ecb146bd67eea0ddfacf79cb858823d7da85d85a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 6 Nov 2025 16:10:26 +0800
Subject: [PATCH 074/333] 1

---
 src/api/export.js                             |  8 ++++
 .../components/exportList.vue                 | 44 +++++++++----------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/api/export.js b/src/api/export.js
index 801716e6..8e05eb1e 100644
--- a/src/api/export.js
+++ b/src/api/export.js
@@ -255,6 +255,14 @@ export function getCommonJudgeRatioList_Export(data) {
     data
   })
 }
+export function getTumor_CDISC_Export(data) {
+  return requestDownload({
+    url: `/Tumor_CDISC_Export/getTumor_CDISC_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
 // 导出国际化列表
 export function GetInternationalizationList_Export(data) {
   return requestDownload({
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
index e49c8a8c..e040ed8b 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
@@ -6,10 +6,7 @@
       </template>
     </el-table-column>
     <!-- 文件名称 -->
-    <el-table-column
-      :label="$t('trials:reviewTrack:title:fileName')"
-      :min-width="50"
-    >
+    <el-table-column :label="$t('trials:reviewTrack:title:fileName')" :min-width="50">
       <template slot-scope="scope">
         {{ scope.row.FileName }}
       </template>
@@ -17,13 +14,8 @@
     <el-table-column prop="" :label="$t('common:action:action')" min-width="80">
       <template slot-scope="scope">
         <!-- 下载 -->
-        <el-button
-          icon="el-icon-download"
-          circle
-          :title="$t('trials:reviewTrack:title:download')"
-          size="mini"
-          @click="handleExport(scope.row.ExportCatogory)"
-        />
+        <el-button icon="el-icon-download" circle :title="$t('trials:reviewTrack:title:download')" size="mini"
+          @click="handleExport(scope.row.ExportCatogory)" />
       </template>
     </el-table-column>
   </el-table>
@@ -35,6 +27,7 @@ import {
   getCommonJudgeRatioList_Export,
   getReadingTaskList_Export,
   getTrialReadingCriterionCanExportDocumentList,
+  getTumor_CDISC_Export,
   getOverallTumorEvaluationList_Export,
   getEvaluationOfTumorEfficacy_Export,
   getDetailedOfEvaluatedLesion_Export,
@@ -85,7 +78,7 @@ export default {
       switch (type) {
         case 0:
           getReadingTaskList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -93,7 +86,7 @@ export default {
         case 1:
           searchData.ReadingExportType = 1
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -101,7 +94,7 @@ export default {
         case 2:
           searchData.ReadingExportType = 2
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -109,7 +102,7 @@ export default {
         case 3:
           searchData.ReadingExportType = 3
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -117,7 +110,7 @@ export default {
         case 4:
           searchData.ReadingExportType = 4
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -125,7 +118,7 @@ export default {
         case 7:
           searchData.ReadingExportType = 7
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -133,7 +126,7 @@ export default {
         case 8:
           searchData.ReadingExportType = 8
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -141,7 +134,7 @@ export default {
         case 17:
           searchData.ReadingExportType = 17
           getCommonJudgeRatioList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -149,7 +142,15 @@ export default {
         case 18:
           searchData.ReadingExportType = 18
           getCommonJudgeRatioList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
+            .catch(() => {
+              this.loading = false
+            })
+          break
+        case 20:
+          searchData.ReadingExportType = 20
+          getTumor_CDISC_Export(searchData)
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -160,5 +161,4 @@ export default {
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>

From 7d57f6b5f6784a453c42d0b2e1d67258e3947a52 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 7 Nov 2025 13:23:18 +0800
Subject: [PATCH 075/333] =?UTF-8?q?=E9=98=85=E7=89=87=E6=AF=94=E4=BE=8B?=
 =?UTF-8?q?=E5=B0=BA=E5=B7=A5=E5=85=B7=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/tools/ScaleOverlayTool.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/tools/ScaleOverlayTool.js b/src/views/trials/trials-panel/reading/dicoms3D/components/tools/ScaleOverlayTool.js
index 5c1611d9..d4b86797 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/tools/ScaleOverlayTool.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/tools/ScaleOverlayTool.js
@@ -58,7 +58,7 @@ class ScaleOverlayTool extends AnnotationDisplayTool {
             }
             enabledElements.forEach((element) => {
                 const { viewport } = element;
-                if (!viewportsWithAnnotations.includes(viewport.id) || annotations.length === 0) {
+                if (!viewportsWithAnnotations.includes(viewport.id) || annotations.length === 0 || !annotation) {
                     const newAnnotation = {
                         metadata: {
                             toolName: this.getToolName(),

From 29e785243eb43cf0b94f39f8e2fef7aa845cd121 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 7 Nov 2025 14:38:18 +0800
Subject: [PATCH 076/333] =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=A0=E7=A8=8B=E5=92=8C=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=89=8B=E5=86=8C=E7=9A=84=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icons/svg/constitution.svg                |   1 +
 src/icons/svg/documentation.svg               |   2 +-
 src/icons/svg/individuation.svg               |   1 +
 .../reading/dicoms/components/DicomViewer.vue |  33 +-
 .../dicoms/customize/CustomizeDicomViewer.vue | 546 ++++++------------
 .../reading/dicoms3D/components/ReadPage.vue  |  23 +-
 .../visit-review/components/FileViewer.vue    |  68 ++-
 7 files changed, 288 insertions(+), 386 deletions(-)
 create mode 100644 src/icons/svg/constitution.svg
 create mode 100644 src/icons/svg/individuation.svg

diff --git a/src/icons/svg/constitution.svg b/src/icons/svg/constitution.svg
new file mode 100644
index 00000000..08748291
--- /dev/null
+++ b/src/icons/svg/constitution.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1762494352859" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22987" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M896 832a128 128 0 0 1-128 128H256a128 128 0 0 1-128-128V192a128 128 0 0 1 128-128h512a128 128 0 0 1 128 128v640zM192 768v64a64 64 0 0 0 56.512 63.552L256 896h512a64 64 0 0 0 63.552-56.512L832 832v-64H192z m448-640H512v206.912l64-38.4 64 38.464V128z m-448 576h640V192a64 64 0 0 0-56.512-63.552L768 128h-64v263.488a32 32 0 0 1-48.448 27.456L576 371.2l-79.552 47.744A32 32 0 0 1 448 391.424V128H256a64 64 0 0 0-63.552 56.512L192 192v512z" fill="#e6e6e6" p-id="22988"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/documentation.svg b/src/icons/svg/documentation.svg
index 70431228..b566e357 100644
--- a/src/icons/svg/documentation.svg
+++ b/src/icons/svg/documentation.svg
@@ -1 +1 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M71.984 44.815H115.9L71.984 9.642v35.173zM16.094.05h63.875l47.906 38.37v76.74c0 3.392-1.682 6.645-4.677 9.044-2.995 2.399-7.056 3.746-11.292 3.746H16.094c-4.236 0-8.297-1.347-11.292-3.746-2.995-2.399-4.677-5.652-4.677-9.044V12.84C.125 5.742 7.23.05 16.094.05zm71.86 102.32V89.58h-71.86v12.79h71.86zm23.952-25.58V64H16.094v12.79h95.812z"/></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1762485370628" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9729" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M150.503786 1024A54.174749 54.174749 0 0 1 96.443451 969.939665V54.289162A54.174749 54.174749 0 0 1 150.503786 0.228827H873.31049a54.174749 54.174749 0 0 1 54.060335 54.060335v915.650503a54.174749 54.174749 0 0 1-54.060335 54.060335zM131.625574 54.289162v915.650503a18.878212 18.878212 0 0 0 18.878212 18.878212H873.31049a18.821006 18.821006 0 0 0 18.878212-18.878212V54.289162a18.878212 18.878212 0 0 0-18.878212-18.878212h-120.706145a117.960223 117.960223 0 0 1-5.72067 22.882681h81.119106a17.505251 17.505251 0 0 1 17.562458 17.562458v860.274414a17.619665 17.619665 0 0 1-17.562458 17.676871H195.925909a17.619665 17.619665 0 0 1-17.562458-17.676871V75.512849a17.562458 17.562458 0 0 1 17.562458-17.562458h81.119106a114.070168 114.070168 0 0 1-5.72067-22.882682H150.6182a18.878212 18.878212 0 0 0-18.992626 19.049833z m81.92 863.821229h596.780335V93.075307h-85.810056l-0.68648 0.686481a122.307933 122.307933 0 0 1-9.038659 8.981452 119.447598 119.447598 0 0 1-10.41162 8.180559c-2.002235 1.315754-4.118883 2.745922-6.349945 4.118883a130.831732 130.831732 0 0 1-15.731843 8.180558l-3.031956 1.144134-1.258547 0.514861a116.358436 116.358436 0 0 1-19.450279 5.72067l-2.231062 0.34324a126.770056 126.770056 0 0 1-22.882681 2.231062H390.771943a124.653408 124.653408 0 0 1-22.882682-2.231062c-0.858101 0-1.544581 0-2.345475-0.34324a123.623687 123.623687 0 0 1-19.450279-5.72067l-1.716201-0.572067-2.574302-1.029721a123.337654 123.337654 0 0 1-15.78905-8.180559 101.71352 101.71352 0 0 1-6.349944-4.233296 116.587263 116.587263 0 0 1-10.354414-8.066145 145.018994 145.018994 0 0 1-9.210279-8.981453 5.72067 5.72067 0 0 0-0.68648-0.800893h-85.810056zM320.407697 63.785475l0.8581 0.800894a86.43933 86.43933 0 0 0 13.615196 13.844022l1.201341 0.915307a90.672626 90.672626 0 0 0 13.786815 8.695419l1.029721 0.514861 2.574302 1.372961a94.677095 94.677095 0 0 0 13.615195 4.748156l2.059442 0.629274a25.34257 25.34257 0 0 0 2.459888 0.68648 87.12581 87.12581 0 0 0 18.992626 2.173855h242.670838a86.725363 86.725363 0 0 0 18.935419-2.173855l2.402681-0.68648 2.173855-0.686481a89.242458 89.242458 0 0 0 13.615195-4.633743l2.402682-1.315754 1.201341-0.572067a90.558212 90.558212 0 0 0 13.786815-8.695419l1.201341-1.029721a81.519553 81.519553 0 0 0 13.500782-13.672402l0.972514-0.8581a77.858324 77.858324 0 0 0 13.615196-28.603352H306.849708a76.142123 76.142123 0 0 0 13.557989 28.603352z m156.345922 763.13743a17.676872 17.676872 0 0 1-17.676872-17.676871 17.619665 17.619665 0 0 1 17.676872-17.562459h252.052737a17.619665 17.619665 0 0 1 17.676872 17.562459 17.676872 17.676872 0 0 1-17.676872 17.676871z m-181.860112-1.372961a17.619665 17.619665 0 0 1-17.562458-17.676871 17.619665 17.619665 0 0 1 17.562458-17.676872h109.493631a17.676872 17.676872 0 0 1 17.676872 17.676872 17.676872 17.676872 0 0 1-17.676872 17.676871z m319.041788-93.532961a17.562458 17.562458 0 0 1-17.562458-17.562458 17.562458 17.562458 0 0 1 17.562458-17.676871h113.097653a17.619665 17.619665 0 0 1 17.562458 17.676871 17.562458 17.562458 0 0 1-17.562458 17.562458z m-319.041788 0a17.619665 17.619665 0 0 1-17.562458-17.562458 17.619665 17.619665 0 0 1 17.562458-17.676871h249.192402a17.619665 17.619665 0 0 1 17.562458 17.676871 17.619665 17.619665 0 0 1-17.562458 17.562458z m273.676871-101.370279h-0.51486a19.393073 19.393073 0 0 1-4.061676-0.572067h-0.400447l-0.51486-0.34324a16.303911 16.303911 0 0 1-5.320224-2.860336l-1.02972-0.915307v-0.34324a16.246704 16.246704 0 0 1-2.745922-3.375196 16.761564 16.761564 0 0 1-1.144134-2.231061v-0.34324a8.867039 8.867039 0 0 1-0.800894-1.658995L451.582669 276.766034 409.764568 418.753073a17.562458 17.562458 0 0 1-17.162011 12.642681H287.113395a17.676872 17.676872 0 0 1-17.676871-17.676871 17.619665 17.619665 0 0 1 17.676871-17.562458h92.217207l54.975642-186.779889a8.638212 8.638212 0 0 1 0.686481-1.372961 27.859665 27.859665 0 0 1 1.830614-3.375195 17.162011 17.162011 0 0 1 2.059442-2.517095 21.16648 21.16648 0 0 1 2.574301-2.173855 16.017877 16.017877 0 0 1 3.203576-1.658994 6.063911 6.063911 0 0 1 1.658994-0.858101 3.718436 3.718436 0 0 1 1.258548 0l0.34324 2.860335v-2.860335a16.418324 16.418324 0 0 1 6.807598 0 5.72067 5.72067 0 0 1 1.544581 0 9.953966 9.953966 0 0 1 1.601787 0.800894 34.896089 34.896089 0 0 1 3.089162 1.658994 18.420559 18.420559 0 0 1 2.688715 2.345475 13.157542 13.157542 0 0 1 2.059442 2.402682 18.248939 18.248939 0 0 1 1.601788 3.203575 3.604022 3.604022 0 0 1 0.800893 1.487375l100.569386 341.466815 41.8181-141.987039a17.562458 17.562458 0 0 1 17.162012-12.585475h109.665251a17.619665 17.619665 0 0 1 17.562458 17.562458 17.676872 17.676872 0 0 1-17.562458 17.676872H640.879652l-55.032849 186.608268a8.008939 8.008939 0 0 1-0.800894 1.658994 0.915307 0.915307 0 0 1 0 0.400447v0.343241a16.475531 16.475531 0 0 1-0.8581 1.716201 14.301676 14.301676 0 0 1-2.860336 3.432402 4.976983 4.976983 0 0 1-1.02972 1.029721 16.189497 16.189497 0 0 1-5.263017 2.860335h-0.858101a21.395307 21.395307 0 0 1-4.233296 0.572067z" fill="#e6e6e6" p-id="9730"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/individuation.svg b/src/icons/svg/individuation.svg
new file mode 100644
index 00000000..0f0bac32
--- /dev/null
+++ b/src/icons/svg/individuation.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1762485648235" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M543.378286 515.949714V104.521143a31.451429 31.451429 0 0 0-62.976 0v411.501714a125.44 125.44 0 0 0 0.292571 242.834286 31.670857 31.670857 0 0 0-0.292571 3.949714v156.745143a31.451429 31.451429 0 0 0 62.902857 0v-156.745143a31.597714 31.597714 0 0 0-0.219429-3.876571 125.513143 125.513143 0 0 0 0.292572-242.980572z m12.946285 165.814857a62.683429 62.683429 0 1 1-88.649142-88.722285 62.683429 62.683429 0 0 1 88.649142 88.722285zM229.522286 202.459429a31.597714 31.597714 0 0 0 0.292571-3.949715V104.594286a31.305143 31.305143 0 1 0-62.610286 0v93.988571c0 1.389714 0 2.706286 0.146286 4.022857a125.44 125.44 0 0 0 0 242.907429 31.670857 31.670857 0 0 0-0.146286 3.876571v470.235429a31.305143 31.305143 0 1 0 62.610286 0V449.316571a31.597714 31.597714 0 0 0-0.292571-3.803428 125.44 125.44 0 0 0 0-243.053714z m13.312 165.888a62.683429 62.683429 0 1 1-88.649143-88.722286 62.683429 62.683429 0 0 1 88.649143 88.722286zM950.857143 324.022857c0-58.587429-40.228571-107.739429-94.500572-121.563428a31.670857 31.670857 0 0 0 0.146286-3.949715V104.594286a31.305143 31.305143 0 0 0-62.610286 0v93.988571c0 1.389714 0.146286 2.706286 0.292572 4.022857a125.44 125.44 0 0 0 0 242.907429 31.670857 31.670857 0 0 0-0.292572 3.949714v470.162286a31.305143 31.305143 0 1 0 62.610286 0V449.389714c0-1.316571 0-2.56-0.146286-3.876571A125.513143 125.513143 0 0 0 950.857143 324.022857z m-81.042286 44.324572a62.683429 62.683429 0 1 1-88.649143-88.722286 62.683429 62.683429 0 0 1 88.649143 88.722286z" p-id="10986" fill="#e6e6e6"></path></svg>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 45712caf..2331140f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -396,15 +396,36 @@
           </div>
         </el-tooltip>
         <div style="margin-left:auto;">
-          <div style="padding:5px">
+          <div style="padding:5px;display: flex;">
             <!-- 手册 -->
-            <el-button v-if="isExistsManual" type="text" @click="previewManuals">{{
-              $t('trials:reading:button:handbooks') }}</el-button>
+            <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
+              v-if="isExistsManual">
+              <div class="tool-wrapper">
+                <div class="icon" @click.prevent="previewManuals">
+                  <svg-icon icon-class="constitution" class="svg-icon" />
+                </div>
+                <div class="text">{{ $t('trials:reading:button:handbooks') }}</div>
+              </div>
+            </el-tooltip>
             <!-- 临床数据 -->
-            <el-button v-if="isExistsClinicalData" type="text" @click="previewCD">{{
-              $t('trials:reading:button:clinicalData') }}</el-button>
+            <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')"
+              placement="bottom" v-if="isExistsClinicalData">
+              <div class="tool-wrapper">
+                <div class="icon" @click.prevent="previewCD">
+                  <svg-icon icon-class="documentation" class="svg-icon" />
+                </div>
+                <div class="text">{{ $t('trials:reading:button:clinicalData') }}</div>
+              </div>
+            </el-tooltip>
             <!-- 个性化配置 -->
-            <el-button type="text" @click="previewConfig">{{ $t('trials:reading:button:customCfg') }}</el-button>
+            <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:customCfg')" placement="bottom">
+              <div class="tool-wrapper">
+                <div class="icon" @click.prevent="previewConfig">
+                  <svg-icon icon-class="individuation" class="svg-icon" />
+                </div>
+                <div class="text">{{ $t('trials:reading:button:customCfg') }}</div>
+              </div>
+            </el-tooltip>
 
           </div>
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index 3efe1ba2..e0368720 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -2,17 +2,8 @@
   <div class="dicom-viewer-wrapper">
     <div class="dicom-viewer-container">
       <div class="dicom-tools">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="`${$t('trials:reading:button:layout')}`"
-          placement="bottom"
-        >
-          <div
-            class="tool-wrapper"
-            @click.stop="showPanel($event)"
-            @mouseleave="handleMouseout"
-          >
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:layout')}`" placement="bottom">
+          <div class="tool-wrapper" @click.stop="showPanel($event)" @mouseleave="handleMouseout">
             <div class="dropdown">
               <div class="icon">
                 <svg-icon icon-class="layout" class="svg-icon" />
@@ -29,11 +20,7 @@
                     <div class="layout_box_1_1">A</div>
                     <div class="layout_box_1_1">A</div>
                   </li>
-                  <li
-                    v-if="isReadingTaskViewInOrder === 1"
-                    class="flex_row"
-                    @click.stop="changeLayout('A|B')"
-                  >
+                  <li v-if="isReadingTaskViewInOrder === 1" class="flex_row" @click.stop="changeLayout('A|B')">
                     <div class="layout_box_1_1">A</div>
                     <div class="layout_box_1_1">B</div>
                   </li>
@@ -54,24 +41,11 @@
           </div>
         </el-tooltip>
 
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="`${$t('trials:reading:button:wwwc')}`"
-          placement="bottom"
-        >
-          <div
-            class="tool-wrapper"
-            @click.stop="showPanel($event)"
-            @mouseleave="handleMouseout"
-          >
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:wwwc')}`" placement="bottom">
+          <div class="tool-wrapper" @click.stop="showPanel($event)" @mouseleave="handleMouseout">
             <div class="dropdown">
-              <div
-                class="icon"
-                data-tool="Wwwc"
-                :class="[activeTool === 'Wwwc' ? 'tool_active' : '']"
-                @click.prevent="setToolActive('Wwwc', false)"
-              >
+              <div class="icon" data-tool="Wwwc" :class="[activeTool === 'Wwwc' ? 'tool_active' : '']"
+                @click.prevent="setToolActive('Wwwc', false)">
                 <svg-icon icon-class="reverse" class="svg-icon" />
                 <i class="el-icon-arrow-down" style="color: #fff" />
               </div>
@@ -81,14 +55,11 @@
                 <ul style="width: 165px; padding: 0 10px">
                   <li v-for="item in wwwcArr" :key="item.label">
                     <a href="#" @click.prevent="setDicomCanvasWwwc(item)">
-                      <div
-                        v-if="item.wc"
-                        style="
+                      <div v-if="item.wc" style="
                           display: flex;
                           flex-direction: row;
                           justify-content: space-between;
-                        "
-                      >
+                        ">
                         <div>{{ item.label }}</div>
                         <div>{{ item.ww }}/{{ item.wc }}</div>
                       </div>
@@ -102,12 +73,8 @@
                   >
                     W/L {{ $t('trials:reading:title:preset') }}
                   </div> -->
-                    <el-divider
-                      v-if="item.val === 1"
-                      class="divider"
-                      content-position="center"
-                      >{{ ` ${$t('trials:reading:title:preset')}` }}</el-divider
-                    >
+                    <el-divider v-if="item.val === 1" class="divider" content-position="center">{{ `
+                      ${$t('trials:reading:title:preset')}` }}</el-divider>
                   </li>
                 </ul>
               </div>
@@ -129,18 +96,11 @@
           <div class="text">区域调窗</div>
 
         </div> -->
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="`${$t('trials:reading:button:reverseColor')}`"
-          placement="bottom"
-        >
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:reverseColor')}`"
+          placement="bottom">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              :class="[activeTool === 'reversecolor' ? 'tool_active' : '']"
-              @click.prevent="toggleInvert"
-            >
+            <div class="icon" :class="[activeTool === 'reversecolor' ? 'tool_active' : '']"
+              @click.prevent="toggleInvert">
               <svg-icon icon-class="reversecolor" class="svg-icon" />
             </div>
             <!-- 反色 -->
@@ -148,19 +108,10 @@
           </div>
         </el-tooltip>
 
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="`${$t('trials:reading:button:zoom')}`"
-          placement="bottom"
-        >
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:zoom')}`" placement="bottom">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              :class="[activeTool === 'Zoom' ? 'tool_active' : '']"
-              data-tool="Zoom"
-              @click.prevent="setToolActive('Zoom', false)"
-            >
+            <div class="icon" :class="[activeTool === 'Zoom' ? 'tool_active' : '']" data-tool="Zoom"
+              @click.prevent="setToolActive('Zoom', false)">
               <svg-icon icon-class="magnifier" class="svg-icon" />
             </div>
             <!-- 缩放 -->
@@ -168,19 +119,10 @@
           </div>
         </el-tooltip>
 
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="`${$t('trials:reading:button:move')}`"
-          placement="bottom"
-        >
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:move')}`" placement="bottom">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              :class="[activeTool === 'Pan' ? 'tool_active' : '']"
-              data-tool="Pan"
-              @click.prevent="setToolActive('Pan', false)"
-            >
+            <div class="icon" :class="[activeTool === 'Pan' ? 'tool_active' : '']" data-tool="Pan"
+              @click.prevent="setToolActive('Pan', false)">
               <svg-icon icon-class="move" class="svg-icon" />
             </div>
             <!-- 移动 -->
@@ -188,24 +130,11 @@
           </div>
         </el-tooltip>
 
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="`${$t('trials:reading:button:rotate')}`"
-          placement="bottom"
-        >
-          <div
-            class="tool-wrapper"
-            @click.stop="showPanel($event)"
-            @mouseleave="handleMouseout"
-          >
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:rotate')}`" placement="bottom">
+          <div class="tool-wrapper" @click.stop="showPanel($event)" @mouseleave="handleMouseout">
             <!-- @click.prevent="setToolActive('Rotate',false)" -->
             <div class="dropdown">
-              <div
-                class="icon"
-                data-tool="Rotate"
-                :class="[activeTool === 'Rotate' ? 'tool_active' : '']"
-              >
+              <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>
@@ -216,16 +145,8 @@
               </div>
               <div class="dropdown-content">
                 <ul style="width: 100px; padding: 0 10px">
-                  <li
-                    v-for="rotate in rotateArr"
-                    :key="rotate.label"
-                    style="text-align: left"
-                  >
-                    <a
-                      href="#"
-                      @click.prevent="setDicomCanvasRotate(rotate.val)"
-                      >{{ rotate.label }}</a
-                    >
+                  <li v-for="rotate in rotateArr" :key="rotate.label" style="text-align: left">
+                    <a href="#" @click.prevent="setDicomCanvasRotate(rotate.val)">{{ rotate.label }}</a>
                   </li>
                 </ul>
               </div>
@@ -233,28 +154,15 @@
           </div>
         </el-tooltip>
 
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="
-            fitType === 1
-              ? `${$t('trials:reading:button:fitWindow')}`
-              : `${$t('trials:reading:button:fitImage')}`
-          "
-          placement="bottom"
-        >
+        <el-tooltip class="item" effect="dark" :content="fitType === 1
+          ? `${$t('trials:reading:button:fitWindow')}`
+          : `${$t('trials:reading:button:fitImage')}`
+          " placement="bottom">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              @click.prevent="
-                fitToType(fitType === 1 ? 'fitToWindow' : 'fitToImage')
-              "
-            >
-              <svg-icon
-                v-if="fitType === 1"
-                icon-class="fitToWindow"
-                class="svg-icon"
-              />
+            <div class="icon" @click.prevent="
+              fitToType(fitType === 1 ? 'fitToWindow' : 'fitToImage')
+              ">
+              <svg-icon v-if="fitType === 1" icon-class="fitToWindow" class="svg-icon" />
               <svg-icon v-else icon-class="fitToImage" class="svg-icon" />
             </div>
             <div class="text">
@@ -267,18 +175,10 @@
           </div>
         </el-tooltip>
 
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="`${$t('trials:reading:button:imageIndexSync')}`"
-          placement="bottom"
-        >
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:imageIndexSync')}`"
+          placement="bottom">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              :class="[isScrollSync ? 'tool_active' : '']"
-              @click.prevent="setImageIndexSync"
-            >
+            <div class="icon" :class="[isScrollSync ? 'tool_active' : '']" @click.prevent="setImageIndexSync">
               <i v-if="isScrollSync" class="el-icon-lock svg-icon" />
               <i v-else class="el-icon-unlock svg-icon" />
             </div>
@@ -298,12 +198,8 @@
           </div>
           <div class="text">适应图像</div>
         </div> -->
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="`${$t('trials:reading:button:screenShot')}`"
-          placement="bottom"
-        >
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:screenShot')}`"
+          placement="bottom">
           <div class="tool-wrapper">
             <div class="icon" @click.prevent="saveImage">
               <svg-icon icon-class="image" class="svg-icon" />
@@ -323,14 +219,9 @@
               <div v-else>{{ tool.text }}</div>
             </div>
             <div class="tool-wrapper">
-              <div
-                class="icon"
-                :class="[activeTool === tool.toolName ? 'tool_active' : '']"
-                :style="{ cursor: tool.isDisabled ? 'not-allowed' : 'pointer' }"
-                :data-tool="tool.toolName"
-                @click.prevent="setToolActive(tool.toolName, true, $event)"
-                @mouseenter="enter($event, tool.toolName)"
-              >
+              <div class="icon" :class="[activeTool === tool.toolName ? 'tool_active' : '']"
+                :style="{ cursor: tool.isDisabled ? 'not-allowed' : 'pointer' }" :data-tool="tool.toolName"
+                @click.prevent="setToolActive(tool.toolName, true, $event)" @mouseenter="enter($event, tool.toolName)">
                 <svg-icon :icon-class="tool.icon" class="svg-icon" />
               </div>
               <div class="text">{{ tool.text }}</div>
@@ -351,19 +242,10 @@
           </div> -->
         </div>
 
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="`${$t('trials:dicom-show:Eraser')}`"
-          placement="bottom"
-        >
+        <el-tooltip class="item" effect="dark" :content="`${$t('trials:dicom-show:Eraser')}`" placement="bottom">
           <div class="tool-wrapper">
-            <div
-              class="icon"
-              :class="[activeTool === 'Eraser' ? 'tool_active' : '']"
-              data-tool="Zoom"
-              @click.prevent="setToolActive('Eraser', false)"
-            >
+            <div class="icon" :class="[activeTool === 'Eraser' ? 'tool_active' : '']" data-tool="Zoom"
+              @click.prevent="setToolActive('Eraser', false)">
               <svg-icon icon-class="clear" class="svg-icon" />
             </div>
             <!-- 缩放 -->
@@ -372,43 +254,23 @@
         </el-tooltip>
         <div class="tool-frame">
           <!-- 第一帧 -->
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="$t('trials:dicom-show:firstframe')"
-            placement="bottom"
-          >
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicom-show:firstframe')" placement="bottom">
             <div class="icon" @click.prevent="scrollPage(-99999)">
               <svg-icon icon-class="firstframe" class="svg-icon" />
             </div>
           </el-tooltip>
           <!-- 上一帧 -->
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="$t('trials:dicom-show:previousframe')"
-            placement="bottom"
-          >
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicom-show:previousframe')" placement="bottom">
             <div class="icon" @click.prevent="scrollPage(-1)">
               <svg-icon icon-class="previousframe" class="svg-icon" />
             </div>
           </el-tooltip>
           <!-- 播放/暂停 -->
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="
-              clipPlaying
-                ? $t('trials:dicom-show:stop')
-                : $t('trials:dicom-show:play')
-            "
-            placement="bottom"
-          >
-            <div
-              v-if="clipPlaying"
-              class="icon"
-              @click.prevent="toggleClipPlay(false)"
-            >
+          <el-tooltip class="item" effect="dark" :content="clipPlaying
+            ? $t('trials:dicom-show:stop')
+            : $t('trials:dicom-show:play')
+            " placement="bottom">
+            <div v-if="clipPlaying" class="icon" @click.prevent="toggleClipPlay(false)">
               <svg-icon icon-class="stop" class="svg-icon" />
             </div>
             <div v-else class="icon" @click.prevent="toggleClipPlay(true)">
@@ -416,40 +278,20 @@
             </div>
           </el-tooltip>
           <!-- 下一帧 -->
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="$t('trials:dicom-show:nextframe')"
-            placement="bottom"
-          >
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicom-show:nextframe')" placement="bottom">
             <div class="icon" @click.prevent="scrollPage(1)">
               <svg-icon icon-class="nextframe" class="svg-icon" />
             </div>
           </el-tooltip>
           <!-- 最后一帧 -->
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="$t('trials:dicom-show:lastframe')"
-            placement="bottom"
-          >
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicom-show:lastframe')" placement="bottom">
             <div class="icon" @click.prevent="scrollPage(99999)">
               <svg-icon icon-class="lastframe" class="svg-icon" />
             </div>
           </el-tooltip>
 
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="$t('trials:dicom-show:speed')"
-            placement="bottom"
-          >
-            <select
-              v-model="fps"
-              class="select-wrapper"
-              :disabled="clipPlaying"
-              @change="setDicomCanvasfps($event)"
-            >
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicom-show:speed')" placement="bottom">
+            <select v-model="fps" class="select-wrapper" :disabled="clipPlaying" @change="setDicomCanvasfps($event)">
               <option :value="5">5</option>
               <option :value="10">10</option>
               <option :value="15">15</option>
@@ -459,12 +301,7 @@
             </select>
           </el-tooltip>
         </div>
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="$t('trials:reading:button:reset')"
-          placement="bottom"
-        >
+        <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:reset')" placement="bottom">
           <div class="tool-wrapper">
             <div class="icon" @click.prevent="resetViewport">
               <svg-icon icon-class="refresh" class="svg-icon" />
@@ -472,16 +309,10 @@
             <div class="text">{{ $t('trials:reading:button:reset') }}</div>
           </div>
         </el-tooltip>
-        <el-tooltip
-          v-if="
-            trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2
-          "
-          v-hasPermi="['role:ir']"
-          class="item"
-          effect="dark"
-          :content="$t('trials:reading:button:upload')"
-          placement="bottom"
-        >
+        <el-tooltip v-if="
+          trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2
+        " v-hasPermi="['role:ir']" class="item" effect="dark" :content="$t('trials:reading:button:upload')"
+          placement="bottom">
           <div class="tool-wrapper">
             <div class="icon" @click.prevent="openUploadImage('upload')">
               <i class="el-icon-upload2 svg-icon" />
@@ -489,22 +320,15 @@
             <div class="text">{{ $t('trials:reading:button:upload') }}</div>
           </div>
         </el-tooltip>
-        <el-tooltip
-          v-if="trialCriterion.ImageDownloadEnum > 0"
-          v-hasPermi="[
-            'role:ir',
-            'role:mim',
-            'role:mc',
-            'role:pm',
-            'role:apm',
-            'role:ea',
-            'role:qa',
-          ]"
-          class="item"
-          effect="dark"
-          :content="$t('trials:reading:button:download')"
-          placement="bottom"
-        >
+        <el-tooltip v-if="trialCriterion.ImageDownloadEnum > 0" v-hasPermi="[
+          'role:ir',
+          'role:mim',
+          'role:mc',
+          'role:pm',
+          'role:apm',
+          'role:ea',
+          'role:qa',
+        ]" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
           <div class="tool-wrapper">
             <div class="icon" @click.prevent="openUploadImage('download')">
               <i class="el-icon-download svg-icon" />
@@ -515,100 +339,73 @@
 
         <div style="margin-left: auto">
           <div style="padding: 5px">
-            <el-button
-              v-if="isExistsManual"
-              type="text"
-              @click="previewManuals"
-              >{{ $t('trials:reading:button:handbooks') }}</el-button
-            >
+            <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
+              v-if="isExistsManual">
+              <div class="tool-wrapper">
+                <div class="icon" @click.prevent="previewManuals">
+                  <svg-icon icon-class="constitution" class="svg-icon" />
+                </div>
+                <div class="text">{{ $t('trials:reading:button:handbooks') }}</div>
+              </div>
+            </el-tooltip>
             <!-- 临床数据 -->
-            <el-button
-              v-if="isExistsClinicalData"
-              type="text"
-              @click="previewCD"
-              >{{ $t('trials:reading:button:clinicalData') }}</el-button
-            >
-            <!-- <el-button v-if="isExistsNoDicomFile" type="text" @click="previewNoneDicoms">非Dicom文件</el-button> -->
-
-            <el-button type="text" @click="previewConfig">{{
-              $t('trials:reading:button:customCfg')
-            }}</el-button>
+            <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')"
+              placement="bottom" v-if="isExistsClinicalData">
+              <div class="tool-wrapper">
+                <div class="icon" @click.prevent="previewCD">
+                  <svg-icon icon-class="documentation" class="svg-icon" />
+                </div>
+                <div class="text">{{ $t('trials:reading:button:clinicalData') }}</div>
+              </div>
+            </el-tooltip>
+            <!-- 个性化配置 -->
+            <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:customCfg')" placement="bottom">
+              <div class="tool-wrapper">
+                <div class="icon" @click.prevent="previewConfig">
+                  <svg-icon icon-class="individuation" class="svg-icon" />
+                </div>
+                <div class="text">{{ $t('trials:reading:button:customCfg') }}</div>
+              </div>
+            </el-tooltip>
           </div>
         </div>
       </div>
       <div class="dicom-viewers">
-        <div
-          ref="container"
-          class="viewer-container"
-          :class="['box', `box_${layoutRow}_${layoutCol}`]"
-        >
-          <div
-            v-for="i in maxCanvas"
-            :key="i"
-            :class="[
-              'item',
-              i - 1 === currentDicomCanvasIndex ? 'item_active' : '',
-            ]"
-            :data-index="i - 1"
-            :style="i - 1 === currentDicomCanvasIndex ? cornerstoneStyle : {}"
-            @click="activateDicomCanvas(i - 1)"
-          >
-            <dicom-canvas
-              v-if="canvasW"
-              :ref="`dicomCanvas${i - 1}`"
-              :style="{width: fullScreenIndex === i-1 ? fullScreenWidth : canvasW,height: fullScreenIndex === i-1 ? fullScreenHeight : canvasH}"
-              :canvas-index="i - 1"
-              :is-active="i - 1 === currentDicomCanvasIndex"
-              :is-scroll-sync="isScrollSync"
+        <div ref="container" class="viewer-container" :class="['box', `box_${layoutRow}_${layoutCol}`]">
+          <div v-for="i in maxCanvas" :key="i" :class="[
+            'item',
+            i - 1 === currentDicomCanvasIndex ? 'item_active' : '',
+          ]" :data-index="i - 1" :style="i - 1 === currentDicomCanvasIndex ? cornerstoneStyle : {}"
+            @click="activateDicomCanvas(i - 1)">
+            <dicom-canvas v-if="canvasW" :ref="`dicomCanvas${i - 1}`"
+              :style="{ width: fullScreenIndex === i - 1 ? fullScreenWidth : canvasW, height: fullScreenIndex === i - 1 ? fullScreenHeight : canvasH }"
+              :canvas-index="i - 1" :is-active="i - 1 === currentDicomCanvasIndex" :is-scroll-sync="isScrollSync"
               :is-reading-show-subject-info="isReadingShowSubjectInfo"
               :is-reading-task-view-in-order="isReadingTaskViewInOrder"
-              :current-dicom-canvas-index="currentDicomCanvasIndex"
-              :custom-wwc-tpl="customWwcTpl"
-              @setMeasureData="setMeasureData"
-              @modifyMeasureData="modifyMeasureData"
-              @scrollSync="scrollSync"
-              @selectViewCanvas="selectViewCanvas"
-              @setCornerstoneStyle="setCornerstoneStyle(i - 1)"
-              @moveMeasureData="moveMeasureData"
-            />
+              :current-dicom-canvas-index="currentDicomCanvasIndex" :custom-wwc-tpl="customWwcTpl"
+              @setMeasureData="setMeasureData" @modifyMeasureData="modifyMeasureData" @scrollSync="scrollSync"
+              @selectViewCanvas="selectViewCanvas" @setCornerstoneStyle="setCornerstoneStyle(i - 1)"
+              @moveMeasureData="moveMeasureData" />
           </div>
         </div>
         <div ref="form-container" class="form-container">
           <!-- 激活canvas测量数据 -->
-          <MeasurementList
-            ref="measurementList"
-            :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading"
-            :is-reading-show-subject-info="isReadingShowSubjectInfo"
-          />
+          <MeasurementList ref="measurementList" :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading"
+            :is-reading-show-subject-info="isReadingShowSubjectInfo" />
         </div>
       </div>
     </div>
 
-    <el-dialog
-      v-if="customWwc.visible"
-      :visible.sync="customWwc.visible"
-      :close-on-click-modal="false"
-      :title="customWwc.title"
-      width="400px"
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="customWwc.visible" :visible.sync="customWwc.visible" :close-on-click-modal="false"
+      :title="customWwc.title" width="400px" custom-class="base-dialog-wrapper">
       <CustomWwwcForm @close="customWwc.visible = false" @setWwwc="setWwwc" />
     </el-dialog>
 
-    <el-dialog
-      v-if="personalConfigDialog.visible"
-      :visible.sync="personalConfigDialog.visible"
-      :close-on-click-modal="false"
-      :title="personalConfigDialog.title"
-      width="600px"
-    >
+    <el-dialog v-if="personalConfigDialog.visible" :visible.sync="personalConfigDialog.visible"
+      :close-on-click-modal="false" :title="personalConfigDialog.title" width="600px">
       <el-tabs v-model="activeName" class="personal_config">
         <el-tab-pane :label="$t('trials:reading:tab:hotkeys')" name="1">
-          <Hotkeys
-            v-if="activeName === '1'"
-            :reading-tool="0"
-            @reset="resetHotkeyList"
-          />
+          <Hotkeys v-if="activeName === '1'" :reading-tool="0" @reset="resetHotkeyList" />
         </el-tab-pane>
         <el-tab-pane :label="$t('trials:reading:tab:wlTemplate')" name="2">
           <WL v-if="activeName === '2'" @getWwcTpl="getWwcTpl" />
@@ -618,31 +415,16 @@
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
-    <el-dialog
-      v-if="manualsDialog.visible"
-      :visible.sync="manualsDialog.visible"
-      :custom-class="
-        isFullscreen
-          ? 'manuals-full-dialog-container'
-          : 'manuals-dialog-container'
-      "
-      :show-close="false"
-      :close-on-click-modal="false"
-      :fullscreen="isFullscreen"
-    >
+    <el-dialog v-if="manualsDialog.visible" :visible.sync="manualsDialog.visible" :custom-class="isFullscreen
+      ? 'manuals-full-dialog-container'
+      : 'manuals-dialog-container'
+      " :show-close="false" :close-on-click-modal="false" :fullscreen="isFullscreen">
       <span slot="title" class="dialog-footer">
         <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute; right: 20px; font-size: 20px">
-          <svg-icon
-            :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
-            style="margin-right: 10px; cursor: pointer"
-            @click="isFullscreen = !isFullscreen"
-          />
-          <svg-icon
-            icon-class="close"
-            style="cursor: pointer"
-            @click="manualsDialog.visible = false"
-          />
+          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+            style="margin-right: 10px; cursor: pointer" @click="isFullscreen = !isFullscreen" />
+          <svg-icon icon-class="close" style="cursor: pointer" @click="manualsDialog.visible = false" />
         </span>
       </span>
       <div style="height: 100%; margin: 0">
@@ -659,23 +441,12 @@
       :criterion="trialCriterion"
       :status="uploadStatus"
     /> -->
-    <upload-dicom-and-nonedicom
-      v-if="uploadImageVisible"
-      :SubjectId="uploadSubjectId"
-      :SubjectCode="uploadSubjectCode"
-      :Criterion="uploadTrialCriterion"
-      :visible.sync="uploadImageVisible"
-      :VisitTaskId="taskId"
-      :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
-    />
-    <download-dicom-and-nonedicom
-      v-if="downloadImageVisible"
-      :SubjectId="uploadSubjectId"
-      :SubjectCode="uploadSubjectCode"
-      :Criterion="uploadTrialCriterion"
-      :TaskId="taskId"
-      :visible.sync="downloadImageVisible"
-    />
+    <upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId" :SubjectCode="uploadSubjectCode"
+      :Criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible" :VisitTaskId="taskId"
+      :isReadingTaskViewInOrder="isReadingTaskViewInOrder" />
+    <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
+      :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :TaskId="taskId"
+      :visible.sync="downloadImageVisible" />
   </div>
 </template>
 <script>
@@ -1079,7 +850,7 @@ export default {
         .then((res) => {
           this.trialCriterion = res.Result
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     openUploadImage(status) {
       const idx = this.visitTaskList.findIndex((i) => i.IsCurrentTask)
@@ -1746,7 +1517,7 @@ export default {
               //   ? `frame=${frame}&instanceId=${instanceId}`
               //   : `instanceId=${instanceId}`
               let filterStr = ''
-              let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
+              let n = series.instanceInfoList.findIndex(k => k.Id === instanceId)
               if (n > -1 && series.isExistMutiFrames) {
                 if (series.instanceInfoList[n].NumberOfFrames > 0) {
                   filterStr = `frame=${frame}&instanceId=${instanceId}`
@@ -1812,7 +1583,7 @@ export default {
       if (obj) {
         const index = Math.floor(
           obj.imageIds.length *
-            ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount)
+          ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount)
         )
         obj.imageIdIndex = index > 0 ? index - 1 : 0
       }
@@ -1920,7 +1691,7 @@ export default {
       if (obj) {
         const index = Math.floor(
           obj.imageIds.length *
-            ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount)
+          ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount)
         )
         obj.imageIdIndex = index > 0 ? index - 1 : 0
       }
@@ -2263,8 +2034,8 @@ export default {
     moveMeasureData(data) {
       this.$confirm(
         this.$t('trials:trials-list:table:isDeleted') +
-          data.questionInfo.MeasureData.data.remark +
-          '?'
+        data.questionInfo.MeasureData.data.remark +
+        '?'
       ).then(() => {
         this.$refs['measurementList'].moveMeasureData(data)
       })
@@ -2354,6 +2125,7 @@ export default {
   height: 100%;
   padding: 5px 0px 5px 5px;
   box-sizing: border-box;
+
   .divider {
     display: block;
     height: 1px;
@@ -2363,6 +2135,7 @@ export default {
     // color: #fff;
     // background-color: #DCDFE6;
   }
+
   .el-divider__text {
     padding: 0 10px;
     color: #fff;
@@ -2370,19 +2143,23 @@ export default {
     font-size: 12px;
     width: 80px;
   }
+
   .dicom-viewer-container {
     display: flex;
     flex-direction: column;
     height: 100%;
   }
+
   ::-webkit-scrollbar {
     width: 5px;
     height: 5px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
+
   .dicom-tools {
     box-sizing: border-box;
     width: 100%;
@@ -2393,22 +2170,26 @@ export default {
     flex-direction: row;
     justify-content: flex-start;
     align-items: center;
+
     .tool-wrapper {
       display: flex;
       flex-direction: column;
       justify-content: center;
       align-items: center;
       margin-right: 20px;
+
       .icon {
         padding: 5px;
         border: 1px solid #404040;
         cursor: pointer;
         text-align: center;
+
         .svg-icon {
           font-size: 20px;
           color: #ddd;
         }
       }
+
       .text {
         position: relative;
         font-size: 12px;
@@ -2417,6 +2198,7 @@ export default {
         display: none;
       }
     }
+
     .tool-frame {
       display: flex;
       flex-direction: row;
@@ -2424,16 +2206,19 @@ export default {
       align-items: center;
       margin-right: 20px;
       border: 1px solid #404040;
+
       .icon {
         padding: 5px;
         border-right: 1px solid #404040;
         cursor: pointer;
         text-align: center;
+
         .svg-icon {
           font-size: 20px;
           color: #ddd;
         }
       }
+
       .select-wrapper {
         width: 60px;
         background-color: black;
@@ -2442,6 +2227,7 @@ export default {
         font-size: 13px;
         outline: none;
       }
+
       .text {
         position: relative;
         font-size: 12px;
@@ -2450,18 +2236,23 @@ export default {
         display: none;
       }
     }
+
     .tool_active {
       background-color: #607d8b;
     }
+
     .tool_disabled {
       cursor: not-allowed;
     }
+
     .icon:hover {
       background-color: #607d8b;
     }
+
     .dropdown {
       position: relative;
       display: inline-block;
+
       .text {
         text-align: center;
       }
@@ -2475,11 +2266,13 @@ export default {
       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;
@@ -2487,6 +2280,7 @@ export default {
           }
         }
       }
+
       ul li:hover a {
         background-color: #727272;
       }
@@ -2500,6 +2294,7 @@ export default {
       border-top: 1px solid #ddd;
       border-left: 1px solid #ddd;
     }
+
     .layout-content ul .flex_row {
       // border: 1px solid #ddd;
       display: flex;
@@ -2509,6 +2304,7 @@ export default {
       // padding: 2px;
       margin-bottom: 2px;
     }
+
     .layout-content ul .flex_column {
       display: flex;
       justify-content: space-between;
@@ -2516,6 +2312,7 @@ export default {
       align-items: center;
       margin-bottom: 2px;
     }
+
     .layout_box_1_1 {
       flex: 1;
       // border: 1px solid #ddd;
@@ -2526,6 +2323,7 @@ export default {
       border-right: 1px solid #ddd;
       // padding: 0 5px;
     }
+
     .layout_box_1_2 {
       flex: 1;
       // border: 1px solid #ddd;
@@ -2536,9 +2334,11 @@ export default {
       border-right: 1px solid #ddd;
       // padding: 0 5px;
     }
+
     .layout-content li .layout_box_1_1 :last-child {
       color: red;
     }
+
     // .layout_li:last-child{
     //   .layout_box{
     //     border-bottom: none;
@@ -2549,6 +2349,7 @@ export default {
       background-color: #727272;
     }
   }
+
   .dicom-viewers {
     box-sizing: border-box;
     flex: 1;
@@ -2558,6 +2359,7 @@ export default {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
+
     .form-container {
       // box-sizing: border-box;
       width: 350px;
@@ -2565,6 +2367,7 @@ export default {
       border: 1px solid #727272;
       // overflow-y: auto;
     }
+
     .viewer-container {
       box-sizing: border-box;
       flex: 1;
@@ -2576,34 +2379,41 @@ export default {
       // height: 100%;
       overflow-y: auto;
     }
+
     .box {
       display: grid;
       box-sizing: border-box;
       height: 100%;
       padding: 0;
+
       .item {
         box-sizing: border-box;
         position: relative;
         border: 1px solid rgba(255, 255, 255, 0.21);
         position: relative;
+
         &_active {
           // border: 2px solid #ffeb3b;
           border: 1px dashed #428bca;
         }
       }
     }
+
     .box_1_1 {
       grid-template-columns: repeat(1, 100%); //1列，占100%
       grid-template-rows: repeat(1, 100%); //1行，占100%
     }
+
     .box_1_2 {
       grid-template-columns: repeat(2, 50%); //1列，占50%
       grid-template-rows: repeat(1, 100%); //1行，占100%
     }
+
     .box_2_1 {
       grid-template-columns: repeat(1, 100%); //1列，占100%
       grid-template-rows: repeat(2, 50%); //1行，占50%
     }
+
     .box_2_2 {
       grid-template-columns: repeat(2, 50%); //1列，占50%
       grid-template-rows: repeat(2, 50%); //1行，占50%
@@ -2622,29 +2432,35 @@ export default {
     //   grid-template-rows: repeat(3, 33.33%); //1行，占100%
     // }
   }
+
   .personal_config {
     ::v-deep .el-tabs__content {
       height: 450px;
       overflow-y: auto;
     }
   }
+
   ::v-deep .manuals-dialog-container {
     margin-top: 50px !important;
     width: 75%;
     height: 80%;
+
     .el-dialog__body {
       padding: 10px;
       height: calc(100% - 50px) !important;
     }
+
     .el-dialog__header {
       position: relative;
     }
   }
+
   ::v-deep .manuals-full-dialog-container {
     .el-dialog__body {
       padding: 10px;
       height: calc(100% - 50px) !important;
     }
+
     .el-dialog__header {
       position: relative;
     }
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 517db540..ba9bc8f2 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -267,20 +267,21 @@
             </template>
           </div>
 
-          <div>
+          <div style="display: flex;">
             <!-- 手册 -->
-            <el-button v-if="taskInfo && taskInfo.ExistsManual" type="text" @click="previewManuals">
-              {{ $t('trials:reading:button:handbooks') }}
-            </el-button>
+            <div class="tool-item" :title="$t('trials:reading:button:handbooks')"
+              v-if="taskInfo && taskInfo.ExistsManual" @click.prevent="previewManuals">
+              <svg-icon icon-class="constitution" class="svg-icon" />
+            </div>
             <!-- 临床数据 -->
-            <el-button v-if="taskInfo && taskInfo.IsExistsClinicalData" type="text"
-              @click="previewCD(taskInfo.VisitTaskId)">
-              {{ $t('trials:reading:button:clinicalData') }}
-            </el-button>
+            <div class="tool-item" :title="$t('trials:reading:button:clinicalData')"
+              v-if="taskInfo && taskInfo.IsExistsClinicalData" @click.prevent="previewCD">
+              <svg-icon icon-class="documentation" class="svg-icon" />
+            </div>
             <!-- 个性化配置 -->
-            <el-button type="text" @click="previewConfig">
-              {{ $t('trials:reading:button:customCfg') }}
-            </el-button>
+            <div class="tool-item" :title="$t('trials:reading:button:customCfg')" @click.prevent="previewConfig">
+              <svg-icon icon-class="individuation" class="svg-icon" />
+            </div>
           </div>
         </div>
         <div class="content-wrapper">
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 6d86e72e..578fd92b 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -114,8 +114,16 @@
         </div>
       </div>
 
-      <div>
-        <el-button type="text" @click="previewConfig">{{ $t('trials:reading:button:customCfg') }}</el-button>
+      <div style="display: flex;">
+        <!-- 手册 -->
+        <div class="tool-item" :title="$t('trials:reading:button:handbooks')" v-if="taskInfo && taskInfo.ExistsManual"
+          @click.prevent="previewManuals">
+          <svg-icon icon-class="constitution" class="svg-icon" />
+        </div>
+        <!-- 个性化配置 -->
+        <div class="tool-item" :title="$t('trials:reading:button:customCfg')" @click.prevent="previewConfig">
+          <svg-icon icon-class="individuation" class="svg-icon" />
+        </div>
       </div>
     </div>
     <!-- viewports -->
@@ -231,6 +239,24 @@
     <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
       :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
       :visible.sync="downloadImageVisible" />
+    <!-- 手册 -->
+    <el-dialog v-if="manualsDialog.visible" :visible.sync="manualsDialog.visible"
+      :custom-class="manualsDialog.isFullscreen ? 'manuals-full-dialog-container' : 'manuals-dialog-container'"
+      :show-close="false" :close-on-click-modal="false" :fullscreen="manualsDialog.isFullscreen">
+      <span slot="title" class="dialog-footer">
+        <!-- 手册 -->
+        <span>{{ $t('trials:reading:button:handbooks') }}</span>
+        <span style="position: absolute;right: 20px;font-size: 20px;">
+          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+            style="margin-right:10px;cursor: pointer;"
+            @click="manualsDialog.isFullscreen = !manualsDialog.isFullscreen" />
+          <svg-icon icon-class="close" style="cursor: pointer;" @click="manualsDialog.visible = false" />
+        </span>
+      </span>
+      <div style="height: 100%;margin:0;">
+        <Manuals :trial-id="trialId" />
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -254,6 +280,7 @@ import registerWebImageLoader from './../js/registerWebImageLoader'
 import { mapGetters } from 'vuex'
 import store from '@/store'
 import Others from '@/views/trials/trials-panel/reading/dicoms/components/Others'
+import Manuals from '@/views/trials/trials-panel/reading/dicoms/components/Manuals'
 const { ViewportType } = Enums
 const renderingEngineId = 'myRenderingEngine'
 import LengthscaleTool from "../tools/LengthscaleTool"
@@ -285,6 +312,7 @@ export default {
     Others,
     downloadDicomAndNonedicom,
     uploadDicomAndNonedicom,
+    Manuals
   },
   props: {
     relatedStudyInfo: {
@@ -356,7 +384,9 @@ export default {
         type: '',
         annotation: null
       },
-      loading: false
+      loading: false,
+      manualsDialog: { visible: false, isFullscreen: false },
+      trialId: null
     }
   },
   computed: {
@@ -406,6 +436,7 @@ export default {
     }
   },
   mounted() {
+    this.trialId = this.$route.query.trialId
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
     this.readingTaskState = this.taskInfo.ReadingTaskState
     this.criterionType = this.taskInfo.CriterionType
@@ -446,6 +477,11 @@ export default {
     window.removeEventListener('message', this.handleIframeMessage)
   },
   methods: {
+    // 手册
+    previewManuals() {
+      this.manualsDialog.isFullscreen = false
+      this.manualsDialog.visible = true
+    },
     getTrialCriterion() {
       getCriterionReadingInfo({
         TrialId: this.$route.query.trialId,
@@ -1791,6 +1827,32 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+::v-deep .manuals-dialog-container {
+  margin-top: 50px !important;
+  width: 75%;
+  height: 80%;
+
+  .el-dialog__body {
+    padding: 10px;
+    height: calc(100% - 50px) !important;
+  }
+
+  .el-dialog__header {
+    position: relative;
+  }
+}
+
+::v-deep .manuals-full-dialog-container {
+  .el-dialog__body {
+    padding: 10px;
+    height: calc(100% - 50px) !important;
+  }
+
+  .el-dialog__header {
+    position: relative;
+  }
+}
+
 .content {
   cursor: default !important;
 }

From b56834e8eda8489c3c9d4dabbe5c2609cc9463b7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 10 Nov 2025 11:36:26 +0800
Subject: [PATCH 077/333] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=A0=B8=E5=AF=B9?=
 =?UTF-8?q?=E6=8F=90=E9=86=92=E6=8C=89=E9=92=AE=E5=8F=AA=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?pm=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/site/index.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue
index c5d2bf0c..76365c7f 100644
--- a/src/views/trials/trials-panel/site/index.vue
+++ b/src/views/trials/trials-panel/site/index.vue
@@ -23,8 +23,8 @@
           <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t('common:button:reset') }}
           </el-button>
-          <!-- 人员核对提醒 -->
-          <el-button type="primary" @click="openCheckRemind">
+          <!-- 人员核对提醒  -->
+          <el-button type="primary" v-hasPermi="['trials:trials-panel:site:verifyEmail']" @click="openCheckRemind">
             {{ $t('trials:site:button:checkRemind') }}
           </el-button>
         </el-form-item>
@@ -77,12 +77,13 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="" min-width="150" fixed="right" :label="$t('common:action:action')"
-          show-overflow-tooltip>
+        <el-table-column prop="" min-width="150" fixed="right" :label="$t('common:action:action')" show-overflow-tooltip
+          v-if="hasPermi(['trials:trials-panel:site:updateEmail'])">
           <template slot-scope="scope">
             <!-- 详情 -->
             <el-button icon="el-icon-message" circle :title="$t('trials:site:button:editEmail')"
-              :disabled="!scope.row.IsHaveSiteSurveyRecord" @click="openSiteEmail(scope.row)" />
+              :disabled="!scope.row.IsHaveSiteSurveyRecord" v-hasPermi="['trials:trials-panel:site:updateEmail']"
+              @click="openSiteEmail(scope.row)" />
           </template>
         </el-table-column>
       </el-table>

From 7c9cde00a94e6ca2c91f5146901d58d00741a733 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 10 Nov 2025 13:45:01 +0800
Subject: [PATCH 078/333] 1

---
 .../trials-panel/subject/reading-period/components/RPList.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue b/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
index c35f0fc5..c34bdd5d 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/RPList.vue
@@ -96,7 +96,7 @@
           <template slot-scope="scope">
             <!-- 编辑 -->
             <el-button circle :title="$t('trials:rpManage:action:edit')" icon="el-icon-tickets"
-              :disabled="scope.row.IsTakeEffect === 1 || scope.row.IsGlobal" @click="handleEdit(scope.row)" />
+              :disabled="scope.row.IsGlobal" @click="handleEdit(scope.row)" />
             <!-- 修改状态 -->
             <el-button circle :title="$t('trials:rpManage:action:status')" icon="el-icon-edit"
               :disabled="scope.row.IsGlobal" @click="handleEditStatus(scope.row)" />

From f7d7d2b742fadb3204998bf14fb158c5a8f9ca12 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 10 Nov 2025 14:22:26 +0800
Subject: [PATCH 079/333] 1

---
 .../subject/reading-period/components/ViewPeriod.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ViewPeriod.vue b/src/views/trials/trials-panel/subject/reading-period/components/ViewPeriod.vue
index e0a10fd1..895e9db1 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/ViewPeriod.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ViewPeriod.vue
@@ -82,7 +82,7 @@
                 <el-table-column prop="IsGenerateTask" :label="$t('trials:rpManage:viewPeriod:table:IsGenerateTask')"
                     show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <span>{{ $fd('TrainingStatusEnum', scope.row.IsGenerateTask) }}</span>
+                        <span>{{ $fd('IsGenerateTask', scope.row.IsGenerateTask) }}</span>
                     </template>
                 </el-table-column>
                 <!-- 生成时间 -->

From 937ab0899e6a93a77e70fc40f41702d4e2a81821 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 10 Nov 2025 15:56:20 +0800
Subject: [PATCH 080/333] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=BD=92=E6=A1=A3?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BD=B1=E5=83=8F=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/dicomFile.vue     | 62 ++++++++++++
 .../components/uploadDicomFiles2.vue          | 99 ++++++++++++++++++-
 2 files changed, 157 insertions(+), 4 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index d0c9c48e..70ed13c6 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -730,6 +730,13 @@ export default {
                 fileList: [],
                 dicomInfo: {
                   studyId: data.string('x00200010'),
+                  Manufacturer: data.string('x00080070') || '',
+                  ManufacturerModelName: data.string('x000801090') || '',
+                  DeviceSerialNumber: data.string('x00181000') || '',
+                  DeviceUID: data.string('x00181002') || '',
+                  SoftwareVersions: data.string('x00181020') || '',
+                  PatientWeight: data.string('x00101030') || '',
+
                   DicomStudyDate: data.string('x00080020'),
                   DicomStudyTime: data.string('x00080030'),
                   studyUid: studyUid,
@@ -842,6 +849,9 @@ export default {
               )
               seriesItem = {
                 seriesUid: seriesUid,
+                RadiopharmaceuticalInformationSequence: data.string('x00540016') || "",
+                AcquisitionDate: data.string('x00080022') || "",
+
                 DicomSeriesDate: data.string('x00080021'),
                 DicomSeriesTime: data.string('x00080031'),
                 seriesNumber: data.intString('x00200011') || 1,
@@ -882,6 +892,20 @@ export default {
                 instanceTime = time ? `${date} ${time}` : `${date} 00:00:00`
               }
               instanceItem = {
+                PhotometricInterpretation: data.string('x00280004') || '',
+                BitsAllocated: data.uint16('x00280100') || '',
+                PixelRepresentation: data.uint16('x00280103') || '',
+                RescaleIntercept: data.string('x00281052') || '',
+                RescaleSlope: data.string('x00281053') || '',
+                ImagePositionPatient: data.string('x00200032') || '',
+                ImageOrientationPatient: data.string('x00200037') || '',
+                SequenceOfUltrasoundRegions: data.string('x00186011') || '',
+                FrameTime: data.string('x00181063') || '',
+                CorrectedImage: data.string('x00280051') || '',
+                Units: data.string('x00541001') || '',
+                DecayCorrection: data.string('x00541102') || '',
+                EncapsulatedDocument: data.string('x00420011') || '',
+
                 instanceUid: instanceUid,
                 SOPClassUID: data.string('x00080016'),
                 TransferSytaxUID: data.string('x00020010'),
@@ -1098,6 +1122,13 @@ export default {
                   DicomStudyDate: dicomInfo.DicomStudyDate,
                   DicomStudyTime: dicomInfo.DicomStudyTime,
                   seriesList: [],
+
+                  Manufacturer: dicomInfo.Manufacturer,
+                  ManufacturerModelName: dicomInfo.ManufacturerModelName,
+                  DeviceSerialNumber: dicomInfo.DeviceSerialNumber,
+                  DeviceUID: dicomInfo.DeviceUID,
+                  SoftwareVersions: dicomInfo.SoftwareVersions,
+                  PatientWeight: dicomInfo.PatientWeight,
                 },
               }
               let arr = []
@@ -1140,6 +1171,20 @@ export default {
                               windowWidth: o.windowWidth,
                               path: o.myPath,
                               FileSize: o.FileSize,
+
+                              PhotometricInterpretation: o.PhotometricInterpretation,
+                              BitsAllocated: o.BitsAllocated,
+                              PixelRepresentation: o.PixelRepresentation,
+                              RescaleIntercept: o.RescaleIntercept,
+                              RescaleSlope: o.RescaleSlope,
+                              ImagePositionPatient: o.ImagePositionPatient,
+                              ImageOrientationPatient: o.ImageOrientationPatient,
+                              SequenceOfUltrasoundRegions: o.SequenceOfUltrasoundRegions,
+                              FrameTime: o.FrameTime,
+                              CorrectedImage: o.CorrectedImage,
+                              Units: o.Units,
+                              DecayCorrection: o.DecayCorrection,
+                              EncapsulatedDocument: o.EncapsulatedDocument,
                             })
                             Record.Uploaded.push(name)
                             dicomInfo.failedFileCount++
@@ -1224,6 +1269,20 @@ export default {
                                 windowWidth: o.windowWidth,
                                 path: scope.$getObjectName(res.url),
                                 FileSize: o.FileSize,
+
+                                PhotometricInterpretation: o.PhotometricInterpretation,
+                                BitsAllocated: o.BitsAllocated,
+                                PixelRepresentation: o.PixelRepresentation,
+                                RescaleIntercept: o.RescaleIntercept,
+                                RescaleSlope: o.RescaleSlope,
+                                ImagePositionPatient: o.ImagePositionPatient,
+                                ImageOrientationPatient: o.ImageOrientationPatient,
+                                SequenceOfUltrasoundRegions: o.SequenceOfUltrasoundRegions,
+                                FrameTime: o.FrameTime,
+                                CorrectedImage: o.CorrectedImage,
+                                Units: o.Units,
+                                DecayCorrection: o.DecayCorrection,
+                                EncapsulatedDocument: o.EncapsulatedDocument,
                               })
                               o.myPath = scope.$getObjectName(res.url)
                               Record.Uploaded.push(name)
@@ -1272,6 +1331,9 @@ export default {
                   bodyPartExamined: dicomInfo.bodyPart,
                   instanceList: instanceList,
                   ImageResizePath: ImageResizePath,
+
+                  RadiopharmaceuticalInformationSequence: v.RadiopharmaceuticalInformationSequence,
+                  AcquisitionDate: v.AcquisitionDate,
                 })
               }
               let text = JSON.stringify(Record)
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index cb076822..eb95d50a 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -926,14 +926,49 @@ export default {
                 SpecificCharacterSet,
                 patientNameBytes
               )
+              // let obj = {
+              //   // ALL
+              //   PhotometricInterpretation: data.string('x00280004') || '',
+              //   BitsAllocated: data.uint16('x00280100') || '',
+              //   PixelRepresentation: data.uint16('x00280103') || '',
+              //   RescaleIntercept: data.string('x00281052') || '',
+              //   RescaleSlope: data.string('x00281053') || '',
+              //   ImagePositionPatient: data.string('x00200032') || '',
+              //   ImageOrientationPatient: data.string('x00200037') || '',
+              //   // IVUS
+              //   SequenceOfUltrasoundRegions: data.string('x00186011') || '', // obj
+              //   FrameTime: data.string('x00181063') || '',
+              //   //PET
+              //   RadiopharmaceuticalInformationSequence: data.string('x00540016') || "", // obj
+              //   Units: data.string('x00541001') || '',
+              //   CorrectedImage: data.string('x00280051') || '',
+              //   DecayCorrection: data.string('x00541102') || '',
+              //   AcquisitionDate: data.string('x00080022') || "",
+              //   PatientWeight: data.string('x00101030') || '',
+
+              //   // 设备
+              //   Manufacturer: data.string('x00080070') || '',
+              //   ManufacturerModelName: data.string('x000801090') || '',
+              //   DeviceSerialNumber: data.string('x00181000') || '',
+              //   DeviceUID: data.string('x00181002') || '',
+              //   SoftwareVersions: data.string('x00181020') || '',
+              // }
+              // console.log(obj)
               scope.uploadQueues.push({
                 studyIndex: studyIndex,
                 seriesList: [],
                 fileList: [],
                 dicomInfo: {
                   studyId: data.string('x00200010'),
-                  DicomStudyDate: data.string('x00080020'),
-                  DicomStudyTime: data.string('x00080030'),
+                  Manufacturer: data.string('x00080070') || '',
+                  ManufacturerModelName: data.string('x000801090') || '',
+                  DeviceSerialNumber: data.string('x00181000') || '',
+                  DeviceUID: data.string('x00181002') || '',
+                  SoftwareVersions: data.string('x00181020') || '',
+                  PatientWeight: data.string('x00101030') || '',
+
+                  DicomStudyDate: data.string('x00080020') || '',
+                  DicomStudyTime: data.string('x00080030') || '',
                   studyUid: studyUid,
                   patientId: data.string('x00100020'),
                   patientName: patientNameStr,
@@ -1042,8 +1077,12 @@ export default {
               )
               seriesItem = {
                 seriesUid: seriesUid,
-                DicomSeriesDate: data.string('x00080021'),
-                DicomSeriesTime: data.string('x00080031'),
+                RadiopharmaceuticalInformationSequence: data.string('x00540016') || "",
+                AcquisitionDate: data.string('x00080022') || "",
+
+
+                DicomSeriesDate: data.string('x00080021') || "",
+                DicomSeriesTime: data.string('x00080031') || "",
                 seriesNumber: data.intString('x00200011') || 1,
                 modality: data.string('x00080060') || '',
                 description: seriesDescriptionStr,
@@ -1082,6 +1121,20 @@ export default {
                 instanceTime = time ? `${date} ${time}` : `${date} 00:00:00`
               }
               instanceItem = {
+                PhotometricInterpretation: data.string('x00280004') || '',
+                BitsAllocated: data.uint16('x00280100') || '',
+                PixelRepresentation: data.uint16('x00280103') || '',
+                RescaleIntercept: data.string('x00281052') || '',
+                RescaleSlope: data.string('x00281053') || '',
+                ImagePositionPatient: data.string('x00200032') || '',
+                ImageOrientationPatient: data.string('x00200037') || '',
+                SequenceOfUltrasoundRegions: data.string('x00186011') || '',
+                FrameTime: data.string('x00181063') || '',
+                CorrectedImage: data.string('x00280051') || '',
+                Units: data.string('x00541001') || '',
+                DecayCorrection: data.string('x00541102') || '',
+                EncapsulatedDocument: data.string('x00420011') || '',
+
                 instanceUid: instanceUid,
                 SOPClassUID: data.string('x00080016'),
                 TransferSytaxUID: data.string('x00020010'),
@@ -1449,6 +1502,13 @@ export default {
                   DicomStudyDate: dicomInfo.DicomStudyDate,
                   DicomStudyTime: dicomInfo.DicomStudyTime,
                   seriesList: [],
+
+                  Manufacturer: dicomInfo.Manufacturer,
+                  ManufacturerModelName: dicomInfo.ManufacturerModelName,
+                  DeviceSerialNumber: dicomInfo.DeviceSerialNumber,
+                  DeviceUID: dicomInfo.DeviceUID,
+                  SoftwareVersions: dicomInfo.SoftwareVersions,
+                  PatientWeight: dicomInfo.PatientWeight,
                 },
               }
               let arr = []
@@ -1491,6 +1551,20 @@ export default {
                               windowWidth: o.windowWidth,
                               path: o.myPath,
                               FileSize: o.FileSize,
+
+                              PhotometricInterpretation: o.PhotometricInterpretation,
+                              BitsAllocated: o.BitsAllocated,
+                              PixelRepresentation: o.PixelRepresentation,
+                              RescaleIntercept: o.RescaleIntercept,
+                              RescaleSlope: o.RescaleSlope,
+                              ImagePositionPatient: o.ImagePositionPatient,
+                              ImageOrientationPatient: o.ImageOrientationPatient,
+                              SequenceOfUltrasoundRegions: o.SequenceOfUltrasoundRegions,
+                              FrameTime: o.FrameTime,
+                              CorrectedImage: o.CorrectedImage,
+                              Units: o.Units,
+                              DecayCorrection: o.DecayCorrection,
+                              EncapsulatedDocument: o.EncapsulatedDocument,
                             })
                             Record.Uploaded.push(name)
                             dicomInfo.failedFileCount++
@@ -1580,6 +1654,20 @@ export default {
                                 windowWidth: o.windowWidth,
                                 path: scope.$getObjectName(res.url),
                                 FileSize: o.FileSize,
+
+                                PhotometricInterpretation: o.PhotometricInterpretation,
+                                BitsAllocated: o.BitsAllocated,
+                                PixelRepresentation: o.PixelRepresentation,
+                                RescaleIntercept: o.RescaleIntercept,
+                                RescaleSlope: o.RescaleSlope,
+                                ImagePositionPatient: o.ImagePositionPatient,
+                                ImageOrientationPatient: o.ImageOrientationPatient,
+                                SequenceOfUltrasoundRegions: o.SequenceOfUltrasoundRegions,
+                                FrameTime: o.FrameTime,
+                                CorrectedImage: o.CorrectedImage,
+                                Units: o.Units,
+                                DecayCorrection: o.DecayCorrection,
+                                EncapsulatedDocument: o.EncapsulatedDocument,
                               })
                               o.myPath = scope.$getObjectName(res.url)
                               Record.Uploaded.push(name)
@@ -1628,6 +1716,9 @@ export default {
                   bodyPartExamined: dicomInfo.bodyPart,
                   instanceList: instanceList,
                   ImageResizePath: ImageResizePath,
+
+                  RadiopharmaceuticalInformationSequence: v.RadiopharmaceuticalInformationSequence,
+                  AcquisitionDate: v.AcquisitionDate,
                 })
               }
               let text = JSON.stringify(Record)

From 49b3b056e3ac8706681c5a85f28ced546097640f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 11 Nov 2025 15:56:26 +0800
Subject: [PATCH 081/333] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E4=B8=8E=E4=B8=AD=E5=BF=83=E5=BD=B1=E5=83=8F=E6=89=8B=E5=86=8C?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |   9 +
 .../SignatureTemplate/attachmentPreview.vue   |  24 +-
 src/views/research/components/BaseInfo.vue    | 133 ++++----
 src/views/research/form.vue                   | 149 ++++----
 .../site-research/components/ImageManual.vue  | 202 +++++++++++
 .../attachments/site-research/index.vue       | 323 +++++-------------
 6 files changed, 459 insertions(+), 381 deletions(-)
 create mode 100644 src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index db4b751c..6bb5711e 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -4357,4 +4357,13 @@ export function setBatchRemoveReadingPlan(data) {
     method: 'post',
     data
   })
+}
+// 更新项目额外json配置
+export function updateTrialExtralConfig(params, data) {
+  return request({
+    url: `/TrialConfig/updateTrialExtralConfig`,
+    method: 'put',
+    params,
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue b/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue
index e5a0915a..1eedf811 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue
@@ -106,6 +106,16 @@ export default {
         isTrial: {
             type: Boolean,
             default: false
+        },
+        isExternal: {
+            type: Boolean,
+            default: false
+        },
+        ExternalList: {
+            type: Array,
+            default: () => {
+                return []
+            }
         }
     },
     data() {
@@ -122,7 +132,8 @@ export default {
             rowData: {},
             list: [],
             searchData: defaultSearchData(),
-            title: this.$t('dictionary:signature:fileList')
+            title: this.$t('dictionary:signature:fileList'),
+            loading: false
         }
     },
     watch: {
@@ -131,6 +142,16 @@ export default {
                 this.getList()
             },
             immediate: true,
+        },
+        isExternal: {
+            handler() {
+                if (this.isExternal) {
+                    this.list = this.ExternalList
+                    this.rowData = this.list[0] || {}
+                    this.title = this.$t('dictionary:signature:view')
+                }
+            },
+            immediate: true
         }
     },
     methods: {
@@ -145,6 +166,7 @@ export default {
         },
         async getList() {
             try {
+                if (this.isExternal) return
                 if (!this.SystemDocumentId) return false
                 this.loading = true
                 if (!this.isTrial) {
diff --git a/src/views/research/components/BaseInfo.vue b/src/views/research/components/BaseInfo.vue
index e32538ba..9ef0402c 100644
--- a/src/views/research/components/BaseInfo.vue
+++ b/src/views/research/components/BaseInfo.vue
@@ -18,19 +18,10 @@
     </el-form-item>
     <!-- 中心名称 -->
     <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
-      <el-select
-        v-model="form.TrialSiteId"
-        filterable
-        style="width:100%;"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-        @change="handleSiteChange"
-      >
-        <el-option
-          v-for="(item,index) of siteOptions"
-          :key="index"
-          :label="item.TrialSiteAliasName"
-          :value="item.TrialSiteId"
-        />
+      <el-select v-model="form.TrialSiteId" filterable style="width:100%;"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" @change="handleSiteChange">
+        <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteAliasName"
+          :value="item.TrialSiteId" />
       </el-select>
     </el-form-item>
     <!-- 中心编号 -->
@@ -42,10 +33,7 @@
       <el-input v-model="form.UserName" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
     </el-form-item>
     <!-- 联系电话 -->
-    <el-form-item
-      :label="$t('trials:researchForm:form:contactorPhone')"
-      prop="Phone"
-    >
+    <el-form-item :label="$t('trials:researchForm:form:contactorPhone')" prop="Phone">
       <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
     </el-form-item>
     <!-- 联系邮箱 -->
@@ -55,75 +43,71 @@
 
     <!-- <el-divider /> -->
     <!-- 平均刻盘周期（天） -->
-    <el-form-item v-if="!notShowFieldList.includes('AverageEngravingCycle')" :label="$t('trials:researchForm:form:engravingCycle')">
-      <el-input-number v-model="form.AverageEngravingCycle" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" />
+    <el-form-item v-if="!notShowFieldList.includes('AverageEngravingCycle')"
+      :label="$t('trials:researchForm:form:engravingCycle')">
+      <el-input-number v-model="form.AverageEngravingCycle"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" />
     </el-form-item>
     <!-- 请确认参与本项目影像采集的影像技师具备对应的资质（如：“技师证”，对应设备的“大型设备上岗证”） -->
-    <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')" :label="$t('trials:researchForm:form:isQualified')">
-      <el-radio-group v-model="form.IsConfirmImagingTechnologist" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
-        <el-radio
-          v-for="item of $d.YesOrNo"
-          :key="`IsConfirmImagingTechnologist${item.value}`"
-          :label="item.value"
-        >{{ item.label }}</el-radio>
+    <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')"
+      :label="$t('trials:researchForm:form:isQualified')">
+      <el-radio-group v-model="form.IsConfirmImagingTechnologist"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+        <el-radio v-for="item of $d.YesOrNo" :key="`IsConfirmImagingTechnologist${item.value}`" :label="item.value">{{
+          item.label }}</el-radio>
       </el-radio-group>
     </el-form-item>
     <!-- 原因 -->
-    <el-form-item
-      v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
-      :label="$t('trials:researchForm:form:notQualifiedReason')"
-    >
-      <el-input
-        v-model="form.NotConfirmReson"
-        type="textarea"
-        :autosize="{ minRows: 2, maxRows: 4}"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-      />
+    <el-form-item v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
+      :label="$t('trials:researchForm:form:notQualifiedReason')">
+      <el-input v-model="form.NotConfirmReson" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
     </el-form-item>
     <!-- 研究单位疗效评估人员类型 -->
-    <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')" :label="$t('trials:researchForm:form:staffType')">
-      <el-radio-group v-model="form.EfficacyEvaluatorType" :disabled="!(state === 0 && userTypeEnumInt === 0)|| isHistory">
-        <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+    <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')"
+      :label="$t('trials:researchForm:form:staffType')">
+      <el-radio-group v-model="form.EfficacyEvaluatorType"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+        <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`"
+          :label="item.value">{{ item.label }}</el-radio>
       </el-radio-group>
     </el-form-item>
     <!-- 是否严格按照研究单位影像手册参数完成图像采集 -->
     <el-form-item v-if="!notShowFieldList.includes('IsFollowStudyParameters')">
       <span slot="label" v-html="$t('trials:researchForm:form:isFollowStudyParam')" />
-      <el-radio-group v-model="form.IsFollowStudyParameters" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
-        <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+      <el-radio-group v-model="form.IsFollowStudyParameters"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" style="margin-right: 10px;">
+        <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{
+          item.label }}</el-radio>
       </el-radio-group>
+      <el-button type="primary" size="small" @click="viewManual">
+        {{ $t('trials:researchForm:button:viewManual') }}
+      </el-button>
     </el-form-item>
     <!-- 不能严格按照研究单位影像手册参数采集图像原因 -->
-    <el-form-item
-      v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters"
-    >
+    <el-form-item v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters">
       <span slot="label" v-html="$t('trials:researchForm:form:notFollowStudyParam')" />
-      <el-input
-        v-model="form.NotFollowReson"
-        type="textarea"
-        :autosize="{ minRows: 2, maxRows: 4}"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-      />
+      <el-input v-model="form.NotFollowReson" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
     </el-form-item>
     <el-form-item>
       <!-- 保存 -->
-      <el-button
-        v-if="state === 0 && userTypeEnumInt === 0 && !isHistory"
-        type="primary"
-        :loading="btnLoading"
-        size="small"
-        @click="handleSave(false)"
-      >
+      <el-button v-if="state === 0 && userTypeEnumInt === 0 && !isHistory" type="primary" :loading="btnLoading"
+        size="small" @click="handleSave(false)">
         {{ $t('common:button:save') }}
       </el-button>
     </el-form-item>
+    <attachmentPreview :visible.sync="perview_visible" :isView="true" :isExternal="true" :ExternalList="ExternalList"
+      v-if="perview_visible" />
   </el-form>
 </template>
 <script>
-import { getTrialSiteSelect } from '@/api/trials'
+import { getTrialSiteSelect, getTrialDocumentList } from '@/api/trials'
 import { addOrUpdateTrialSiteSurvey } from '@/api/research'
+import attachmentPreview from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview'
 export default {
   name: 'QuestionForm',
+  components: { attachmentPreview },
   props: {
     isHistory: {
       type: Boolean,
@@ -197,10 +181,41 @@ export default {
       state: null,
       userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
       isShow: false,
-      notShowFieldList: []
+      notShowFieldList: [],
+      perview_visible: false,
+      ExternalList: []
     }
   },
   methods: {
+    async viewManual() {
+      try {
+        let data = {
+          PageIndex: 1,
+          PageSize: 20,
+          TrialId: this.$route.query.trialId,
+          IsPublish: true,
+          FileTypeCode: 4,
+          IsDeleted: false
+        }
+        let res = await getTrialDocumentList(data)
+        if (res.IsSuccess) {
+          const { CurrentPageData } = res.Result
+          if (CurrentPageData.length <= 0) return this.$message.warning(this.$t("trials:researchRecord:ImageManual:message:noImageManual"))
+          this.ExternalList = []
+          CurrentPageData.forEach(item => {
+            let obj = {
+              FilePath: item.Path,
+              FileFormat: 'pdf',
+              Name: item.Name
+            }
+            this.ExternalList.push(obj)
+          });
+          this.perview_visible = true
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     // 保存基本信息
     handleSave(isAutoCommit) {
       return new Promise((resolve, reject) => {
diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index b9c05b7d..afd5728e 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -6,61 +6,37 @@
         {{ $t('trials:researchForm:title:question') }}
       </h2>
       <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
-      <div style="display: flex;justify-content: space-between;">
-        <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
+      <div style="display: flex;justify-content: space-between;" v-if="!isPreview">
+        <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state)
+        }}</el-tag></div>
         <div>
           <!-- 提交 -->
-          <el-button
-            v-if="(state === 0 && userTypeEnumInt === 0)"
-            type="primary"
-            size="small"
-            @click="handleSubmit('submit')"
-          >
+          <el-button v-if="(state === 0 && userTypeEnumInt === 0)" type="primary" size="small"
+            @click="handleSubmit('submit')">
             {{ $t('trials:researchForm:button:submit') }}
           </el-button>
           <!-- 审核通过 -->
-          <el-button
-            v-if="(state === 1 && hasPermi(['role:spm','role:cpm']))"
-            type="primary"
-            size="small"
-            @click="handleSubmit('approve')"
-          >
+          <el-button v-if="(state === 1 && hasPermi(['role:spm', 'role:cpm']))" type="primary" size="small"
+            @click="handleSubmit('approve')">
             {{ $t('trials:researchForm:button:auditPasses') }}
           </el-button>
           <!-- 审核通过 -->
-          <el-button
-            v-if="(state === 2 && hasPermi(['role:pm','role:apm']))"
-            type="primary"
-            size="small"
-            @click="generateAccount"
-          >
+          <el-button v-if="(state === 2 && hasPermi(['role:pm', 'role:apm']))" type="primary" size="small"
+            @click="generateAccount">
             {{ $t('trials:researchForm:button:auditPasses') }}
           </el-button>
           <!-- 驳回 -->
           <el-button
-            v-if="((state === 1 && hasPermi(['role:spm','role:cpm'])) || (state === 2 && hasPermi(['role:pm','role:apm'])))"
-            type="primary"
-            size="small"
-            @click="handleReject"
-          >
+            v-if="((state === 1 && hasPermi(['role:spm', 'role:cpm'])) || (state === 2 && hasPermi(['role:pm', 'role:apm'])))"
+            type="primary" size="small" @click="handleReject">
             {{ $t('trials:researchForm:button:auditRejected') }}
           </el-button>
           <!-- 历史记录 -->
-          <el-button
-            v-if="userTypeEnumInt === 0"
-            type="primary"
-            size="small"
-            @click="handleHistory"
-          >
+          <el-button v-if="userTypeEnumInt === 0" type="primary" size="small" @click="handleHistory">
             {{ $t('trials:researchForm:button:historicalRecord') }}
           </el-button>
           <!-- 退出 -->
-          <el-button
-            v-if="userTypeEnumInt === 0"
-            type="primary"
-            size="small"
-            @click="handleBack"
-          >
+          <el-button v-if="userTypeEnumInt === 0" type="primary" size="small" @click="handleBack">
             {{ $t('trials:researchForm:button:loginOut') }}
           </el-button>
         </div>
@@ -69,24 +45,26 @@
     <div class="center-wrapper">
       <!-- 基本信息 -->
       <el-card shadow="hover">
-        <BaseInfo ref="baseResearchInfo" />
+        <BaseInfo ref="baseResearchInfo" :isPreview="isPreview" />
       </el-card>
 
       <!-- 人员调查 -->
       <el-card shadow="hover" class="mt10">
         <!-- 历史人员 -->
         <h4>{{ $t('trials:staffResearch:title:historicalStaff') }}</h4>
-        <HistoricalParticipant ref="historicalParticipant" @refreshPage="refreshPage" @getList="initPage" />
+        <HistoricalParticipant ref="historicalParticipant" :isPreview="isPreview" @refreshPage="refreshPage"
+          @getList="initPage" />
         <!-- <h4>{{ $t('trials:staffResearch:title:staff') }}</h4> -->
         <!-- 新增人员 -->
         <h4>{{ $t('trials:staffResearch:title:newStaff') }}</h4>
-        <ParticipantList ref="researchParticipants" @refreshPage="refreshPage" @getList="initPage" />
+        <ParticipantList ref="researchParticipants" :isPreview="isPreview" @refreshPage="refreshPage"
+          @getList="initPage" />
       </el-card>
 
       <!-- 设备调研 -->
       <el-card shadow="hover" class="mt10">
         <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
-        <EquipmentList ref="researchEquipments" />
+        <EquipmentList ref="researchEquipments" :isPreview="isPreview" />
       </el-card>
 
       <!-- 其他信息调研 -->
@@ -110,31 +88,17 @@
       </el-card>
     </div>
 
-    <el-dialog
-      v-if="rejectVisible"
-      :visible.sync="rejectVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:researchForm:dialogTitle:reject')"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-      append-to-body
-    >
+    <el-dialog v-if="rejectVisible" :visible.sync="rejectVisible" :close-on-click-modal="false"
+      :title="$t('trials:researchForm:dialogTitle:reject')" width="600px" custom-class="base-dialog-wrapper"
+      append-to-body>
       <el-form ref="rejectForm" :model="rejectForm" label-width="100px">
         <div class="base-dialog-body">
           <!-- 驳回原因 -->
-          <el-form-item
-            :label="$t('trials:researchForm:form:rejectReson')"
-            prop="reason"
-            :rules="[
-              { required: true, message: $t('trials:researchForm:formRule:specify')}
-            ]"
-          >
-            <el-input
-              v-model="rejectForm.reason"
-              type="textarea"
-              :autosize="{ minRows: 2, maxRows: 4}"
-              style="width:100%;"
-            />
+          <el-form-item :label="$t('trials:researchForm:form:rejectReson')" prop="reason" :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:specify') }
+          ]">
+            <el-input v-model="rejectForm.reason" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+              style="width:100%;" />
           </el-form-item>
         </div>
         <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@@ -152,30 +116,24 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog
-      :visible.sync="historyVisible"
-      :custom-class="isFullscreen?'full-dialog-container':'dialog-container'"
-      :close-on-click-modal="false"
-      :fullscreen="isFullscreen"
-      :show-close="false"
-    >
+    <el-dialog :visible.sync="historyVisible"
+      :custom-class="isFullscreen ? 'full-dialog-container' : 'dialog-container'" :close-on-click-modal="false"
+      :fullscreen="isFullscreen" :show-close="false">
       <span slot="title" class="dialog-footer">
         <div style="display: flex;flex-direction: row;justify-content: space-between;">
           <div>
             {{ $t('trials:researchForm:button:historicalRecord') }}
           </div>
           <div>
-            <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" style="vertical-align: baseline;cursor: pointer;font-size: 20px;" @click="isFullscreen=!isFullscreen" />
-            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="historyVisible = false" />
+            <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+              style="vertical-align: baseline;cursor: pointer;font-size: 20px;" @click="isFullscreen = !isFullscreen" />
+            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
+              @click="historyVisible = false" />
           </div>
         </div>
       </span>
       <div style="height:100%;margin:0;">
-        <HistoricalRecord
-          :trial-id="trialId"
-          :site-id="siteId"
-          :trial-site-survey-id="trialSiteSurveyId"
-        />
+        <HistoricalRecord :trial-id="trialId" :site-id="siteId" :trial-site-survey-id="trialSiteSurveyId" />
       </div>
     </el-dialog>
 
@@ -194,6 +152,12 @@ import HistoricalRecord from './components/HistoricalRecord'
 export default {
   name: 'QuestionForm',
   components: { BaseInfo, HistoricalParticipant, ParticipantList, EquipmentList, TopLang, HistoricalRecord },
+  props: {
+    isPreview: {
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
     return {
       trialId: this.$route.query.trialId,
@@ -290,7 +254,7 @@ export default {
             }
           }
         }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 生成账号
     generateAccount() {
@@ -325,7 +289,7 @@ export default {
         }).catch(() => {
           this.loading = false
         })
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 驳回
     handleReject() {
@@ -373,37 +337,44 @@ export default {
   display: flex;
   flex-direction: column;
   height: 100%;
-  .mt10{
+
+  .mt10 {
     margin-top: 10px;
   }
-  .header-wrapper{
+
+  .header-wrapper {
     width: 70%;
     margin: 20px auto;
   }
-  .center-wrapper{
+
+  .center-wrapper {
     flex: 1;
     width: 70%;
     margin: 0px auto;
     padding-bottom: 20px;
     overflow-y: auto;
   }
-  ::v-deep.el-card__body{
+
+  ::v-deep.el-card__body {
     padding: 10px;
   }
+
   // >>>.el-dialog__body{
   //   padding: 10px 20px 20px 20px;
   // }
 
-  ::v-deep.full-dialog-container{
-   .el-dialog__body{
+  ::v-deep.full-dialog-container {
+    .el-dialog__body {
       height: calc(100% - 80px);
     }
   }
-  ::v-deep.dialog-container{
+
+  ::v-deep.dialog-container {
     // margin-top: 50px !important;
-    width:75%;
-    height:80%;
-    .el-dialog__body{
+    width: 75%;
+    height: 80%;
+
+    .el-dialog__body {
       padding: 10px;
       height: calc(100% - 80px);
     }
diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
new file mode 100644
index 00000000..0f330542
--- /dev/null
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
@@ -0,0 +1,202 @@
+<template>
+    <div class="ImageManual">
+        <div class="config">
+            <div style="margin-bottom: 20px;font-weight: bold;">
+                {{ $t("trials:researchRecord:ImageManual:BasicQuestion") }}
+            </div>
+            <el-form size="small" :model="form" style="width:80%">
+                <el-form-item>
+                    <el-checkbox v-model="form.AverageEngravingCycle">
+                        {{ $t('trials:researchForm:form:engravingCycle') }}
+                    </el-checkbox>
+                </el-form-item>
+                <el-form-item>
+                    <el-checkbox v-model="form.IsConfirmImagingTechnologist"
+                        @change="(val) => handleChange(val, 'IsConfirmImagingTechnologist')">
+                        {{ $t('trials:researchForm:form:isQualified') }}
+                    </el-checkbox>
+                </el-form-item>
+                <el-form-item>
+                    <el-checkbox v-model="form.EfficacyEvaluatorType">
+                        {{ $t('trials:researchForm:form:staffType') }}
+                    </el-checkbox>
+                </el-form-item>
+                <el-form-item>
+                    <el-checkbox v-model="form.IsFollowStudyParameters"
+                        @change="(val) => handleChange(val, 'IsFollowStudyParameters')">
+                        {{ $t('trials:researchForm:form:isFollowStudyParam') }}
+                    </el-checkbox>
+                </el-form-item>
+            </el-form>
+            <div style="margin-bottom: 20px;font-weight: bold;">
+                {{ $t("trials:researchRecord:ImageManual:Precautions") }}
+            </div>
+            <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 99 }" placeholder=""
+                v-model="form.ReplaceContent" @input="handleInput" style="width: 70%;" />
+            <div style="text-align: right;margin: 20px;">
+                <el-button type="primary" :loading="loading" size="small" @click="handleSave">
+                    {{ $t('common:button:save') }}
+                </el-button>
+            </div>
+        </div>
+        <div class="preview">
+            <researchForm ref="ResearchForm" :trialSiteSurveyId="trialSiteSurveyId" />
+        </div>
+    </div>
+</template>
+<script>
+import researchForm from '@/views/research/components/ResearchForm'
+import { updateTrialExtralConfig, getTrialExtralConfig, getTrialDocumentList } from "@/api/trials"
+export default {
+    name: "ImageManual",
+    components: { researchForm },
+    props: {
+        trialSiteSurveyId: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            form: {
+                AverageEngravingCycle: false,
+                IsConfirmImagingTechnologist: false,
+                NotConfirmReson: false,
+                EfficacyEvaluatorType: false,
+                IsFollowStudyParameters: false,
+                NotFollowReson: false,
+                ReplaceContent: '',
+                ReplaceContentCN: '',
+                IsOpenLostVistRead: false,
+                IsSupportQCDownloadImage: false
+            },
+            obj: {
+                AverageEngravingCycle: false,
+                IsConfirmImagingTechnologist: false,
+                NotConfirmReson: false,
+                EfficacyEvaluatorType: false,
+                IsFollowStudyParameters: false,
+                NotFollowReson: false,
+            },
+            loading: false
+        }
+    },
+    mounted() {
+        this.getInfo()
+    },
+    methods: {
+        handleChange(val, key) {
+            if (key === 'IsConfirmImagingTechnologist') this.form.NotConfirmReson = val
+            if (key === 'IsFollowStudyParameters') this.form.NotFollowReson = val
+        },
+        handleInput(val) {
+            this.form.ReplaceContentCN = val
+        },
+        async getInfo() {
+            try {
+                let param = {
+                    TrialId: this.$route.query.trialId
+                }
+                let res = await getTrialExtralConfig(param)
+                if (res.IsSuccess) {
+                    Object.keys(this.form).forEach(key => {
+                        this.form[key] = true
+                        if (key === 'ReplaceContent' || key === 'ReplaceContentCN') this.form[key] = ''
+                    })
+                    this.form.IsOpenLostVistRead = res.Result.IsOpenLostVistRead
+                    this.form.IsSupportQCDownloadImage = res.Result.IsSupportQCDownloadImage
+                    if (Array.isArray(res.Result.NotShowFieldList) && res.Result.NotShowFieldList.length > 0) {
+                        res.Result.NotShowFieldList.forEach(key => {
+                            this.form[key] = false
+                        })
+                    }
+                    if (Array.isArray(res.Result.ModifyFiledList) && res.Result.ModifyFiledList.length > 0) {
+                        this.form.ReplaceContent = res.Result.ModifyFiledList[0].ReplaceContent.split('<p>').join('').split('</p>').filter(item => isNaN(item)).join("\n")
+                        this.form.ReplaceContentCN = res.Result.ModifyFiledList[0].ReplaceContentCN.split('<p>').join('').split('</p>').filter(item => isNaN(item)).join("\n")
+                    }
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        },
+
+        async getTrialDocumentList() {
+            try {
+                let data = {
+                    PageIndex: 1,
+                    PageSize: 20,
+                    TrialId: this.$route.query.trialId,
+                    IsPublish: true,
+                    FileTypeCode: 4,
+                    IsDeleted: false
+                }
+                let res = await getTrialDocumentList(data)
+                if (res.IsSuccess) {
+                    const { CurrentPageData } = res.Result
+                    if (CurrentPageData.length <= 0) this.$message.warning(this.$t("trials:researchRecord:ImageManual:message:noImageManual"))
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        },
+        async handleSave() {
+            try {
+                let param = {
+                    TrialId: this.$route.query.trialId
+                }
+                let data = {
+                    IsOpenLostVistRead: this.form.IsOpenLostVistRead,
+                    IsSupportQCDownloadImage: this.form.IsSupportQCDownloadImage,
+                    ModifyFiledList: [],
+                    NotShowFieldList: []
+                }
+                Object.keys(this.obj).forEach(key => {
+                    if (!this.form[key]) data.NotShowFieldList.push(key)
+                })
+                let ReplaceContent = ''
+                this.form.ReplaceContent.split("\n").forEach(item => {
+                    ReplaceContent += `<p>${item}</p>`
+                })
+                let ReplaceContentCN = ''
+                this.form.ReplaceContentCN.split("\n").forEach(item => {
+                    ReplaceContentCN += `<p>${item}</p>`
+                })
+                let obj = {
+                    NeedModifyFiled: 'SiteSurveyNote',
+                    ReplaceContent: ReplaceContent,
+                    ReplaceContentCN: ReplaceContentCN,
+                }
+                data.ModifyFiledList.push(obj)
+                this.loading = true
+                let res = await updateTrialExtralConfig(param, data)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.$refs.ResearchForm.initPage()
+                    if (!data.NotShowFieldList.includes('IsFollowStudyParameters')) this.getTrialDocumentList()
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.ImageManual {
+    width: 100%;
+    height: 100%;
+    display: flex;
+
+    .config,
+    .preview {
+        width: 50%;
+        height: 100%;
+        overflow-y: auto;
+    }
+
+    .config {
+        border-right: 1px solid #EBEEF5;
+    }
+}
+</style>
diff --git a/src/views/trials/trials-panel/attachments/site-research/index.vue b/src/views/trials/trials-panel/attachments/site-research/index.vue
index cd45126a..9507c564 100644
--- a/src/views/trials/trials-panel/attachments/site-research/index.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/index.vue
@@ -5,127 +5,62 @@
       <el-form :inline="true">
         <!-- 中心 -->
         <el-form-item :label="$t('trials:researchRecord:table:siteId')">
-          <el-select
-            v-model="searchData.TrialSiteId"
-            clearable
-            filterable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="(item, index) of siteOptions"
-              :key="index"
-              :label="item.TrialSiteCode"
-              :value="item.TrialSiteId"
-            />
+          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width: 120px">
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
+              :value="item.TrialSiteId" />
           </el-select>
         </el-form-item>
         <!-- 联系人 -->
         <el-form-item :label="$t('trials:researchRecord:table:contactor')">
-          <el-input
-            v-model="searchData.UserKeyInfo"
-            class="mr"
-            clearable
-            :placeholder="`${$t(
-              'trials:researchRecord:placeholder:contactorInfo'
-            )}`"
-            style="width: 140px"
-          />
+          <el-input v-model="searchData.UserKeyInfo" class="mr" clearable :placeholder="`${$t(
+            'trials:researchRecord:placeholder:contactorInfo'
+          )}`" style="width: 140px" />
         </el-form-item>
         <!-- 初审人 -->
-        <el-form-item
-          :label="$t('trials:researchRecord:table:preliminaryUser')"
-        >
-          <el-input
-            v-model="searchData.PreliminaryUserName"
-            class="mr"
-            clearable
-            style="width: 140px"
-          />
+        <el-form-item :label="$t('trials:researchRecord:table:preliminaryUser')">
+          <el-input v-model="searchData.PreliminaryUserName" class="mr" clearable style="width: 140px" />
         </el-form-item>
         <!-- 审核人 -->
         <el-form-item :label="$t('trials:researchRecord:table:ReviewerUser')">
-          <el-input
-            v-model="searchData.ReviewerUserName"
-            class="mr"
-            clearable
-            style="width: 140px"
-          />
+          <el-input v-model="searchData.ReviewerUserName" class="mr" clearable style="width: 140px" />
         </el-form-item>
         <!-- 状态 -->
         <el-form-item :label="$t('trials:researchRecord:table:status')">
-          <el-select
-            v-model="searchData.State"
-            clearable
-            filterable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="(item, index) of $d.ResearchRecord"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            />
+          <el-select v-model="searchData.State" clearable filterable style="width: 120px">
+            <el-option v-for="(item, index) of $d.ResearchRecord" :key="index" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
         <!-- 是否废除 -->
         <el-form-item :label="$t('trials:researchRecord:table:isDeleted')">
-          <el-select
-            v-model="searchData.IsDeleted"
-            clearable
-            filterable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="item of $d.YesOrNo"
-              v-show="item.raw.ValueCN !== '无'"
-              :key="`IsDeleted${item.value}`"
-              :label="item.label"
-              :value="item.value"
-            />
+          <el-select v-model="searchData.IsDeleted" clearable filterable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :key="`IsDeleted${item.value}`"
+              :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <!-- 更新时间 -->
         <el-form-item :label="$t('trials:researchRecord:table:updateTime')">
-          <el-date-picker
-            v-model="searchData.DateRange"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            format="yyyy-MM-dd"
-            style="width: 250px"
-          />
+          <el-date-picker v-model="searchData.DateRange" type="daterange" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+            style="width: 250px" />
         </el-form-item>
         <!-- 查询 -->
         <el-button type="primary" icon="el-icon-search" @click="handleSearch">
           {{ $t('common:button:search') }}
         </el-button>
         <!-- 重置 -->
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-left"
-          @click="handleReset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
           {{ $t('common:button:reset') }}
         </el-button>
         <!-- 中心人员 -->
-        <el-button
-          v-hasPermi="[
-            'trials:trials-panel:attachments:site-research:summary-record',
-          ]"
-          type="primary"
-          icon="el-icon-info"
-          @click="showResearchUser"
-        >
+        <el-button v-hasPermi="[
+          'trials:trials-panel:attachments:site-research:summary-record',
+        ]" type="primary" icon="el-icon-info" @click="showResearchUser">
           {{ $t('trials:researchRecord:button:questionStaffs') }}
         </el-button>
         <!-- 调查表链接 -->
-        <el-button
-          v-hasPermi="[
-            'trials:trials-panel:attachments:site-research:questionnaire-link',
-          ]"
-          type="primary"
-          icon="el-icon-link"
-          @click="showResearchLink"
-        >
+        <el-button v-hasPermi="[
+          'trials:trials-panel:attachments:site-research:questionnaire-link',
+        ]" type="primary" icon="el-icon-link" @click="showResearchLink">
           {{ $t('trials:researchRecord:button:questionLink') }}
         </el-button>
       </el-form>
@@ -133,61 +68,27 @@
 
     <template slot="main-container">
       <!-- 系统文件列表 -->
-      <el-table
-        ref="siteResearchList"
-        v-loading="loading"
-        v-adaptive="{ bottomOffset: 60 }"
-        :data="list"
-        stripe
-        height="100"
-        @sort-change="handleSortByColumn"
-      >
+      <el-table ref="siteResearchList" v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe
+        height="100" @sort-change="handleSortByColumn">
         <el-table-column type="index" width="50" />
         <!-- 中心编号 -->
-        <el-table-column
-          prop="TrialSiteCode"
-          :label="$t('trials:researchRecord:table:siteId')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="TrialSiteCode" :label="$t('trials:researchRecord:table:siteId')" min-width="100"
+          sortable="custom" show-overflow-tooltip />
         <!-- 中心名称 -->
-        <el-table-column
-          prop="SiteName"
-          :label="$t('trials:researchRecord:table:siteName')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="SiteName" :label="$t('trials:researchRecord:table:siteName')" min-width="100"
+          sortable="custom" show-overflow-tooltip />
         <!-- 联系人 -->
-        <el-table-column
-          prop="UserName"
-          :label="$t('trials:researchRecord:table:contactor')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="UserName" :label="$t('trials:researchRecord:table:contactor')" min-width="100"
+          sortable="custom" show-overflow-tooltip />
         <!-- 联系电话 -->
-        <el-table-column
-          prop="Phone"
-          :label="$t('trials:researchRecord:table:contactorPhone')"
-          min-width="100"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="Phone" :label="$t('trials:researchRecord:table:contactorPhone')" min-width="100"
+          show-overflow-tooltip />
         <!-- 联系邮箱 -->
-        <el-table-column
-          prop="Email"
-          :label="$t('trials:researchRecord:table:contactorEmail')"
-          min-width="150"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="Email" :label="$t('trials:researchRecord:table:contactorEmail')" min-width="150"
+          show-overflow-tooltip />
         <!-- 初审人 -->
-        <el-table-column
-          prop="preliminaryUser"
-          :label="$t('trials:researchRecord:table:preliminaryUser')"
-          min-width="150"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="preliminaryUser" :label="$t('trials:researchRecord:table:preliminaryUser')"
+          min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{
               scope.row.PreliminaryUser
@@ -197,24 +98,15 @@
           </template>
         </el-table-column>
         <!-- 审核人 -->
-        <el-table-column
-          prop="ReviewerUser"
-          :label="$t('trials:researchRecord:table:ReviewerUser')"
-          min-width="150"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="ReviewerUser" :label="$t('trials:researchRecord:table:ReviewerUser')" min-width="150"
+          show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.ReviewerUser ? scope.row.ReviewerUser.RealName : '' }}
           </template>
         </el-table-column>
         <!-- 状态 -->
-        <el-table-column
-          prop="State"
-          :label="$t('trials:researchRecord:table:status')"
-          min-width="150"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="State" :label="$t('trials:researchRecord:table:status')" min-width="150"
+          sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tag v-if="scope.row.State === 0" type="primary">{{
               $fd('ResearchRecord', scope.row.State)
@@ -231,13 +123,8 @@
           </template>
         </el-table-column>
         <!-- 是否废除 -->
-        <el-table-column
-          prop="IsDeleted"
-          :label="$t('trials:researchRecord:table:isDeleted')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="IsDeleted" :label="$t('trials:researchRecord:table:isDeleted')" min-width="100"
+          sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsDeleted" type="danger">{{
               $fd('YesOrNo', scope.row.IsDeleted)
@@ -248,88 +135,59 @@
           </template>
         </el-table-column>
         <!-- 更新时间 -->
-        <el-table-column
-          prop="UpdateTime"
-          :label="$t('trials:researchRecord:table:updateTime')"
-          min-width="150"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column prop="UpdateTime" :label="$t('trials:researchRecord:table:updateTime')" min-width="150"
+          show-overflow-tooltip sortable="custom" />
         <el-table-column width="150">
           <template slot-scope="scope">
             <!-- 查看 -->
-            <el-button
-              :disabled="scope.row.State !== 3"
-              circle
-              :title="$t('common:button:view')"
-              icon="el-icon-view"
-              @click="handleViewResearchList(scope.row)"
-            />
+            <el-button :disabled="scope.row.State !== 3" circle :title="$t('common:button:view')" icon="el-icon-view"
+              @click="handleViewResearchList(scope.row)" />
             <!-- 审批 -->
-            <el-button
-              v-hasPermi="[
-                'trials:trials-panel:attachments:site-research:auidt',
-              ]"
-              :disabled="scope.row.State === 0 || scope.row.State === 3 || scope.row.IsDeleted"
-              circle
-              :title="$t('trials:researchRecord:action:view')"
-              icon="el-icon-s-check"
-              @click="handleViewResearchList(scope.row)"
-            />
+            <el-button v-hasPermi="[
+              'trials:trials-panel:attachments:site-research:auidt',
+            ]" :disabled="scope.row.State === 0 || scope.row.State === 3 || scope.row.IsDeleted" circle
+              :title="$t('trials:researchRecord:action:view')" icon="el-icon-s-check"
+              @click="handleViewResearchList(scope.row)" />
             <!-- 废除 -->
-            <el-button
-              v-hasPermi="[
-                'trials:trials-panel:attachments:site-research:abolish',
-              ]"
-              :disabled="scope.row.State !== 0 || scope.row.IsDeleted"
-              circle
-              :title="$t('trials:researchRecord:action:abolish')"
-              icon="el-icon-delete"
-              @click="handleRepealResearch(scope.row)"
-            />
+            <el-button v-hasPermi="[
+              'trials:trials-panel:attachments:site-research:abolish',
+            ]" :disabled="scope.row.State !== 0 || scope.row.IsDeleted" circle
+              :title="$t('trials:researchRecord:action:abolish')" icon="el-icon-delete"
+              @click="handleRepealResearch(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
     </template>
 
     <!-- 中心人员 -->
-    <el-dialog
-      v-if="researchUserVisible"
-      :visible.sync="researchUserVisible"
-      :title="$t('trials:researchRecord:dialogTitle:questionStaff')"
-      custom-class="base-dialog-wrapper"
-      :fullscreen="true"
-    >
-      <div
-        class="base-modal-body"
-        style="border: 1px solid #ccc; padding: 10px"
-      >
+    <el-dialog v-if="researchUserVisible" :visible.sync="researchUserVisible"
+      :title="$t('trials:researchRecord:dialogTitle:questionStaff')" custom-class="base-dialog-wrapper"
+      :fullscreen="true">
+      <div class="base-modal-body" style="border: 1px solid #ccc; padding: 10px">
         <Users v-if="researchUserVisible" />
       </div>
     </el-dialog>
 
     <!-- 调查表 -->
-    <el-dialog
-      v-if="researchInfoVisible"
-      :visible.sync="researchInfoVisible"
-      :fullscreen="true"
-      :close-on-click-modal="false"
-    >
+    <el-dialog v-if="researchInfoVisible" :visible.sync="researchInfoVisible" :fullscreen="true"
+      :close-on-click-modal="false">
       <research-form v-if="researchInfoVisible" @refreshPage="getList" />
     </el-dialog>
-
+    <!-- 调查表编辑 -->
+    <el-dialog v-if="ImageManualVisible" :visible.sync="ImageManualVisible" :fullscreen="true"
+      :close-on-click-modal="false" :title="$t('trials:researchRecord:dialogTitle:ImageManualEdit')">
+      <ImageManual v-if="ImageManualVisible" :trialSiteSurveyId="trialSiteSurveyId" @getList="getList" />
+    </el-dialog>
     <!-- 调查表链接 -->
     <base-model :config="share_model">
       <template slot="dialog-body">
+        <el-button size="small" type="primary" style="margin-bottom: 10px;" @click.stop="openImageManual">{{
+          $t('trials:researchRecord:label:edit')
+        }}</el-button>
         <div style="width: 100%; display: flex">
           <div class="shareLink">
             <!-- <div>
@@ -341,22 +199,11 @@
             <div style="margin: 10px 0">
               <!-- 链接： -->
               {{ $t('trials:researchRecord:label:link') }}
-              <el-input
-                ref="shareLink"
-                v-model="shareLink"
-                readonly
-                type="textarea"
-                autosize
-              />
+              <el-input ref="shareLink" v-model="shareLink" readonly type="textarea" autosize />
             </div>
             <div>
               <!-- 复制链接 -->
-              <el-button
-                type="primary"
-                round
-                @click="copyLink"
-                class="shareLinkBtn"
-              >
+              <el-button type="primary" round @click="copyLink" class="shareLinkBtn">
                 {{ $t('trials:researchRecord:button:copyLink') }}
               </el-button>
             </div>
@@ -391,6 +238,7 @@ import Pagination from '@/components/Pagination'
 import Users from './components/users'
 import ResearchForm from '@/views/research/form'
 import BaseModel from '@/components/BaseModel'
+import ImageManual from './components/ImageManual'
 import QRCode from 'qrcodejs2'
 
 const searchDataDefault = () => {
@@ -410,7 +258,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'SiteResearchList',
-  components: { BaseContainer, Pagination, Users, ResearchForm, BaseModel },
+  components: { BaseContainer, Pagination, Users, ResearchForm, BaseModel, ImageManual },
   data() {
     return {
       searchData: searchDataDefault(),
@@ -429,6 +277,9 @@ export default {
       shareLink: '',
       researchState: this.$d.ResearchRecord,
       qrcode: null,
+
+      ImageManualVisible: false,
+      trialSiteSurveyId: null
     }
   },
   mounted() {
@@ -436,6 +287,10 @@ export default {
     this.getSite()
   },
   methods: {
+    openImageManual() {
+      if (!this.trialSiteSurveyId) return false
+      this.ImageManualVisible = true
+    },
     // 获取系统文件数据
     getList() {
       this.loading = true
@@ -488,8 +343,7 @@ export default {
     copyLink() {
       // 中心调研表链接
       this.$copyText(
-        `${this.$t('trials:researchRecord:message:researchFormLink')}: ${
-          this.shareLink
+        `${this.$t('trials:researchRecord:message:researchFormLink')}: ${this.shareLink
         }`
       )
         .then((res) => {
@@ -564,6 +418,7 @@ export default {
       const trialId = this.trialId
       this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`
       this.share_model.visible = true
+      this.trialSiteSurveyId = this.list[0].Id
       this.$nextTick(() => {
         this.creatQrCode()
       })
@@ -611,18 +466,21 @@ export default {
   padding-right: 20px;
   width: 50%;
   position: relative;
+
   .shareLinkBtn {
     position: absolute;
     bottom: 0px;
     left: 0px;
   }
 }
+
 .shareCode {
   width: 50%;
   border-left: 1px solid #eee;
   display: flex;
   justify-content: center;
   flex-wrap: wrap;
+
   .qrCode {
     width: 220px;
     height: 220px;
@@ -633,6 +491,7 @@ export default {
     align-items: center;
     justify-content: center;
   }
+
   .codeBtnBox {
     margin-top: 20px;
     width: 100%;

From a75f4a38f694e90895d5b0c38b19d8ba22e35b1d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 11 Nov 2025 16:00:01 +0800
Subject: [PATCH 082/333] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2a03c87e..f7d04881 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -77,7 +77,7 @@
             </span> -->
           </el-form-item>
           <!-- Login -->
-          <el-button :loading="loading" type="primary" style="
+          <el-button :loading="loading" type="primary" :disabled="!checked" style="
               width: 100%;
               margin-bottom: 10px;
               background-color: rgb(0, 147, 221);
@@ -85,6 +85,7 @@
             {{ $t('login:button:login') }}
           </el-button>
           <div class="PrivacyPolicy" style="font-size: 14px;">
+            <el-checkbox v-model="checked" style="margin-right: 5px;" />
             <span>{{ $t('login:message:PrivacyPolicy') }}</span>
             <span style="cursor: pointer;color:#428bca" @click="viewAgreement(0)">{{ $t('login:message:UserAgreement')
             }}</span>
@@ -239,7 +240,8 @@ export default {
       Img1,
       toggleRoleVisible: false,
       toggleRoleLoading: false,
-      Agreement: []
+      Agreement: [],
+      checked: true
     }
   },
   computed: {

From cca8a0df9dcbb8bdef98ac1ad5c7dd2443d8bbe7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 12 Nov 2025 15:31:00 +0800
Subject: [PATCH 083/333] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E4=B8=8E=E7=A1=AE=E8=AE=A4=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MFA/index.vue               | 27 ++++++++++++++++++----
 src/views/forgetpassword/index.vue         | 20 ++++++++++++----
 src/views/research/login.vue               | 17 +++++++++++++-
 src/views/trials/trials-myinfo/account.vue |  1 -
 4 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index b5b2186d..0d08585b 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -17,11 +17,13 @@
       </el-form-item>
       <!-- 验证码 -->
       <el-form-item :label="$t('mfa:form:MFACode')" prop="Code">
-        <el-input :placeholder="$t('mfa:form:input:placeholder:Codes')" v-model="form.Code"
-          style="width: 200px; margin-right: 10px" />
-        <el-button type="primary" size="small" @click.stop="sendMFACode" :disabled="flag || sendFlag"
-          style="float: right;margin-right: 35px;">{{ flag ?
-            `${second}s ${$t("mfa:form:sendMFACodeCountDown")}` : $t("mfa:form:sendMFACode") }}</el-button>
+        <div style="display: flex;justify-content: space-between;width: 90%;">
+          <el-input :placeholder="$t('mfa:form:input:placeholder:Codes')" v-model="form.Code" />
+          <el-button size="small" @click.stop="sendMFACode" :disabled="flag || sendFlag" style="margin-left: 10px;"
+            class="codeBtn">{{
+              flag ?
+                `${second}s ${$t("mfa:form:sendMFACodeCountDown")}` : $t("mfa:form:sendMFACode") }}</el-button>
+        </div>
       </el-form-item>
     </el-form>
     <div slot="footer">
@@ -178,6 +180,21 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.codeBtn {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.codeBtn.is-disabled,
+.el-button.is-disabled:focus,
+.el-button.is-disabled:hover {
+  color: #c0c4cc;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #fff;
+  border-color: #ebeef5;
+}
+
 .tip_mfa {
   width: 86%;
   margin: auto;
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 8d27ca10..b730ed3c 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -21,13 +21,19 @@
         <el-form-item :label="$t('trials:researchForm:form:verifyCode')" required>
           <el-col :span="18">
             <el-form-item prop="VerificationCode">
-              <el-input v-model="form.VerificationCode" autocomplete="off" />
+              <div style="display: flex;justify-content: space-between;">
+                <el-input v-model="form.VerificationCode" autocomplete="off" />
+                <el-button size="small" class="codeBtn" :disabled="sendDisabled" @click="handleSendCode"
+                  style="width: 30%;margin-left: 10px;">
+                  {{ sendTitle }}
+                </el-button>
+              </div>
+
             </el-form-item>
           </el-col>
-          <el-col :span="6" style="text-align: right">
-            <el-button size="small" type="primary" style="width: 80%" :disabled="sendDisabled"
-              @click="handleSendCode">{{ sendTitle }}</el-button>
-          </el-col>
+          <!-- <el-col :span="6" style="text-align: right">
+     
+          </el-col> -->
         </el-form-item>
       </el-form>
       <!-- 校验 -->
@@ -381,6 +387,10 @@ export default {
 /*::v-deep .is-error{*/
 /*  margin-bottom: 40px;*/
 /*}*/
+.codeBtn {
+  color: #409EFF;
+  border-color: #409EFF;
+}
 .is-error.my_new_pwd {
   margin-bottom: 45px;
 }
diff --git a/src/views/research/login.vue b/src/views/research/login.vue
index 8e56c895..c8724834 100644
--- a/src/views/research/login.vue
+++ b/src/views/research/login.vue
@@ -64,7 +64,7 @@
               </el-form-item>
             </el-col>
             <el-col style="width: 120px;margin-left: 10px">
-              <el-button size="small" type="primary" style="width:100%;"
+              <el-button size="small" class="codeBtn" style="width:100%;"
                 :disabled="sendDisabled || !form.EmailOrPhone || count > 0" @click="handleSendCode">{{
                   this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}</el-button>
             </el-col>
@@ -343,6 +343,21 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.codeBtn {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.codeBtn.is-disabled,
+.el-button.is-disabled:focus,
+.el-button.is-disabled:hover {
+  color: #c0c4cc;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #fff;
+  border-color: #ebeef5;
+}
+
 .question-login-wrapper {
   padding: 20px;
 
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index 2afea5ce..c982002b 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -81,7 +81,6 @@
           <el-button
             class="sendCode"
             :disabled="sendDisabled"
-            type="primary"
             size="mini"
             @click="sendVerificationCode"
             >{{ sendTitle }}</el-button

From c7740493f8462cc900af7484c5827e92c7c63f1d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 13 Nov 2025 15:26:45 +0800
Subject: [PATCH 084/333] 1

---
 .../components/CriterionsBaseData.vue         |  28 +--
 .../template/components/KeyDocument.vue       | 212 ++++++++++++++++++
 2 files changed, 224 insertions(+), 16 deletions(-)
 create mode 100644 src/views/dictionary/template/components/KeyDocument.vue

diff --git a/src/views/dictionary/template/components/CriterionsBaseData.vue b/src/views/dictionary/template/components/CriterionsBaseData.vue
index 01854a2b..7a2a1813 100644
--- a/src/views/dictionary/template/components/CriterionsBaseData.vue
+++ b/src/views/dictionary/template/components/CriterionsBaseData.vue
@@ -3,27 +3,22 @@
     <!-- 器官 -->
     <el-tab-pane :label="$t('dictionary:template:basicData:organs')" name="organs">
 
-      <OrgansTbl
-        :criterion-id="criterionId"
-        :is-complete-config="isCompleteConfig"
-      />
+      <OrgansTbl :criterion-id="criterionId" :is-complete-config="isCompleteConfig" />
     </el-tab-pane>
     <!-- 疗效评估 -->
     <el-tab-pane :label="$t('dictionary:template:basicData:efficacyAssessment')" name="efficacyAssessment">
-      <EfficacyAssessment
-        v-if="tabs.includes('efficacyAssessment')"
-        :criterion-id="criterionId"
-        :criterion-type="criterionType"
-        :is-complete-config="isCompleteConfig"
-      />
+      <EfficacyAssessment v-if="tabs.includes('efficacyAssessment')" :criterion-id="criterionId"
+        :criterion-type="criterionType" :is-complete-config="isCompleteConfig" />
     </el-tab-pane>
     <!-- 标准字典 -->
     <el-tab-pane :label="$t('dictionary:template:basicData:criterionDictionary')" name="criterionDictionary">
-      <CriterionDictionary
-        v-if="tabs.includes('criterionDictionary')"
-        :criterion-id="criterionId"
-        :is-complete-config="isCompleteConfig"
-      />
+      <CriterionDictionary v-if="tabs.includes('criterionDictionary')" :criterion-id="criterionId"
+        :is-complete-config="isCompleteConfig" />
+    </el-tab-pane>
+    <!-- 关键文件 -->
+    <el-tab-pane :label="$t('dictionary:template:basicData:keyDocument')" name="keyDocument">
+      <KeyDocument v-if="tabs.includes('keyDocument')" :criterion-id="criterionId"
+        :is-complete-config="isCompleteConfig" />
     </el-tab-pane>
   </el-tabs>
 </template>
@@ -31,9 +26,10 @@
 import OrgansTbl from './OrgansTbl'
 import EfficacyAssessment from './EfficacyAssessment'
 import CriterionDictionary from './CriterionDictionary'
+import KeyDocument from './KeyDocument'
 export default {
   name: 'CriterionsBaseData',
-  components: { OrgansTbl, EfficacyAssessment, CriterionDictionary },
+  components: { OrgansTbl, EfficacyAssessment, CriterionDictionary, KeyDocument },
   props: {
     criterionId: {
       type: String,
diff --git a/src/views/dictionary/template/components/KeyDocument.vue b/src/views/dictionary/template/components/KeyDocument.vue
new file mode 100644
index 00000000..27a50be6
--- /dev/null
+++ b/src/views/dictionary/template/components/KeyDocument.vue
@@ -0,0 +1,212 @@
+<template>
+    <BaseContainer>
+        <!-- 搜索框 -->
+        <template slot="search-container">
+            <el-form :inline="true" size="mini">
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">
+                        {{ $t('common:button:search') }}
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-refresh-left" size="mini" @click="handleReset">
+                        {{ $t('common:button:reset') }}
+                    </el-button>
+                </el-form-item>
+                <el-form-item>
+                    <div class="upload">
+                        <input multiple="multiple" webkitdirectory="" directory accept=".pdf" type="file"
+                            name="uploadFolder" class="select-file" title="" @change="beginScanFiles($event)" />
+                        <div class="btn-select">
+                            {{ $t('dictionary:template:basicData:button:selectFile') }}
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </template>
+
+        <template slot="main-container">
+            <el-table ref="keyDocList" v-loading="loading" v-adaptive="{ bottomOffset: 80 }" :data="list" width="100%"
+                style="width: 100%;min-width: 300px" stripe height="100" @sort-change="handleSortByColumn">
+                <el-table-column type="index" min-width="90" />
+                <el-table-column prop="FileName" :label="$t('dictionary:template:keyDocList:FileName')"
+                    show-overflow-tooltip />
+                <el-table-column prop="CreateTime" :label="$t('dictionary:template:keyDocList:CreateTime')"
+                    show-overflow-tooltip />
+                <el-table-column :label="$t('common:action:action')" align="left" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button circle icon="el-icon-view" :title="$t('dictionary:template:keyDocList:button:view')"
+                            @click.stop="view(scope.row)" />
+                        <el-button circle icon="el-icon-delete" :title="$t('dictionary:template:keyDocList:button:del')"
+                            @click.stop="del(scope.row)" />
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!-- 分页组件 -->
+            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+                @pagination="getList" />
+        </template>
+
+    </BaseContainer>
+</template>
+<script>
+import { Upload } from '@/api/dictionary'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+const searchDataDefault = () => {
+    return {
+        CriterionId: '',
+        TargetLesion: null,
+        NonTargetLesions: null,
+        NewLesion: null,
+        OverallEfficacy: null,
+        PageIndex: 1,
+        PageSize: 20
+    }
+}
+export default {
+    name: "KeyDocument",
+    components: { BaseContainer, Pagination },
+    data() {
+        return {
+            searchData: searchDataDefault(),
+            loading: false,
+            list: [],
+            total: 0,
+        }
+    },
+    mounted() {
+        this.getList()
+    },
+    methods: {
+        handleDragover(e) {
+            e.stopPropagation();
+            e.preventDefault();
+        },
+        handleDrop(e) {
+            e.stopPropagation();
+            e.preventDefault();
+            this.beginScanFiles(e, true)
+        },
+        beforeUpload(file) {
+            // 检测文件类型是否符合要求
+            if (this.checkFileSuffix(file.name)) {
+                this.fileList = [];
+                return true;
+            } else {
+                // this.$alert("必须是word/excel格式");
+                this.$alert(this.$t("dictionary:attachment:export:alert:formatFile"));
+                return false;
+            }
+        },
+        async beginScanFiles(e, isDrop = false) {
+            try {
+                this.loading = true;
+                let files = []
+                if (isDrop) {
+                    const items = e.dataTransfer.items;
+                    const allFiles = []; // 用于存储所有找到的文件
+
+                    // 遍历拖拽项
+                    for (const item of items) {
+                        const entry = item.webkitGetAsEntry(); // 获取文件系统入口
+                        if (entry) {
+                            const files = await readEntry(entry); // 递归读取入口内容
+                            allFiles.push(...files);
+                        }
+                    }
+                    files = allFiles
+                } else {
+                    files = [...e.target.files]
+                }
+                for (let i = 0; i < files.length; i++) {
+                    let file = files[i]
+                    if (!this.checkFileSuffix(file.name)) continue
+                    const formData = new FormData();
+                    formData.append("file", file);
+                    await Upload(formData, 5)
+                    if (i === files.length - 1) {
+                        this.loading = false;
+                        this.getList()
+                    }
+                }
+            } catch (err) {
+                console.log(err)
+                this.loading = false;
+            }
+        },
+        checkFileSuffix(fileName) {
+            var index = fileName.lastIndexOf('.')
+            var suffix = fileName.substring(index + 1, fileName.length)
+            if (['.pdf'].toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
+                return false
+            } else {
+                return true
+            }
+        },
+        getList() { },
+        // 查询
+        handleSearch() {
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+        // 重置
+        handleReset() {
+            this.searchData = searchDataDefault()
+            this.getList()
+        },
+        // 排序
+        handleSortByColumn(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.upload {
+    display: inline-block;
+    height: 30px;
+    width: 90px;
+    padding: 2px 10px;
+    line-height: 23px;
+    position: relative;
+    text-decoration: none;
+    border-radius: 3px;
+    overflow: hidden;
+    text-align: center;
+    background: #428bca;
+    border-color: #428bca;
+    color: #fff;
+
+    .select-file {
+        height: 30px;
+        width: 90px;
+        position: absolute;
+        overflow: hidden;
+        left: 0;
+        top: 0;
+        opacity: 0;
+        font-size: 0;
+    }
+
+    .btn-select {
+        //给显示在页面上的按钮写样式
+        width: 90px;
+        height: 30px;
+        line-height: 30px;
+        text-align: center;
+        cursor: pointer;
+        border-radius: 24px;
+        overflow: hidden;
+        position: absolute;
+        top: 0;
+        left: 0;
+        pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
+    }
+}
+</style>
\ No newline at end of file

From 64cec20d7dde0fe207c2bb5e0cf207fb638b88d8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 14 Nov 2025 10:08:27 +0800
Subject: [PATCH 085/333] =?UTF-8?q?=E8=A1=A5=E4=BC=A0=E5=BD=B1=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crc-upload/components/historyChat.vue     | 249 ++++++------------
 .../components/uploadDicomFiles2.vue          |  21 +-
 .../trials-panel/visit/crc-upload/index.vue   |  10 +-
 3 files changed, 101 insertions(+), 179 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/historyChat.vue b/src/views/trials/trials-panel/visit/crc-upload/components/historyChat.vue
index db223273..8abbeefd 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/historyChat.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/historyChat.vue
@@ -4,41 +4,20 @@
       <el-tab-pane v-for="(item, index) in list" :key="item.Id">
         <span slot="label">
           {{ item.ChallengeCode }}
-          <i
-            v-show="!item.IsClosed"
-            class="el-icon-message-solid"
-            style="color: red"
-          />
+          <i v-show="!item.IsClosed" class="el-icon-message-solid" style="color: red" />
         </span>
         <div class="chat-wrapper">
           <div class="chat-content">
             <div v-for="record in item.DialogList" :key="record.Id">
               <div v-if="!record.IsCurrentUser" class="word">
                 <!-- <img :src="record.headUrl"> -->
-                <img
-                  v-if="record.UserTypeEnum * 1 === 8"
-                  :src="adminAvatar"
-                  alt="Admin"
-                />
-                <img
-                  v-else-if="record.UserTypeEnum * 1 === 1"
-                  :src="pmAvatar"
-                  alt="PM"
-                />
-                <img
-                  v-else-if="record.UserTypeEnum * 1 === 2"
-                  :src="crcAvatar"
-                  alt="CRC"
-                />
-                <img
-                  v-else-if="record.UserTypeEnum * 1 === 3"
-                  :src="qcAvatar"
-                  alt="QC"
-                />
+                <img v-if="record.UserTypeEnum * 1 === 8" :src="adminAvatar" alt="Admin" />
+                <img v-else-if="record.UserTypeEnum * 1 === 1" :src="pmAvatar" alt="PM" />
+                <img v-else-if="record.UserTypeEnum * 1 === 2" :src="crcAvatar" alt="CRC" />
+                <img v-else-if="record.UserTypeEnum * 1 === 3" :src="qcAvatar" alt="QC" />
                 <div class="info">
                   <p class="user-info">
-                    <span style="font-weight: 700"
-                      >{{ record.CreateUserFullName || record.CreateUserName }}
+                    <span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }}
                     </span>
                     <span>({{ record.CreateTime }}) </span>
                   </p>
@@ -49,88 +28,48 @@
               <div v-else class="word-my">
                 <div class="info">
                   <p class="user-info">
-                    <span style="font-weight: 700"
-                      >{{ record.CreateUserFullName || record.CreateUserName }}
+                    <span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }}
                     </span>
                     <span>({{ record.CreateTime }}) </span>
                   </p>
                   <div class="info-content" v-html="record.TalkContent" />
                 </div>
                 <!-- <img :src="record.headUrl"> -->
-                <img
-                  v-if="record.UserTypeEnum * 1 === 8"
-                  :src="adminAvatar"
-                  alt="Admin"
-                />
-                <img
-                  v-else-if="record.UserTypeEnum * 1 === 1"
-                  :src="pmAvatar"
-                  alt="PM"
-                />
-                <img
-                  v-else-if="record.UserTypeEnum * 1 === 2"
-                  :src="crcAvatar"
-                  alt="CRC"
-                />
-                <img
-                  v-else-if="record.UserTypeEnum * 1 === 3"
-                  :src="qcAvatar"
-                  alt="QC"
-                />
+                <img v-if="record.UserTypeEnum * 1 === 8" :src="adminAvatar" alt="Admin" />
+                <img v-else-if="record.UserTypeEnum * 1 === 1" :src="pmAvatar" alt="PM" />
+                <img v-else-if="record.UserTypeEnum * 1 === 2" :src="crcAvatar" alt="CRC" />
+                <img v-else-if="record.UserTypeEnum * 1 === 3" :src="qcAvatar" alt="QC" />
               </div>
             </div>
           </div>
           <div v-if="!item.IsClosed" class="chat-message">
-            <div
-              class="message"
-              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:send'])"
-            >
+            <div class="message" v-if="hasPermi(['trials:trials-panel:visit:crc-upload:send'])">
               <el-input v-model="newMessage" type="textarea" :rows="2" />
             </div>
             <div class="function">
               <!-- 申请重传 -->
-              <el-button
-                v-show="(item.ReuploadEnum === 0 || item.ReuploadEnum === 3) && item.SecondReviewState !== 1"
+              <el-button v-show="(item.ReuploadEnum === 0 || item.ReuploadEnum === 3) && item.SecondReviewState !== 1"
                 v-hasPermi="[
                   'trials:trials-panel:visit:crc-upload:apply-reupload',
-                ]"
-                type="primary"
-                :loading="applyBtnLoading"
-                @click="handleCRCApplyReupload(item)"
-              >
+                ]" type="primary" :loading="applyBtnLoading" @click="handleCRCApplyReupload(item)">
                 {{ $t('trials:reuploadDicoms:button:applyReupload') }}
               </el-button>
               <!-- 重传 -->
-              <el-button
-                v-show="item.ReuploadEnum === 2 && item.SecondReviewState !== 1"
-                v-hasPermi="['trials:trials-panel:visit:crc-upload:reupload']"
-                type="primary"
-                :loading="uploadBtnLoading"
-                @click="openUploadDialog(index)"
-              >
+              <el-button v-show="item.ReuploadEnum === 2 && item.SecondReviewState !== 1"
+                v-hasPermi="['trials:trials-panel:visit:crc-upload:reupload']" type="primary"
+                :loading="uploadBtnLoading" @click="openUploadDialog(index)">
                 {{ $t('trials:reuploadDicoms:button:reupload') }}
               </el-button>
               <!-- 确认重传完成 -->
-              <el-button
-                v-show="item.ReuploadEnum === 2"
-                v-hasPermi="[
-                  'trials:trials-panel:visit:crc-upload:set-reupload-finished',
-                ]"
-                type="primary"
-                :disabled="item.IsReuploaded"
-                :loading="reuploadedFinishbtnLoading"
-                @click="handleSetUploadFinished(index)"
-              >
+              <el-button v-show="item.ReuploadEnum === 2" v-hasPermi="[
+                'trials:trials-panel:visit:crc-upload:set-reupload-finished',
+              ]" type="primary" :disabled="item.IsReuploaded" :loading="reuploadedFinishbtnLoading"
+                @click="handleSetUploadFinished(index)">
                 {{ $t('trials:reuploadDicoms:button:reuploadFinished') }}
               </el-button>
               <!-- 发送 -->
-              <el-button
-                v-hasPermi="['trials:trials-panel:visit:crc-upload:send']"
-                :disabled="newMessage === ''"
-                type="primary"
-                :loading="btnLoading"
-                @click="handleReply(item.Id, index)"
-              >
+              <el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:send']" :disabled="newMessage === ''"
+                type="primary" :loading="btnLoading" @click="handleReply(item.Id, index)">
                 {{ $t('trials:reuploadDicoms:button:send') }}
               </el-button>
             </div>
@@ -139,13 +78,8 @@
       </el-tab-pane>
     </el-tabs>
     <!-- 上传Dicom/非Dicom文件 -->
-    <el-dialog
-      v-if="uploadVisible"
-      :visible.sync="uploadVisible"
-      :fullscreen="true"
-      append-to-body
-      custom-class="upload-dialog"
-    >
+    <el-dialog v-if="uploadVisible" :visible.sync="uploadVisible" :fullscreen="true" append-to-body
+      custom-class="upload-dialog">
       <span slot="title">
         <el-breadcrumb separator-class="el-icon-arrow-right">
           <label style="float: left; margin-right: 10px">Upload: </label>
@@ -163,100 +97,51 @@
           }}</el-breadcrumb-item>
         </el-breadcrumb>
       </span>
-      <div
-        class="base-modal-body"
-        style="display: flex; flex-direction: column"
-      >
+      <div class="base-modal-body" style="display: flex; flex-direction: column">
         <el-tabs v-model="activeName" type="border-card" style="flex: 1">
           <!-- DICOM影像上传 -->
-          <el-tab-pane
-            :label="$t('trials:uploadedDicoms:tab:uploadDicoms')"
-            name="dicom"
-            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
-          >
-            <upload-dicom-files
-              :data="data"
-              :subject-id="data.SubjectId"
-              :subject-visit-id="data.Id"
-              @close="closeUpload"
-              @getList="reFreshList"
-            />
+          <el-tab-pane :label="$t('trials:uploadedDicoms:tab:uploadDicoms')" name="dicom"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)">
+            <upload-dicom-files :data="data" :isAfresh="true" :subject-id="data.SubjectId" :subject-visit-id="data.Id"
+              @close="closeUpload" @getList="reFreshList" />
           </el-tab-pane>
           <!-- 非DICOM影像上传 -->
-          <el-tab-pane
-            :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
-            name="non-dicom"
-            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
-          >
-            <upload-non-dicom-files
-              v-if="activeName === 'non-dicom'"
-              :data="data"
-              :allow-add-or-edit="true"
-              :body-parts="bodyParts"
-              :modalities="modalities"
-              :subject-visit-id="data.Id"
-              @getList="reFreshList"
-            />
+          <el-tab-pane :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')" name="non-dicom"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)">
+            <upload-non-dicom-files v-if="activeName === 'non-dicom'" :data="data" :allow-add-or-edit="true"
+              :body-parts="bodyParts" :modalities="modalities" :subject-visit-id="data.Id" @getList="reFreshList" />
           </el-tab-pane>
           <!-- 临床数据采集data.IsBaseLine &&  -->
-          <el-tab-pane
-            v-if="
-              data.IsBaseLine &&
-              (otherInfo.IsHaveSubjectClinicalData ||
-                otherInfo.IsHaveVisitClinicalData)
-            "
-            :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
-            name="clinical-data"
-          >
-            <upload-clinical-data
-              v-if="activeName === 'clinical-data'"
-              :subject-visit-id="data.Id"
-              :data="data"
-              :enum-type="otherInfo.ClinicalInformationTransmissionEnum"
-              :allow-add-or-edit="true"
-              @getList="reFreshList"
-            />
+          <el-tab-pane v-if="
+            data.IsBaseLine &&
+            (otherInfo.IsHaveSubjectClinicalData ||
+              otherInfo.IsHaveVisitClinicalData)
+          " :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')" name="clinical-data">
+            <upload-clinical-data v-if="activeName === 'clinical-data'" :subject-visit-id="data.Id" :data="data"
+              :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="true"
+              @getList="reFreshList" />
           </el-tab-pane>
-          <el-tab-pane
-            v-if="!data.IsBaseLine && otherInfo.IsHaveVisitClinicalData"
-            :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
-            name="clinical-data"
-          >
-            <upload-clinical-data
-              v-if="activeName === 'clinical-data'"
-              :subject-visit-id="data.Id"
-              :data="data"
-              :enum-type="otherInfo.ClinicalInformationTransmissionEnum"
-              :allow-add-or-edit="true"
-              @getList="reFreshList"
-            />
+          <el-tab-pane v-if="!data.IsBaseLine && otherInfo.IsHaveVisitClinicalData"
+            :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')" name="clinical-data">
+            <upload-clinical-data v-if="activeName === 'clinical-data'" :subject-visit-id="data.Id" :data="data"
+              :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="true"
+              @getList="reFreshList" />
           </el-tab-pane>
         </el-tabs>
       </div>
     </el-dialog>
 
     <!-- 临床数据签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px" append-to-body
+      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"
-        :signReplaceText="signReplaceText"
-        :subject-visit-id="data.Id"
-        @closeDialog="closeClinicalDataSignDialog"
-      />
+      <SignForm ref="signForm" :sign-code-enum="signCode" :signReplaceText="signReplaceText" :subject-visit-id="data.Id"
+        @closeDialog="closeClinicalDataSignDialog" />
     </el-dialog>
   </div>
 </template>
@@ -371,12 +256,11 @@ export default {
                         ${this.$t('trials:qcQuality:dialogTips:tip')}
                         </p>
                         <p style='color:red'>${this.$t(
-                          'trials:qcQuality:dialog:deadline'
-                        )}: ${
-              item.DeadlineTime
+              'trials:qcQuality:dialog:deadline'
+            )}: ${item.DeadlineTime
                 ? item.DeadlineTime
                 : this.$t('trials:qcQuality:dialog:none')
-            }</p>`
+              }</p>`
             const userId = zzSessionStorage.getItem('userId')
             var recordContent = []
             recordContent.push({
@@ -494,7 +378,7 @@ export default {
             this.currentChallengeIndex = index
             this.setReuploadFinished()
           })
-          .catch(() => {})
+          .catch(() => { })
       }
     },
     setReuploadFinished(signInfo) {
@@ -562,7 +446,7 @@ export default {
               this.applyBtnLoading = false
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
   },
 }
@@ -570,14 +454,17 @@ export default {
 <style lang="scss" scoped>
 .history-chat {
   height: 500px;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
+
   ::v-deep .el-tabs {
     ::v-deep .el-tabs__header {
       width: 100px;
@@ -585,34 +472,41 @@ export default {
       height: 500px;
       overflow-y: auto;
     }
+
     ::v-deep .el-tabs__content {
       margin-right: 10px;
       height: 500px;
       width: calc(100% - 120px);
       overflow-y: auto;
     }
+
     .chat-wrapper {
       background-color: #f5f7fa;
       height: 500px;
       display: flex;
       flex-direction: column !important;
       overflow: hidden;
+
       .chat-content {
         width: 100%;
         padding: 20px;
         // height: 400px;
         overflow-y: auto;
         flex: 1;
+
         .word {
           display: flex;
           margin-bottom: 20px;
+
           img {
             width: 40px;
             height: 40px;
             border-radius: 50%;
           }
+
           .info {
             margin-left: 10px;
+
             .user-info {
               font-size: 12px;
               color: rgba(51, 51, 51, 0.8);
@@ -621,6 +515,7 @@ export default {
               line-height: 20px;
               margin-top: -5px;
             }
+
             .info-content {
               padding: 10px;
               font-size: 14px;
@@ -628,6 +523,7 @@ export default {
               position: relative;
               margin-top: 8px;
             }
+
             .info-content::before {
               position: absolute;
               left: -8px;
@@ -639,19 +535,23 @@ export default {
             }
           }
         }
+
         .word-my {
           display: flex;
           justify-content: flex-end;
           margin-bottom: 20px;
+
           img {
             width: 40px;
             height: 40px;
             border-radius: 50%;
           }
+
           .info {
             width: 90%;
             margin-left: 10px;
             text-align: right;
+
             .user-info {
               font-size: 12px;
               color: rgba(51, 51, 51, 0.8);
@@ -661,6 +561,7 @@ export default {
               margin-top: -5px;
               margin-right: 10px;
             }
+
             .info-content {
               position: relative;
               max-width: 70%;
@@ -673,6 +574,7 @@ export default {
               color: #fff;
               text-align: left;
             }
+
             .info-content::after {
               position: absolute;
               right: -8px;
@@ -685,14 +587,17 @@ export default {
           }
         }
       }
+
       .chat-message {
         height: 100px;
         padding: 0 50px;
+
         .function {
           margin-top: 10px;
           text-align: right;
         }
       }
+
       ol {
         margin: 5px;
         padding: 0px 10px;
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 839190c1..ebdef565 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -22,7 +22,7 @@
     <el-table v-loading="studyLoading" :data="studyList" style="width: 100%" :row-class-name="tableRowClassName"
       max-height="250" @selection-change="handleUploadedSelectionChange"
       :default-sort="{ prop: 'UploadedTime', order: 'ascending' }">
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" width="55" :selectable="handleSelectable2" />
       <!-- 检查编号 -->
       <el-table-column prop="StudyCode" :label="$t('trials:uploadedDicoms:table:studyId')" min-width="80"
         show-overflow-tooltip sortable>
@@ -105,12 +105,16 @@
           <el-button icon="el-icon-upload2" v-if="
             ['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
             relationInfo.IsHaveStudyClinicalData
-          " :title="$t('trials:workbench:title:UploadClinicalData')" circle @click="handleUploadPetData(scope.row)" />
+          " :disabled="!isAfresh && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
+            :title="$t('trials:workbench:title:UploadClinicalData')" circle @click="handleUploadPetData(scope.row)" />
           <!-- 编辑 -->
           <el-button icon="el-icon-edit-outline" v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
-            :title="$t('common:button:edit')" circle @click="handleEditStudy(scope.row)" />
+            :title="$t('common:button:edit')"
+            :disabled="!isAfresh && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
+            circle @click="handleEditStudy(scope.row)" />
           <!-- 删除 :disabled="scope.row.IsDeleted"-->
           <el-button icon="el-icon-delete" :title="$t('trials:uploadedDicoms:action:delete')" circle
+            :disabled="!isAfresh && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
             @click="handleDeleteStudy(scope.row)" />
           <!--          <el-button-->
           <!--            icon="el-icon-toilet-paper"-->
@@ -594,6 +598,10 @@ export default {
       type: String,
       required: true,
     },
+    isAfresh: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -1765,6 +1773,13 @@ export default {
         return true
       }
     },
+    handleSelectable2(row) {
+      if (!this.isAfresh && this.data.SubmitTime && moment(this.data.SubmitTime).isAfter(moment(row.UploadedTime))) {
+        return false
+      } else {
+        return true
+      }
+    },
     // 收集已上传文件列表勾选项
     handleUploadedSelectionChange(selection) {
       this.deleteArr = []
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 32801c55..e98c54f0 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -308,14 +308,14 @@
         " :label="$t('common:action:action')" width="250" fixed="right">
           <template slot-scope="scope">
             <!-- 上传 -->
-            <el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']" icon="el-icon-upload2" :disabled="scope.row.SubmitState * 1 === 2 ||
+            <el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']" icon="el-icon-upload2" :disabled="!isOCTorIVUS && (scope.row.SubmitState * 1 === 2 ||
               scope.row.VisitExecuted === 2 ||
-              scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2)
+              scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2))
               " circle :title="$t('trials:crcUpload:action:upload')" @click="CRChandleUpload(scope.row)" />
             <!-- 上传2 -->
-            <el-button icon="el-icon-upload2" v-hasPermi="['trials:trials-panel:visit:crc-upload:upload2']" :disabled="scope.row.SubmitState * 1 === 2 ||
+            <el-button icon="el-icon-upload2" v-hasPermi="['trials:trials-panel:visit:crc-upload:upload2']" :disabled="!isOCTorIVUS && (scope.row.SubmitState * 1 === 2 ||
               scope.row.VisitExecuted === 2 ||
-              scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2)
+              scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2))
               " circle :title="$t('trials:crcUpload:action:upload')" @click="CRChandleUpload2(scope.row)" />
             <!-- 提交 -->
             <el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:submit']" icon="el-icon-check" :disabled="scope.row.AuditState * 1 > 0 ||
@@ -968,6 +968,7 @@ export default {
       },
       TrialReadingCriterionName: null,
       TrialCode: null,
+      isOCTorIVUS: false
     }
   },
   watch: {
@@ -1060,6 +1061,7 @@ export default {
           this.trialCriterionList = res.Result
           this.TrialReadingCriterionId =
             this.trialCriterionList[0].TrialReadingCriterionId
+          this.isOCTorIVUS = this.trialCriterionList.some(item => item.CriterionType === 19 || item.CriterionType === 20)
           // this.handleUpload2(this.subjectRowData)
         })
         .catch(() => { })

From cf1af92c2f9f15fb363394e878ae330d9001126b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 14 Nov 2025 11:43:12 +0800
Subject: [PATCH 086/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E7=82=B9=E7=B3=BB=E7=BB=9F=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dictionary.js                         |  23 +++
 src/components/Preview/fun.js                 |   4 +-
 src/components/Preview/index.vue              |  17 +--
 src/components/PreviewFile/index.vue          |  16 ++-
 .../template/components/KeyDocument.vue       | 133 ++++++++++++++----
 5 files changed, 145 insertions(+), 48 deletions(-)

diff --git a/src/api/dictionary.js b/src/api/dictionary.js
index 4c16f173..3310635f 100644
--- a/src/api/dictionary.js
+++ b/src/api/dictionary.js
@@ -1451,3 +1451,26 @@ export function getCurrentVersionUserAgreements(data) {
     data
   })
 }
+// 获取系统阅片关键点文件列表
+export function getSystemCriterionKeyFileList(data) {
+  return request({
+    url: `/SystemCriterionKeyFile/getSystemCriterionKeyFileList`,
+    method: 'post',
+    data
+  })
+}
+// 新增/修改系统阅片关键点文件
+export function addOrUpdateSystemCriterionKeyFile(data) {
+  return request({
+    url: `/SystemCriterionKeyFile/addOrUpdateSystemCriterionKeyFile`,
+    method: 'post',
+    data
+  })
+}
+// 删除系统阅片关键点文件
+export function deleteSystemCriterionKeyFile(systemCriterionKeyFileId) {
+  return request({
+    url: `/SystemCriterionKeyFile/deleteSystemCriterionKeyFile/${systemCriterionKeyFileId}`,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/src/components/Preview/fun.js b/src/components/Preview/fun.js
index 370657d7..4a76f522 100644
--- a/src/components/Preview/fun.js
+++ b/src/components/Preview/fun.js
@@ -4,7 +4,7 @@ import Preview from "./index.vue";
 const PreviewConstructor = Vue.extend(Preview);
 
 const preview = options => {
-    const { path, type, title } = options;
+    const { path, type, title, isLocal = false } = options;
     if (!path) throw `path is requred.but ${path}`
     const id = `Preview_${new Date().getTime()}`;
     const instance = new PreviewConstructor();
@@ -12,7 +12,7 @@ const preview = options => {
     instance.vm = instance.$mount();
     if (instance.vm.visible) return;
     document.body.appendChild(instance.vm.$el);
-    instance.vm.open(path, type, title);
+    instance.vm.open(path, type, title, isLocal);
     instance.vm.$on("closed", () => {
         document.body.removeChild(instance.vm.$el);
         instance.vm.$destroy();
diff --git a/src/components/Preview/index.vue b/src/components/Preview/index.vue
index c44b0194..5b22ac8a 100644
--- a/src/components/Preview/index.vue
+++ b/src/components/Preview/index.vue
@@ -1,15 +1,8 @@
 <template>
-  <el-dialog
-    v-if="visible"
-    :visible.sync="visible"
-    :title="title"
-    :fullscreen="true"
-    append-to-body
-    custom-class="base-dialog-wrapper"
-    @close="handleClose"
-  >
+  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
+    custom-class="base-dialog-wrapper" @close="handleClose">
     <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-      <PreviewFile v-if="visible" :file-path="path" :file-type="type" />
+      <PreviewFile v-if="visible" :file-path="path" :file-type="type" :is-local="isLocal" />
     </div>
   </el-dialog>
 </template>
@@ -24,13 +17,15 @@ export default {
       path: null,
       type: null,
       title: null,
+      isLocal: false
     };
   },
   methods: {
-    open(path, type, title) {
+    open(path, type, title, isLocal) {
       this.path = path;
       this.type = type;
       this.title = title;
+      this.isLocal = isLocal;
       this.visible = true;
     },
     handleClose() {
diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue
index 53112407..8b6966b1 100644
--- a/src/components/PreviewFile/index.vue
+++ b/src/components/PreviewFile/index.vue
@@ -5,16 +5,17 @@
     <!-- <embed v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" style="width: 100%; height: 100%"> -->
     <!-- <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" width="100%" height="100%" frameborder="0" /> -->
     <iframe v-else-if="fileType.indexOf('pdf') !== -1"
-      :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
+      :src="`/static/pdfjs/web/viewer.html?file=${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
       width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <!--    <pdf-->
     <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
     <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
     <!--    </pdf>-->
-    <video :src="`${OSSclientConfig.basePath}${filePath}`" style="width: 100%;height: 99%;" autoplay controls
-      controlsList="nodownload" v-else-if="fileType.indexOf('mp4') !== -1"></video>
+    <video :src="`${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}`"
+      style="width: 100%;height: 99%;" autoplay controls controlsList="nodownload"
+      v-else-if="fileType.indexOf('mp4') !== -1"></video>
     <iframe v-else
-      :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
+      :src="`/static/onlyOffice/viewer.html?url=${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
       width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <!-- <div v-else>
       {{ $t('common:message:downloadFile') }}
@@ -43,12 +44,17 @@ export default {
       type: String,
       default: ''
     },
+    isLocal: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
       currentUser: zzSessionStorage.getItem('userName'),
       COMPANY: process.env.VUE_APP_COMPANY_NAME,
-      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL,
+      window,
     }
   },
   computed: {
diff --git a/src/views/dictionary/template/components/KeyDocument.vue b/src/views/dictionary/template/components/KeyDocument.vue
index 27a50be6..c52c256a 100644
--- a/src/views/dictionary/template/components/KeyDocument.vue
+++ b/src/views/dictionary/template/components/KeyDocument.vue
@@ -3,6 +3,9 @@
         <!-- 搜索框 -->
         <template slot="search-container">
             <el-form :inline="true" size="mini">
+                <el-form-item :label="$t('dictionary:template:keyDocList:FileName')">
+                    <el-input clearable v-model="searchData.FileName"></el-input>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">
                         {{ $t('common:button:search') }}
@@ -13,8 +16,8 @@
                 </el-form-item>
                 <el-form-item>
                     <div class="upload">
-                        <input multiple="multiple" webkitdirectory="" directory accept=".pdf" type="file"
-                            name="uploadFolder" class="select-file" title="" @change="beginScanFiles($event)" />
+                        <input directory accept=".pdf" type="file" name="uploadFolder" class="select-file" title=""
+                            @change="beginScanFiles($event)" />
                         <div class="btn-select">
                             {{ $t('dictionary:template:basicData:button:selectFile') }}
                         </div>
@@ -24,22 +27,27 @@
         </template>
 
         <template slot="main-container">
-            <el-table ref="keyDocList" v-loading="loading" v-adaptive="{ bottomOffset: 80 }" :data="list" width="100%"
-                style="width: 100%;min-width: 300px" stripe height="100" @sort-change="handleSortByColumn">
-                <el-table-column type="index" min-width="90" />
-                <el-table-column prop="FileName" :label="$t('dictionary:template:keyDocList:FileName')"
-                    show-overflow-tooltip />
-                <el-table-column prop="CreateTime" :label="$t('dictionary:template:keyDocList:CreateTime')"
-                    show-overflow-tooltip />
-                <el-table-column :label="$t('common:action:action')" align="left" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button circle icon="el-icon-view" :title="$t('dictionary:template:keyDocList:button:view')"
-                            @click.stop="view(scope.row)" />
-                        <el-button circle icon="el-icon-delete" :title="$t('dictionary:template:keyDocList:button:del')"
-                            @click.stop="del(scope.row)" />
-                    </template>
-                </el-table-column>
-            </el-table>
+            <div class="drag" ref="drag" @dragover="handleDragover" @drop="handleDrop">
+                <el-table ref="keyDocList" v-loading="loading" v-adaptive="{ bottomOffset: 80 }" :data="list"
+                    width="100%" style="width: 100%;min-width: 300px" stripe height="100"
+                    @sort-change="handleSortByColumn">
+                    <el-table-column type="index" min-width="90" />
+                    <el-table-column prop="FileName" :label="$t('dictionary:template:keyDocList:FileName')"
+                        show-overflow-tooltip />
+                    <el-table-column prop="CreateTime" :label="$t('dictionary:template:keyDocList:CreateTime')"
+                        show-overflow-tooltip />
+                    <el-table-column :label="$t('common:action:action')" align="left" fixed="right">
+                        <template slot-scope="scope">
+                            <el-button circle icon="el-icon-view"
+                                :title="$t('dictionary:template:keyDocList:button:view')"
+                                @click.stop="view(scope.row)" />
+                            <el-button circle icon="el-icon-delete"
+                                :title="$t('dictionary:template:keyDocList:button:del')" @click.stop="del(scope.row)" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+
             <!-- 分页组件 -->
             <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
                 @pagination="getList" />
@@ -51,20 +59,29 @@
 import { Upload } from '@/api/dictionary'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
+import { getSystemCriterionKeyFileList, addOrUpdateSystemCriterionKeyFile, deleteSystemCriterionKeyFile } from '@/api/dictionary'
 const searchDataDefault = () => {
     return {
-        CriterionId: '',
-        TargetLesion: null,
-        NonTargetLesions: null,
-        NewLesion: null,
-        OverallEfficacy: null,
+        FileName: '',
         PageIndex: 1,
-        PageSize: 20
+        PageSize: 20,
+        Asc: false,
+        SortField: ''
     }
 }
 export default {
     name: "KeyDocument",
     components: { BaseContainer, Pagination },
+    props: {
+        criterionId: {
+            type: String,
+            required: true
+        },
+        isCompleteConfig: {
+            type: Boolean,
+            required: true
+        },
+    },
     data() {
         return {
             searchData: searchDataDefault(),
@@ -122,11 +139,13 @@ export default {
                     if (!this.checkFileSuffix(file.name)) continue
                     const formData = new FormData();
                     formData.append("file", file);
-                    await Upload(formData, 5)
-                    if (i === files.length - 1) {
-                        this.loading = false;
-                        this.getList()
+                    let res = await Upload(formData, 5)
+                    let data = {
+                        FilePath: res.Result.FilePath,
+                        FileName: file.name
                     }
+                    await this.addKeyDoc(data)
+
                 }
             } catch (err) {
                 console.log(err)
@@ -136,13 +155,67 @@ export default {
         checkFileSuffix(fileName) {
             var index = fileName.lastIndexOf('.')
             var suffix = fileName.substring(index + 1, fileName.length)
-            if (['.pdf'].toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
+            if ('.pdf'.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
                 return false
             } else {
                 return true
             }
         },
-        getList() { },
+        async getList() {
+            try {
+                this.searchData.SystemCriterionId = this.criterionId
+                this.loading = true
+                let res = await getSystemCriterionKeyFileList(this.searchData)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.list = res.Result.CurrentPageData
+                    this.total = res.Result.TotalCount
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        async addKeyDoc(row) {
+            try {
+                let { FileName, FilePath } = row
+                let data = {
+                    FileName,
+                    FilePath,
+                    SystemCriterionId: this.criterionId
+                }
+                this.loading = true
+                let res = await addOrUpdateSystemCriterionKeyFile(data)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getList()
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        async del(row) {
+            try {
+                this.loading = true
+                let res = await deleteSystemCriterionKeyFile(row.Id)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getList()
+                }
+            } catch (err) {
+                console.log(err)
+                this.loading = false
+            }
+        },
+        view(row) {
+            this.$preview({
+                path: row.FilePath,
+                type: 'pdf',
+                isLocal: true,
+                title: row.FileName,
+            })
+        },
         // 查询
         handleSearch() {
             this.searchData.PageIndex = 1

From b55245a83a247c929e0c11d3b22e5ad3b2f3964d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 14 Nov 2025 16:03:32 +0800
Subject: [PATCH 087/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E7=82=B9=E6=B7=BB=E5=8A=A0=E3=80=81=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=9B=E5=85=A5=E9=98=85=E7=89=87=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=98=85=E7=89=87=E5=85=B3=E9=94=AE=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  16 ++
 .../template/components/KeyDocument.vue       |   1 +
 .../reading/dicoms/components/DicomViewer.vue |  51 +++++-
 .../reading/dicoms/components/Manuals.vue     |  82 ++++++---
 .../reading/dicoms/components/ReadPage.vue    |   9 +
 .../dicoms/customize/CustomizeDicomViewer.vue |  48 ++++-
 .../dicoms/customize/CustomizeReadPage.vue    |  11 +-
 .../reading/dicoms/customize/Manuals.vue      |  89 ++++++---
 .../trials-panel/reading/dicoms/index.vue     |  10 +-
 .../reading/dicoms3D/components/ReadPage.vue  |  38 +++-
 .../visit-review/components/FileViewer.vue    |  38 +++-
 .../reading-unit/components/ReadingRules.vue  | 173 ++++++++++++++++++
 .../setting/reading-unit/index.vue            |  10 +-
 .../visit/qc-check/components/manuals.vue     |  92 +++++++---
 14 files changed, 550 insertions(+), 118 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 6bb5711e..c8e8d53b 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -4366,4 +4366,20 @@ export function updateTrialExtralConfig(params, data) {
     params,
     data
   })
+}
+// 获取项目标准阅片关键点列表
+export function getTrialCriterionKeyFileList(data) {
+  return request({
+    url: `/TrialCriterionKeyFile/getTrialCriterionKeyFileList`,
+    method: 'post',
+    data
+  })
+}
+// 设置已阅读关键文件
+export function setReadKeyFile(data) {
+  return request({
+    url: `/ReadingImageTask/setReadKeyFile`,
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/views/dictionary/template/components/KeyDocument.vue b/src/views/dictionary/template/components/KeyDocument.vue
index c52c256a..83cc9ba0 100644
--- a/src/views/dictionary/template/components/KeyDocument.vue
+++ b/src/views/dictionary/template/components/KeyDocument.vue
@@ -60,6 +60,7 @@ import { Upload } from '@/api/dictionary'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import { getSystemCriterionKeyFileList, addOrUpdateSystemCriterionKeyFile, deleteSystemCriterionKeyFile } from '@/api/dictionary'
+import { readEntry } from '@/utils/index'
 const searchDataDefault = () => {
     return {
         FileName: '',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 2331140f..91da05e1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -399,9 +399,9 @@
           <div style="padding:5px;display: flex;">
             <!-- 手册 -->
             <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
-              v-if="isExistsManual">
+              v-if="isExistsManual || isHaveKeyFile">
               <div class="tool-wrapper">
-                <div class="icon" @click.prevent="previewManuals">
+                <div class="icon" @click.prevent="previewManuals(false)">
                   <svg-icon icon-class="constitution" class="svg-icon" />
                 </div>
                 <div class="text">{{ $t('trials:reading:button:handbooks') }}</div>
@@ -548,8 +548,14 @@
         </span>
       </span>
       <div style="height: 100%;margin:0;">
-        <Manuals :trial-id="trialId" />
+        <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
+        <div slot="footer" style="text-align:right;" v-if="openManuals">
+          <!-- 确认 -->
+          <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
+            {{ $t('common:button:confirm') }}</el-button>
+        </div>
       </div>
+
     </el-dialog>
 
     <el-dialog v-if="fusionSeries.visible" :visible.sync="fusionSeries.visible" :close-on-click-modal="false"
@@ -683,7 +689,7 @@ import html2canvas from 'html2canvas'
 import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import SignForm from '@/views/trials/components/newSignForm'
-import { getCriterionReadingInfo, verifyVisitTaskQuestions, submitDicomVisitTask } from '@/api/trials'
+import { getCriterionReadingInfo, verifyVisitTaskQuestions, submitDicomVisitTask, setReadKeyFile } from '@/api/trials'
 import { setSkipReadingCache } from '@/api/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
@@ -736,6 +742,14 @@ export default {
       type: Boolean,
       required: true
     },
+    isReadKeyFile: {
+      type: Boolean,
+      required: true
+    },
+    isHaveKeyFile: {
+      type: Boolean,
+      required: false
+    },
     iseCRFShowInDicomReading: {
       type: Boolean,
       required: true
@@ -838,7 +852,7 @@ export default {
       activeName: '1',
       customWwcTpl: [],
       isFullscreen: false,
-      manualsDialog: { visible: false },
+      manualsDialog: { visible: false, justKeyDoc: false },
       petct: { visible: false },
       fusionSeries: { visible: false },
       fusionForm: {
@@ -886,9 +900,18 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['visitTaskList', 'currentReadingTaskState', 'lastCanvasTaskId', 'imageQualityIssues'])
+    ...mapGetters(['visitTaskList', 'currentReadingTaskState', 'lastCanvasTaskId', 'imageQualityIssues']),
+    openManuals() {
+      return !this.isReadKeyFile && this.isHaveKeyFile
+    }
   },
   watch: {
+    openManuals: {
+      handler() {
+        if (this.openManuals) this.previewManuals(true)
+      },
+      immediate: true
+    },
     currentReadingTaskState: {
       immediate: true,
       handler(val) {
@@ -1126,6 +1149,19 @@ export default {
     })
   },
   methods: {
+    async handleSubmitKeyDoc() {
+      try {
+        let data = {
+          TrialCriterionId: this.$router.currentRoute.query.TrialReadingCriterionId,
+        }
+        let res = await setReadKeyFile(data)
+        if (res.IsSuccess) {
+          this.manualsDialog.visible = false
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     showPanel(e, toolName) {
       if (toolName === 'layout') return false
       e.currentTarget.firstChild.lastChild.style.display = 'block'
@@ -2206,9 +2242,10 @@ export default {
     previewNoneDicoms() {
       this.$emit('previewNoneDicoms')
     },
-    previewManuals() {
+    previewManuals(justKeyDoc = false) {
       this.isFullscreen = false
       this.manualsDialog.visible = true
+      this.manualsDialog.justKeyDoc = justKeyDoc
     },
     async skipTask() {
       // 是否确认跳过？
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Manuals.vue b/src/views/trials/trials-panel/reading/dicoms/components/Manuals.vue
index 847b30be..9f63da6d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Manuals.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Manuals.vue
@@ -1,14 +1,9 @@
 <template>
   <div v-loading="loading" class="manuals-wrapper">
     <div class="left-wrapper">
-      <div v-if="fileList.length>0" class="basic-content">
-        <div
-          v-for="file in fileList"
-          :key="file.Id"
-          class="file-item"
-          :class="{activeItem:file.Id === selected.id}"
-          @click.prevent="preview(file)"
-        >
+      <div v-if="fileList.length > 0" class="basic-content">
+        <div v-for="file in fileList" :key="file.Id" class="file-item" :class="{ activeItem: file.Id === selected.id }"
+          @click.prevent="preview(file)">
           <!-- {{ file.Name }} -->
           <el-tooltip class="item" :content="file.Name" placement="bottom">
             <span>{{ file.Name }} </span>
@@ -21,19 +16,25 @@
     </div>
     <div class="right-wrapper">
       <div class="right-content">
-        <iframe v-if="selected.filePath" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" />
+        <iframe v-if="selected.filePath"
+          :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
+          width="100%" height="100%" frameborder="0" />
       </div>
     </div>
   </div>
 </template>
 <script>
-import { getManualList } from '@/api/trials'
+import { getManualList, getTrialCriterionKeyFileList } from '@/api/trials'
 export default {
   name: 'Manuals',
   props: {
     trialId: {
       type: String,
       required: true
+    },
+    justKeyDoc: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -45,7 +46,7 @@ export default {
       fileList: [],
       loading: false,
       currentUser: zzSessionStorage.getItem('userName'),
-      COMPANY:process.env.VUE_APP_COMPANY_NAME
+      COMPANY: process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {
@@ -54,16 +55,35 @@ export default {
   methods: {
     async getList() {
       this.loading = true
+      this.fileList = []
       try {
         var param = {
-          trialId: this.trialId
+          TrialCriterionId: this.$router.currentRoute.query.TrialReadingCriterionId,
+          PageIndex: 1,
+          PageSize: 1000
         }
-        const res = await getManualList(param)
+        const res = await getTrialCriterionKeyFileList(param)
         if (res.IsSuccess) {
-          this.fileList = res.Result
-          if (this.fileList.length > 0) {
-            this.preview(this.fileList[0])
+          let list = res.Result.CurrentPageData.map(item => {
+            return {
+              Id: item.Id,
+              Name: item.FileName,
+              Path: item.FilePath
+            }
+          })
+          this.fileList = [...this.fileList, ...list]
+        }
+        if (!this.justKeyDoc) {
+          var param = {
+            trialId: this.trialId
           }
+          const res = await getManualList(param)
+          if (res.IsSuccess) {
+            this.fileList = [...this.fileList, ...res.Result]
+          }
+        }
+        if (this.fileList.length > 0) {
+          this.preview(this.fileList[0])
         }
         this.loading = false
       } catch (e) {
@@ -77,38 +97,43 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-.manuals-wrapper{
+<style lang="scss" scoped>
+.manuals-wrapper {
   display: flex;
   flex-direction: row !important;
   width: 100%;
-  height: 100%;
+  height: 95%;
   padding: 5px;
   overflow: hidden;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  .left-wrapper{
+
+  .left-wrapper {
     box-sizing: border-box;
     margin-right: 10px;
     height: 100%;
     width: 300px;
     border: 1px solid #ddd;
 
-    .basic-content{
+    .basic-content {
       height: 100%;
       overflow: auto;
     }
-    .basic-content-empty{
+
+    .basic-content-empty {
       padding: 5px;
       font-size: 16px;
     }
-    .file-item{
+
+    .file-item {
       box-sizing: border-box;
       border-bottom: 1px solid #f3f3f3;
       height: 50px;
@@ -121,18 +146,21 @@ export default {
       text-overflow: ellipsis;
       width: 100%;
     }
-    .activeItem{
+
+    .activeItem {
       color: #428bca !important;
       border-bottom: 1px solid #f3f3f3 !important;
     }
   }
-  .right-wrapper{
+
+  .right-wrapper {
     flex: 1;
     height: 100%;
     border: 1px solid #ddd;
   }
-  .right-content{
-    height:100%;
+
+  .right-content {
+    height: 100%;
   }
 
 }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 78bd94bc..3a07458c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -43,6 +43,7 @@
           :is-exists-clinical-data="isExistsClinicalData" :is-exists-no-dicom-file="isExistsNoDicomFile"
           :is-reading-show-subject-info="isReadingShowSubjectInfo" :studyShow="studyShow"
           :is-reading-task-view-in-order="isReadingTaskViewInOrder" :is-exists-manual="isExistsManual"
+          :isReadKeyFile="isReadKeyFile" :isHaveKeyFile="isHaveKeyFile"
           :iseCRFShowInDicomReading="iseCRFShowInDicomReading" @previewCD="previewCD" />
       </div>
 
@@ -124,6 +125,14 @@ export default {
       type: Boolean,
       required: true
     },
+    isReadKeyFile: {
+      type: Boolean,
+      required: true
+    },
+    isHaveKeyFile: {
+      type: Boolean,
+      required: false
+    },
     iseCRFShowInDicomReading: {
       type: Boolean,
       required: true
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index e0368720..9d03a965 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -340,9 +340,9 @@
         <div style="margin-left: auto">
           <div style="padding: 5px">
             <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
-              v-if="isExistsManual">
+              v-if="isExistsManual || isHaveKeyFile">
               <div class="tool-wrapper">
-                <div class="icon" @click.prevent="previewManuals">
+                <div class="icon" @click.prevent="previewManuals()">
                   <svg-icon icon-class="constitution" class="svg-icon" />
                 </div>
                 <div class="text">{{ $t('trials:reading:button:handbooks') }}</div>
@@ -428,7 +428,12 @@
         </span>
       </span>
       <div style="height: 100%; margin: 0">
-        <Manuals :trial-id="trialId" />
+        <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
+        <div slot="footer" style="text-align:right;" v-if="openManuals">
+          <!-- 确认 -->
+          <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
+            {{ $t('common:button:confirm') }}</el-button>
+        </div>
       </div>
     </el-dialog>
     <!--    <button :title="$t('trials:dicom-show:Eraser')" class="btn-link" data-tool="Eraser" @click="setToolActive($event,'Eraser')">-->
@@ -472,7 +477,7 @@ import store from '@/store'
 import { getDoctorShortcutKey, getUserWLTemplateList } from '@/api/user'
 import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
-import { getCriterionReadingInfo } from '@/api/trials'
+import { getCriterionReadingInfo, setReadKeyFile } from '@/api/trials'
 export default {
   name: 'DicomViewer',
   components: {
@@ -499,6 +504,14 @@ export default {
       type: Boolean,
       required: true,
     },
+    isReadKeyFile: {
+      type: Boolean,
+      required: true
+    },
+    isHaveKeyFile: {
+      type: Boolean,
+      required: false
+    },
     isReadingShowSubjectInfo: {
       type: Boolean,
       required: true,
@@ -654,7 +667,7 @@ export default {
       activeName: '1',
       customWwcTpl: [],
       isFullscreen: false,
-      manualsDialog: { visible: false },
+      manualsDialog: { visible: false, justKeyDoc: false },
       clipPlaying: false,
       fps: 15,
       trialCriterion: {},
@@ -674,8 +687,17 @@ export default {
 
   computed: {
     ...mapGetters(['visitTaskList', 'currentReadingTaskState']),
+    openManuals() {
+      return !this.isReadKeyFile && this.isHaveKeyFile
+    }
   },
   watch: {
+    openManuals: {
+      handler() {
+        if (this.openManuals) this.previewManuals(true)
+      },
+      immediate: true
+    },
     currentReadingTaskState: {
       immediate: true,
       handler(val) {
@@ -842,6 +864,19 @@ export default {
     DicomEvent.$off('loadLinkedImageStack')
   },
   methods: {
+    async handleSubmitKeyDoc() {
+      try {
+        let data = {
+          TrialCriterionId: this.$router.currentRoute.query.TrialReadingCriterionId,
+        }
+        let res = await setReadKeyFile(data)
+        if (res.IsSuccess) {
+          this.manualsDialog.visible = false
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     getTrialCriterion() {
       getCriterionReadingInfo({
         TrialId: this.trialId,
@@ -2113,9 +2148,10 @@ export default {
     previewNoneDicoms() {
       this.$emit('previewNoneDicoms')
     },
-    previewManuals() {
+    previewManuals(justKeyDoc = false) {
       this.isFullscreen = false
       this.manualsDialog.visible = true
+      this.manualsDialog.justKeyDoc = justKeyDoc
     },
   },
 }
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
index f51d3978..313c6b5e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
@@ -33,6 +33,7 @@
           :is-exists-clinical-data="isExistsClinicalData" :is-exists-no-dicom-file="isExistsNoDicomFile"
           :is-reading-show-subject-info="isReadingShowSubjectInfo"
           :is-reading-task-view-in-order="isReadingTaskViewInOrder" :isExistsManual="isExistsManual"
+          :isReadKeyFile="isReadKeyFile" :isHaveKeyFile="isHaveKeyFile"
           :IseCRFShowInDicomReading="IseCRFShowInDicomReading" @previewCD="previewCD" />
       </div>
     </div>
@@ -108,6 +109,14 @@ export default {
       type: Boolean,
       required: true,
     },
+    isReadKeyFile: {
+      type: Boolean,
+      required: true
+    },
+    isHaveKeyFile: {
+      type: Boolean,
+      required: false
+    },
     isExistsNoDicomFile: {
       type: Boolean,
       required: true,
@@ -656,7 +665,7 @@ export default {
     },
     cornerstoneimageloadprogress(e) {
       const imageId = e.detail.imageId
-      console.log(imageId,'imageId')
+      console.log(imageId, 'imageId')
       const params = {}
       const searchParams = new URLSearchParams(imageId.split('?')[1])
       for (const [key, value] of searchParams.entries()) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/Manuals.vue b/src/views/trials/trials-panel/reading/dicoms/customize/Manuals.vue
index fd4babe4..9f63da6d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/Manuals.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/Manuals.vue
@@ -1,14 +1,9 @@
 <template>
   <div v-loading="loading" class="manuals-wrapper">
     <div class="left-wrapper">
-      <div v-if="fileList.length>0" class="basic-content">
-        <div
-          v-for="file in fileList"
-          :key="file.Id"
-          class="file-item"
-          :class="{activeItem:file.Id === selected.id}"
-          @click.prevent="preview(file)"
-        >
+      <div v-if="fileList.length > 0" class="basic-content">
+        <div v-for="file in fileList" :key="file.Id" class="file-item" :class="{ activeItem: file.Id === selected.id }"
+          @click.prevent="preview(file)">
           <!-- {{ file.Name }} -->
           <el-tooltip class="item" :content="file.Name" placement="bottom">
             <span>{{ file.Name }} </span>
@@ -21,19 +16,25 @@
     </div>
     <div class="right-wrapper">
       <div class="right-content">
-        <iframe v-if="selected.filePath" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" />
+        <iframe v-if="selected.filePath"
+          :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
+          width="100%" height="100%" frameborder="0" />
       </div>
     </div>
   </div>
 </template>
 <script>
-import { getManualList } from '@/api/trials'
+import { getManualList, getTrialCriterionKeyFileList } from '@/api/trials'
 export default {
   name: 'Manuals',
   props: {
     trialId: {
       type: String,
       required: true
+    },
+    justKeyDoc: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -45,7 +46,7 @@ export default {
       fileList: [],
       loading: false,
       currentUser: zzSessionStorage.getItem('userName'),
-      COMPANY:process.env.VUE_APP_COMPANY_NAME
+      COMPANY: process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {
@@ -54,18 +55,38 @@ export default {
   methods: {
     async getList() {
       this.loading = true
-      var param = {
-        trialId: this.trialId
-      }
-      try{
-        let res = await getManualList(param)
-        this.fileList = res.Result
-
+      this.fileList = []
+      try {
+        var param = {
+          TrialCriterionId: this.$router.currentRoute.query.TrialReadingCriterionId,
+          PageIndex: 1,
+          PageSize: 1000
+        }
+        const res = await getTrialCriterionKeyFileList(param)
+        if (res.IsSuccess) {
+          let list = res.Result.CurrentPageData.map(item => {
+            return {
+              Id: item.Id,
+              Name: item.FileName,
+              Path: item.FilePath
+            }
+          })
+          this.fileList = [...this.fileList, ...list]
+        }
+        if (!this.justKeyDoc) {
+          var param = {
+            trialId: this.trialId
+          }
+          const res = await getManualList(param)
+          if (res.IsSuccess) {
+            this.fileList = [...this.fileList, ...res.Result]
+          }
+        }
         if (this.fileList.length > 0) {
           this.preview(this.fileList[0])
         }
         this.loading = false
-      }catch(e){
+      } catch (e) {
         this.loading = false
       }
     },
@@ -76,38 +97,43 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-.manuals-wrapper{
+<style lang="scss" scoped>
+.manuals-wrapper {
   display: flex;
   flex-direction: row !important;
   width: 100%;
-  height: 100%;
+  height: 95%;
   padding: 5px;
   overflow: hidden;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  .left-wrapper{
+
+  .left-wrapper {
     box-sizing: border-box;
     margin-right: 10px;
     height: 100%;
     width: 300px;
     border: 1px solid #ddd;
 
-    .basic-content{
+    .basic-content {
       height: 100%;
       overflow: auto;
     }
-    .basic-content-empty{
+
+    .basic-content-empty {
       padding: 5px;
       font-size: 16px;
     }
-    .file-item{
+
+    .file-item {
       box-sizing: border-box;
       border-bottom: 1px solid #f3f3f3;
       height: 50px;
@@ -120,18 +146,21 @@ export default {
       text-overflow: ellipsis;
       width: 100%;
     }
-    .activeItem{
+
+    .activeItem {
       color: #428bca !important;
       border-bottom: 1px solid #f3f3f3 !important;
     }
   }
-  .right-wrapper{
+
+  .right-wrapper {
     flex: 1;
     height: 100%;
     border: 1px solid #ddd;
   }
-  .right-content{
-    height:100%;
+
+  .right-content {
+    height: 100%;
   }
 
 }
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index 1c930608..23cc8b0d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -18,6 +18,7 @@
             :is-reading-show-subject-info="isReadingShowSubjectInfo"
             :is-reading-task-view-in-order="isReadingTaskViewInOrder" :is-exists-clinical-data="isExistsClinicalData"
             :is-exists-no-dicom-file="isExistsNoDicomFile" :is-exists-manual="isExistsManual"
+            :isReadKeyFile="isReadKeyFile" :isHaveKeyFile="isHaveKeyFile"
             :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading" @previewCD="previewCD" />
         </el-tab-pane>
         <!-- 报告 -->
@@ -38,7 +39,8 @@
             :subject-code="subjectCode" :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
             :is-reading-task-view-in-order="isReadingTaskViewInOrder"
             :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading" :is-exists-clinical-data="isExistsClinicalData"
-            :is-exists-no-dicom-file="isExistsNoDicomFile" :is-exists-manual="isExistsManual" @previewCD="previewCD" />
+            :is-exists-no-dicom-file="isExistsNoDicomFile" :is-exists-manual="isExistsManual"
+            :isReadKeyFile="isReadKeyFile" :isHaveKeyFile="isHaveKeyFile" @previewCD="previewCD" />
         </el-tab-pane>
         <!-- 报告 -->
         <el-tab-pane v-if="!IseCRFShowInDicomReading" :label="$t('trials:reading:tabTitle:report')" name="report">
@@ -219,7 +221,9 @@ export default {
       closeCDVisible: false,
       cdVisitTaskId: '',
       readingVersionEnum: null,
-      dialogBodyPartVisible: false
+      dialogBodyPartVisible: false,
+      isReadKeyFile: true,
+      isHaveKeyFile: false
     }
   },
   computed: {
@@ -327,6 +331,8 @@ export default {
         this.isExistsNoDicomFile = res.Result.IsExistsNoDicomFile
         this.isExistsClinicalData = res.Result.IsExistsClinicalData
         this.isExistsManual = res.Result.ExistsManual
+        this.isReadKeyFile = res.Result.IsReadKeyFile
+        this.isHaveKeyFile = res.Result.IsHaveKeyFile
         this.isReadClinicalData = res.Result.IsReadClinicalData
         this.IsViewStudyPart = res.Result.IsViewStudyPart
         this.isNeedReadClinicalData = res.Result.IsNeedReadClinicalData
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 ba9bc8f2..4e864c1a 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -270,7 +270,7 @@
           <div style="display: flex;">
             <!-- 手册 -->
             <div class="tool-item" :title="$t('trials:reading:button:handbooks')"
-              v-if="taskInfo && taskInfo.ExistsManual" @click.prevent="previewManuals">
+              v-if="taskInfo && (taskInfo.ExistsManual || taskInfo.IsHaveKeyFile)" @click.prevent="previewManuals()">
               <svg-icon icon-class="constitution" class="svg-icon" />
             </div>
             <!-- 临床数据 -->
@@ -370,7 +370,12 @@
         </span>
       </span>
       <div style="height: 100%;margin:0;">
-        <Manuals :trial-id="trialId" />
+        <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
+        <div slot="footer" style="text-align:right;" v-if="openManuals">
+          <!-- 确认 -->
+          <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
+            {{ $t('common:button:confirm') }}</el-button>
+        </div>
       </div>
     </el-dialog>
     <!-- 个性化配置 -->
@@ -425,7 +430,7 @@
   </div>
 </template>
 <script>
-import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList, deleteCustomTag, getCriterionReadingInfo } from '@/api/trials'
+import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList, deleteCustomTag, getCriterionReadingInfo, setReadKeyFile } from '@/api/trials'
 import { getDoctorShortcutKey, getUserWLTemplateList } from '@/api/user'
 import { getCustomTag, submitCustomTag } from '@/api/reading'
 import { getToken } from '@/utils/auth'
@@ -596,7 +601,7 @@ export default {
       activeViewportWC: null,
       clipPlaying: false,
       fps: 15,
-      manualsDialog: { visible: false, isFullscreen: false },
+      manualsDialog: { visible: false, isFullscreen: false, justKeyDoc: false },
       hotKeyList: [],
       forceFitToWindow: false,
       isShowAnnotations: true,
@@ -661,8 +666,17 @@ export default {
     viewportKey() {
       return this.isFusion ? 'viewport-fusion' : 'viewport'
     },
+    openManuals() {
+      return !this.taskInfo.IsReadKeyFile && this.taskInfo.IsHaveKeyFile
+    }
   },
   watch: {
+    openManuals: {
+      handler() {
+        if (this.openManuals) this.previewManuals(true)
+      },
+      immediate: true
+    },
     currentReadingTaskState() { console.log(this.currentReadingTaskState, 'currentReadingTaskState') },
     activeTaskId: {
       immediate: true,
@@ -751,6 +765,19 @@ export default {
     })
   },
   methods: {
+    async handleSubmitKeyDoc() {
+      try {
+        let data = {
+          TrialCriterionId: this.$router.currentRoute.query.TrialReadingCriterionId,
+        }
+        let res = await setReadKeyFile(data)
+        if (res.IsSuccess) {
+          this.manualsDialog.visible = false
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     // 加载当前任务关联的任务信息
     async loadRelatedTasks() {
       this.loading = true
@@ -2792,9 +2819,10 @@ export default {
       return a < b ? (a < c ? a : c) : (b < c ? b : c)
     },
     // 手册
-    previewManuals() {
+    previewManuals(justKeyDoc = false) {
       this.manualsDialog.isFullscreen = false
       this.manualsDialog.visible = true
+      this.manualsDialog.justKeyDoc = justKeyDoc
     },
     // 临床数据
     previewCD(taskId) {
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 578fd92b..a07305d5 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -116,8 +116,8 @@
 
       <div style="display: flex;">
         <!-- 手册 -->
-        <div class="tool-item" :title="$t('trials:reading:button:handbooks')" v-if="taskInfo && taskInfo.ExistsManual"
-          @click.prevent="previewManuals">
+        <div class="tool-item" :title="$t('trials:reading:button:handbooks')"
+          v-if="taskInfo && (taskInfo.ExistsManual || taskInfo.IsHaveKeyFile)" @click.prevent="previewManuals">
           <svg-icon icon-class="constitution" class="svg-icon" />
         </div>
         <!-- 个性化配置 -->
@@ -254,7 +254,12 @@
         </span>
       </span>
       <div style="height: 100%;margin:0;">
-        <Manuals :trial-id="trialId" />
+        <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
+        <div slot="footer" style="text-align:right;" v-if="openManuals">
+          <!-- 确认 -->
+          <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
+            {{ $t('common:button:confirm') }}</el-button>
+        </div>
       </div>
     </el-dialog>
   </div>
@@ -410,9 +415,18 @@ export default {
     cells() {
       return Array(this.rows * this.cols).fill(0)
     },
-    ...mapGetters(['lastViewportTaskId', 'currentTaskState'])
+    ...mapGetters(['lastViewportTaskId', 'currentTaskState']),
+    openManuals() {
+      return !this.taskInfo.IsReadKeyFile && this.taskInfo.IsHaveKeyFile
+    }
   },
   watch: {
+    openManuals: {
+      handler() {
+        if (this.openManuals) this.previewManuals(true)
+      },
+      immediate: true
+    },
     relatedStudyInfo: {
       immediate: true,
       handler(obj) {
@@ -477,10 +491,24 @@ export default {
     window.removeEventListener('message', this.handleIframeMessage)
   },
   methods: {
+    async handleSubmitKeyDoc() {
+      try {
+        let data = {
+          TrialCriterionId: this.$router.currentRoute.query.TrialReadingCriterionId,
+        }
+        let res = await setReadKeyFile(data)
+        if (res.IsSuccess) {
+          this.manualsDialog.visible = false
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     // 手册
-    previewManuals() {
+    previewManuals(justKeyDoc = false) {
       this.manualsDialog.isFullscreen = false
       this.manualsDialog.visible = true
+      this.manualsDialog.justKeyDoc = justKeyDoc
     },
     getTrialCriterion() {
       getCriterionReadingInfo({
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index 56a4e131..f4825871 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -288,6 +288,15 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <!-- 阅片关键点 -->
+      <el-form-item :label="$t('trials:readingUnit:readingRules:title:keyDoc')
+        " prop="KeyFileList">
+        <el-input v-model="form.KeyFileListStr" type="textarea" :autosize="{ minRows: 1, maxRows: 3 }"
+          style="width: 80%" disabled />
+        <el-button :disabled="isConfirm ||
+          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          " icon="el-icon-plus" circle @click="handleSetKeyFileList" />
+      </el-form-item>
       <el-form-item :label="$t(
         'trials:trials-panel:setting:reading-unit:TrialCriterionAdditionalAssessmentTypeList'
       )
@@ -332,11 +341,45 @@
         </el-button>
       </el-form-item>
     </el-form>
+    <!-- 配置信息确认框 -->
+    <el-dialog v-if="keyDocVisible" :visible.sync="keyDocVisible" :close-on-click-modal="false" width="600px"
+      :title="$t('trials:reading-unit:dialogTitle:keyDoc')" custom-class="base-dialog-wrapper">
+      <div class="base-dialog-body">
+        <div class="upload">
+          <input directory accept=".pdf" type="file" name="uploadFolder" class="select-file" title=""
+            @change="beginScanFiles($event)" />
+          <div class="btn-select">
+            {{ $t('dictionary:template:basicData:button:selectFile') }}
+          </div>
+        </div>
+        <div class="drag" ref="drag" @dragover="handleDragover" @drop="handleDrop">
+          <el-table :data="confirmData" border style="width: 100%" size="small">
+            <el-table-column prop="FileName" :label="$t('trials:reading-unit:table:FileName')" show-overflow-tooltip />
+            <el-table-column :label="$t('common:action:action')" align="left" fixed="right">
+              <template slot-scope="scope">
+                <el-button circle icon="el-icon-view" :title="$t('dictionary:template:keyDocList:button:view')"
+                  @click.stop="view(scope.row)" />
+                <el-button circle icon="el-icon-delete" :title="$t('dictionary:template:keyDocList:button:del')"
+                  @click.stop="del(scope.$index)" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+
+      </div>
+      <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+        <!-- 确认 -->
+        <el-button size="small" type="primary" @click="handleConfirm">
+          {{ $t('trials:reading-unit:button:confirmCfg') }}
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
 import { getCriterionReadingInfo, setCriterionReadingInfo } from '@/api/trials'
 import { config } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
+import { readEntry } from '@/utils/index'
 export default {
   name: 'ReadingRules',
   props: {
@@ -350,9 +393,15 @@ export default {
       type: Number,
       default: 0,
     },
+    TrialReadingCriterionName: {
+      type: String,
+      default: ''
+    }
   },
   data() {
     return {
+      keyDocVisible: false,
+      confirmData: [],
       additionalAssessmentOptionList: [],
       form: {
         TrialId: '',
@@ -387,6 +436,8 @@ export default {
         ImageDownloadEnum: null,
         ImageUploadEnum: null,
         IsImageFilter: false,
+        KeyFileListStr: '',
+        KeyFileList: []
       },
       rules: {
         IsAutoCreate: [
@@ -577,6 +628,83 @@ export default {
     },
   },
   methods: {
+    handleDragover(e) {
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    handleDrop(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      this.beginScanFiles(e, true)
+    },
+    view(row) {
+      this.$preview({
+        path: row.FilePath,
+        type: 'pdf',
+        title: row.FileName,
+      })
+    },
+    del(index) {
+      this.confirmData.splice(index, 1)
+    },
+    handleSetKeyFileList() {
+      this.confirmData = [...this.form.KeyFileList]
+      this.keyDocVisible = true
+    },
+    handleConfirm() {
+      this.form.KeyFileList = [...this.confirmData]
+      this.form.KeyFileListStr = this.form.KeyFileList.map(item => item.FileName).join(',')
+      this.keyDocVisible = false
+    },
+    async beginScanFiles(e, isDrop = false) {
+      try {
+        let files = []
+        if (isDrop) {
+          const items = e.dataTransfer.items;
+          const allFiles = []; // 用于存储所有找到的文件
+
+          // 遍历拖拽项
+          for (const item of items) {
+            const entry = item.webkitGetAsEntry(); // 获取文件系统入口
+            if (entry) {
+              const files = await readEntry(entry); // 递归读取入口内容
+              allFiles.push(...files);
+            }
+          }
+          files = allFiles
+        } else {
+          files = [...e.target.files]
+        }
+        for (let i = 0; i < files.length; i++) {
+          let file = files[i]
+          let name = file.name
+          if (!this.checkFileSuffix(name)) continue
+          file = await this.fileToBlob(file)
+          let scope = this
+          let res = await this.OSSclient.put(
+            `/${this.$route.query.trialId}/ReadingModule/${this.TrialReadingCriterionName}/${scope.getGuid(Date.now() + '_' + name.split('.')[0])}.pdf`,
+            file
+          )
+          let data = {
+            FilePath: this.$getObjectName(res.url),
+            FileName: name
+          }
+          this.confirmData.push(data)
+        }
+      } catch (err) {
+        console.log(err)
+        this.loading = false;
+      }
+    },
+    checkFileSuffix(fileName) {
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName.substring(index + 1, fileName.length)
+      if ('.pdf'.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
+        return false
+      } else {
+        return true
+      }
+    },
     // 阅片工具选择
     handleReadingToolInput(val) {
       this.form.ReadingToolList = []
@@ -625,6 +753,9 @@ export default {
               this.form[k] = res.Result[k]
             }
           }
+          if (Array.isArray(this.form.KeyFileList) && this.form.KeyFileList.length > 0) {
+            this.form.KeyFileListStr = this.form.KeyFileList.map(item => item.FileName).join(',')
+          }
           if (this.CriterionType === 0) {
             if (this.form.ReadingTool === 0 || this.form.ReadingTool === 2) {
               this.tools = [...config.customizeStandards]
@@ -727,4 +858,46 @@ export default {
     color: red;
   }
 }
+
+.upload {
+  display: inline-block;
+  height: 30px;
+  width: 90px;
+  padding: 2px 10px;
+  line-height: 23px;
+  position: relative;
+  text-decoration: none;
+  border-radius: 3px;
+  overflow: hidden;
+  text-align: center;
+  background: #428bca;
+  border-color: #428bca;
+  color: #fff;
+
+  .select-file {
+    height: 30px;
+    width: 90px;
+    position: absolute;
+    overflow: hidden;
+    left: 0;
+    top: 0;
+    opacity: 0;
+    font-size: 0;
+  }
+
+  .btn-select {
+    //给显示在页面上的按钮写样式
+    width: 90px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    cursor: pointer;
+    border-radius: 24px;
+    overflow: hidden;
+    position: absolute;
+    top: 0;
+    left: 0;
+    pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
+  }
+}
 </style>
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index f6a65cd6..999de213 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -19,11 +19,11 @@
               <el-collapse-item :title="$t('trials:readingUnit:readingRules')" name="1">
                 <ReadingRules :ref="`readingRules${item.TrialReadingCriterionId}`"
                   :trial-reading-criterion-id="TrialReadingCriterionId" :CriterionType="item.CriterionType"
-                  @setConfirm="setConfirm" @reloadArbitrationRules="reloadArbitrationRules"
-                  @setArbitrationReading="setArbitrationReading" @setAdditionalAssessment="setAdditionalAssessment"
-                  @setIsClinicalReading="setIsClinicalReading" @setGlobalReading="setGlobalReading"
-                  @setOncologyReading="setOncologyReading" @setDigitPlaces="setDigitPlaces"
-                  @setReadingTools="setReadingTools" />
+                  :TrialReadingCriterionName="item.TrialReadingCriterionName" @setConfirm="setConfirm"
+                  @reloadArbitrationRules="reloadArbitrationRules" @setArbitrationReading="setArbitrationReading"
+                  @setAdditionalAssessment="setAdditionalAssessment" @setIsClinicalReading="setIsClinicalReading"
+                  @setGlobalReading="setGlobalReading" @setOncologyReading="setOncologyReading"
+                  @setDigitPlaces="setDigitPlaces" @setReadingTools="setReadingTools" />
               </el-collapse-item>
               <!-- 阅片标准 -->
               <el-collapse-item :title="$t('trials:readingUnit:readingCriterion')" name="2">
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/manuals.vue b/src/views/trials/trials-panel/visit/qc-check/components/manuals.vue
index 8857bb8e..9f63da6d 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/manuals.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/manuals.vue
@@ -1,14 +1,9 @@
 <template>
   <div v-loading="loading" class="manuals-wrapper">
     <div class="left-wrapper">
-      <div v-if="fileList.length>0" class="basic-content">
-        <div
-          v-for="file in fileList"
-          :key="file.Id"
-          class="file-item"
-          :class="{activeItem:file.Id === selected.id}"
-          @click.prevent="preview(file)"
-        >
+      <div v-if="fileList.length > 0" class="basic-content">
+        <div v-for="file in fileList" :key="file.Id" class="file-item" :class="{ activeItem: file.Id === selected.id }"
+          @click.prevent="preview(file)">
           <!-- {{ file.Name }} -->
           <el-tooltip class="item" :content="file.Name" placement="bottom">
             <span>{{ file.Name }} </span>
@@ -21,19 +16,25 @@
     </div>
     <div class="right-wrapper">
       <div class="right-content">
-        <iframe v-if="selected.filePath" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" />
+        <iframe v-if="selected.filePath"
+          :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
+          width="100%" height="100%" frameborder="0" />
       </div>
     </div>
   </div>
 </template>
 <script>
-import { getManualList } from '@/api/trials'
+import { getManualList, getTrialCriterionKeyFileList } from '@/api/trials'
 export default {
   name: 'Manuals',
   props: {
     trialId: {
       type: String,
       required: true
+    },
+    justKeyDoc: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -45,26 +46,49 @@ export default {
       fileList: [],
       loading: false,
       currentUser: zzSessionStorage.getItem('userName'),
-      COMPANY:process.env.VUE_APP_COMPANY_NAME
+      COMPANY: process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {
     this.getList()
   },
   methods: {
-    getList() {
+    async getList() {
       this.loading = true
-      var param = {
-        trialId: this.trialId
-      }
-      getManualList(param).then(res => {
-        this.fileList = res.Result
-
+      this.fileList = []
+      try {
+        var param = {
+          TrialCriterionId: this.$router.currentRoute.query.TrialReadingCriterionId,
+          PageIndex: 1,
+          PageSize: 1000
+        }
+        const res = await getTrialCriterionKeyFileList(param)
+        if (res.IsSuccess) {
+          let list = res.Result.CurrentPageData.map(item => {
+            return {
+              Id: item.Id,
+              Name: item.FileName,
+              Path: item.FilePath
+            }
+          })
+          this.fileList = [...this.fileList, ...list]
+        }
+        if (!this.justKeyDoc) {
+          var param = {
+            trialId: this.trialId
+          }
+          const res = await getManualList(param)
+          if (res.IsSuccess) {
+            this.fileList = [...this.fileList, ...res.Result]
+          }
+        }
         if (this.fileList.length > 0) {
           this.preview(this.fileList[0])
         }
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
     preview(file) {
       this.$set(this.selected, 'filePath', file.Path)
@@ -73,38 +97,43 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-.manuals-wrapper{
+<style lang="scss" scoped>
+.manuals-wrapper {
   display: flex;
   flex-direction: row !important;
   width: 100%;
-  height: 100%;
+  height: 95%;
   padding: 5px;
   overflow: hidden;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  .left-wrapper{
+
+  .left-wrapper {
     box-sizing: border-box;
     margin-right: 10px;
     height: 100%;
     width: 300px;
     border: 1px solid #ddd;
 
-    .basic-content{
+    .basic-content {
       height: 100%;
       overflow: auto;
     }
-    .basic-content-empty{
+
+    .basic-content-empty {
       padding: 5px;
       font-size: 16px;
     }
-    .file-item{
+
+    .file-item {
       box-sizing: border-box;
       border-bottom: 1px solid #f3f3f3;
       height: 50px;
@@ -117,18 +146,21 @@ export default {
       text-overflow: ellipsis;
       width: 100%;
     }
-    .activeItem{
+
+    .activeItem {
       color: #428bca !important;
       border-bottom: 1px solid #f3f3f3 !important;
     }
   }
-  .right-wrapper{
+
+  .right-wrapper {
     flex: 1;
     height: 100%;
     border: 1px solid #ddd;
   }
-  .right-content{
-    height:100%;
+
+  .right-content {
+    height: 100%;
   }
 
 }

From 9de73b9d4470575e3a89d5f92198ea6ceb280d02 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 14 Nov 2025 17:17:16 +0800
Subject: [PATCH 088/333] =?UTF-8?q?=E3=80=90=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E7=AD=89=E5=BE=85=E6=97=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=9C=80=E8=A6=81=E7=BD=AE=E4=B8=BA=E7=81=B0=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MFA/index.vue               |   4 +-
 src/views/forgetpassword/index.vue         |  11 ++
 src/views/research/login.vue               |   4 +-
 src/views/trials/trials-myinfo/account.vue | 150 +++++++--------------
 4 files changed, 62 insertions(+), 107 deletions(-)

diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index 0d08585b..2a2c20f1 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -186,8 +186,8 @@ export default {
 }
 
 .codeBtn.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
+.codeBtn.is-disabled:focus,
+.codeBtn.is-disabled:hover {
   color: #c0c4cc;
   cursor: not-allowed;
   background-image: none;
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index b730ed3c..5a6b3240 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -391,6 +391,17 @@ export default {
   color: #409EFF;
   border-color: #409EFF;
 }
+
+.codeBtn.is-disabled,
+.codeBtn.is-disabled:focus,
+.codeBtn.is-disabled:hover {
+  color: #c0c4cc;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #fff;
+  border-color: #ebeef5;
+}
+
 .is-error.my_new_pwd {
   margin-bottom: 45px;
 }
diff --git a/src/views/research/login.vue b/src/views/research/login.vue
index c8724834..10f84628 100644
--- a/src/views/research/login.vue
+++ b/src/views/research/login.vue
@@ -349,8 +349,8 @@ export default {
 }
 
 .codeBtn.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
+.codeBtn.is-disabled:focus,
+.codeBtn.is-disabled:hover {
   color: #c0c4cc;
   cursor: not-allowed;
   background-image: none;
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index c982002b..c920064e 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -5,134 +5,61 @@
         <!-- 账号信息 -->
         {{ $t('trials:trials-myinfo:title:accountInfo') }}
       </div>
-      <el-form
-        label-position="right"
-        label-width="100px"
-        :rules="rule"
-        :model="userForm"
-        ref="userFormRef"
-      >
+      <el-form label-position="right" label-width="100px" :rules="rule" :model="userForm" ref="userFormRef">
         <!-- 用户名 -->
-        <el-form-item
-          :label="$t('trials:trials-myinfo:form:userName')"
-          style="margin-bottom: 5px"
-        >
+        <el-form-item :label="$t('trials:trials-myinfo:form:userName')" style="margin-bottom: 5px">
           <span>{{ user.UserName }}</span>
         </el-form-item>
         <el-form-item label="" style="position: relative" prop="UserName">
-          <el-input
-            v-model="userForm.UserName"
-            :placeholder="$t('trials:trials-myinfo:form:userName')"
-          />
+          <el-input v-model="userForm.UserName" :placeholder="$t('trials:trials-myinfo:form:userName')" />
           <!-- 修改 -->
-          <el-button
-            :disabled="!userForm.UserName"
-            class="saveBtn"
-            type="primary"
-            size="small"
-            @click="setNewUserName"
-          >
+          <el-button :disabled="!userForm.UserName" class="saveBtn" type="primary" size="small" @click="setNewUserName">
             {{ $t('trials:trials-myinfo:button:update') }}
           </el-button>
         </el-form-item>
         <!-- 电话 -->
-        <el-form-item
-          :label="$t('trials:trials-myinfo:form:phone')"
-          style="margin-bottom: 5px"
-          prop="Phone"
-        >
+        <el-form-item :label="$t('trials:trials-myinfo:form:phone')" style="margin-bottom: 5px" prop="Phone">
           <span>{{ user.Phone }}</span>
         </el-form-item>
         <el-form-item label="" style="position: relative" prop="Phone">
-          <el-input
-            v-model="userForm.Phone"
-            :placeholder="$t('trials:trials-myinfo:form:phone')"
-          />
+          <el-input v-model="userForm.Phone" :placeholder="$t('trials:trials-myinfo:form:phone')" />
           <!-- 修改 -->
-          <el-button
-            :disabled="!userForm.Phone"
-            class="saveBtn"
-            type="primary"
-            size="small"
-            @click="setNewPhone"
-          >
+          <el-button :disabled="!userForm.Phone" class="saveBtn" type="primary" size="small" @click="setNewPhone">
             {{ $t('trials:trials-myinfo:button:update') }}
           </el-button>
         </el-form-item>
         <!-- 邮箱 -->
-        <el-form-item
-          :label="$t('trials:trials-myinfo:form:email')"
-          style="margin-bottom: 5px"
-          prop="EMail"
-        >
+        <el-form-item :label="$t('trials:trials-myinfo:form:email')" style="margin-bottom: 5px" prop="EMail">
           <span>{{ user.EMail }}</span>
         </el-form-item>
-        <el-form-item
-          label=""
-          style="margin-bottom: 10px; position: relative"
-          prop="EMail"
-          v-if="IsCanConnectInternet"
-        >
-          <el-input
-            v-model="userForm.EMail"
-            @input="handleEmailChange"
-            :placeholder="$t('trials:trials-myinfo:form:email')"
-          />
-          <el-button
-            class="sendCode"
-            :disabled="sendDisabled"
-            size="mini"
-            @click="sendVerificationCode"
-            >{{ sendTitle }}</el-button
-          >
+        <el-form-item label="" style="margin-bottom: 10px; position: relative" prop="EMail" v-if="IsCanConnectInternet">
+          <el-input v-model="userForm.EMail" @input="handleEmailChange"
+            :placeholder="$t('trials:trials-myinfo:form:email')" />
         </el-form-item>
-        <el-form-item
-          label=""
-          style="position: relative"
-          prop="VerificationCode"
-          v-if="IsCanConnectInternet"
-        >
-          <el-input
-            v-model="userForm.VerificationCode"
-            :placeholder="$t('trials:researchForm:form:verifyCode')"
-          />
+        <el-form-item label="" style="position: relative" prop="VerificationCode" v-if="IsCanConnectInternet">
+          <div style="display: flex;justify-content: space-between;width: 100%;">
+            <el-input v-model="userForm.VerificationCode" :placeholder="$t('trials:researchForm:form:verifyCode')" />
+            <el-button class="codeBtn" :disabled="sendDisabled" size="mini" @click="sendVerificationCode">{{
+              sendTitle
+            }}</el-button>
+          </div>
           <!-- 修改 -->
-          <el-button
-            :disabled="!userForm.EMail || !userForm.VerificationCode"
-            class="saveBtn"
-            type="primary"
-            size="small"
-            @click="setNewEmail"
-          >
+          <el-button :disabled="!userForm.EMail || !userForm.VerificationCode" class="saveBtn" type="primary"
+            size="small" @click="setNewEmail">
             {{ $t('trials:trials-myinfo:button:update') }}
           </el-button>
         </el-form-item>
-        <el-form-item
-          :label="$t('trials:trials-myinfo:form:toggleRole')"
-          style="position: relative"
-          prop="VerificationCode"
-          v-if="hasRole"
-        >
+        <el-form-item :label="$t('trials:trials-myinfo:form:toggleRole')" style="position: relative"
+          prop="VerificationCode" v-if="hasRole">
           <el-radio-group v-model="userRoleId" class="roles" v-if="hasRole">
-            <el-radio
-              v-for="item in roles"
-              :key="item.Id"
-              :label="item.Id"
-              :disabled="item.IsUserRoleDisabled"
-              style="margin-bottom: 10px"
-            >
+            <el-radio v-for="item in roles" :key="item.Id" :label="item.Id" :disabled="item.IsUserRoleDisabled"
+              style="margin-bottom: 10px">
               {{ item.UserTypeShortName }}
             </el-radio>
           </el-radio-group>
           <!-- 修改 -->
-          <el-button
-            :disabled="!userRoleId || saveDisabled"
-            class="saveBtn"
-            :loading="toggleRoleLoading"
-            type="primary"
-            size="small"
-            @click="toggleRole"
-          >
+          <el-button :disabled="!userRoleId || saveDisabled" class="saveBtn" :loading="toggleRoleLoading" type="primary"
+            size="small" @click="toggleRole">
             {{ $t('trials:trials-myinfo:button:toggleRole') }}
           </el-button>
         </el-form-item>
@@ -188,11 +115,11 @@ export default {
                 callback(
                   lang === 'zh'
                     ? new Error(
-                        '1）用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
-                      )
+                      '1）用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
+                    )
                     : new Error(
-                        'the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
-                      )
+                      'the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
+                    )
                 )
               } else {
                 callback()
@@ -344,9 +271,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.codeBtn {
+  color: #409EFF;
+  border-color: #409EFF;
+  margin-left: 10px;
+}
+
+.codeBtn.is-disabled,
+.codeBtn.is-disabled:focus,
+.codeBtn.is-disabled:hover {
+  color: #c0c4cc;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #fff;
+  border-color: #ebeef5;
+}
+
 .el-radio-group {
   margin-top: 12px;
 }
+
 .el-radio {
   width: 60px;
 }

From b60b0f8de7fdfa76ab6925bbb284892863297a74 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 17 Nov 2025 11:07:10 +0800
Subject: [PATCH 089/333] 1

---
 src/components/MFA/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index 2a2c20f1..c3d3ac31 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -22,7 +22,8 @@
           <el-button size="small" @click.stop="sendMFACode" :disabled="flag || sendFlag" style="margin-left: 10px;"
             class="codeBtn">{{
               flag ?
-                `${second}s ${$t("mfa:form:sendMFACodeCountDown")}` : $t("mfa:form:sendMFACode") }}</el-button>
+                `${$t("mfa:form:sendMFACodeCountDown")} (${$t("mfa:form:sendMFACodeCountDown")})` :
+                $t("mfa:form:sendMFACode") }}</el-button>
         </div>
       </el-form-item>
     </el-form>

From 1dd153448c86215ba7370e60b38d1674fc8a87a5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 17 Nov 2025 11:26:39 +0800
Subject: [PATCH 090/333] 1

---
 src/components/MFA/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index c3d3ac31..a85dc293 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -22,8 +22,7 @@
           <el-button size="small" @click.stop="sendMFACode" :disabled="flag || sendFlag" style="margin-left: 10px;"
             class="codeBtn">{{
               flag ?
-                `${$t("mfa:form:sendMFACodeCountDown")} (${$t("mfa:form:sendMFACodeCountDown")})` :
-                $t("mfa:form:sendMFACode") }}</el-button>
+                `${$t("mfa:form:sendMFACodeCountDown")} (${second}s)` : $t("mfa:form:sendMFACode") }}</el-button>
         </div>
       </el-form-item>
     </el-form>

From f58e52585f22b6d5b987b1325227d8dbded38b82 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 17 Nov 2025 13:21:48 +0800
Subject: [PATCH 091/333] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AE=80?=
 =?UTF-8?q?=E5=8E=86=E9=87=87=E9=9B=86=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/ReviewersResearch.vue | 102 ++++++++--------------
 1 file changed, 38 insertions(+), 64 deletions(-)

diff --git a/src/views/reviewers/ReviewersResearch.vue b/src/views/reviewers/ReviewersResearch.vue
index ab476208..c7d97be9 100644
--- a/src/views/reviewers/ReviewersResearch.vue
+++ b/src/views/reviewers/ReviewersResearch.vue
@@ -7,51 +7,20 @@
         {{ $t('trials:researchForm:form:title') }}
       </h2>
       <el-card shadow="hover" style="padding-top: 40px">
-        <el-form
-          ref="resetForm"
-          v-loading="loading"
-          :model="form"
-          label-width="150px"
-          style="width: 80%; margin: 0 auto"
-          :rules="rules"
-          class="demo-ruleForm"
-          size="small"
-        >
+        <el-form ref="resetForm" v-loading="loading" :model="form" label-width="150px"
+          style="width: 80%; margin: 0 auto" :rules="rules" class="demo-ruleForm" size="small">
           <!-- 联系邮箱 -->
-          <el-form-item
-            :label="$t('trials:researchForm:form:contactorEmail')"
-            prop="EmailOrPhone"
-          >
-            <el-input
-              v-model="form.EmailOrPhone"
-              autocomplete="new-password"
-              @change="handleEmailChange"
-            />
+          <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="EmailOrPhone">
+            <el-input v-model="form.EmailOrPhone" autocomplete="new-password" @change="handleEmailChange" />
           </el-form-item>
           <!-- 验证码 -->
-          <el-form-item
-            :label="$t('trials:researchForm:form:verifyCode')"
-            required
-          >
-            <el-col :span="20">
-              <el-form-item prop="VerificationCode">
-                <el-input
-                  v-model="form.VerificationCode"
-                  autocomplete="new-password"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-button
-                size="small"
-                type="primary"
-                style="width: 100%"
-                :disabled="sendDisabled"
-                @click="handleSendCode"
-                >{{ this.$t('trials:researchForm:button:send')
-                }}{{ count || count === 0 ? `(${count}s)` : '' }}</el-button
-              >
-            </el-col>
+          <el-form-item :label="$t('trials:researchForm:form:verifyCode')" prop="VerificationCode">
+            <div style="display: flex;;justify-content: space-between;">
+              <el-input v-model="form.VerificationCode" autocomplete="new-password" />
+              <el-button size="small" style="margin-left: 10px;" :disabled="sendDisabled" class="codeBtn"
+                @click="handleSendCode">{{ this.$t('trials:researchForm:button:send')
+                }}{{ count || count === 0 ? `(${count}s)` : '' }}</el-button>
+            </div>
           </el-form-item>
           <el-form-item>
             <!-- 取消 -->
@@ -59,12 +28,7 @@
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 提交 -->
-            <el-button
-              size="small"
-              type="primary"
-              :loading="btnLoading"
-              @click="onSubmit"
-            >
+            <el-button size="small" type="primary" :loading="btnLoading" @click="onSubmit">
               {{ $t('common:button:submit') }}
             </el-button>
           </el-form-item>
@@ -216,7 +180,7 @@ export default {
     this.$i18n.locale = this.$route.query.lang
     this.setLanguage(this.$route.query.lang)
   },
-  mounted() {},
+  mounted() { },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     // 提交
@@ -249,21 +213,16 @@ export default {
               // this.$router.push({ path: `/researchForm?trialId=${this.trialId}&trialSiteSurveyId=${res.Result.TrialSiteSurveyId}` })
               if (this.$route.query.trialId) {
                 this.$router.push({
-                  path: `/curriculumVitae?Id=${
-                    res.Result.DoctorId ? res.Result.DoctorId : ''
-                  }&tabActive=BasicInfo&ReviewStatus=${
-                    res.Result.ReviewStatus
-                  }&trialId=${this.$route.query.trialId}&lang=${
-                    this.$route.query.lang
-                  }`,
+                  path: `/curriculumVitae?Id=${res.Result.DoctorId ? res.Result.DoctorId : ''
+                    }&tabActive=BasicInfo&ReviewStatus=${res.Result.ReviewStatus
+                    }&trialId=${this.$route.query.trialId}&lang=${this.$route.query.lang
+                    }`,
                 })
               } else {
                 this.$router.push({
-                  path: `/curriculumVitae?Id=${
-                    res.Result.DoctorId ? res.Result.DoctorId : ''
-                  }&tabActive=BasicInfo&ReviewStatus=${
-                    res.Result.ReviewStatus
-                  }&lang=${this.$route.query.lang}`,
+                  path: `/curriculumVitae?Id=${res.Result.DoctorId ? res.Result.DoctorId : ''
+                    }&tabActive=BasicInfo&ReviewStatus=${res.Result.ReviewStatus
+                    }&lang=${this.$route.query.lang}`,
                 })
               }
             })
@@ -312,9 +271,8 @@ export default {
         this.timer = setInterval(() => {
           if (this.count > 0 && this.count <= TIME_COUNT) {
             this.count--
-            this.sendTitle = `${this.$t('trials:researchForm:button:send')}(${
-              this.count
-            }s)`
+            this.sendTitle = `${this.$t('trials:researchForm:button:send')}(${this.count
+              }s)`
             this.sendDisabled = true
           } else {
             this.sendDisabled = false
@@ -335,6 +293,7 @@ export default {
 <style lang="scss" scoped>
 .question-login-wrapper {
   padding: 20px;
+
   .box-wrapper {
     width: 50%;
     margin: 20px auto;
@@ -342,4 +301,19 @@ export default {
     color: #303133;
   }
 }
+
+.codeBtn {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.codeBtn.is-disabled,
+.codeBtn.is-disabled:focus,
+.codeBtn.is-disabled:hover {
+  color: #c0c4cc;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #fff;
+  border-color: #ebeef5;
+}
 </style>

From 8dedd1068a21b23578871268cbbaf37f2c15295b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 17 Nov 2025 13:28:51 +0800
Subject: [PATCH 092/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E7=82=B9=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-unit/components/ReadingRules.vue  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index f4825871..67f90905 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -296,6 +296,7 @@
         <el-button :disabled="isConfirm ||
           !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
           " icon="el-icon-plus" circle @click="handleSetKeyFileList" />
+        <el-button :disabled="form.KeyFileList.length <= 0" icon="el-icon-view" circle @click="viewManual" />
       </el-form-item>
       <el-form-item :label="$t(
         'trials:trials-panel:setting:reading-unit:TrialCriterionAdditionalAssessmentTypeList'
@@ -374,14 +375,18 @@
         </el-button>
       </div>
     </el-dialog>
+    <attachmentPreview :visible.sync="perview_visible" :isView="true" :isExternal="true" :ExternalList="ExternalList"
+      v-if="perview_visible" />
   </div>
 </template>
 <script>
 import { getCriterionReadingInfo, setCriterionReadingInfo } from '@/api/trials'
 import { config } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
 import { readEntry } from '@/utils/index'
+import attachmentPreview from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview'
 export default {
   name: 'ReadingRules',
+  components: { attachmentPreview },
   props: {
     trialReadingCriterionId: {
       type: String,
@@ -400,6 +405,8 @@ export default {
   },
   data() {
     return {
+      perview_visible: false,
+      ExternalList: [],
       keyDocVisible: false,
       confirmData: [],
       additionalAssessmentOptionList: [],
@@ -628,6 +635,23 @@ export default {
     },
   },
   methods: {
+    async viewManual() {
+      try {
+        if (this.form.KeyFileList.length <= 0) return this.$message.warning(this.$t("trials:researchRecord:ImageManual:message:noImageManual"))
+        this.ExternalList = []
+        this.form.KeyFileList.forEach(item => {
+          let obj = {
+            FilePath: item.FilePath,
+            FileFormat: 'pdf',
+            Name: item.FileName
+          }
+          this.ExternalList.push(obj)
+        });
+        this.perview_visible = true
+      } catch (err) {
+        console.log(err)
+      }
+    },
     handleDragover(e) {
       e.stopPropagation();
       e.preventDefault();

From e5d86abf927d80062a1029ffbd523db091b68813 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 19 Nov 2025 13:13:29 +0800
Subject: [PATCH 093/333] =?UTF-8?q?=E9=98=85=E7=89=87=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E5=80=BC=E7=9A=84=E7=BB=9F=E8=AE=A1=E4=B8=8E?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js                            |   8 +
 src/components/readingChart/index.vue         | 143 ++++++++++++++++++
 src/icons/svg/readingChart.svg                |   1 +
 src/styles/index.scss                         |   7 +
 .../reading/dicoms3D/components/ReadPage.vue  |  16 +-
 .../components/customize/QuestionFormItem.vue |  88 +++++++----
 .../components/customize/QuestionList.vue     |   5 +-
 .../customize/QuestionTableFormItem.vue       |  75 ++++++---
 .../visit-review/components/FileViewer.vue    |   2 +-
 .../visit-review/components/ReadPage.vue      |  22 ++-
 .../reading-unit/components/QuestionsForm.vue |   9 ++
 .../reading-unit/components/TableQsForm.vue   |   9 ++
 12 files changed, 324 insertions(+), 61 deletions(-)
 create mode 100644 src/components/readingChart/index.vue
 create mode 100644 src/icons/svg/readingChart.svg

diff --git a/src/api/reading.js b/src/api/reading.js
index b2e7a1bb..55170036 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -311,3 +311,11 @@ export function changePlottingScaleChangeAnswer(param) {
     data: param
   })
 }
+// 阅片获取图表数据
+export function getReportsChartData(param) {
+  return request({
+    url: `/ReadingImageTask/getReportsChartData`,
+    method: 'post',
+    data: param
+  })
+}
\ No newline at end of file
diff --git a/src/components/readingChart/index.vue b/src/components/readingChart/index.vue
new file mode 100644
index 00000000..aecca89d
--- /dev/null
+++ b/src/components/readingChart/index.vue
@@ -0,0 +1,143 @@
+<template>
+    <div id="readingChart" class="readingChart" v-show="visible" :style="{
+        'z-index': zIndex
+    }" :loading="loading">
+        <div ref="chartContainer" style="width: 490px; height: 290px;"></div>
+    </div>
+</template>
+
+<script>
+import { getReportsChartData } from "@/api/reading"
+let echarts = require('echarts/lib/echarts');
+
+// 按需引入图表
+// require('echarts/lib/chart/bar');
+require('echarts/lib/chart/line');
+// require('echarts/lib/chart/pie');
+// require('echarts/lib/chart/scatter');
+
+// 按需引入组件
+require('echarts/lib/component/tooltip');
+require('echarts/lib/component/title');
+require('echarts/lib/component/legend');
+require('echarts/lib/component/grid');
+require('echarts/lib/component/dataZoom');
+export default {
+    name: "readingChart",
+    props: {
+
+    },
+    data() {
+        return {
+            visible: false,
+            zIndex: 9,
+            chart: null,
+            loading: false
+        };
+    },
+    methods: {
+        init(event, obj, zIndex = 9) {
+            this.zIndex = zIndex
+            // 设置菜单出现的位置
+            // 具体显示位置根据自己需求进行调节
+            this.visible = true
+            let readingChart = document.querySelector("#readingChart");
+            let chaY = document.body.clientHeight - event.clientY;
+            let chaX = document.body.clientWidth - event.clientX;
+            // 防止菜单太靠底，根据可视高度调整菜单出现位置
+            if (chaY < 250) {
+                readingChart.style.top = event.clientY - 220 + "px";
+            } else {
+                readingChart.style.top = event.clientY + "px";
+            }
+            if (chaX < 150) {
+                readingChart.style.left = event.clientX - 520 + "px";
+            } else {
+                readingChart.style.left = event.clientX + 15 + "px";
+            }
+            this.getInfo(obj)
+            // this.initChart()
+            // document.addEventListener("click", this.foo); // 给整个document添加监听鼠标事件，点击任何位置执行foo方法
+        },
+        async getInfo(data) {
+            try {
+                let { VisitTaskId = null, TrialId = null, QuestionId = null, TableQuestionId = null, RowIndex = null, ReportChartTypeEnum = null } = data
+                let params = {
+                    VisitTaskId, TrialId, QuestionId, TableQuestionId, RowIndex, ReportChartTypeEnum
+                }
+                this.loading = true
+                let res = await getReportsChartData(params)
+                this.loading = false
+                if (res.IsSuccess) {
+                    let obj = {
+                        xAxisData: res.Result.VisitTaskNameList || [],
+                        series: []
+                    }
+                    res.Result.ChartDataList.forEach(item => {
+                        obj.series.push({
+                            name: item.Name,
+                            data: item.Value,
+                            type: 'line'
+
+                        })
+                    });
+                    this.initChart(obj)
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        foo() {
+            this.visible = false
+            this.$emit("foo");
+            this.dispose()
+        },
+        initChart(obj) {
+            this.chart = echarts.init(this.$refs.chartContainer);
+            // ...图表配置
+            const option = {
+                title: { text: '' },
+                tooltip: {
+                    trigger: 'axis'
+                },
+                xAxis: { data: obj.xAxisData },
+                yAxis: { type: 'value' },
+                series: obj.series
+            };
+            // 4. 使用配置项渲染图表
+            this.chart.setOption(option);
+        },
+        resize() {
+            if (this.chart) {
+                this.chart.resize()
+            }
+        },
+        dispose() {
+            if (this.chart) {
+                this.chart.dispose()
+                this.chart = null
+            }
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.readingChart {
+    min-width: 500px;
+    max-width: 500px;
+    font-size: 14px;
+    display: inline-block;
+    background: #fff;
+    border-radius: 4px;
+    position: fixed;
+    padding: 10px 6px;
+    list-style-type: none;
+    min-height: 300px;
+    max-height: 80vh;
+    overflow: hidden;
+    overflow-y: auto;
+    box-sizing: border-box;
+}
+</style>
\ No newline at end of file
diff --git a/src/icons/svg/readingChart.svg b/src/icons/svg/readingChart.svg
new file mode 100644
index 00000000..db700743
--- /dev/null
+++ b/src/icons/svg/readingChart.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1763446648844" class="icon" viewBox="0 0 1321 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3570" xmlns:xlink="http://www.w3.org/1999/xlink" width="258.0078125" height="200"><path d="M1187.981 845.871H200.885V120.065C200.885 91.032 177.659 62 142.82 62s-58.064 23.226-58.064 58.065v783.87c0 29.033 23.225 58.065 58.064 58.065h1045.161c29.033 0 58.065-23.226 58.065-58.065s-29.032-58.064-58.065-58.064z" fill="#1296db" p-id="3571"></path><path d="M287.981 317.484L555.078 485.87c11.613 5.806 17.42 5.806 29.032 5.806 17.42 0 34.84-5.806 46.452-23.225l185.806-255.484 191.613 145.161c23.226 17.42 58.065 11.613 75.484-11.613 17.42-23.226 11.613-58.064-11.613-75.484L839.594 96.84c-23.226-17.42-58.064-11.613-75.484 11.613L572.497 363.935 346.046 224.581c-23.226-17.42-58.065-5.807-75.484 17.419s-5.806 58.065 17.42 75.484z m29.033 505.161c29.032 0 58.064-23.226 58.064-58.064V532.323c0-29.033-23.226-58.065-58.064-58.065s-58.065 23.226-58.065 58.065v238.064c5.807 29.032 29.032 52.258 58.065 52.258zM502.82 619.42v150.968c0 29.032 23.226 58.065 58.065 58.065s58.064-23.226 58.064-58.065V619.42c0-29.032-23.226-58.064-58.064-58.064s-58.065 29.032-58.065 58.064z" fill="#1296db" p-id="3572"></path><path d="M740.885 416.194v354.193c0 29.032 23.225 58.065 58.064 58.065s58.065-23.226 58.065-58.065V416.194c0-29.033-23.226-58.065-58.065-58.065s-58.064 29.032-58.064 58.065z m296.129 92.903c-29.033 0-58.065 23.226-58.065 58.064v203.226c0 29.032 23.226 58.065 58.065 58.065s58.064-23.226 58.064-58.065V567.161c0-29.032-29.032-58.064-58.064-58.064z" fill="#1296db" p-id="3573"></path></svg>
\ No newline at end of file
diff --git a/src/styles/index.scss b/src/styles/index.scss
index d95173e6..77906de2 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -357,4 +357,11 @@ body .el-table th.gutter {
 
 .el-message-box__wrapper {
   z-index: 9999 !important;
+}
+
+.svg-readingChart {
+  width: 28px !important;
+  height: 30px !important;
+  margin-left: 10px;
+  cursor: pointer;
 }
\ No newline at end of file
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 4e864c1a..4562ac64 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -341,7 +341,7 @@
                 :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @resetAnnotations="resetAnnotations"
                 @setReadingTaskState="setReadingTaskState" @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
                 @getCustomScreenshots="getCustomScreenshots" @setReadingToolActive="setReadingToolActive"
-                @setReadingToolPassive="setReadingToolPassive" />
+                @setReadingToolPassive="setReadingToolPassive" @handleReadingChart="handleReadingChart" />
             </div>
           </div>
         </div>
@@ -427,6 +427,7 @@
     <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
       :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
       :visible.sync="downloadImageVisible" />
+    <readingChart ref="readingChart" />
   </div>
 </template>
 <script>
@@ -472,6 +473,7 @@ import ScaleOverlayTool from './tools/ScaleOverlayTool'
 import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import { getNetWorkSpeed, setNetWorkSpeedSizeAll, workSpeedclose } from "@/utils"
+import readingChart from '@/components/readingChart'
 const { visibility } = annotation
 const { ViewportType, Events } = Enums
 const renderingEngineId = 'myRenderingEngine'
@@ -544,6 +546,7 @@ export default {
     colorMap,
     downloadDicomAndNonedicom,
     uploadDicomAndNonedicom,
+    readingChart
   },
   props: {
     readingTool: {
@@ -765,6 +768,17 @@ export default {
     })
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.taskInfo.VisitTaskI
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart.init(e, obj, zIndex)
+    },
     async handleSubmitKeyDoc() {
       try {
         let data = {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index b3139c5d..7a7597b7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -56,7 +56,8 @@
               :question-form="QuestionsForm" :visit-task-id="visitTaskId" :criterion-id="criterionId"
               :type="addOrEdit.type" :calculationList="calculationList" :questionsMarkStatus="questionsMarkStatus"
               @formItemTableNumberChange="formItemTableNumberChange" @resetFormItemData="resetTableFormItemData"
-              @setFormItemData="setFormTableItemData" @operateImageMarker="operateImageMarker" @save="save" />
+              @setFormItemData="setFormTableItemData" @operateImageMarker="operateImageMarker" @save="save"
+              @handleReadingChart="handleReadingChart" />
           </el-form>
         </div>
         <div slot="footer">
@@ -152,14 +153,7 @@
         <!-- 自增 -->
         <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
         <!-- 数值 -->
-        <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-          @change="(val) => { formItemNumberChange(val, question) }" :disabled="readingTaskState === 2">
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
-        </el-select>
+
         <template v-if="question.Type === 'number' && (question.ImageMarkEnum === 1 || question.ImageMarkEnum === 2)">
           <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
             <el-input type="text" @change="(val) => { formItemNumberChange(val, question) }"
@@ -173,6 +167,13 @@
                 {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
               </template>
             </el-input>
+            <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  QuestionId: question.Id
+                }
+              })" />
             <!-- 测量 -->
             <el-button
               v-if="readingTaskState < 2 && (!questionsMarkStatus[question.Id] || (questionsMarkStatus[question.Id] && !questionsMarkStatus[question.Id].isMarked))"
@@ -215,27 +216,47 @@
           </div>
         </template>
         <template v-else-if="question.Type === 'number'">
-          <el-input type="text" v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
-            @change="(val) => { formItemNumberChange(val, question) }" @input="numberInput(question.Id)"
-            @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)" v-model="questionForm[question.Id]"
-            :disabled="readingTaskState === 2">
-            <!-- <template slot="append">1</template> -->
-            <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit)
-              :
-              question.CustomUnit }}</template>
-            <template slot="append" v-else-if="question.ValueType === 2">%</template>
-
-          </el-input>
-          <el-input type="text" @input="numberInput(question.Id)"
-            v-if="question.Type === 'number' && !question.TypeValue && question.DataSource === 1"
-            @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-            :disabled="question.DataSource === 1 || readingTaskState === 2" v-model="questionForm[question.Id]">
-            <!-- <template slot="append">2</template> -->
-            <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit)
-              :
-              question.CustomUnit }}</template>
-            <template slot="append" v-else-if="question.ValueType === 2">%</template>
-          </el-input>
+          <div style="display: flex;justify-content: space-between;">
+            <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]"
+              clearable @change="(val) => { formItemNumberChange(val, question) }" :disabled="readingTaskState === 2">
+              <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()"
+                :value="val.trim()" />
+              <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit',
+                question.Unit)
+                :
+                question.CustomUnit }}</template>
+              <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
+            </el-select>
+            <el-input type="text" @change="(val) => { formItemNumberChange(val, question) }"
+              v-else-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
+              @input="numberInput(question.Id)" @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
+              v-model="questionForm[question.Id]" :disabled="readingTaskState === 2">
+              <!-- <template slot="append">1</template> -->
+              <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit',
+                question.Unit)
+                :
+                question.CustomUnit }}</template>
+              <template slot="append" v-else-if="question.ValueType === 2">%</template>
+            </el-input>
+            <el-input type="text" @input="numberInput(question.Id)"
+              v-else-if="question.Type === 'number' && !question.TypeValue && question.DataSource === 1"
+              @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
+              :disabled="question.DataSource === 1 || readingTaskState === 2" v-model="questionForm[question.Id]">
+              <!-- <template slot="append">2</template> -->
+              <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit',
+                question.Unit)
+                :
+                question.CustomUnit }}</template>
+              <template slot="append" v-else-if="question.ValueType === 2">%</template>
+            </el-input>
+            <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  QuestionId: question.Id
+                }
+              })" />
+          </div>
         </template>
         <!-- 上传图像 -->
         <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'"
@@ -263,7 +284,7 @@
         :questionMarkInfoList="questionMarkInfoList" :questionsMarkStatus="questionsMarkStatus"
         @formItemNumberChange="formItemNumberChange" @setFormItemData="setFormItemData"
         @resetFormItemData="resetFormItemData" @getQuestions="getQuestions" @operateImageMarker="operateImageMarker"
-        @unBindAnnotationToQuestion="unBindAnnotationToQuestion" />
+        @unBindAnnotationToQuestion="unBindAnnotationToQuestion" @handleReadingChart="handleReadingChart" />
     </template>
 
     <!-- <base-model :config="addOrEdit"
@@ -296,7 +317,6 @@ import {
   utilities as csUtils
   // getEnabledElementByIds
 } from '@cornerstonejs/core'
-import store from '@/store'
 export default {
   name: 'QuestionFormItem',
   components: {
@@ -501,6 +521,10 @@ export default {
     })
   },
   methods: {
+    handleReadingChart(row) {
+      console.log(row, 'row')
+      this.$emit('handleReadingChart', row)
+    },
     numberInput(id) {
       this.questionForm[id] = this.questionForm[id].toUpperCase();
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 313457a5..fe18dbc1 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -21,7 +21,7 @@
             :question-mark-info-list="questionMarkInfoList" :questions-mark-status="questionsMarkStatus"
             :is-baseline="isBaseLineTask" @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData"
             @getQuestions="getQuestions" @operateImageMarker="operateImageMarker"
-            @unBindAnnotationToQuestion="unBindAnnotationToQuestion" />
+            @unBindAnnotationToQuestion="unBindAnnotationToQuestion" @handleReadingChart="handleReadingChart" />
         </template>
 
         <el-form-item v-if="readingTaskState < 2">
@@ -131,6 +131,9 @@ export default {
     this.getQuestions(true)
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async getQuestions(isInit) {
       this.loading = true
       try {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index 7aa0c548..9c3f3382 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -62,7 +62,8 @@
       <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
         v-model="questionForm[question.Id]" />
       <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType || question.IsPreinstall" @change="(val) => { formItemChange(val, question) }">
+        :disabled="!question.ClassifyEditType || question.IsPreinstall"
+        @change="(val) => { formItemChange(val, question) }">
         <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
       </el-select>
       <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
@@ -92,6 +93,14 @@
               {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
             </template>
           </el-input>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                TableQuestionId: question.Id,
+                RowIndex: question.RowIndex
+              }
+            })" />
           <!-- 测量 -->
           <el-button
             v-if="readingTaskState < 2 && (!questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] || (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && !questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked))"
@@ -136,31 +145,46 @@
         </div>
       </template>
       <template v-else-if="question.Type === 'number'">
-        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-          @change="((val) => { formItemChange(val, question) })">
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
-        </el-select>
-        <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False') || question.IsPreinstall"
-          @change="((val) => { formItemNumberChange(val, question) })" @input="numberInput(question.Id)"
-          @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)" v-model="questionForm[question.Id]">
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-        </el-input>
-        <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource === 1"
-          :disabled="question.DataSource === 1" @input="numberInput(question.Id, true) || question.IsPreinstall"
-          @blur="handleCalculationBlur(calculationValue)" v-model="calculationValue">
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-        </el-input>
+        <div style="display: flex;justify-content: space-between;">
+          <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]"
+            clearable @change="((val) => { formItemChange(val, question) })">
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
+            <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit)
+              :
+              question.CustomUnit }}</template>
+            <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
+          </el-select>
+          <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
+            :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False') || question.IsPreinstall"
+            @change="((val) => { formItemNumberChange(val, question) })" @input="numberInput(question.Id)"
+            @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
+            v-model="questionForm[question.Id]">
+            <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit)
+              :
+              question.CustomUnit }}</template>
+          </el-input>
+          <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource === 1"
+            :disabled="question.DataSource === 1" @input="numberInput(question.Id, true) || question.IsPreinstall"
+            @blur="handleCalculationBlur(calculationValue)" v-model="calculationValue">
+            <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit)
+              :
+              question.CustomUnit }}</template>
+          </el-input>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                TableQuestionId: question.Id,
+                RowIndex: questionForm.RowIndex
+              }
+            })" />
+        </div>
+
       </template>
       <!-- 上传图像 -->
-      <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'" :disabled="readingTaskState === 2 || question.IsPreinstall"
-        action :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
-        :on-preview="handlePictureCardPreview"
+      <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'"
+        :disabled="readingTaskState === 2 || question.IsPreinstall" action :accept="question.FileType"
+        :limit="question.ImageCount === 0 ? 100 : question.ImageCount" :on-preview="handlePictureCardPreview"
         :before-upload="(file) => { return handleBeforeUpload(file, question.FileType, question.Type) }"
         :http-request="uploadScreenshot" :on-remove="handleRemove" :file-list="fileList"
         :class="{ disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount }">
@@ -298,6 +322,9 @@ export default {
     if (this.type === 'edit') return
   },
   methods: {
+    handleReadingChart(row) {
+      this.$emit('handleReadingChart', row)
+    },
     numberInput(id, notId = false) {
       if (notId) {
         this.calculationValue = this.calculationValue.toUpperCase();
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index a07305d5..129bb4f7 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -350,7 +350,7 @@ export default {
       layout: '1*2',
       cellsMax: 4,
       viewportInfos: [],
-      taskInfo: null,
+      taskInfo: {},
       activeTool: '',
       readingTaskState: 2,
       renderHistoryAnnotationTaskIds: [],
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index daf31b18..6930a9e6 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -62,7 +62,7 @@
           @setReadingTaskState="setReadingTaskState" @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
           @getCustomScreenshots="getCustomScreenshots" @setReadingToolActive="setReadingToolActive"
           @setReadingToolPassive="setReadingToolPassive" @setSaved="setSaved"
-          @setIsHaveBindingQuestion="setIsHaveBindingQuestion" />
+          @setIsHaveBindingQuestion="setIsHaveBindingQuestion" @handleReadingChart="handleReadingChart" />
       </div>
     </div>
 
@@ -83,6 +83,7 @@
       </div>
 
     </el-dialog>
+    <readingChart ref="readingChart" />
   </div>
 </template>
 
@@ -96,6 +97,7 @@ import EcrfList from './EcrfList'
 import customizeQuestionList from '@/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList'
 import ClinicalData from '@/views/trials/trials-panel/reading/clinical-data'
 import { mapGetters } from 'vuex'
+import readingChart from '@/components/readingChart'
 export default {
   name: 'ReadPage',
   components: {
@@ -105,7 +107,8 @@ export default {
     // PdfViewer,
     EcrfList,
     ClinicalData,
-    customizeQuestionList
+    customizeQuestionList,
+    readingChart
   },
   data() {
     return {
@@ -158,8 +161,23 @@ export default {
     this.trialId = this.$route.query.trialId
     this.readingTaskState = this.taskInfo.ReadingTaskState
     this.getRelatedTask()
+    document.addEventListener("click", this.foo);
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart.init(e, obj, zIndex)
+    },
+    foo() {
+      this.$refs.readingChart.foo()
+    },
     getEcrf(data) {
       let { type } = data
       if (type === 'getOperateStateEnum') {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 15a8a1f8..8c78fc40 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -457,6 +457,13 @@
             }}
           </div>
         </div>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' && !isFromSystem"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 影像标记:disabled="form.IsRequired === 0" -->
         <el-form-item v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
           :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')" prop="ImageMarkEnum">
@@ -735,6 +742,7 @@ export default {
         ClassifyEditType: null,
         ClassifyShowType: null,
         ImageMarkEnum: 0,
+        ShowChartTypeEnum: 0,
         ImageTool: '',
         ImageToolAttribute: '',
         ExcludeShowVisitList: []
@@ -1244,6 +1252,7 @@ export default {
       form.ClassifyType = null
       form.ClassifyShowType = null
       form.ImageMarkEnum = 0
+      form.ShowChartTypeEnum = 0
       form.ImageTool = ''
       form.ImageToolAttribute = ''
       this.imageToolAttributes = []
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index 4797e4b8..59d88710 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -259,6 +259,13 @@
               $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2') }}
           </div>
         </div>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' && !isFromSystem"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 影像标记:disabled="form.IsRequired === 0" -->
         <el-form-item v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
           :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')" prop="ImageMarkEnum">
@@ -598,6 +605,7 @@ export default {
         ClassifyEditType: null,
         ClassifyShowType: null,
         ImageMarkEnum: 0,
+        ShowChartTypeEnum: 0,
         ImageTool: '',
         ImageToolAttribute: '',
         // IsEnable: true
@@ -1108,6 +1116,7 @@ export default {
       form.ClassifyType = null
       form.ClassifyShowType = null
       form.ImageMarkEnum = 0
+      form.ShowChartTypeEnum = 0
       form.ImageTool = ''
       form.ImageToolAttribute = ''
       this.imageToolAttributes = []

From 20c257be4f7ecd5e4ff77ea2e4f813fc10c686e1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 19 Nov 2025 15:51:10 +0800
Subject: [PATCH 094/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=89=8D=E5=AF=B9?=
 =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=BF=9B=E8=A1=8C=E9=9D=B6=E6=AE=B5=E6=A0=87?=
 =?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |   9 +
 .../downloadDicomAndNonedicom/index.vue       |  72 +++-
 .../uploadDicomAndNonedicom/dicomFile.vue     |  39 +-
 .../uploadDicomAndNonedicom/index.vue         |  54 +--
 .../uploadDicomAndNonedicom/nonedicomFile.vue |  33 +-
 .../reading-task/components/TargetSection.vue | 160 +++++++++
 .../reading/reading-task/index.vue            | 333 ++++++------------
 7 files changed, 424 insertions(+), 276 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index becea280..664adc5c 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -4281,4 +4281,13 @@ export function deleteAuditRecord(auditRecordId) {
     url: `/AuditDocument/deleteAuditRecord/${auditRecordId}`,
     method: 'delete'
   })
+}
+
+// 靶段标注列表
+export function getTrialSubjectVisitMarkList(data) {
+  return request({
+    url: `/DownloadAndUpload/getTrialSubjectVisitMarkList`,
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 920e1a4c..60efa567 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -34,9 +34,12 @@
       <!--受试者-->
       <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
         show-overflow-tooltip />
+      <!--访视名称-->
+      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" sortable="custom"
+        v-if="IsImageSegment" />
       <!--任务名称-->
       <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
-        sortable />
+        sortable v-else />
       <!--检查类型-->
       <el-table-column :label="$t('download:table:studyType')" min-width="130" show-overflow-tooltip prop="IsDicom"
         sortable>
@@ -126,6 +129,10 @@ export default {
         return {}
       },
     },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -157,6 +164,7 @@ export default {
     this.bodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getList()
     this.title = `Download Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+    if (this.IsImageSegment) this.title = `Download Images：${this.SubjectCode}`
   },
   beforeDestroy() {
     store.dispatch('trials/setUnLock', false)
@@ -175,6 +183,12 @@ export default {
         if (this.TaskId) {
           this.searchData.VisitTaskId = this.TaskId
         }
+        if (this.IsImageSegment) {
+          this.searchData.IsImageSegmentLabel = true
+        }
+        else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
+          this.searchData.IsImageSegmentLabel = false
+        }
         this.loading = true
         let res = await getSubjectImageDownloadSelectList(this.searchData)
         this.loading = false
@@ -257,6 +271,12 @@ export default {
             data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
           }
         }
+        if (this.IsImageSegment) {
+          data.IsImageSegmentLabel = true
+        }
+        else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
+          data.IsImageSegmentLabel = false
+        }
         this.btnLoading = true
         let res = await getIRReadingDownloadStudyInfo(data)
         this.btnLoading = false
@@ -286,13 +306,18 @@ export default {
     formatDownloadFile(list) {
       let files = [],
         name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
-      if (this.IsReadingTaskViewInOrder === 1) {
-        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
-      }
-      if (this.IsReadingTaskViewInOrder === 0) {
-        // name = `${list[0].TaskBlindName}.zip`
-        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
+      if (this.IsImageSegment) {
+        name = `${list[0].SubjectCode}_${list[0].VisitName}.zip`
+      } else {
+        if (this.IsReadingTaskViewInOrder === 1) {
+          name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
+        }
+        if (this.IsReadingTaskViewInOrder === 0) {
+          // name = `${list[0].TaskBlindName}.zip`
+          name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
+        }
       }
+
       list.forEach((data) => {
         if (data.StudyList && data.StudyList.length > 0) {
           let StudyList = data.StudyList
@@ -304,7 +329,14 @@ export default {
                   }/DICOMDIR`,
                 url: this.OSSclientConfig.basePath + study.StudyDIRPath,
               }
-              if (this.IsReadingTaskViewInOrder === 0) {
+              if (this.IsImageSegment) {
+                obj = {
+                  name: `${data.SubjectCode}/${data.VisitName
+                    }/${this.$fd('IsDicom', true)}/${study.StudyCode
+                    }/DICOMDIR`,
+                  url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+                }
+              } else if (this.IsReadingTaskViewInOrder === 0) {
                 obj = {
                   name: `${data.TaskBlindName}/${this.$fd(
                     'IsDicom',
@@ -330,7 +362,15 @@ export default {
                       url: this.OSSclientConfig.basePath + instance.Path,
                       IsEncapsulated: instance.IsEncapsulated
                     }
-                    if (this.IsReadingTaskViewInOrder === 0) {
+                    if (this.IsImageSegment) {
+                      obj = {
+                        name: `${data.SubjectCode}/${data.VisitName
+                          }/${this.$fd('IsDicom', true)}/${study.StudyCode
+                          }/IMAGE/${fileName}`,
+                        url: this.OSSclientConfig.basePath + instance.Path,
+                        IsEncapsulated: instance.IsEncapsulated
+                      }
+                    } else if (this.IsReadingTaskViewInOrder === 0) {
                       obj = {
                         name: `${data.TaskBlindName}/${this.$fd(
                           'IsDicom',
@@ -360,7 +400,16 @@ export default {
                   )}/${study.StudyCode}/${item.FileName}`,
                   url: this.OSSclientConfig.basePath + item.Path,
                 }
-                if (this.IsReadingTaskViewInOrder === 0) {
+                if (this.IsImageSegment) {
+                  obj = {
+                    name: `${data.SubjectCode}/${data.VisitName}/${this.$fd(
+                      'IsDicom',
+                      false
+                    )}/${study.StudyCode}/${item.FileName}`,
+                    url: this.OSSclientConfig.basePath + item.Path,
+                  }
+                }
+                else if (this.IsReadingTaskViewInOrder === 0) {
                   obj = {
                     name: `${data.TaskBlindName}/${this.$fd(
                       'IsDicom',
@@ -390,6 +439,9 @@ export default {
     },
     handleOpenDialog(item) {
       this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
+      if (this.IsImageSegment) {
+        this.model_cfg.title = `${item.SubjectCode || ''} > ${item.VisitName}`
+      }
       if (item.IsDicom) {
         this.modelList = item.DicomStudyList
       } else {
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index d0c9c48e..3f91050c 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -363,12 +363,17 @@ export default {
       type: Number,
       default: 0,
     },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    }
   },
   components: {
     'study-view': studyView,
   },
   data() {
     return {
+      loading: false,
       list: [],
       StudyInstanceUidList: [],
       SopInstanceUidList: [],
@@ -439,6 +444,12 @@ export default {
         if (this.TaskId) {
           params.VisitTaskId = this.TaskId
         }
+        if (this.IsImageSegment) {
+          this.searchData.IsImageSegmentLabel = true
+        }
+        else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
+          this.searchData.IsImageSegmentLabel = false
+        }
         this.loading = true
         let res = await getSubjectImageUploadList(params)
         this.loading = false
@@ -536,6 +547,9 @@ export default {
         if (this.VisitTaskId) {
           data.VisitTaskId = this.VisitTaskId
         }
+        if (this.IsImageSegment) {
+          data.IsImageSegmentLabel = true
+        }
         let res = await verifyIRStudyAllowUpload(data)
         if (res.IsSuccess) {
           return res.Result
@@ -562,8 +576,9 @@ export default {
           confirmMessage = null
         for (let i = 0; i < checkFiles.length; i++) {
           let item = checkFiles[i]
-          var dicom = await parseDicom(item, 'StudyInstanceUid')
+          var dicom = await parseDicom(item, ['StudyInstanceUid', 'Modality'])
           if (!dicom.StudyInstanceUid) continue
+          if (this.IsImageSegment && dicom.Modality !== 'US') continue
           let has = true,
             has2 = false,
             has3 = false
@@ -1153,6 +1168,16 @@ export default {
                                 o.instanceUid +
                                 params.trialId
                               )}`
+                            if (this.IsImageSegment) {
+                              path = `/${params.trialId}/Image/${params.subjectId
+                                }/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId
+                                }/${scope.getGuid(
+                                  dicomInfo.studyUid +
+                                  v.seriesUid +
+                                  o.instanceUid +
+                                  params.trialId
+                                )}`
+                            }
                             if (scope.isClose) return
                             let res = await dcmUpload(
                               {
@@ -1186,6 +1211,9 @@ export default {
                                     o.imageRows
                                   )
                                   let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
+                                  if (this.IsImageSegment) {
+                                    thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
+                                  }
                                   let OSSclient = scope.OSSclient
                                   let seriesRes = await OSSclient.put(
                                     thumbnailPath,
@@ -1277,6 +1305,9 @@ export default {
               let text = JSON.stringify(Record)
               let logJsonBlob = scope.generateTxtFile(text)
               let logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
+              if (this.IsImageSegment) {
+                logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
+              }
               let logRes
               try {
                 logRes = await scope.OSSclient.put(
@@ -1305,6 +1336,9 @@ export default {
                     v.instanceList[0].imageRows
                   )
                   let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
+                  if (this.IsImageSegment) {
+                    thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
+                  }
                   let OSSclient = scope.OSSclient
                   try {
                     let seriesRes = await OSSclient.put(thumbnailPath, blob)
@@ -1322,6 +1356,9 @@ export default {
                 if (scope.isClose) return false
                 console.log(params)
                 params.VisitTaskId = dicomInfo.visitTaskId
+                if (this.IsImageSegment) {
+                  params.IsImageSegmentLabel = true
+                }
                 addOrUpdateArchiveTaskStudy(params)
                   .then((res) => {
                     if (dicomInfo.failedFileCount === dicomInfo.fileCount) {
diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue
index fb364a44..dd9264f5 100644
--- a/src/components/uploadDicomAndNonedicom/index.vue
+++ b/src/components/uploadDicomAndNonedicom/index.vue
@@ -1,40 +1,17 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :fullscreen="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :append-to-body="true"
-    class="uploadDicomAndNonedicom"
-  >
+  <el-dialog :visible.sync="visible" :fullscreen="true" :close-on-click-modal="false" :before-close="beforeClose"
+    :append-to-body="true" class="uploadDicomAndNonedicom">
     <span slot="title">{{ title }}</span>
     <el-tabs type="border-card" v-model="activeName">
-      <el-tab-pane
-        :label="$t('uploadDicomAndNonedicom:label:dicom')"
-        name="dicom"
-      >
-        <dicomFile
-          v-if="activeName === 'dicom'"
-          :SubjectId="SubjectId"
-          :SubjectCode="SubjectCode"
-          :Criterion="Criterion"
-          :TaskId="VisitTaskId"
-          :isUpload.sync="isUpload"
-          :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
-        />
+      <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:dicom')" name="dicom">
+        <dicomFile v-if="activeName === 'dicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
+          :Criterion="Criterion" :TaskId="VisitTaskId" :isUpload.sync="isUpload"
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :IsImageSegment="IsImageSegment" />
       </el-tab-pane>
-      <el-tab-pane
-        :label="$t('uploadDicomAndNonedicom:label:nonedicom')"
-        name="nonedicom"
-      >
-        <nonedicomFile
-          v-if="activeName === 'nonedicom'"
-          :SubjectId="SubjectId"
-          :SubjectCode="SubjectCode"
-          :Criterion="Criterion"
-          :VisitTaskId="VisitTaskId"
-          :isUpload.sync="isUpload"
-        />
+      <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:nonedicom')" name="nonedicom">
+        <nonedicomFile v-if="activeName === 'nonedicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
+          :Criterion="Criterion" :VisitTaskId="VisitTaskId" :isUpload.sync="isUpload"
+          :IsImageSegment="IsImageSegment" />
       </el-tab-pane>
     </el-tabs>
   </el-dialog>
@@ -74,6 +51,10 @@ export default {
       type: Number,
       default: 0,
     },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -84,6 +65,7 @@ export default {
   },
   mounted() {
     this.title = `Upload Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+    if (this.IsImageSegment) this.title = `Upload Images：${this.SubjectCode}`
     store.dispatch('trials/setUnLock', true)
   },
   methods: {
@@ -103,11 +85,13 @@ export default {
 ::v-deep.el-tabs--left .el-tabs__header.is-left {
   margin-right: 0;
 }
+
 .uploadDicomAndNonedicom {
-  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item {
+  ::v-deep.el-tabs--border-card>.el-tabs__header .el-tabs__item {
     color: #909399;
   }
-  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
+
+  ::v-deep.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
     color: #428bca;
     background-color: #fff;
     border-right-color: #dcdfe6;
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 047f7924..e2046cd7 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -12,8 +12,11 @@
       @sort-change="handleSortByColumn" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!--受试者-->
       <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
+      <!--访视名称-->
+      <el-table-column prop="VisitName" :label="$t('upload:nonedicom:table:VisitName')" sortable="custom"
+        v-if="IsImageSegment" />
       <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable="custom" />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable="custom" v-else />
       <!--检查类型-->
       <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable="custom">
       </el-table-column>
@@ -104,7 +107,7 @@
             :title="$t('upload:nonedicom:button:preview')" @click.stop="handlePreviewNoneDicomFiles(scope.row)" />
           <!--上传--->
           <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')"
-            @click.native.prevent="handleUpload(scope.row)" />
+            @click.native.prevent="handleUpload(scope.row)" v-if="scope.row.Modality !== 'IVUS'" />
           <!--删除--->
           <el-button :disabled="scope.row.UploadedFileCount <= 0 ||
             scope.row.ReadingTaskState === 2
@@ -248,6 +251,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -311,6 +318,12 @@ export default {
         if (this.VisitTaskId) {
           this.searchData.VisitTaskId = this.VisitTaskId
         }
+        if (this.IsImageSegment) {
+          this.searchData.IsImageSegmentLabel = true
+        }
+        else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
+          this.searchData.IsImageSegmentLabel = false
+        }
         this.loading = true
         let res = await getIRUploadTaskNoneDicomStudyList(this.searchData)
         this.loading = false
@@ -534,9 +547,15 @@ export default {
       let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
       file.status = 1
       let path = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId
-        }/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
+        }/${this.currentRow.SourceSubjectVisitId}/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
           .substring(file.name.lastIndexOf('.'))
           .toLocaleLowerCase()}`
+      if (this.IsImageSegment) {
+        path = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId
+          }/${this.currentRow.SourceSubjectVisitId}/AnnotationImage/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
+            .substring(file.name.lastIndexOf('.'))
+            .toLocaleLowerCase()}`
+      }
       file.curPath = path
       const fileData = await this.fileToBlob(file.file)
       let res = await this.fileToOss(path, fileData, file)
@@ -620,6 +639,9 @@ export default {
         params.RecordPath = RecordPath.path
         params.FailedFileCount = RecordPath.Record.Failed.length
       }
+      if (this.IsImageSegment) {
+        params.IsImageSegmentLabel = true
+      }
       uploadNoneDicomFile(params)
         .then((res) => {
           if (!isReLoad) {
@@ -658,7 +680,10 @@ export default {
           })
           let text = JSON.stringify(Record)
           let logJsonBlob = this.generateTxtFile(text)
-          let logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
+          let logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.SourceSubjectVisitId}/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
+          if (this.IsImageSegment) {
+            logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.SourceSubjectVisitId}/AnnotationImage/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
+          }
           let logRes
           try {
             logRes = await this.OSSclient.put(logJsonObjectName, logJsonBlob)
diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
new file mode 100644
index 00000000..ddc0fab8
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -0,0 +1,160 @@
+<template>
+    <BaseContainer>
+        <div slot="main-container">
+            <el-table v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100" @sort-change="handleSortChange"
+                v-loading="loading">
+                <el-table-column type="index" width="40" align="left" />
+                <el-table-column prop="IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
+                    show-overflow-tooltip min-width="100">
+                    <template slot-scope="scope">
+                        <el-tag :type="scope.row.IsUrgent
+                            ? 'danger' : 'primary'
+                            ">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
+                    </template>
+                </el-table-column>
+                <!-- 受试者编号 -->
+                <el-table-column prop="SubjectCode" min-width="100"
+                    :label="$t('trials:pendingReadingTasks:table:subjectCode')" show-overflow-tooltip
+                    sortable="custom" />
+                <!-- 访视数量 -->
+                <el-table-column prop="VisitCount" :label="$t('trials:pendingReadingTasks:table:VisitCount')"
+                    show-overflow-tooltip />
+                <!-- dicom检查数量 -->
+                <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
+                    show-overflow-tooltip />
+                <!-- 非dicom检查数量 -->
+                <el-table-column prop="NoneDicomStudyCount"
+                    :label="$t('trials:pendingReadingTasks:table:NoneDicomStudyCount')" show-overflow-tooltip />
+                <!-- 标记访视数量 -->
+                <el-table-column prop="MarkVisitCount" :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')"
+                    show-overflow-tooltip />
+                <!-- 标记dicom检查数量 -->
+                <el-table-column prop="MarkDicomStudyCount"
+                    :label="$t('trials:pendingReadingTasks:table:MarkDicomStudyCount')" show-overflow-tooltip />
+                <!-- 标记非dicom检查数量 -->
+                <el-table-column prop="MarkNoneDicomStudyCount"
+                    :label="$t('trials:pendingReadingTasks:table:MarkNoneDicomStudyCount')" show-overflow-tooltip />
+                <el-table-column :label="$t('common:action:action')" width="250" fixed="right">
+                    <template slot-scope="scope">
+                        <!-- 阅片 -->
+                        <!-- <el-button :disabled="scope.row.ExistReadingApply" circle :title="scope.row.ExistReadingApply
+                            ? $t(
+                                'trials:pendingReadingTasks:button:ExistReadingApply'
+                            )
+                            : $t('trials:pendingReadingTasks:button:review')
+                            " icon="el-icon-edit-outline" @click="handleReadImage(scope.row)" /> -->
+                        <!-- 上传 -->
+                        <el-button v-hasPermi="['role:ir']" circle icon="el-icon-upload2"
+                            :title="$t('trials:pendingReadingTasks:button:upload')"
+                            @click="openUploadImage(scope.row, 'upload')" />
+                        <!-- 下载 -->
+                        <el-button v-hasPermi="['role:ir']" circle icon="el-icon-download"
+                            :title="$t('trials:pendingReadingTasks:button:download')"
+                            @click="openUploadImage(scope.row, 'download')" />
+                    </template>
+                </el-table-column>
+            </el-table>
+            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+                @pagination="getList" />
+        </div>
+        <upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId"
+            :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible"
+            :IsImageSegment="true" />
+        <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
+            :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="downloadImageVisible"
+            :IsImageSegment="true" />
+    </BaseContainer>
+</template>
+<script>
+import BaseContainer from '@/components/BaseContainer'
+import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
+import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
+import Pagination from '@/components/Pagination'
+import { getTrialSubjectVisitMarkList } from "@/api/trials"
+const searchDataDefault = () => {
+    return {
+        SubjectCode: '',
+        PageIndex: 1,
+        PageSize: 20,
+    }
+}
+export default {
+    name: "TargetSection",
+    components: {
+        BaseContainer,
+        Pagination,
+        'upload-dicom-and-nonedicom': uploadDicomAndNonedicom,
+        'download-dicom-and-nonedicom': downloadDicomAndNonedicom,
+    },
+    props: {
+        TrialReadingCriterionId: {
+            type: String,
+            default: ''
+        },
+        trialCriterionList: {
+            type: Array,
+            default: () => {
+                return []
+            }
+        }
+    },
+    data() {
+        return {
+            searchData: searchDataDefault(),
+            loading: false,
+            list: [],
+            total: 0,
+
+            // 上传
+            downloadImageVisible: false,
+            uploadImageVisible: false,
+            uploadSubjectId: null,
+            uploadSubjectCode: null,
+            uploadTrialCriterion: {},
+            uploadStatus: 'upload',
+        }
+    },
+    mounted() {
+        this.getList()
+    },
+    methods: {
+        async getList() {
+            try {
+                this.searchData.TrialId = this.$route.query.trialId
+                this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
+                this.loading = true
+                let res = await getTrialSubjectVisitMarkList(this.searchData)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.list = res.Result.CurrentPageData
+                    this.total = res.Result.TotalCount
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        // 排序
+        handleSortChange(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+        // 打开上传下载弹框
+        openUploadImage(item, status) {
+            this.uploadSubjectCode = item.SubjectCode
+            this.uploadSubjectId = item.SubjectId
+            let trialCriterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.TrialReadingCriterionId)
+            this.uploadTrialCriterion = trialCriterion
+            this.uploadStatus = status
+            this[`${status}ImageVisible`] = true
+        },
+    }
+}
+</script>
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index a9cbff5b..8b844be0 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -1,272 +1,152 @@
 <template>
-  <BaseContainer
-    v-loading="loading"
-    class="reading-task"
-  >
-    <el-tabs
-      v-if="TrialReadingCriterionId"
-      v-model="TrialReadingCriterionId"
-      type="border-card"
-    >
-      <el-tab-pane
-        v-for="item of trialCriterionList"
-        :key="item.TrialReadingCriterionId"
-        :label="item.TrialReadingCriterionName"
-        :name="item.TrialReadingCriterionId"
-      >
-        <div
-          v-if="
-            (isReadingTaskViewInOrder === 1 ||
-              isReadingTaskViewInOrder === 2) &&
-            TrialReadingCriterionId === item.TrialReadingCriterionId
-          "
-        >
+  <BaseContainer v-loading="loading" class="reading-task">
+    <el-tabs v-if="TrialReadingCriterionId" v-model="TrialReadingCriterionId" type="border-card">
+      <el-tab-pane v-for="item of trialCriterionList" :key="item.TrialReadingCriterionId"
+        :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
+        <div v-if="
+          (isReadingTaskViewInOrder === 1 ||
+            isReadingTaskViewInOrder === 2) &&
+          TrialReadingCriterionId === item.TrialReadingCriterionId
+        ">
           <div slot="search-container">
             <el-form :inline="true">
               <!-- 受试者编号 -->
-              <el-form-item
-                :label="$t('trials:pendingReadingTasks:table:subjectCode')"
-              >
-                <el-input
-                  v-model="searchData.SubjectCode"
-                  style="width: 130px"
-                  clearable
-                />
+              <el-form-item :label="$t('trials:pendingReadingTasks:table:subjectCode')">
+                <el-input v-model="searchData.SubjectCode" style="width: 130px" clearable />
               </el-form-item>
 
               <el-form-item>
                 <!-- 查询 -->
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="handleSearch"
-                >
+                <el-button type="primary" icon="el-icon-search" @click="handleSearch">
                   {{ $t('common:button:search') }}
                 </el-button>
                 <!-- 重置 -->
-                <el-button
-                  type="primary"
-                  icon="el-icon-refresh-left"
-                  @click="handleReset"
-                >
+                <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
                   {{ $t('common:button:reset') }}
                 </el-button>
+                <!-- 靶段标注 -->
+                <el-button type="primary" @click="() => TargetSection_visible = true"
+                  v-if="item.CriterionType === 19 || item.CriterionType === 20">
+                  {{ $t('trials:pendingReadingTasks:button:TargetSection') }}
+                </el-button>
               </el-form-item>
             </el-form>
           </div>
           <div slot="main-container">
-            <el-table
-              v-adaptive="{ bottomOffset: 75 }"
-              :data="list"
-              stripe
-              height="100"
-              @sort-change="handleSortChange"
-            >
+            <el-table v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100"
+              @sort-change="handleSortChange">
               <el-table-column type="index" width="40" align="left" />
-              <el-table-column
-                prop="IsUrgent"
-                :label="$t('trials:consistencyCheck:table:isUrgent')"
-                show-overflow-tooltip
-                min-width="100"
-              >
+              <el-table-column prop="IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
+                show-overflow-tooltip min-width="100">
                 <template slot-scope="scope">
-                  <el-tooltip
-                    class="item"
-                    effect="dark"
-                    :content="$t('trials:pendingReadingTasks:table:feedbackmsg')"
-                    placement="bottom"
-                    v-if="scope.row.IsExistUnprocessedFeedback"
-                  >
-                    <i
-                      v-if="scope.row.IsExistUnprocessedFeedback"
-                      class="el-icon-warning"
-                      style="color: #f44336; font-size: 16px"
-                    />
+                  <el-tooltip class="item" effect="dark" :content="$t('trials:pendingReadingTasks:table:feedbackmsg')"
+                    placement="bottom" v-if="scope.row.IsExistUnprocessedFeedback">
+                    <i v-if="scope.row.IsExistUnprocessedFeedback" class="el-icon-warning"
+                      style="color: #f44336; font-size: 16px" />
                   </el-tooltip>
-                  <el-tag
-                    :type="
-                      scope.row.UrgentColor === 1
-                        ? 'danger'
-                        : scope.row.UrgentColor === 2
-                        ? 'warning'
-                        : 'primary'
-                    "
-                    >{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag
-                  >
+                  <el-tag :type="scope.row.UrgentColor === 1
+                    ? 'danger'
+                    : scope.row.UrgentColor === 2
+                      ? 'warning'
+                      : 'primary'
+                    ">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
                 </template>
               </el-table-column>
               <!-- 受试者编号 -->
-              <el-table-column
-                prop="SubjectCode"
-                min-width="100"
-                :label="$t('trials:pendingReadingTasks:table:subjectCode')"
-                show-overflow-tooltip
-                sortable="custom"
-              />
+              <el-table-column prop="SubjectCode" min-width="100"
+                :label="$t('trials:pendingReadingTasks:table:subjectCode')" show-overflow-tooltip sortable="custom" />
               <!-- 剩余阅片量 -->
-              <el-table-column
-                prop="UnReadCanReadTaskCount"
-                min-width="100"
-                :label="
-                  $t('trials:pendingReadingTasks:table:remainingReadingVolume')
-                "
-                show-overflow-tooltip
-                sortable="custom"
-              />
-              <el-table-column
-                prop="UrgentCount"
-                :label="$t('trials:sysDocBeSigned:table:UrgentCount')"
-                show-overflow-tooltip
-                min-width="100"
-                sortable="custom"
-              >
+              <el-table-column prop="UnReadCanReadTaskCount" min-width="100" :label="$t('trials:pendingReadingTasks:table:remainingReadingVolume')
+                " show-overflow-tooltip sortable="custom" />
+              <el-table-column prop="UrgentCount" :label="$t('trials:sysDocBeSigned:table:UrgentCount')"
+                show-overflow-tooltip min-width="100" sortable="custom">
                 <template slot-scope="scope">
-                  <span
-                    :style="{
-                      color:
-                        scope.row.UrgentColor === 1
-                          ? '#F56C6C'
-                          : scope.row.UrgentColor === 2
+                  <span :style="{
+                    color:
+                      scope.row.UrgentColor === 1
+                        ? '#F56C6C'
+                        : scope.row.UrgentColor === 2
                           ? '#E6A23C'
                           : '#409EFF',
-                    }"
-                    >{{ scope.row.UrgentCount }}</span
-                  >
+                  }">{{ scope.row.UrgentCount }}</span>
                 </template>
               </el-table-column>
               <!-- 建议完成时间 -->
-              <el-table-column
-                prop="SuggesteFinishedTime"
-                min-width="100"
-                :label="
-                  $t('trials:pendingReadingTasks:table:suggestedCompletionTime')
-                "
-                show-overflow-tooltip
-                sortable="custom"
-              >
+              <el-table-column prop="SuggesteFinishedTime" min-width="100" :label="$t('trials:pendingReadingTasks:table:suggestedCompletionTime')
+                " show-overflow-tooltip sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.SuggesteFinishedTime.split(':')[0] + ':00:00' }}
                 </template>
               </el-table-column>
-              <el-table-column
-                :label="$t('common:action:action')"
-                width="250"
-                fixed="right"
-              >
+              <el-table-column :label="$t('common:action:action')" width="250" fixed="right">
                 <template slot-scope="scope">
                   <!-- 阅片 -->
-                  <el-button
-                    :disabled="scope.row.ExistReadingApply"
-                    circle
-                    :title="
-                      scope.row.ExistReadingApply
-                        ? $t(
-                            'trials:pendingReadingTasks:button:ExistReadingApply'
-                          )
-                        : $t('trials:pendingReadingTasks:button:review')
-                    "
-                    icon="el-icon-edit-outline"
-                    @click="handleReadImage(scope.row)"
-                  />
+                  <el-button :disabled="scope.row.ExistReadingApply" circle :title="scope.row.ExistReadingApply
+                    ? $t(
+                      'trials:pendingReadingTasks:button:ExistReadingApply'
+                    )
+                    : $t('trials:pendingReadingTasks:button:review')
+                    " icon="el-icon-edit-outline" @click="handleReadImage(scope.row)" />
                   <!-- 上传 -->
-                  <el-button
-                    v-if="
-                      item.ImageUploadEnum > 0 &&
-                      item.IsReadingTaskViewInOrder > 1 &&
-                      !scope.row.IsSubjectJudge
-                    "
-                    v-hasPermi="['role:ir']"
-                    circle
-                    icon="el-icon-upload2"
+                  <el-button v-if="
+                    item.ImageUploadEnum > 0 &&
+                    item.IsReadingTaskViewInOrder > 1 &&
+                    !scope.row.IsSubjectJudge
+                  " v-hasPermi="['role:ir']" circle icon="el-icon-upload2"
                     :title="$t('trials:pendingReadingTasks:button:upload')"
-                    @click="openUploadImage(scope.row, item, 'upload')"
-                  />
+                    @click="openUploadImage(scope.row, item, 'upload')" />
                   <!-- 下载 -->
-                  <el-button
-                    v-if="
-                      item.ImageDownloadEnum > 0 &&
-                      item.IsReadingTaskViewInOrder > 1 &&
-                      !scope.row.IsSubjectJudge
-                    "
-                    v-hasPermi="['role:ir']"
-                    circle
-                    icon="el-icon-download"
+                  <el-button v-if="
+                    item.ImageDownloadEnum > 0 &&
+                    item.IsReadingTaskViewInOrder > 1 &&
+                    !scope.row.IsSubjectJudge
+                  " v-hasPermi="['role:ir']" circle icon="el-icon-download"
                     :title="$t('trials:pendingReadingTasks:button:download')"
-                    @click="openUploadImage(scope.row, item, 'download')"
-                  />
+                    @click="openUploadImage(scope.row, item, 'download')" />
                 </template>
               </el-table-column>
             </el-table>
-            <pagination
-              class="page"
-              :total="total"
-              :page.sync="searchData.PageIndex"
-              :limit.sync="searchData.PageSize"
-              @pagination="getList"
-            />
+            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+              @pagination="getList" />
           </div>
         </div>
-        <div
-          v-else-if="
-            isReadingTaskViewInOrder === 0 &&
-            TrialReadingCriterionId === item.TrialReadingCriterionId
-          "
-        >
+        <div v-else-if="
+          isReadingTaskViewInOrder === 0 &&
+          TrialReadingCriterionId === item.TrialReadingCriterionId
+        ">
           <el-descriptions :column="2" border style="width: 800px">
             <!-- 剩余任务量 -->
-            <el-descriptions-item
-              :label="
-                $t('trials:pendingReadingTasks:table:remainingTaskVolume')
-              "
-              :label-style="{ width: '200px' }"
-            >
+            <el-descriptions-item :label="$t('trials:pendingReadingTasks:table:remainingTaskVolume')
+              " :label-style="{ width: '200px' }">
               <el-tag size="small" type="danger">{{
                 randomReadInfo.UnReadTaskCount
               }}</el-tag>
             </el-descriptions-item>
             <!-- 剩余裁判量 -->
-            <el-descriptions-item
-              :label="
-                $t('trials:pendingReadingTasks:table:amountOfJudgesRemaining')
-              "
-              :label-style="{ width: '200px' }"
-            >
+            <el-descriptions-item :label="$t('trials:pendingReadingTasks:table:amountOfJudgesRemaining')
+              " :label-style="{ width: '200px' }">
               <el-tag size="small" type="danger">{{
                 randomReadInfo.UnReadJudgeTaskCount
               }}</el-tag>
             </el-descriptions-item>
             <!-- 已完成任务量 -->
-            <el-descriptions-item
-              :label="
-                $t('trials:pendingReadingTasks:table:amountOfCompletedTasks')
-              "
-              :label-style="{ width: '200px' }"
-            >
+            <el-descriptions-item :label="$t('trials:pendingReadingTasks:table:amountOfCompletedTasks')
+              " :label-style="{ width: '200px' }">
               <el-tag size="small">{{ randomReadInfo.FinishTaskCount }}</el-tag>
             </el-descriptions-item>
             <!-- 已完成裁判量 -->
-            <el-descriptions-item
-              :label="
-                $t('trials:pendingReadingTasks:table:numberOfJudgesCompleted')
-              "
-              :label-style="{ width: '200px' }"
-            >
+            <el-descriptions-item :label="$t('trials:pendingReadingTasks:table:numberOfJudgesCompleted')
+              " :label-style="{ width: '200px' }">
               <el-tag size="small">{{
                 randomReadInfo.FinishJudgeTaskCount
               }}</el-tag>
             </el-descriptions-item>
             <el-descriptions-item>
               <!-- 开始随机阅片 -->
-              <el-button
-                type="primary"
-                size="small"
-                :disabled="
-                  randomReadInfo.UnReadTaskCount +
-                    randomReadInfo.UnReadJudgeTaskCount ===
-                  0
-                "
-                @click="handleOutOfOrderReading"
-              >
+              <el-button type="primary" size="small" :disabled="randomReadInfo.UnReadTaskCount +
+                randomReadInfo.UnReadJudgeTaskCount ===
+                0
+                " @click="handleOutOfOrderReading">
                 {{ $t('trials:pendingReadingTasks:button:beginRandomReview') }}
               </el-button>
             </el-descriptions-item>
@@ -282,21 +162,17 @@
       :status="uploadStatus"
       @getList="getList"
     /> -->
-    <upload-dicom-and-nonedicom
-      v-if="uploadImageVisible"
-      :SubjectId="uploadSubjectId"
-      :SubjectCode="uploadSubjectCode"
-      :Criterion="uploadTrialCriterion"
-      :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
-      :visible.sync="uploadImageVisible"
-    />
-    <download-dicom-and-nonedicom
-      v-if="downloadImageVisible"
-      :SubjectId="uploadSubjectId"
-      :SubjectCode="uploadSubjectCode"
-      :Criterion="uploadTrialCriterion"
-      :visible.sync="downloadImageVisible"
-    />
+    <upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId" :SubjectCode="uploadSubjectCode"
+      :Criterion="uploadTrialCriterion" :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
+      :visible.sync="uploadImageVisible" />
+    <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
+      :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="downloadImageVisible" />
+    <el-dialog :title="$t('trials:pendingReadingTasks:button:TargetSection')" :visible.sync="TargetSection_visible"
+      :fullscreen="true">
+      <TargetSection v-if="TargetSection_visible" :TrialReadingCriterionId="TrialReadingCriterionId"
+        :trialCriterionList="trialCriterionList" />
+    </el-dialog>
+
   </BaseContainer>
 </template>
 <script>
@@ -308,6 +184,7 @@ import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
+import TargetSection from "./components/TargetSection"
 const searchDataDefault = () => {
   return {
     SubjectCode: '',
@@ -322,6 +199,7 @@ export default {
     Pagination,
     'upload-dicom-and-nonedicom': uploadDicomAndNonedicom,
     'download-dicom-and-nonedicom': downloadDicomAndNonedicom,
+    TargetSection
   },
   data() {
     return {
@@ -347,6 +225,8 @@ export default {
       uploadSubjectCode: null,
       uploadTrialCriterion: {},
       uploadStatus: 'upload',
+
+      TargetSection_visible: false
     }
   },
   watch: {
@@ -438,7 +318,7 @@ export default {
         var path = ''
         if (this.readingTool === 0 || this.readingTool === 2) {
           if (this.criterionType === 0 && this.trialId === '08dd28b3-6843-fc05-0242-ac1301000000') {
-             path = `/fusion?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&studyId=62b3dfc4-1e04-4180-910d-fe595f398361&ctseriesId=1bd24f53-d419-32e5-92d4-2b04640aaa65&ptseriesId=2b7b128d-8c3f-8357-ad14-e38f3acbbdff&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&TokenKey=${token}&lang=${this.$i18n.locale}`
+            path = `/fusion?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&studyId=62b3dfc4-1e04-4180-910d-fe595f398361&ctseriesId=1bd24f53-d419-32e5-92d4-2b04640aaa65&ptseriesId=2b7b128d-8c3f-8357-ad14-e38f3acbbdff&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&TokenKey=${token}&lang=${this.$i18n.locale}`
           } else {
             path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
           }
@@ -468,7 +348,7 @@ export default {
         )
         var token = getToken()
         var path = ''
-        if (this.readingTool === 0 || this.readingTool === 2 ) {
+        if (this.readingTool === 0 || this.readingTool === 2) {
           path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
         } else {
           path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
@@ -500,11 +380,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .reading-task{
-    height: 100%;
-    background-color: #fff;
-    ::v-deep.search {
-      padding: 0px !important;
-    }
+.reading-task {
+  height: 100%;
+  background-color: #fff;
+
+  ::v-deep.search {
+    padding: 0px !important;
   }
+}
 </style>

From ca44352b9ece9e0ce10684d37fde56f15533e80a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 20 Nov 2025 10:49:22 +0800
Subject: [PATCH 095/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CriterionQuestionForm.vue      | 782 ++++++------------
 .../template/components/TableQsForm.vue       | 558 ++++---------
 .../reading-unit/components/QuestionsForm.vue |   2 +-
 .../reading-unit/components/TableQsForm.vue   |   2 +-
 4 files changed, 401 insertions(+), 943 deletions(-)

diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 52b5f545..267ba854 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -1,251 +1,143 @@
 <template>
-  <el-form
-    ref="clinicalDataForm"
-    v-loading="loading"
-    :model="form"
-    size="small"
-    :rules="rules"
-    :disabled="type === 'look'"
-    label-width="220px"
-  >
+  <el-form ref="clinicalDataForm" v-loading="loading" :model="form" size="small" :rules="rules"
+    :disabled="type === 'look'" label-width="220px">
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">
         <!-- 类型 -->
         <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
-          <el-select
-            v-model="form.Type"
-            clearable
-            @change="
-              (val) => {
-                typeChange(val, form)
-              }
-            "
-          >
-            <el-option
-              v-for="item of $d.Criterion_Question_Type"
-              v-show="item.value !== 'class'"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
+          <el-select v-model="form.Type" clearable @change="
+            (val) => {
+              typeChange(val, form)
+            }
+          ">
+            <el-option v-for="item of $d.Criterion_Question_Type" v-show="item.value !== 'class'" :key="item.value"
+              :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 分组名称 -->
-        <el-form-item
-          v-if="form.Type === 'group'"
-          :label="$t('trials:readingUnit:qsList:title:groupName')"
-          prop="GroupName"
-        >
+        <el-form-item v-if="form.Type === 'group'" :label="$t('trials:readingUnit:qsList:title:groupName')"
+          prop="GroupName">
           <el-input v-model="form.GroupName" />
         </el-form-item>
         <!-- 分组名称（EN） -->
-        <el-form-item
-          v-if="form.Type === 'group'"
-          :label="$t('dictionary:template:criterionConfig:title:groupNameEn')"
-          prop="GroupEnName"
-        >
+        <el-form-item v-if="form.Type === 'group'" :label="$t('dictionary:template:criterionConfig:title:groupNameEn')"
+          prop="GroupEnName">
           <el-input v-model="form.GroupEnName" />
         </el-form-item>
         <!-- 问题名称 -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:qsName')"
-          prop="QuestionName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsName')"
+          prop="QuestionName" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
+          ]">
           <el-input v-model="form.QuestionName" />
         </el-form-item>
         <!-- 问题名称（EN） -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('dictionary:template:criterionConfig:title:qsNameEn')"
-          prop="QuestionEnName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('dictionary:template:criterionConfig:title:qsNameEn')"
+          prop="QuestionEnName" :rules="[
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
+          ]">
           <el-input v-model="form.QuestionEnName" />
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
         <!-- 公有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:publicProperties') }}</el-divider>
         <!-- 问题分组 -->
-        <el-form-item 
-          v-if="form.Type !== 'group'" 
-          :label="$t('trials:readingUnit:qsList:title:qsGroupName')"
-          :rules="[
-            { required: form.ShowQuestion === 1 ? false : true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-select
-            v-model="form.GroupId"
-            clearable
-            :disabled="isParentExistGroup"
-          >
-            <el-option
-              v-for="group of groupOptions"
-              :key="group.GroupId"
-              :label="group.GroupName"
-              :value="group.GroupId"
-            />
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsGroupName')" :rules="[
+          { required: form.ShowQuestion === 1 ? false : true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-select v-model="form.GroupId" clearable :disabled="isParentExistGroup">
+            <el-option v-for="group of groupOptions" :key="group.GroupId" :label="group.GroupName"
+              :value="group.GroupId" />
           </el-select>
         </el-form-item>
         <!-- 是否显示 -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:isShow')"
-          prop="ShowQuestion"
-        >
-          <el-radio-group
-            v-model="form.ShowQuestion"
-            @change="
-              (val) => {
-                isShowQuestionChange(val, form)
-              }
-            "
-          >
-            <el-radio
-              v-for="item of $d.ShowQuestion"
-              :key="`ShowQuestion${item.value}`"
-              :label="item.value"
-            >
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')"
+          prop="ShowQuestion">
+          <el-radio-group v-model="form.ShowQuestion" @change="
+            (val) => {
+              isShowQuestionChange(val, form)
+            }
+          ">
+            <el-radio v-for="item of $d.ShowQuestion" :key="`ShowQuestion${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 显示时依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.ShowQuestion === 1"
-          :label="$t('trials:readingUnit:qsList:title:parentId')"
-          prop="ParentId"
-        >
-          <el-select
-            v-model="form.ParentId"
-            clearable
-            @change="
-              (val) => {
-                parentQuestionChange(val, form)
-              }
-            "
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`ParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentId')" prop="ParentId">
+          <el-select v-model="form.ParentId" clearable @change="
+            (val) => {
+              parentQuestionChange(val, form)
+            }
+          ">
+            <el-option v-for="item of parentOptions" :key="`ParentId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 显示时依赖父问题触发值 -->
-        <el-form-item
-          v-if="form.ParentId && form.ShowQuestion === 1"
-          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" 
-          prop="ParentTriggerValueList"
-        >
+        <el-form-item v-if="form.ParentId && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-            <el-option
-              v-for="item of parentTriggerValOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value + ''"
-            />
+            <el-option v-for="item of parentTriggerValOptions" :key="item.value" :label="item.label"
+              :value="item.value + ''" />
           </el-select>
         </el-form-item>
         <!-- 是否必填 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'"
-          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired"
-        >
-          <el-radio-group
-            v-model="form.IsRequired"
-            :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
+          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
+          <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
             @change="
               (val) => {
                 isRequiredChange(val, form)
               }
-            "
-          >
-            <el-radio
-              v-for="item of $d.QuestionRequired"
-              :key="`QuestionRequired${item.value}`"
-              :label="item.value"
-            >
+            ">
+            <el-radio v-for="item of $d.QuestionRequired" :key="`QuestionRequired${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 必填依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-          prop="RelevanceId"
-        >
-          <el-select
-            v-model="form.RelevanceId"
-            clearable
-            @change="
-              (val) => {
-                relevanceQuestionChange(val, form)
-              }
-            "
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`RelevanceId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')" prop="RelevanceId">
+          <el-select v-model="form.RelevanceId" clearable @change="
+            (val) => {
+              relevanceQuestionChange(val, form)
+            }
+          ">
+            <el-option v-for="item of parentOptions" :key="`RelevanceId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 必填触发值 -->
-        <el-form-item
-          v-if="form.RelevanceId && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-          prop="RelevanceValueList"
-        >
+        <el-form-item v-if="form.RelevanceId && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')" prop="RelevanceValueList">
           <el-select v-model="form.RelevanceValueList" clearable multiple>
-            <el-option
-              v-for="item of reParentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value + ''"
-            />
+            <el-option v-for="item of reParentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="item.value + ''" />
           </el-select>
         </el-form-item>
         <!-- 是否裁判问题 -->
-        <el-form-item
-          v-if="
-            form.Type === 'select' ||
-            form.Type === 'radio' ||
-            form.Type === 'calculation' ||
-            form.Type === 'number'
-          "
-          :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')"
-          prop="IsJudgeQuestion"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.IsJudgeQuestion"
-            @change="
-              (val) => {
-                isJudgeQuestionChange(val, form)
-              }
-            "
-          >
-            <el-radio
-              v-for="item of $d.YesOrNo"
-              :key="`YesOrNo${item.value}`"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+        <el-form-item v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation' ||
+          form.Type === 'number'
+        " :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')" prop="IsJudgeQuestion" :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-radio-group v-model="form.IsJudgeQuestion" @change="
+            (val) => {
+              isJudgeQuestionChange(val, form)
+            }
+          ">
+            <el-radio v-for="item of $d.YesOrNo" :key="`YesOrNo${item.value}`" :label="item.value">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- <el-form-item label="导出标识" 
@@ -269,471 +161,274 @@
           </el-radio-group>
         </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
-           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'">
           <el-select v-model="form.ExportResult" multiple>
-            <el-option
-              v-for="item in CriterionDictionaryList.ExportResult"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            >
+            <el-option v-for="item in CriterionDictionaryList.ExportResult" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value">
             </el-option>
           </el-select>
         </el-form-item>
         <!-- 限制编辑 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'upload' || form.Type === 'number' || form.Type === 'screenshot'"
-          prop="LimitEdit"
-          :rules="[
+          prop="LimitEdit" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-radio-group v-model="form.LimitEdit">
-            <el-radio
-              v-for="item of $d.LimitEdit"
-              :key="`LimitEdit${item.value}`"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item of $d.LimitEdit" :key="`LimitEdit${item.value}`" :label="item.value">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 全局阅片是否显示 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')"
-          prop="GlobalReadingShowType"
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')" prop="GlobalReadingShowType"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-radio-group v-model="form.GlobalReadingShowType">
-            <el-radio
-              v-for="item of $d.GlobalReadingShowType"
-              :key="item.id"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 问题标识 -->
-        <el-form-item
-          :label="$t('dictionary:template:criterionConfig:table:questionType')"
-          v-if="form.Type !== 'group' && form.Type !== 'summary'"
-          prop="QuestionType"
-        >
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionType')"
+          v-if="form.Type !== 'group' && form.Type !== 'summary'" prop="QuestionType">
           <el-select v-model="form.QuestionType" clearable>
-            <el-option
-              v-for="item of CriterionDictionaryList.QuestionType"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
+            <el-option v-for="item of CriterionDictionaryList.QuestionType" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
           </el-select>
         </el-form-item>
         <!-- 是否在阅片页面显示 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:isShowInDicom')"
-          prop="IsShowInDicom"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:isShowInDicom')" prop="IsShowInDicom" :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
           <el-radio-group v-model="form.IsShowInDicom">
-            <el-radio
-              v-for="item of $d.YesOrNo"
-              :key="`YesOrNo${item.value}`"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item of $d.YesOrNo" :key="`YesOrNo${item.value}`" :label="item.value">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 注释 -->
-        <el-form-item
-          :label="$t('trials:readingUnit:qsList:title:Remark')"
-          prop="Remark"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:Remark')" prop="Remark">
           <el-input v-model="form.Remark" />
         </el-form-item>
         <!-- 序号 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:order')" 
-          prop="ShowOrder"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-input-number
-            v-model="form.ShowOrder"
-            controls-position="right"
-            :min="0"
-          />
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder" :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
+        </el-form-item>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <!-- 适用于Lugano 2014标准 -->
         <!-- 问题分类 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="form.Type !== 'group' && criterionType === 2">
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')"
+          v-if="form.Type !== 'group' && criterionType === 2">
           <el-select v-model="form.QuestionClassify" clearable>
-            <el-option
-              v-for="item of $d.QuestionClassify"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.QuestionClassify" :key="item.id" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <!-- 适用于iRECST标准 -->
         <!-- 转化显示类型 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:convertType')" prop="ConvertShowType" v-if="criterionType === 3">
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:convertType')" prop="ConvertShowType"
+          v-if="criterionType === 3">
           <el-radio-group v-model="form.ConvertShowType">
-            <el-radio
-              v-for="item of $d.ConvertShowType"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio v-for="item of $d.ConvertShowType" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 私有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
         <!-- 选项类型 -->
-        <el-form-item
-          v-if="
-            form.Type === 'select' ||
-            form.Type === 'radio' ||
-            form.Type === 'calculation'
-          "
-          :label="$t('trials:readingUnit:label:QuestionGenre')"
-          prop="QuestionGenre"
-          :rules="[{ required: form.Type !== 'calculation', message: this.$t('common:ruleMessage:select') }]"
-        >
-          <el-radio-group
-            v-model="form.QuestionGenre"
-            @change="
-              (val) => {
-                questionGenreChange(val, form)
-              }
-            "
-          >
+        <el-form-item v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation'
+        " :label="$t('trials:readingUnit:label:QuestionGenre')" prop="QuestionGenre"
+          :rules="[{ required: form.Type !== 'calculation', message: this.$t('common:ruleMessage:select') }]">
+          <el-radio-group v-model="form.QuestionGenre" @change="
+            (val) => {
+              questionGenreChange(val, form)
+            }
+          ">
             <el-radio :label="-1"> {{ this.$t('common:title:none') }} </el-radio>
-            <el-radio
-              v-for="item of $d.TableQuestionType"
-              v-show="item.value === 0 || item.value === 3"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio v-for="item of $d.TableQuestionType" v-show="item.value === 0 || item.value === 3" :key="item.id"
+              :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 选项 -->
-        <el-form-item
-          v-if="form.QuestionGenre === 0 || form.Type === 'class'"
-          :label="$t('trials:qcCfg:table:typeValue')"
-          prop="TypeValue"
-        >
-          <el-input
-            v-model="form.TypeValue"
-            :placeholder="$t('trials:qcCfg:message:typeValue')"
-            @change="typeValueChange"
-          />
+        <el-form-item v-if="form.QuestionGenre === 0 || form.Type === 'class'"
+          :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue">
+          <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')"
+            @change="typeValueChange" />
         </el-form-item>
-        
+
         <!-- 关联字典 -->
-        <el-form-item
-          v-if="form.QuestionGenre === 3"
-          :label="$t('trials:readingUnit:label:DictionaryCode')"
-          prop="DictionaryCode"
-        >
-          <el-select
-            v-model="form.DictionaryCode"
-            clearable
-            @change="
-              () => {
-                form.DefaultValue = null
-              }
-            "
-          >
-            <el-option
-              v-for="item of dicList"
-              :key="item.Id"
-              :label="item.Code"
-              :value="item.Code"
-            />
+        <el-form-item v-if="form.QuestionGenre === 3" :label="$t('trials:readingUnit:label:DictionaryCode')"
+          prop="DictionaryCode">
+          <el-select v-model="form.DictionaryCode" clearable @change="
+            () => {
+              form.DefaultValue = null
+            }
+          ">
+            <el-option v-for="item of dicList" :key="item.Id" :label="item.Code" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
         <el-form-item v-if="form.QuestionGenre === 3" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of highlightAnswers"
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
+            <el-option v-for="item of highlightAnswers" :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
         <el-form-item v-if="form.QuestionGenre === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
+            <el-option v-for="item of form.TypeValue ? form.TypeValue.split('|') : []" :key="item" :label="item"
+              :value="item" />
           </el-select>
         </el-form-item>
         <!-- 高亮标记值 -->
-        <el-form-item
-          v-if="form.Type === 'select' || form.Type === 'radio'"
-          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')"
-          prop="HighlightAnswerList"
-        >
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
+          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
-              <el-option
-                v-for="item of form.TypeValue.split('|')"
-                :key="item"
-                :label="item"
-                :value="item"
-              />
+              <el-option v-for="item of form.TypeValue.split('|')" :key="item" :label="item" :value="item" />
             </template>
             <template v-else-if="form.DictionaryCode">
-              <el-option
-                v-for="item of highlightAnswers"
-                :key="item.Id"
-                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-                :value="item.Code"
-              />
+              <el-option v-for="item of highlightAnswers" :key="item.Id"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
             </template>
           </el-select>
         </el-form-item>
         <!-- 分组标识 -->
-        <el-form-item
-          :label="$t('dictionary:template:criterionConfig:table:groupClassify')"
-          v-if="form.Type === 'group'"
-          prop="GroupClassify"
-        >
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:groupClassify')"
+          v-if="form.Type === 'group'" prop="GroupClassify">
           <el-select v-model="form.GroupClassify" clearable>
-            <el-option
-              v-for="item of groupClassifyList"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
+            <el-option v-for="item of groupClassifyList" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
           </el-select>
         </el-form-item>
         <!-- 最大长度 -->
-        <el-form-item 
-          v-if="form.Type === 'input' || form.Type === 'textarea'"
-          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
-          prop="MaxAnswerLength"
-          :rules="[
+        <el-form-item v-if="form.Type === 'input' || form.Type === 'textarea'"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')" prop="MaxAnswerLength" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
         </el-form-item>
         <!-- 最大行数 -->
-        <el-form-item 
-          v-if="form.Type === 'table' || form.Type === 'basicTable'" 
-          :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')"
-          prop="MaxQuestionCount"
-          :rules="[
+        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'"
+          :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')" prop="MaxQuestionCount" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-          ]"
-        >
-          <el-input-number
-            v-model="form.MaxQuestionCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+          ]">
+          <el-input-number v-model="form.MaxQuestionCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
-        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:orderMark')">
+        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'"
+          :label="$t('trials:readingUnit:qsList:title:orderMark')">
           <el-input v-model="form.OrderMark" />
         </el-form-item>
-        
+
         <!-- 数值类型 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:valueType')"
-          prop="ValueType"
-          :rules="[{ required: true, message: this.$t('common:ruleMessage:select') }]"
-        >
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:valueType')" prop="ValueType"
+          :rules="[{ required: true, message: this.$t('common:ruleMessage:select') }]">
           <el-radio-group v-model="form.ValueType">
-            <el-radio
-              v-for="item of $d.ValueType"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio v-for="item of $d.ValueType" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 单位 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:unit')"
-          prop="Unit"
-          :rules="[
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:unit')" prop="Unit" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-radio-group v-model="form.Unit">
-            <el-radio
-              v-for="item of $d.ValueUnit"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio v-for="item of $d.ValueUnit" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 表格类型标识 -->
-        <el-form-item
-          v-if="form.Type === 'table'"
-          :label="$t('dictionary:template:criterionConfig:table:tableType')"
-          prop="LesionType"
-        >
+        <el-form-item v-if="form.Type === 'table'" :label="$t('dictionary:template:criterionConfig:table:tableType')"
+          prop="LesionType">
           <el-select v-model="form.LesionType" clearable>
-            <el-option
-              v-for="item of lesionTypes"
-              :key="item.Code"
-              :value="parseInt(item.Code)"
-              :label="$fd('LesionType', parseInt(item.Code))"
-            />
+            <el-option v-for="item of lesionTypes" :key="item.Code" :value="parseInt(item.Code)"
+              :label="$fd('LesionType', parseInt(item.Code))" />
           </el-select>
         </el-form-item>
         <!-- 表格类型标识 -->
-        <el-form-item
-          v-if="form.Type === 'basicTable'"
-          :label="$t('dictionary:template:criterionConfig:table:tableType')"
-          prop="LesionType"
-        >
+        <el-form-item v-if="form.Type === 'basicTable'"
+          :label="$t('dictionary:template:criterionConfig:table:tableType')" prop="LesionType">
           <el-select v-model="form.LesionType" clearable>
-            <el-option
-              v-for="item of lesionTypeList"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
+            <el-option v-for="item of lesionTypeList" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
           </el-select>
         </el-form-item>
         <!-- 关联字典 -->
-        <el-form-item
-          v-if="form.Type === 'table' || form.Type === 'basicTable'"
-          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
-        >
-          <el-select
-            v-model="form.DictionaryCode"
-            clearable
-            @change="
-              () => {
-                form.DefaultValue = null
-              }
-            "
-          >
-            <el-option
-              v-for="item of dicList"
-              :key="item.Id"
-              :label="item.Code"
-              :value="item.Code"
-            />
+        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')">
+          <el-select v-model="form.DictionaryCode" clearable @change="
+            () => {
+              form.DefaultValue = null
+            }
+          ">
+            <el-option v-for="item of dicList" :key="item.Id" :label="item.Code" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 最大上传个数 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:imageCount')"
-        >
-          <el-input-number
-            v-model="form.ImageCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')">
+          <el-input-number v-model="form.ImageCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
         <!-- 文件类型 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:FileType')"
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
-          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
-        >
-          <el-checkbox-group
-            v-model="form.FileType"
-            @change="(v) => {
-              if (v && v.includes('-1')) {
-                form.FileType = ['-1']
-              }
-            }"
-          >
-            <el-checkbox
-              v-for="item of $d.fileType"
-              :key="`fileType${item.value}`"
-              :value="item.value + ''"
-              :label="item.value"
-              :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
-            >
+          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }]">
+          <el-checkbox-group v-model="form.FileType" @change="(v) => {
+            if (v && v.includes('-1')) {
+              form.FileType = ['-1']
+            }
+          }">
+            <el-checkbox v-for="item of $d.fileType" :key="`fileType${item.value}`" :value="item.value + ''"
+              :label="item.value" :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'">
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <!-- 分类数据来源 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
-          prop="ClassifyQuestionId"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')" prop="ClassifyQuestionId">
           <el-select v-model="form.ClassifyQuestionId" clearable>
-            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName"
-                      :value="item.Id"/>
+            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName" :value="item.Id" />
           </el-select>
         </el-form-item>
         <!-- 分类算法 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
-          prop="ClassifyAlgorithms"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')" prop="ClassifyAlgorithms">
           <div>
-            <el-table
-              ref="CalculateTable"
-              :data="ClassifyAlgorithmsList"
-              style="margin: 10px;width: 100%"
-              size="small"
-            >
+            <el-table ref="CalculateTable" :data="ClassifyAlgorithmsList" style="margin: 10px;width: 100%" size="small">
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:label')"
-                show-overflow-tooltip
-                min-width="70"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:label')" show-overflow-tooltip min-width="70">
                 <template slot-scope="scope">
                   {{ scope.row.label }}
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:gt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:gt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.gt"></el-input-number>
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:lt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:lt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.lt"></el-input-number>
                 </template>
@@ -747,21 +442,11 @@
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
-        <el-button
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="close"
-        >
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="close">
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
-        <el-button
-          size="small"
-          type="primary"
-          :loading="btnLoading"
-          @click="save"
-        >
+        <el-button size="small" type="primary" :loading="btnLoading" @click="save">
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -863,6 +548,7 @@ export default {
         FileType: [],
         ClassifyQuestionId: null,
         ClassifyAlgorithms: null,
+        ShowChartTypeEnum: 0
       },
       rules: {
         Type: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
@@ -941,7 +627,7 @@ export default {
   mounted() {
     this.initForm()
     this.getCalculateQuestions('number')
-    
+
   },
   methods: {
     typeValueChange(v) {
@@ -964,7 +650,7 @@ export default {
       }).then(res => {
         this.dicList = res.Result
       })
-    }, 
+    },
     getCalculateQuestions(type) {
       getSystemCalculateQuestions({
         systemCriterionId: this.criterionId,
@@ -1010,7 +696,7 @@ export default {
           if (this.data.hasOwnProperty(k)) {
             if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
               this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
-            } else if(k === 'FileType'){
+            } else if (k === 'FileType') {
               this.form[k] = this.data[k].split(',')
             } else {
               this.form[k] = this.data[k]
@@ -1033,10 +719,10 @@ export default {
               // this.parentTriggerValOptions =
               //   this.$d[this.parentOptions[index].DictionaryCode]
               let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId, DictionaryCode: dicCode })
+
+              this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
 
             } else {
@@ -1059,9 +745,9 @@ export default {
               // this.reParentTriggerValOptions =
               //   this.$d[this.parentOptions[index].DictionaryCode]
               let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId, DictionaryCode: dicCode })
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -1164,7 +850,7 @@ export default {
       if (val !== 'select' && val !== 'radio') {
         data.IsJudgeQuestion = false
       }
-      
+
       if (val === 'number' || val === 'calculation') {
         data.Unit = 0
       } else {
@@ -1189,6 +875,7 @@ export default {
       data.HighlightAnswerList = []
       // data.ExportIdentification = 0
       data.ExportResult = []
+      data.ShowChartTypeEnum = 0
       data.FileType = []
       data.ClassifyQuestionId = null
       data.ClassifyAlgorithms = null
@@ -1263,11 +950,11 @@ export default {
             // this.reParentTriggerValOptions =
             //   this.$d[this.parentOptions[index].DictionaryCode]
             let dicCode = this.parentOptions[index].DictionaryCode
-            let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
-              
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId, DictionaryCode: dicCode })
+
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
+            })
           } else {
             var options = []
             this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1310,5 +997,4 @@ export default {
   },
 }
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index 0e770227..5b5fc499 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -1,155 +1,86 @@
 <template>
-  <el-form
-    ref="tableQsForm"
-    v-loading="loading"
-    :model="form"
-    size="small"
-    :disabled="type === 'look'"
-    :rules="rules"
-    label-width="130px"
-  >
+  <el-form ref="tableQsForm" v-loading="loading" :model="form" size="small" :disabled="type === 'look'" :rules="rules"
+    label-width="130px">
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">
         <!-- 类型 -->
         <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
-          <el-select
-            v-model="form.Type"
-            @change="((val)=>{qsTypeChange(val, form)})"
-          >
-            <el-option
-              v-for="item of $d.Criterion_Question_Type"
+          <el-select v-model="form.Type" @change="((val) => { qsTypeChange(val, form) })">
+            <el-option v-for="item of $d.Criterion_Question_Type"
               v-show="item.value !== 'class' && item.value !== 'group' && item.value !== 'table' && item.value !== 'basicTable'"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
+              :key="item.value" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 问题名称 -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          prop="QuestionName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
+          prop="QuestionName" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
-          <el-input
-            v-model="form.QuestionName"
-          />
+          ]">
+          <el-input v-model="form.QuestionName" />
         </el-form-item>
         <!-- 问题名称（EN） -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          prop="QuestionEnName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
+          prop="QuestionEnName" :rules="[
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
-          <el-input
-            v-model="form.QuestionEnName"
-          />
+          ]">
+          <el-input v-model="form.QuestionEnName" />
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
         <!-- 公有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:publicProperties') }}</el-divider>
         <!-- 是否显示 -->
-        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion">
-          <el-radio-group
-            v-model="form.ShowQuestion"
-            @change="((val)=>{isShowQuestionChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.ShowQuestion"
-              :key="`ShowQuestion${item.value}`"
-              :label="item.value"
-            >
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')"
+          prop="ShowQuestion">
+          <el-radio-group v-model="form.ShowQuestion" @change="((val) => { isShowQuestionChange(val, form) })">
+            <el-radio v-for="item of $d.ShowQuestion" :key="`ShowQuestion${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 显示时依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.ShowQuestion===1"
-          :label="$t('trials:readingUnit:qsList:title:parentId')"
-          prop="ParentId"
-        >
-          <el-select
-            v-model="form.ParentId"
-            clearable
-            @change="((val)=>{parentQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`ParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentId')" prop="ParentId">
+          <el-select v-model="form.ParentId" clearable @change="((val) => { parentQuestionChange(val, form) })">
+            <el-option v-for="item of parentOptions" :key="`ParentId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 显示时依赖父问题触发值 -->
-        <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')"  prop="ParentTriggerValueList">
+        <el-form-item v-if="form.ParentId && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-            <el-option
-              v-for="item of parentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
+            <el-option v-for="item of parentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="String(item.value)" />
           </el-select>
         </el-form-item>
         <!-- 是否必填 -->
-        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
-          <el-radio-group
-            v-model="form.IsRequired"
-            :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-            @change="((val)=>{isRequiredChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.QuestionRequired"
-              :key="`QuestionRequired${item.value}`"
-              :label="item.value"
-            >
+        <el-form-item
+          v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'"
+          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
+          <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
+            @change="((val) => { isRequiredChange(val, form) })">
+            <el-radio v-for="item of $d.QuestionRequired" :key="`QuestionRequired${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 必填依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-          prop="RelevanceId"
-        >
-          <el-select
-            v-model="form.RelevanceId"
-            clearable
-            @change="((val)=>{relevanceQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`RelevanceId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')" prop="RelevanceId">
+          <el-select v-model="form.RelevanceId" clearable @change="((val) => { relevanceQuestionChange(val, form) })">
+            <el-option v-for="item of parentOptions" :key="`RelevanceId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 必填触发值 -->
-        <el-form-item
-          v-if="form.RelevanceId && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-          prop="RelevanceValueList"
-        >
+        <el-form-item v-if="form.RelevanceId && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')" prop="RelevanceValueList">
           <el-select v-model="form.RelevanceValueList" clearable multiple>
-            <el-option
-              v-for="item of reParentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
+            <el-option v-for="item of reParentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="String(item.value)" />
           </el-select>
         </el-form-item>
         <!-- 导出标识 -->
@@ -174,175 +105,102 @@
           </el-radio-group>
         </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
-          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'">
           <el-select v-model="form.ExportResult" multiple>
-            <el-option
-              v-for="item in CriterionDictionaryList.ExportResult"
-              :key="`ExportResult${item.value}`"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            >
+            <el-option v-for="item in CriterionDictionaryList.ExportResult" :key="`ExportResult${item.value}`"
+              :value="parseInt(item.Code)" :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value">
             </el-option>
           </el-select>
         </el-form-item>
         <!-- 限制编辑 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
-          v-if="form.Type !== 'summary'"
-          prop="LimitEdit"
-          :rules="[
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="form.Type !== 'summary'"
+          prop="LimitEdit" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-radio-group v-model="form.LimitEdit">
             <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 问题标识 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.Type !== 'summary'"
-          :label="$t('dictionary:template:criterionConfig:table:questionMark')"
-          prop="QuestionMark"
-        >
-          <el-select
-            v-model="form.QuestionMark"
-            clearable
-          >
-            <el-option
-              v-for="item of CriterionDictionaryList.QuestionMark"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'summary'"
+          :label="$t('dictionary:template:criterionConfig:table:questionMark')" prop="QuestionMark">
+          <el-select v-model="form.QuestionMark" clearable>
+            <el-option v-for="item of CriterionDictionaryList.QuestionMark" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
           </el-select>
         </el-form-item>
         <!-- 注释 -->
-        <el-form-item
-          :label="$t('trials:readingUnit:qsList:title:Remark')"
-          prop="Remark"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:Remark')" prop="Remark">
           <el-input v-model="form.Remark" />
         </el-form-item>
         <!-- 序号 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:order')" 
-          prop="ShowOrder"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-input-number
-            v-model="form.ShowOrder"
-            controls-position="right"
-            :min="0"
-          />
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder" :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
+        </el-form-item>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <!-- 重复出现最大次数 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
-          <el-input-number
-            v-model="form.MaxRowCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')"
+          v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+          <el-input-number v-model="form.MaxRowCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
         <!-- 问题分类 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="criterionType === 2">
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')"
+          v-if="criterionType === 2">
           <el-select v-model="form.QuestionClassify" clearable>
-            <el-option
-              v-for="item of $d.QuestionClassify"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.QuestionClassify" :key="item.id" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <!-- 私有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
         <!-- 选项类型 -->
-        <el-form-item
-          v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
-          :label="$t('trials:readingUnit:label:QuestionGenre')"
-          prop="TableQuestionType"
-          :rules="[
-            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.TableQuestionType"
-            @change="((val)=>{tableQuestionTypeChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.TableQuestionType"
-              :key="item.id"
-              :label="item.value"
-              :disabled="(form.Type === 'radio' && (item.value===1 || item.value===2)) || (form.Type === 'input' && (item.value===0 || item.value===3))"
-            >
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
+          :label="$t('trials:readingUnit:label:QuestionGenre')" prop="TableQuestionType" :rules="[
+            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select') }
+          ]">
+          <el-radio-group v-model="form.TableQuestionType" @change="((val) => { tableQuestionTypeChange(val, form) })">
+            <el-radio v-for="item of $d.TableQuestionType" :key="item.id" :label="item.value"
+              :disabled="(form.Type === 'radio' && (item.value === 1 || item.value === 2)) || (form.Type === 'input' && (item.value === 0 || item.value === 3))">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 选项 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 0  || form.Type === 'class'"
-          :label="$t('trials:qcCfg:table:typeValue')"
-          prop="TypeValue"
-        >
-          <el-input
-            v-model="form.TypeValue"
-            :placeholder="$t('trials:qcCfg:message:typeValue')"
-            @change="typeValueChange"
-          />
+        <el-form-item v-if="form.TableQuestionType === 0 || form.Type === 'class'"
+          :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue">
+          <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')"
+            @change="typeValueChange" />
         </el-form-item>
         <!-- 关联问题 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 2"
-          :label="$t('dictionary:template:criterionConfig:table:dependParentId')"
-          prop="DependParentId"
-        >
-          <el-select
-            v-model="form.DependParentId"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`DependParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.TableQuestionType === 2"
+          :label="$t('dictionary:template:criterionConfig:table:dependParentId')" prop="DependParentId">
+          <el-select v-model="form.DependParentId">
+            <el-option v-for="item of parentOptions" :key="`DependParentId${item.QuestionId}`"
+              :label="item.QuestionName" :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 关联字段 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 1 || !!form.DependParentId"
-          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')"
-          prop="DataTableColumn"
-        >
+        <el-form-item v-if="form.TableQuestionType === 1 || !!form.DependParentId"
+          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')" prop="DataTableColumn">
           <el-select v-model="form.DataTableColumn">
-            <el-option
-              v-for="item of CriterionDictionaryList.OrganColumn"
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
+            <el-option v-for="item of CriterionDictionaryList.OrganColumn" :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 关联字典 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
-          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
-          prop="DictionaryCode"
-          :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
-        >
+        <el-form-item v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')" prop="DictionaryCode"
+          :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]">
           <el-select v-model="form.DictionaryCode">
-            <el-option
-              v-for="item of dicList"
-              :key="item.Id"
-              :label="item.Code"
-              :value="item.Code"
-            />
+            <el-option v-for="item of dicList" :key="item.Id" :label="item.Code" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
@@ -354,35 +212,23 @@
               :label="item.label"
               :value="item.value.toString()"
             /> -->
-            <el-option
-              v-for="item of highlightAnswers"
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
+            <el-option v-for="item of highlightAnswers" :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
         <el-form-item v-if="form.TableQuestionType === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
+            <el-option v-for="item of form.TypeValue ? form.TypeValue.split('|') : []" :key="item" :label="item"
+              :value="item" />
           </el-select>
         </el-form-item>
         <!-- 高亮标记值 -->
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
+          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
-              <el-option
-                v-for="item of form.TypeValue.split('|')"
-                :key="item"
-                :label="item"
-                :value="item"
-              />
+              <el-option v-for="item of form.TypeValue.split('|')" :key="item" :label="item" :value="item" />
             </template>
             <template v-else-if="form.DictionaryCode">
               <!-- <el-option
@@ -391,24 +237,16 @@
                 :label="item.label"
                 :value="item.value.toString()"
               /> -->
-              <el-option
-                v-for="item of highlightAnswers"
-                :key="item.Id"
-                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-                :value="item.Code"
-              />
+              <el-option v-for="item of highlightAnswers" :key="item.Id"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
             </template>
           </el-select>
         </el-form-item>
         <!-- 最大长度 -->
-        <el-form-item 
-          v-if="form.Type === 'input' || form.Type === 'textarea'"
-          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
-          prop="MaxAnswerLength"
-          :rules="[
+        <el-form-item v-if="form.Type === 'input' || form.Type === 'textarea'"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')" prop="MaxAnswerLength" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
         </el-form-item>
         <!-- 是否复制前值 -->
@@ -425,138 +263,75 @@
           />
         </el-form-item> -->
         <!-- 数值类型 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:valueType')"
-          prop="ValueType"
-          :rules="[
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:valueType')" prop="ValueType" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select') }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ValueType"
-          >
-            <el-radio
-              v-for="item of $d.ValueType"
-              :key="item.id"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.ValueType">
+            <el-radio v-for="item of $d.ValueType" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 单位 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:unit')"
-          prop="Unit"
-          :rules="[
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:unit')" prop="Unit" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.Unit"
-          >
-            <el-radio
-              v-for="item of $d.ValueUnit"
-              :key="item.id"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.Unit">
+            <el-radio v-for="item of $d.ValueUnit" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 最大上传个数 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:imageCount')"
-          prop="ImageCount"
-        >
-          <el-input-number
-            v-model="form.ImageCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')"
+          prop="ImageCount">
+          <el-input-number v-model="form.ImageCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
         <!-- 文件类型 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:FileType')"
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
-          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
-        >
-          <el-checkbox-group
-            v-model="form.FileType"
-            @change="(v) => {
-              if (v && v.includes('-1')) {
-                form.FileType = ['-1']
-              }
-            }"
-          >
-            <el-checkbox
-              v-for="item of $d.fileType"
-              :key="`fileType${item.value}`"
-              :value="item.value + ''"
-              :label="item.value"
-              :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
-            >
+          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }]">
+          <el-checkbox-group v-model="form.FileType" @change="(v) => {
+            if (v && v.includes('-1')) {
+              form.FileType = ['-1']
+            }
+          }">
+            <el-checkbox v-for="item of $d.fileType" :key="`fileType${item.value}`" :value="item.value + ''"
+              :label="item.value" :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'">
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <!-- 分类 -->
         <!-- 分类数据来源 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
-          prop="ClassifyTableQuestionId"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')" prop="ClassifyTableQuestionId">
           <el-select v-model="form.ClassifyTableQuestionId" clearable>
-            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName"
-                      :value="item.Id"/>
+            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName" :value="item.Id" />
           </el-select>
         </el-form-item>
         <!-- 分类算法 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
-          prop="ClassifyAlgorithms"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')" prop="ClassifyAlgorithms">
           <div>
-            <el-table
-              ref="CalculateTable"
-              :data="ClassifyAlgorithmsList"
-              style="margin: 10px;width: 100%"
-              size="small"
-            >
+            <el-table ref="CalculateTable" :data="ClassifyAlgorithmsList" style="margin: 10px;width: 100%" size="small">
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:label')"
-                show-overflow-tooltip
-                min-width="70"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:label')" show-overflow-tooltip min-width="70">
                 <template slot-scope="scope">
                   {{ scope.row.label }}
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:gt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:gt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.gt"></el-input-number>
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:lt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:lt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.lt"></el-input-number>
                 </template>
@@ -569,11 +344,7 @@
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item>
         <!-- 取消 -->
-        <el-button
-          size="small"
-          type="primary"
-          @click="close"
-        >
+        <el-button size="small" type="primary" @click="close">
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
@@ -666,7 +437,8 @@ export default {
         ClassifyAlgorithms: null,
         // ExportIdentification: 0,
         ExportResult: [],
-        DefaultValue:null
+        DefaultValue: null,
+        ShowChartTypeEnum: 0
         // IsEnable: true
       },
       rules: {
@@ -677,8 +449,8 @@ export default {
         //   { max: 300, message: '最大长度为 300' }],
 
         TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { validator: validateTypeVal, trigger: 'blur' },
-          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
+        { validator: validateTypeVal, trigger: 'blur' },
+        { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
         ShowQuestion: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
@@ -776,7 +548,7 @@ export default {
           if (this.data.hasOwnProperty(k)) {
             if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
               this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
-            } else if(k === 'FileType'){
+            } else if (k === 'FileType') {
               this.form[k] = this.data[k].split(',')
             } else {
               this.form[k] = this.data[k]
@@ -792,10 +564,10 @@ export default {
             if (this.parentOptions[index].QuestionGenre === 3) {
               // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
               let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+
+              this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -814,9 +586,9 @@ export default {
             if (this.parentOptions[i].QuestionGenre === 3) {
               // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
               let dicCode = this.parentOptions[i].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -903,12 +675,12 @@ export default {
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
             // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
-             let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
+            let dicCode = this.parentOptions[index].DictionaryCode
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+
+            this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
+            })
           } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -929,10 +701,10 @@ export default {
           if (this.parentOptions[index].QuestionGenre === 3) {
             // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
             let dicCode = this.parentOptions[index].DictionaryCode
-            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-            
-            this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
             })
           } else {
             const options = []
@@ -993,6 +765,7 @@ export default {
       // form.ExportIdentification = 0
       form.ExportResult = []
       form.DefaultValue = null
+      form.ShowChartTypeEnum = 0
     },
     close() {
       this.$emit('close')
@@ -1001,5 +774,4 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 8c78fc40..60bee424 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -458,7 +458,7 @@
           </div>
         </div>
         <!-- 图表展示-->
-        <el-form-item v-if="form.Type === 'number' && !isFromSystem"
+        <el-form-item v-if="(form.Type === 'number' || form.Type === 'calculation') && !isFromSystem"
           :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
           <el-radio-group v-model="form.ShowChartTypeEnum">
             <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index 59d88710..d11b1a6f 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -260,7 +260,7 @@
           </div>
         </div>
         <!-- 图表展示-->
-        <el-form-item v-if="form.Type === 'number' && !isFromSystem"
+        <el-form-item v-if="(form.Type === 'number' || form.Type === 'calculation') && !isFromSystem"
           :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
           <el-radio-group v-model="form.ShowChartTypeEnum">
             <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>

From 3243b33b33eead8f3064a82f03061ff745e1b832 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 20 Nov 2025 15:48:40 +0800
Subject: [PATCH 096/333] =?UTF-8?q?=E9=98=85=E7=89=87=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E5=80=BC=E7=9A=84=E7=BB=9F=E8=AE=A1=E4=B8=8E?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/readingChart/index.vue         |  82 ++--
 src/styles/index.scss                         |   7 +
 .../reading/dicoms/components/DicomViewer.vue |  30 +-
 .../components/IRecist/QuestionForm.vue       | 418 +++++++---------
 .../components/IRecist/QuestionList.vue       | 230 ++++-----
 .../dicoms/components/IVUS/QuestionList.vue   |  25 +-
 .../components/IVUS/QuestionTableFormItem.vue | 214 ++++-----
 .../dicoms/components/Lugano/QuestionForm.vue | 441 ++++++++---------
 .../dicoms/components/Lugano/QuestionList.vue | 352 +++++++-------
 .../LuganoWithoutPET/QuestionForm.vue         | 445 ++++++++----------
 .../LuganoWithoutPET/QuestionList.vue         | 352 +++++++-------
 .../components/MRIPDFF/QuestionForm.vue       | 264 +++++------
 .../components/MRIPDFF/QuestionList.vue       | 161 ++++---
 .../dicoms/components/OCT/QuestionList.vue    |  13 +-
 .../components/OCT/QuestionTableFormItem.vue  | 216 ++++-----
 .../dicoms/components/PCWG/QuestionForm.vue   | 248 ++++------
 .../dicoms/components/PCWG/QuestionList.vue   | 159 ++++---
 .../dicoms/components/QuestionItem.vue        | 378 ++++++---------
 .../reading/dicoms/components/Questions.vue   |   6 +-
 .../reading/dicoms/components/ReadPage.vue    |  24 +-
 .../dicoms/components/Recist/QuestionForm.vue | 320 +++++--------
 .../dicoms/components/Recist/QuestionList.vue | 193 ++++----
 .../components/RecistBM/QuestionForm.vue      | 286 +++++------
 .../components/RecistBM/QuestionList.vue      | 187 ++++----
 .../reading/dicoms/components/ReportPage.vue  |  35 +-
 .../dicoms/customize/CustomizeDicomViewer.vue |   5 +-
 .../customize/CustomizeMeasurementList.vue    | 225 +++++----
 .../customize/CustomizeQuestionFormItem.vue   |  82 ++--
 .../CustomizeQuestionTableFormItem.vue        |  70 +--
 .../customize/CustomizeQuestionsPreview.vue   |  63 ++-
 .../dicoms/customize/CustomizeReadPage.vue    |  22 +-
 .../dicoms/customize/CustomizeReportPage.vue  |  35 +-
 .../reading/dicoms3D/components/ReadPage.vue  |  17 +-
 .../components/Recist/QuestionFormItem.vue    | 253 ++++------
 .../components/Recist/QuestionList.vue        |  13 +-
 .../Recist/TableQuestionFormItem.vue          | 213 ++++-----
 .../dicoms3D/components/ReportPage.vue        |  35 +-
 .../components/customize/QuestionFormItem.vue |  14 +-
 .../customize/QuestionTableFormItem.vue       |  14 +-
 .../components/customize/ReportPage.vue       |  31 +-
 .../components/mRecist/QuestionFormItem.vue   | 253 ++++------
 .../components/mRecist/QuestionList.vue       | 389 ++++++++-------
 .../mRecist/TableQuestionFormItem.vue         | 221 ++++-----
 .../visit-review/components/ReadPage.vue      |   1 +
 .../visit-review/components/ReportPage.vue    |  33 +-
 45 files changed, 3290 insertions(+), 3785 deletions(-)

diff --git a/src/components/readingChart/index.vue b/src/components/readingChart/index.vue
index aecca89d..08468337 100644
--- a/src/components/readingChart/index.vue
+++ b/src/components/readingChart/index.vue
@@ -1,8 +1,8 @@
 <template>
-    <div id="readingChart" class="readingChart" v-show="visible" :style="{
+    <div :id="key" class="readingChart" v-show="visible" :style="{
         'z-index': zIndex
-    }" :loading="loading">
-        <div ref="chartContainer" style="width: 490px; height: 290px;"></div>
+    }">
+        <div ref="chartContainer" style="width: 490px; height: 290px;" v-loading="loading"></div>
     </div>
 </template>
 
@@ -32,32 +32,35 @@ export default {
             visible: false,
             zIndex: 9,
             chart: null,
-            loading: false
+            loading: false,
+            key: 'readingChart'
         };
     },
     methods: {
         init(event, obj, zIndex = 9) {
+            this.loading = true
             this.zIndex = zIndex
-            // 设置菜单出现的位置
-            // 具体显示位置根据自己需求进行调节
-            this.visible = true
-            let readingChart = document.querySelector("#readingChart");
-            let chaY = document.body.clientHeight - event.clientY;
-            let chaX = document.body.clientWidth - event.clientX;
-            // 防止菜单太靠底，根据可视高度调整菜单出现位置
-            if (chaY < 250) {
-                readingChart.style.top = event.clientY - 220 + "px";
-            } else {
-                readingChart.style.top = event.clientY + "px";
+            let { key } = obj
+            if (key) {
+                this.key = key
             }
-            if (chaX < 150) {
-                readingChart.style.left = event.clientX - 520 + "px";
-            } else {
-                readingChart.style.left = event.clientX + 15 + "px";
-            }
-            this.getInfo(obj)
-            // this.initChart()
-            // document.addEventListener("click", this.foo); // 给整个document添加监听鼠标事件，点击任何位置执行foo方法
+            this.$nextTick(() => {
+                this.visible = true
+                let readingChart = document.querySelector(`#${this.key}`);
+                let chaY = document.body.clientHeight - event.clientY;
+                let chaX = document.body.clientWidth - event.clientX;
+                if (chaY < 250) {
+                    readingChart.style.top = event.clientY - 220 + "px";
+                } else {
+                    readingChart.style.top = event.clientY + "px";
+                }
+                if (chaX < 500) {
+                    readingChart.style.left = event.clientX - 520 + "px";
+                } else {
+                    readingChart.style.left = event.clientX + 15 + "px";
+                }
+                this.getInfo(obj)
+            })
         },
         async getInfo(data) {
             try {
@@ -70,7 +73,7 @@ export default {
                 this.loading = false
                 if (res.IsSuccess) {
                     let obj = {
-                        xAxisData: res.Result.VisitTaskNameList || [],
+                        xAxisData: res.Result.LatestScanDateList || [],
                         series: []
                     }
                     res.Result.ChartDataList.forEach(item => {
@@ -101,8 +104,32 @@ export default {
                 tooltip: {
                     trigger: 'axis'
                 },
-                xAxis: { data: obj.xAxisData },
-                yAxis: { type: 'value' },
+                xAxis: {
+                    data: obj.xAxisData,
+                    axisLine: { // 设置 x 轴线颜色
+                        lineStyle: {
+                            color: '#fff',
+                        }
+                    },
+                    axisLabel: { // 设置 x 轴文字颜色
+                        textStyle: {
+                            color: '#fff'
+                        }
+                    }
+                },
+                yAxis: {
+                    type: 'value',
+                    axisLabel: {
+                        textStyle: {
+                            color: '#fff',
+                        }
+                    },
+                    axisLine: {
+                        lineStyle: {
+                            color: '#fff',
+                        }
+                    }
+                },
                 series: obj.series
             };
             // 4. 使用配置项渲染图表
@@ -129,7 +156,8 @@ export default {
     max-width: 500px;
     font-size: 14px;
     display: inline-block;
-    background: #fff;
+    background: #000;
+    border: 1px solid #ebeef5;
     border-radius: 4px;
     position: fixed;
     padding: 10px 6px;
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 77906de2..13ba518a 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -364,4 +364,11 @@ body .el-table th.gutter {
   height: 30px !important;
   margin-left: 10px;
   cursor: pointer;
+}
+
+.svg-readingChart-mini {
+  width: 18px !important;
+  height: 20px !important;
+  vertical-align: -0.4em !important;
+  cursor: pointer;
 }
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 91da05e1..59d026c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -457,32 +457,41 @@
             <div class="form-wrapper" v-show="listShow">
               <RecistBMQuestionList v-if="CriterionType === 17" ref="measurementList"
                 :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
+                @handleReadingChart="handleReadingChart" />
               <IRecistQuestionList v-else-if="CriterionType === 3" ref="measurementList"
                 :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
+                @handleReadingChart="handleReadingChart" />
               <PCWGQuestionList v-else-if="CriterionType === 10" ref="measurementList"
                 :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
+                @handleReadingChart="handleReadingChart" />
               <LuganoQuestionList v-else-if="CriterionType === 2" ref="measurementList"
                 :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
+                @handleReadingChart="handleReadingChart" />
               <LuganoWithoutPETQuestionList v-else-if="CriterionType === 18" ref="measurementList"
                 :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
+                @handleReadingChart="handleReadingChart" />
               <RecistQuestionList v-else-if="CriterionType === 1" ref="measurementList"
                 :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
+                @handleReadingChart="handleReadingChart" />
 
               <IVUSList v-else-if="CriterionType === 19" ref="measurementList"
                 :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
+                @handleReadingChart="handleReadingChart" />
               <OCTList v-else-if="CriterionType === 20" ref="measurementList"
                 :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
+                @handleReadingChart="handleReadingChart" />
               <MRIPDFF v-else-if="CriterionType === 21" ref="measurementList"
                 :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+                :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
+                @handleReadingChart="handleReadingChart" />
               <h2 v-else style="color:#ddd">
                 Developing...
               </h2>
@@ -1149,6 +1158,9 @@ export default {
     })
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async handleSubmitKeyDoc() {
       try {
         let data = {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 6bc066c0..ef1b47d2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -19,179 +13,118 @@
         </div>
       </div>
 
-      <el-form-item
-        :label="$t('trials:reading:title:lesionType')"
-        prop="LesionType"
-        :rules="[
-          { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
-        ]"
-      >
+      <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 && !(isFirstChangeTask && (lesionType === 2 || lesionType === 5 || lesionType === 6)))"
-          @change="((val)=>{lesionTypeChange(val)})"
-        >
+        <el-select v-model="questionForm.LesionType" filterable
+          :disabled="!isCurrentTask || readingTaskState >= 2 || (!isBaseLineTask && !(isFirstChangeTask && (lesionType === 2 || lesionType === 5 || lesionType === 6)))"
+          @change="((val) => { lesionTypeChange(val) })">
 
-          <el-option
-            v-for="item of $d.LesionType"
+          <el-option v-for="item of $d.LesionType"
             v-show="(isBaseLineTask && (item.value === 0 || item.value === 1)) || (!isBaseLineTask && ((isFirstChangeTask && (item.value === 5 || item.value === 6)) || !isFirstChangeTask))"
-            :key="item.id"
-            :value="item.value"
-            :label="item.label"
-          />
+            :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']},
-        ]"
-      >
+      <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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2 ) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (isFirstChangeTask && (lesionType === 5 || lesionType === 6) && (qs.QuestionMark === 8 || qs.QuestionMark === 10 ))"
-            @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 v-if="qs.Type === 'input' || qs.Type === 'number'">
+          <div style="display: flex;justify-content: space-between;">
+            <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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (isFirstChangeTask && (lesionType === 5 || lesionType === 6) && (qs.QuestionMark === 8 || qs.QuestionMark === 10))"
+              @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>
+            <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  TableQuestionId: qs.Id,
+                  RowIndex: questionForm.RowIndex
+                }
+              })" />
+          </div>
         </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-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
+        <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
           :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && isFirstChangeTask ) || (qs.QuestionMark === 8 && isFirstChangeTask)"
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
+          :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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && isFirstChangeTask) || (qs.QuestionMark === 8 && isFirstChangeTask)"
+          @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]"
-            />
+            <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))) && (crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[qs.DictionaryCode]"
+              v-show="((lesionType === 0 && item.value === 0) || (lesionType === 1 && (item.value === 0))) && (crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
+              :key="item.id" :value="item.value" :label="item.label" />
           </template>
-          <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && isFirstChangeTask && (lesionType === 5 || lesionType ===6)">
-            <el-option
-              v-for="item of $d[qs.DictionaryCode]"
-              v-show="((lesionType === 5 && item.value ===1) || (lesionType === 6 && (item.value ===0))) && (crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+          <template
+            v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && isFirstChangeTask && (lesionType === 5 || lesionType === 6)">
+            <el-option v-for="item of $d[qs.DictionaryCode]"
+              v-show="((lesionType === 5 && item.value === 1) || (lesionType === 6 && (item.value === 0))) && (crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
+              :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(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode,parseFloat(answers.LastTaskState))}` : ''"
-            >
+              :label="!isNaN(parseFloat(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode, parseFloat(answers.LastTaskState))}` : ''">
               <!-- 首次分裂的病灶只能选择存在 -->
-              <template v-if="answers.IsFristAdd=== 'True' && answers.SplitOrMergeType === '0'">
-                <el-option
-                  v-for="item of $d[qs.DictionaryCode]"
-                  v-show="((lesionType === 0 && item.value === 0) || (lesionType === 1 && item.value === 0 ) || (lesionType === 2 && item.value === 0 )|| (lesionType === 5 && item.value === 1 )|| (lesionType === 6 && item.value === 0 )|| (lesionType === 7 && item.value === 0 )|| (lesionType === 8 && item.value === 1 )) && (crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
-                  :key="item.id"
-                  :value="item.value"
-                  :label="item.label"
-                />
+              <template v-if="answers.IsFristAdd === 'True' && answers.SplitOrMergeType === '0'">
+                <el-option v-for="item of $d[qs.DictionaryCode]"
+                  v-show="((lesionType === 0 && item.value === 0) || (lesionType === 1 && item.value === 0) || (lesionType === 2 && item.value === 0) || (lesionType === 5 && item.value === 1) || (lesionType === 6 && item.value === 0) || (lesionType === 7 && item.value === 0) || (lesionType === 8 && item.value === 1)) && (crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
+                  :key="item.id" :value="item.value" :label="item.label" />
               </template>
-              <template v-else-if="isCurrentTaskAdd=== 'True' && (lesionType === 2 || lesionType === 8)">
+              <template v-else-if="isCurrentTaskAdd === 'True' && (lesionType === 2 || lesionType === 8)">
                 <!-- 首次添加的新病灶不能为无法评估和消失 -->
-                <el-option
-                  v-for="item of $d[qs.DictionaryCode]"
+                <el-option v-for="item of $d[qs.DictionaryCode]"
                   v-show="(((item.value === 0 || item.value === 1) && lesionType === 2) || ((item.value === 1 || item.value === 2) && lesionType === 8)) && (crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
-                  :key="item.id"
-                  :value="item.value"
-                  :label="item.label"
-                />
+                  :key="item.id" :value="item.value" :label="item.label" />
               </template>
-              <template v-else-if="isCurrentTaskAdd=== 'False' && lesionType === 1 && answers.LastTaskState !== '4'">
-                <el-option
-                  v-for="item of filterState($d[qs.DictionaryCode])"
+              <template v-else-if="isCurrentTaskAdd === 'False' && lesionType === 1 && answers.LastTaskState !== '4'">
+                <el-option v-for="item of filterState($d[qs.DictionaryCode])"
                   v-show="(item.value !== 5) && (crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
-                  :key="item.id"
-                  :value="item.value"
-                  :label="item.label"
-                />
+                  :key="item.id" :value="item.value" :label="item.label" />
               </template>
               <template v-else>
-                <el-option
-                  v-for="item of filterState($d[qs.DictionaryCode])"
-                  v-show="crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1"
-                  :key="item.id"
-                  :value="item.value"
-                  :label="item.label"
-                />
+                <el-option v-for="item of filterState($d[qs.DictionaryCode])"
+                  v-show="crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1" :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]"
-              v-show="crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[qs.DictionaryCode]"
+              v-show="crterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1" :key="item.id"
+              :value="item.value" :label="item.label" />
           </template>
           <template v-else-if="qs.TypeValue">
-            <el-option
-              v-for="val in qs.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-              :value="val"
-            />
+            <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"
-          >
+        <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>
@@ -199,33 +132,21 @@
 
     </div>
 
-    <div
-      v-if="isCurrentTask && readingTaskState<2"
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
+    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
+      style="text-align:right;margin-top:10px;">
       <!-- 清除标记 -->
       <el-button
         v-if="questionForm.MeasureData && (!isFirstChangeTask || (isFirstChangeTask && (lesionType === 5 || lesionType === 6)))"
-        size="mini"
-        @click="handleDeleteMeasureData"
-      >
+        size="mini" @click="handleDeleteMeasureData">
         {{ $t('trials:reading:button:removeMark') }}
       </el-button>
       <!-- 删除 -->
-      <el-button
-        v-if="!isFirstChangeTask && isCurrentTaskAdd !== 'False'"
-        size="mini"
-        @click="handleDelete"
-      >
+      <el-button v-if="!isFirstChangeTask && isCurrentTaskAdd !== 'False'" size="mini" @click="handleDelete">
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button
-        v-if="(isFirstChangeTask && (lesionType === 5 || lesionType === 6)) || !isFirstChangeTask"
-        size="mini"
-        @click="handleSave"
-      >
+      <el-button v-if="(isFirstChangeTask && (lesionType === 5 || lesionType === 6)) || !isFirstChangeTask" size="mini"
+        @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -330,6 +251,9 @@ export default {
     DicomEvent.$off('handleImageQualityAbnormal')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initForm() {
       const loading = this.$loading({ fullscreen: true })
       this.questions.forEach(item => {
@@ -375,12 +299,12 @@ export default {
         await this.setMeasureData(this.answers.measureObj, true)
       } else {
         if (this.questionForm.MeasureData) {
-        // 十字线工具 且是靶病灶  器官只能是淋巴结类型
+          // 十字线工具 且是靶病灶  器官只能是淋巴结类型
           if (this.questionForm.MeasureData.type === 'Bidirectional') {
             this.organList = []
             await this.getOrganInfoList(1)
           } else if (this.questionForm.MeasureData.type === 'Length') {
-          // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
+            // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
             this.organList = []
             await this.getOrganInfoList(0)
           } else {
@@ -486,8 +410,8 @@ export default {
               type: 'warning',
               distinguishCancelAndClose: true
             })
-              .then(() => {})
-              .catch(() => {})
+              .then(() => { })
+              .catch(() => { })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
           }
@@ -500,7 +424,7 @@ export default {
             this.$confirm(msg, {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
@@ -735,7 +659,7 @@ export default {
                 }
               }
             }
-            
+
             var status = ''
             if (lesionState) {
               if (this.lesionType === 0 && lesionState === 1) {
@@ -926,7 +850,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg19'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -938,7 +862,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg20'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -955,7 +879,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg21'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -967,7 +891,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg22'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -985,7 +909,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg23'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -997,7 +921,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg24'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1013,7 +937,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg25'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1029,7 +953,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg26'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1050,7 +974,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg27'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1062,7 +986,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg28'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1078,7 +1002,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg29'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1090,7 +1014,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg30'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1111,7 +1035,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg31'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1123,7 +1047,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg32'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1140,7 +1064,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1152,7 +1076,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg34'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1169,7 +1093,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg35'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1181,7 +1105,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg36'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1198,7 +1122,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1210,7 +1134,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg38'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1227,7 +1151,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1239,7 +1163,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg34'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1256,7 +1180,7 @@ export default {
               this.$confirm(this.$t('trials:iRecist:warnning:msg50'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1268,7 +1192,7 @@ export default {
               this.$confirm(this.$t('trials:iRecist:warnning:msg51'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1285,7 +1209,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg39'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1297,7 +1221,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg40'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1314,7 +1238,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg41'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1326,7 +1250,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg42'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1343,7 +1267,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg43'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1355,7 +1279,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg44'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1372,7 +1296,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1384,7 +1308,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg46'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1404,7 +1328,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg31'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1416,7 +1340,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg32'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1433,7 +1357,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg1'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1445,7 +1369,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg2'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1460,7 +1384,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg3'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1472,7 +1396,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg4'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1493,7 +1417,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg5'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1505,7 +1429,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg6'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1522,7 +1446,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg33'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1538,7 +1462,7 @@ export default {
                   this.$confirm(this.$t('trials:iRecist:warnning:msg34'), {
                     type: 'warning',
                     showCancelButton: false,
-                    callback: action => {}
+                    callback: action => { }
                   })
                   loading.close()
                   return
@@ -1595,7 +1519,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg7'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1607,7 +1531,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg8'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1623,7 +1547,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg9'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1635,7 +1559,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg10'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1651,7 +1575,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg11'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1663,7 +1587,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg12'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1679,7 +1603,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg13'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1691,7 +1615,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg14'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1711,7 +1635,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg15'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1723,7 +1647,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg16'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1740,7 +1664,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg17'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1752,7 +1676,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg18'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1769,7 +1693,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg19'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1781,7 +1705,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg20'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1798,7 +1722,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg21'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1810,7 +1734,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg22'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1829,7 +1753,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg23'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1841,7 +1765,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg24'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1858,7 +1782,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg25'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1870,7 +1794,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg26'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1886,7 +1810,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg27'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1898,7 +1822,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg28'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1914,7 +1838,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg29'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1926,7 +1850,7 @@ export default {
                 this.$confirm(this.$t('trials:iRecist:warnning:msg30'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -2167,42 +2091,50 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  ::v-deep .el-form-item__label{
+.measurement-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+  ::v-deep .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index 127e380a..8bd4a380 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -8,43 +8,47 @@
           <span style="margin-left:5px;">{{ 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="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
       <!-- 非测量问题 -->
       <div class="lesions">
-        <Questions
-          ref="ecrf"
-          :question-form-change-state="questionFormChangeState"
-          :question-form-change-num="questionFormChangeNum"
-          :is-first-change-task="isFirstChangeTask"
-        />
+        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState"
+          :question-form-change-num="questionFormChangeNum" :is-first-change-task="isFirstChangeTask"
+          @handleReadingChart="handleReadingChart" />
       </div>
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <div v-for="item in qs.Childrens" v-show="(!isConvertedTask && !(isBaseLineTask && item.LesionType === 2)) || (isConvertedTask && (isFirstChangeTask && item.LesionType !== 8) || (!isFirstChangeTask && item.LesionType !== 2))" :key="item.Id">
+            <div v-for="item in qs.Childrens"
+              v-show="(!isConvertedTask && !(isBaseLineTask && item.LesionType === 2)) || (isConvertedTask && (isFirstChangeTask && item.LesionType !== 8) || (!isFirstChangeTask && item.LesionType !== 2))"
+              :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
-                <div
-                  v-if="isFirstChangeTask && item.LesionType === 2 && readingTaskState<2"
-                  class="title"
-                >
+                <div v-if="isFirstChangeTask && item.LesionType === 2 && readingTaskState < 2" class="title">
                   {{ item.QuestionName }}
-                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">{{ $t("trials:reading:dicom:IRecist:reevaluate") }}</span>
+                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0"
+                    style="color:red;font-size: 12px;">{{ $t("trials:reading:dicom:IRecist:reevaluate") }}</span>
                 </div>
                 <div v-else class="title">
                   {{ item.QuestionName }}
+                  <svg-icon v-if="item.LesionType === 0" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0
+                      },
+                    })" />
                 </div>
-                <div v-if="readingTaskState<2 && ((!isConvertedTask && (isBaseLineTask || item.LesionType === 2)) || (isConvertedTask && !isFirstChangeTask && item.LesionType === 8))" class="add-icon" @click.prevent="handleAdd(item)">
+                <div
+                  v-if="readingTaskState < 2 && ((!isConvertedTask && (isBaseLineTask || item.LesionType === 2)) || (isConvertedTask && !isFirstChangeTask && item.LesionType === 8))"
+                  class="add-icon" @click.prevent="handleAdd(item)">
                   <i class="el-icon-plus" />
                 </div>
 
@@ -52,109 +56,106 @@
                   111
                 </div> -->
               </div>
-              <el-collapse
-                v-if="item.Type === 'table' && item.TableQuestions"
-                v-model="activeName"
-                accordion
-                @change="handleCollapseChange"
-              >
-                <el-collapse-item
-                  v-for="(q,i) in item.TableQuestions.Answers"
-                  :key="`${item.Id}_${q.RowIndex}`"
+              <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
+                @change="handleCollapseChange">
+                <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                   :name="`${item.Id}_${q.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
-                >
+                  @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                   <template slot="title">
-                    <div
-                      style="width:300px;position: relative;"
-                      :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}"
-                    >
+                    <div style="width:300px;position: relative;"
+                      :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : '#fff') }">
 
-                      {{ getLesionName(item.OrderMark,q.RowIndex) }}
+                      {{ getLesionName(item.OrderMark, q.RowIndex) }}
                       <!-- 未保存 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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: 62px;top: 2px;">
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
                         <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div
-                            v-if="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
-                          >
-                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                               <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
                             </el-tooltip>
                           </div>
-                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
                             <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else-if="item.LesionType === 2">
-                              {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else-if="item.LesionType === 5">
-                              {{ $fd('NewTargetLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NewTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else-if="item.LesionType === 6">
-                              {{ $fd('NewNoTargetLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NewNoTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else-if="item.LesionType === 7">
-                              {{ $fd('OtherPreviousNewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('OtherPreviousNewLesionState',
+                                parseInt(item.TableQuestions.Answers[i].lesionState))
+                              }}
                             </span>
                             <span v-else-if="item.LesionType === 8">
-                              {{ $fd('NewLesionAfterTriggeringiRECSITState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{
+                                $fd('NewLesionAfterTriggeringiRECSITState',
+                                  parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                            <template
+                              v-if="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
                               {{ item.TableQuestions.Answers[i].lesionShort }}mm
                             </template>
-                            <template v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                            <template
+                              v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
                               {{ item.TableQuestions.Answers[i].lesionLength }}mm
                             </template>
                           </div>
                         </div>
                       </div>
-                      <div v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0,1,4,5].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 5 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1) || (item.LesionType === 6 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 7 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 8 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                      <div
+                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1, 4, 5].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 5 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1) || (item.LesionType === 6 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 7 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 8 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
-                        <el-tooltip v-show="readingTaskState<2 && !!item.TableQuestions.Answers[i].RowId && (!isBaseLineTask && !isFirstChangeTask ) && item.TableQuestions.Answers[i].isDicomReading !== false" class="item" :content="$t('trials:reading:button:split')" placement="left">
-                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />
+                        <el-tooltip
+                          v-show="readingTaskState < 2 && !!item.TableQuestions.Answers[i].RowId && (!isBaseLineTask && !isFirstChangeTask) && item.TableQuestions.Answers[i].isDicomReading !== false"
+                          class="item" :content="$t('trials:reading:button:split')" placement="left">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
                       </div>
 
                     </div>
 
                   </template>
-                  <QuestionForm
-                    :ref="`${item.Id}_${q.RowIndex}`"
-                    :questions="item.TableQuestions.Questions"
-                    :answers="item.TableQuestions.Answers[i]"
-                    :lesion-type="item.LesionType"
-                    :order-mark="item.OrderMark"
-                    :table-questions="tableQuestions"
-                    :row-index="String(q.RowIndex)"
-                    :question-name="item.QuestionName"
-                    :parent-qs-id="item.Id"
-                    :crterion-dictionary-group="item.CrterionDictionaryGroup"
-                    :visit-task-id="visitTaskId"
-                    :is-current-task="isCurrentTask"
-                    :is-first-change-task="isFirstChangeTask"
-                    :is-converted-task="isConvertedTask"
-                    :reading-task-state="readingTaskState"
-                    :is-base-line-task="isBaseLineTask"
-                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
-                    @determineExistsUnsavedLession="determineExistsUnsavedLession"
-                    @resetQuestions="resetQuestions"
-                    @close="close"
-                  />
+                  <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName" :parent-qs-id="item.Id"
+                    :crterion-dictionary-group="item.CrterionDictionaryGroup" :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask" :is-first-change-task="isFirstChangeTask"
+                    :is-converted-task="isConvertedTask" :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask" @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @determineExistsUnsavedLession="determineExistsUnsavedLession" @resetQuestions="resetQuestions"
+                    @close="close" @handleReadingChart="handleReadingChart" />
                 </el-collapse-item>
 
               </el-collapse>
@@ -275,6 +276,9 @@ export default {
     DicomEvent.$off('getUnSaveTarget')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -568,7 +572,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           } else {
             // 是否确认分裂
             this.$confirm(this.$t('trials:reading:warnning:msg4'), {
@@ -578,7 +582,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           }
         }
       }
@@ -736,7 +740,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -747,7 +751,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
       } else {
         // saveTypeEnum: 0
@@ -898,7 +902,7 @@ export default {
     async changeLesionType(questionsObj) {
       await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
       // saveTypeEnum: 0
-      var lesionObj = { }
+      var lesionObj = {}
       var questionObj = questionsObj.questionForm
       // 切换到新的病灶集合
       var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
@@ -1176,23 +1180,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -1200,14 +1207,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -1216,42 +1225,49 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .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;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1260,7 +1276,7 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 1c3857d4..17c2b431 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -18,7 +18,7 @@
       <!-- 影像质量问题 -->
       <div class="lesions">
         <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-          :group-classify="1" />
+          :group-classify="1" @handleReadingChart="handleReadingChart" />
       </div>
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
@@ -37,7 +37,8 @@
                       <div class="add-icon" @click.prevent="downloadTpl">
                         <i class="el-icon-download" />
                       </div>
-                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
+                      <div class="add-icon" style="margin: 0 5px;"
+                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
                         <i class="el-icon-upload2" />
                       </div>
                       <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
@@ -100,9 +101,18 @@
                           @change="((val) => { formItemChange(val, item) })" />
                       </template>
                       <template v-if="item.Type === 'number'">
-                        <el-input-number v-model="questionForm[item.Id]"
-                          :disabled="!isCurrentTask || readingTaskState >= 2" :precision="0"
-                          @change="((val) => { formItemChange(val, item) })" />
+                        <div style="display: flex;justify-content: space-between;">
+                          <el-input-number v-model="questionForm[item.Id]"
+                            :disabled="!isCurrentTask || readingTaskState >= 2" :precision="0"
+                            @change="((val) => { formItemChange(val, item) })" />
+                          <svg-icon v-if="item.ShowChartTypeEnum > 0" icon-class="readingChart"
+                            class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
+                              e,
+                              data: {
+                                QuestionId: item.Id
+                              }
+                            })" />
+                        </div>
                       </template>
                       <template v-if="item.Type === 'select'">
                         <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
@@ -159,7 +169,7 @@
         <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
           <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
             :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
-            @resetFormItemData="resetFormItemData" />
+            @resetFormItemData="resetFormItemData" @handleReadingChart="handleReadingChart" />
           <el-form-item style="text-align: right">
             <el-button size="small" @click="addOrEdit.visible = false">
               {{ $t('common:button:cancel') }}
@@ -286,6 +296,9 @@ export default {
     DicomEvent.$off('refreshQuestions')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
index 8500284f..fa6ee2be 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
@@ -1,119 +1,66 @@
 <template>
   <div>
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ 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']},
+        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' : '']"
-      >
+        :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-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-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]"
+        <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)})"
-        >
+          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]"
-            />
+            <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"
-            />
+            <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
+            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"
-            />
+            <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)})"
-        >
+        <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)"
-            >
+            <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"
-            >
+            <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"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
+        <el-checkbox-group v-else-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2" @change="((val) => { formItemChange(val, question) })">
+          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
             {{ val }}
           </el-checkbox>
         </el-checkbox-group>
@@ -144,40 +91,37 @@
           />
         </template> -->
         <!-- 数值类型 -->
-        <el-input
-          v-else-if="question.Type==='number'"
-          v-model="questionForm[question.Id]"
-          :disabled="readingTaskState>=2 "
-          type="number"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <template v-if="question.Unit" slot="append">
-            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
-          </template>
-        </el-input>
+        <div style="display: flex;justify-content: space-between;"
+          v-else-if="question.Type === 'number' || question.Type === 'calculation'">
+          <el-input v-if="question.Type === 'number'" v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2" type="number" @change="((val) => { formItemChange(val, question) })">
+            <template v-if="question.Unit" slot="append">
+              {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+            </template>
+          </el-input>
+
+          <el-input v-else-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled
+            @change="((val) => { formItemChange(val, question) })">
+            <template v-if="question.Unit" slot="append">
+              {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+            </template>
+          </el-input>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                TableQuestionId: question.Id,
+                RowIndex: questionForm.RowIndex
+              }
+            })" />
+        </div>
 
-        <el-input
-          v-else-if="question.Type==='calculation'"
-          v-model="questionForm[question.Id]"
-          disabled
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <template v-if="question.Unit" slot="append">
-            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
-          </template>
-        </el-input>
       </el-form-item>
     </template>
 
-    <QuestionTableFormItem
-      v-for="item in question.Childrens"
-      :key="item.Id"
-      :question="item"
-      :question-form="questionForm"
-      :reading-task-state="readingTaskState"
-      @setFormItemData="setFormItemData"
-      @resetFormItemData="resetFormItemData"
-    />
+    <QuestionTableFormItem v-for="item in question.Childrens" :key="item.Id" :question="item"
+      :question-form="questionForm" :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
+      @resetFormItemData="resetFormItemData" />
   </div>
 </template>
 <script>
@@ -214,6 +158,9 @@ export default {
     this.digitPlaces = Number(localStorage.getItem('digitPlaces'))
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     formItemChange(v, question) {
       if (question.Childrens && question.Childrens.length > 0) {
         this.resetChild(question.Childrens)
@@ -269,29 +216,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.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;
-  }
+
+::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/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 5b13de71..5e5ff1f7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="lesionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -19,198 +13,135 @@
         </div>
       </div>
       <div ref="scrollPanel" style="height: 420px;overflow-y: auto;overflow-x: hidden;" @scroll.stop="scrollHandle">
-        <el-form-item
-          :label="$t('trials:reading:title:lesionType')"
-          prop="LesionType"
-          :rules="[
-            { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
-          ]"
-        >
+        <el-form-item :label="$t('trials:reading:title:lesionType')" prop="LesionType" :rules="[
+          { required: true, message: $t('common:ruleMessage:select'), trigger: ['blur'] },
+        ]">
           <!-- 下拉框 -->
-          <el-select
-            :ref="`select_LesionType`"
-            v-model="questionForm.LesionType"
-            filterable
-            :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
-            @change="((val)=>{lesionTypeChange(val)})"
-          >
+          <el-select :ref="`select_LesionType`" v-model="questionForm.LesionType" filterable
+            :disabled="!isCurrentTask || readingTaskState >= 2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
+            @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-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 && (qs.RelevanceValue.includes(questionForm[qs.RelevanceId]))) || (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']},
-          ]"
-        >
+        <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 && (qs.RelevanceValue.includes(questionForm[qs.RelevanceId]))) || (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'">
+          <template v-if="qs.Type === 'input' || qs.Type === 'number'">
+            <div style="display: flex;justify-content: space-between;">
+              <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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || answers.SplitOrMergeType === '1'"
+                @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>
+              <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+                @click.stop="(e) => handleReadingChart({
+                  e,
+                  data: {
+                    TableQuestionId: qs.Id,
+                    RowIndex: questionForm.RowIndex
+                  }
+                })" />
+            </div>
             <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
-            <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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || answers.SplitOrMergeType === '1'"
-              @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}"
-            maxlength="500"
-            :disabled="!isCurrentTask || readingTaskState>=2 || answers.SplitOrMergeType === '1'"
-            @change="((val)=>{formItemChange(val, qs)})"
-          />
+          <el-input v-if="qs.Type === 'textarea'" v-model="questionForm[qs.Id]" type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }" maxlength="500"
+            :disabled="!isCurrentTask || readingTaskState >= 2 || answers.SplitOrMergeType === '1'"
+            @change="((val) => { formItemChange(val, qs) })" />
           <!-- 下拉框 -->
           <!-- :disabled="!isCurrentTask || readingTaskState>=2 || (!isBaseLineTask && qs.QuestionMark === 5 && isCurrentTaskAdd === 'False') || qs.QuestionMark === 2 || (qs.QuestionMark === 8 && !isBaseLineTask && isCurrentTaskAdd === 'False')" -->
 
-          <el-select
-            v-if="qs.Type==='select'"
-            :ref="`select_${qs.Id}`"
-            v-model="questionForm[qs.Id]"
-            filterable
+          <el-select v-if="qs.Type === 'select'" :ref="`select_${qs.Id}`" v-model="questionForm[qs.Id]" filterable
             :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
-            @change="((val)=>{formItemChange(val, qs)})"
-          >
+            :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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
+            @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]"
-              />
+              <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"
-              />
+              <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(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode,parseFloat(answers.LastTaskState))}` : ''"
-              >
+                :label="!isNaN(parseFloat(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode, parseFloat(answers.LastTaskState))}` : ''">
                 <!-- 首次分裂的病灶只能选择存在 -->
-                <template v-if="answers.IsFristAdd=== 'True' && answers.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 v-if="answers.IsFristAdd === 'True' && answers.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 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"
-                  />
+                  <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"
-              />
+              <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"
-              />
+              <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 || answers.SplitOrMergeType === '1'"
-          >
-            <el-radio
-              v-for="val in qs.options.split('|')"
-              :key="val"
-              :label="val"
-              @change="((val)=>{formItemChange(val, qs)})"
-            >
+          <el-radio-group v-if="qs.Type === 'radio'" v-model="questionForm[qs.id]"
+            :disabled="!isCurrentTask || readingTaskState >= 2 || answers.SplitOrMergeType === '1'">
+            <el-radio v-for="val in qs.options.split('|')" :key="val" :label="val"
+              @change="((val) => { formItemChange(val, qs) })">
               {{ val }}
             </el-radio>
           </el-radio-group>
           <template v-if="qs.QuestionMark === 20">
             <div style="display: flex;flex-direction: row;justify-content: flex-start;">
-
-              <el-input
-                v-if="qs.Type==='calculation'"
-                v-model="questionForm[qs.Id]"
-                disabled
-                style="width:120px;"
-                @change="((val)=>{formItemChange(val, qs)})"
-              >
-                <template v-if="qs.Unit" slot="append">
-                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-                </template>
-              </el-input>
-              <viewer
-                v-if="answers.OtherPicturePath"
-                ref="viewer"
-                style="margin:0 10px;"
-                :images="[`${OSSclientConfig.basePath}${answers.OtherPicturePath}`]"
-              >
+              <div style="display: flex;justify-content: space-between;" v-if="qs.Type === 'calculation'">
+                <el-input v-if="qs.Type === 'calculation'" v-model="questionForm[qs.Id]" disabled style="width:120px;"
+                  @change="((val) => { formItemChange(val, qs) })">
+                  <template v-if="qs.Unit" slot="append">
+                    {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                  </template>
+                </el-input>
+                <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+                  @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      TableQuestionId: qs.Id,
+                      RowIndex: questionForm.RowIndex
+                    }
+                  })" />
+              </div>
+              <viewer v-if="answers.OtherPicturePath" ref="viewer" style="margin:0 10px;"
+                :images="[`${OSSclientConfig.basePath}${answers.OtherPicturePath}`]">
                 <span style="color:#409eff;cursor: pointer" @click="previewImage()">
                   {{ $t('trials:lugano:button:suvscreenshot1') }}
                 </span>
-                <img
-                  v-show="false"
-                  crossorigin="anonymous"
-                  :src="`${OSSclientConfig.basePath}${answers.OtherPicturePath}`"
-                  alt="Image"
-                >
+                <img v-show="false" crossorigin="anonymous"
+                  :src="`${OSSclientConfig.basePath}${answers.OtherPicturePath}`" alt="Image">
               </viewer>
               <!-- <img
                 v-if="answers.OtherPicturePath"
@@ -226,45 +157,39 @@
             </div>
           </template>
           <template v-else>
-            <el-input
-              v-if="qs.Type==='calculation'"
-              v-model="questionForm[qs.Id]"
-              disabled
-              @change="((val)=>{formItemChange(val, qs)})"
-            >
-              <template v-if="qs.Unit" slot="append">
-                {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-              </template>
-            </el-input>
+            <div style="display: flex;justify-content: space-between;" v-if="qs.Type === 'calculation'">
+              <el-input v-if="qs.Type === 'calculation'" v-model="questionForm[qs.Id]" disabled
+                @change="((val) => { formItemChange(val, qs) })">
+                <template v-if="qs.Unit" slot="append">
+                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                </template>
+              </el-input>
+              <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+                @click.stop="(e) => handleReadingChart({
+                  e,
+                  data: {
+                    TableQuestionId: qs.Id,
+                    RowIndex: questionForm.RowIndex
+                  }
+                })" />
+            </div>
+
           </template>
         </el-form-item>
       </div>
       <div
-        v-if="isCurrentTask && readingTaskState<2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
-        class="base-dialog-footer"
-        style="text-align:right;margin-top:10px;"
-      >
+        v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+        class="base-dialog-footer" style="text-align:right;margin-top:10px;">
         <!-- 清除标记 -->
-        <el-button
-          v-if="questionForm.MeasureData"
-          size="mini"
-          @click="handleDeleteMeasureData"
-        >
+        <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
           {{ $t('trials:reading:button:removeMark') }}
         </el-button>
         <!-- 删除 -->
-        <el-button
-          v-if="isCurrentTaskAdd !== 'False'"
-          size="mini"
-          @click="handleDelete"
-        >
+        <el-button v-if="isCurrentTaskAdd !== 'False'" size="mini" @click="handleDelete">
           {{ $t('common:button:delete') }}
         </el-button>
         <!-- 保存 -->
-        <el-button
-          size="mini"
-          @click="handleSave"
-        >
+        <el-button size="mini" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
       </div>
@@ -368,6 +293,9 @@ export default {
     // container.removeEventListener('scroll', this.scrollHandle , true)
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     scrollHandle() {
       for (const k in this.$refs) {
         if (k.indexOf('select_') === -1) continue
@@ -505,11 +433,11 @@ export default {
           if ((ldi > 15 && ldi <= 20) && (pddIncrease >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
             this.stateDisabled = true
           } else if ((ldi > 20) && (pddIncrease >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
-          /** 疾病进展
-           * 当前靶病灶LDi>20 mm
-           * 相比最低点PPD增加百分比 ≥50％
-           * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
-          **/
+            /** 疾病进展
+             * 当前靶病灶LDi>20 mm
+             * 相比最低点PPD增加百分比 ≥50％
+             * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
+            **/
             this.stateDisabled = true
           } else {
             this.stateDisabled = false
@@ -607,8 +535,8 @@ export default {
               type: 'warning',
               distinguishCancelAndClose: true
             })
-              .then(() => {})
-              .catch(() => {})
+              .then(() => { })
+              .catch(() => { })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
           }
@@ -621,7 +549,7 @@ export default {
             this.$confirm(msg, {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
@@ -653,7 +581,7 @@ export default {
       })
     },
     deleteLesionInfo() {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         const loading = this.$loading({ fullscreen: true })
         var param = {
           visitTaskId: this.visitTaskId,
@@ -810,7 +738,7 @@ export default {
             if (this.lesionType === 0) {
               this.calculatePPD()
             }
-            
+
             var status = ''
             if (lesionState) {
               if (this.lesionType === 0 && lesionState === 1) {
@@ -965,31 +893,31 @@ export default {
             this.stateDisabled = false
           }
         } else {
-        /** 疾病进展
-         * 15mm<当前靶病灶LDi≤20mm
-         * 相比最低点PPD增加百分比 ≥50％
-         * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
-        **/
+          /** 疾病进展
+           * 15mm<当前靶病灶LDi≤20mm
+           * 相比最低点PPD增加百分比 ≥50％
+           * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
+          **/
           if ((ldi > 15 && ldi <= 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
             const stateId = this.getQuestionId(7)
             this.$set(this.questionForm, stateId, 4)
             this.stateDisabled = true
           } else if ((ldi > 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
-          /** 疾病进展
-           * 当前靶病灶LDi>20 mm
-           * 相比最低点PPD增加百分比 ≥50％
-           * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
-          **/
+            /** 疾病进展
+             * 当前靶病灶LDi>20 mm
+             * 相比最低点PPD增加百分比 ≥50％
+             * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
+            **/
             const stateId = this.getQuestionId(7)
             this.$set(this.questionForm, stateId, 4)
             this.stateDisabled = true
           } else {
-          // 不符合疾病进展是否需要清空修改前疾病进展的状态
-          // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
-          // if (lesionState === 4) {
-          //   const stateId = this.getQuestionId(7)
-          //   this.$set(this.questionForm, stateId, null)
-          // }
+            // 不符合疾病进展是否需要清空修改前疾病进展的状态
+            // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
+            // if (lesionState === 4) {
+            //   const stateId = this.getQuestionId(7)
+            //   this.$set(this.questionForm, stateId, null)
+            // }
             this.stateDisabled = false
           }
         }
@@ -1132,7 +1060,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState1'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1143,7 +1071,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState2'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1159,7 +1087,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg21'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1170,7 +1098,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState12'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1187,7 +1115,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState3'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1199,7 +1127,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState4'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1215,7 +1143,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg25'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1234,7 +1162,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg26'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1258,7 +1186,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg27'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1270,7 +1198,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg28'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1287,7 +1215,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState5'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1296,7 +1224,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState6'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1318,7 +1246,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg30'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1347,7 +1275,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState7'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1359,7 +1287,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState8'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1376,7 +1304,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg31'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1388,7 +1316,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState9'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1405,7 +1333,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1417,7 +1345,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState10'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1434,7 +1362,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg35'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1446,7 +1374,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg36'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1463,7 +1391,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1475,7 +1403,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg38'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1492,7 +1420,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg39'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1504,7 +1432,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState11'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1550,7 +1478,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg43'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1562,7 +1490,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg44'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1579,7 +1507,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1591,7 +1519,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg46'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1837,51 +1765,62 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  ::v-deep .el-form-item__label{
+.measurement-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
     flex-wrap: wrap;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-input-group__append, .el-input-group__prepend{
+
+  ::v-deep .el-input-group__append,
+  .el-input-group__prepend {
     padding: 0 10px;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+  ::v-deep .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
-  .suv_viewer{
+
+  .suv_viewer {
     ::v-deep .viewer-play {
       display: none;
     }
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 4da80196..36e7c707 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -8,11 +8,9 @@
           <span style="margin-left:5px;">{{ 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="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
@@ -25,121 +23,132 @@
           :question-form-change-num="questionFormChangeNum"
           :group-classify="1"
         /> -->
-        <Questions
-          ref="ecrf"
-          :question-form-change-state="true"
-          :question-form-change-num="0"
-          :is-qulity-issues="false"
-          :group-classify="1"
-        />
+        <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+          :group-classify="1" @handleReadingChart="handleReadingChart" />
       </div>
       <!-- 测量问题 -->
       <template v-if="questions.length > 0 && CriterionType !== 10">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
             <div v-for="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
-                <div class="title">{{ item.QuestionName }}</div>
-                <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
+                <div class="title">{{ item.QuestionName }}
+                  <svg-icon v-if="item.LesionType === 0" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0
+                      },
+                    })" />
+                </div>
+                <div v-if="readingTaskState < 2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon"
+                  @click.prevent="handleAdd(item)">
                   <i class="el-icon-plus" />
                 </div>
               </div>
               <!-- @change="handleCollapseChange(qs.Childrens,item)" -->
-              <el-collapse
-                v-if="item.Type === 'table' && item.TableQuestions"
-                v-model="activeName"
-                accordion
-                @change="handleCollapseChange"
-              >
-                <el-collapse-item
-                  v-for="(q,i) in item.TableQuestions.Answers"
-                  :key="`${item.Id}_${q.RowIndex}`"
+              <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
+                @change="handleCollapseChange">
+                <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                   :name="`${item.Id}_${q.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
-                >
+                  @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                   <template slot="title">
-                    <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+                    <div style="width:300px;position: relative;"
+                      :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : '#fff') }">
 
-                      {{ getLesionName(item.OrderMark,q.RowIndex) }}
+                      {{ getLesionName(item.OrderMark, q.RowIndex) }}
                       <!-- 未保存 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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: item.LesionType === 1 && readingTaskState < 2?'58px':'50px',top: '2px'}">
+                      <div
+                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
 
-                        <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
-                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
                               <span class="login-cycle" />
                             </div>
                           </el-tooltip>
                           <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
                             <span class="login-cycle" />
                           </div>
-                          <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                            <div v-if="item.TableQuestions.Answers[i].lesionPart" style="max-width: 100px;overflow: hidden;">
+                          <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                            :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="max-width: 100px;overflow: hidden;">
                               {{ item.TableQuestions.Answers[i].lesionPart }}
                             </div>
                           </el-tooltip>
                           <div v-if="item.LesionType === 0" style="margin:0 5px;">
-                            {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                           </div>
                           <div v-else-if="item.LesionType === 1" style="margin:0 5px;">
-                            {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                           </div>
                           <div v-else style="margin:0 5px;">
-                            {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                           </div>
                           <div v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                            <el-tooltip class="item" effect="dark" :content="`${item.TableQuestions.Answers[i].lesionLength}*${item.TableQuestions.Answers[i].lesionShort}m㎡`" placement="bottom">
-                              <span>{{ item.TableQuestions.Answers[i].lesionLength }}*{{ item.TableQuestions.Answers[i].lesionShort }}m㎡</span>
+                            <el-tooltip class="item" effect="dark"
+                              :content="`${item.TableQuestions.Answers[i].lesionLength}*${item.TableQuestions.Answers[i].lesionShort}m㎡`"
+                              placement="bottom">
+                              <span>{{ item.TableQuestions.Answers[i].lesionLength }}*{{
+                                item.TableQuestions.Answers[i].lesionShort }}m㎡</span>
                             </el-tooltip>
                           </div>
 
                         </div>
                       </div>
-                      <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False' && readingTaskState < 2" style="position: absolute;right: 5px;top: 2px;">
+                      <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False' && readingTaskState < 2"
+                        style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
-                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && ((item.LesionType === 0 && [0,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0))" class="item" :content="$t('trials:reading:button:split')" placement="bottom">
-                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && ((item.LesionType === 0 && [0, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0))"
+                          class="item" :content="$t('trials:reading:button:split')" placement="bottom">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
 
                         <!-- 融合 -->
-                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0,1,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))" class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
-                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;" @click.stop="handleMerge(item.TableQuestions.Answers[i],item.Id,item.OrderMark)" />
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
                         </el-tooltip>
                       </div>
 
                     </div>
 
                   </template>
-                  <QuestionForm
-                    :ref="`${item.Id}_${q.RowIndex}`"
-                    :questions="item.TableQuestions.Questions"
-                    :answers="item.TableQuestions.Answers[i]"
-                    :lesion-type="item.LesionType"
-                    :order-mark="item.OrderMark"
-                    :table-questions="tableQuestions"
-                    :row-index="String(q.RowIndex)"
-                    :question-name="item.QuestionName"
-                    :parent-qs-id="item.Id"
-                    :visit-task-id="visitTaskId"
-                    :is-current-task="isCurrentTask"
-                    :reading-task-state="readingTaskState"
-                    :is-base-line-task="isBaseLineTask"
-                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
-                    @determineExistsUnsavedLession="determineExistsUnsavedLession"
-                    @resetQuestions="resetQuestions"
-                    @close="close"
-                  />
+                  <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName" :parent-qs-id="item.Id" :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask" :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask" @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @determineExistsUnsavedLession="determineExistsUnsavedLession" @resetQuestions="resetQuestions"
+                    @close="close" @handleReadingChart="handleReadingChart" />
                 </el-collapse-item>
 
               </el-collapse>
@@ -149,35 +158,15 @@
       </template>
       <!-- <el-divider /> -->
       <!-- 肝脏评估 -->
-      <Questions
-        ref="ecrf2"
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :group-classify="2"
-        :is-qulity-issues="false"
-        style="margin-top:20px"
-        :question-type="6"
-        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
-      />
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :group-classify="2"
+        :is-qulity-issues="false" style="margin-top:20px" :question-type="6"
+        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus" />
       <!-- 脾脏评估 -->
-      <Questions
-        ref="ecrf3"
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :group-classify="3"
-        :is-qulity-issues="false"
-        :question-type="7"
-        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
-      />
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :group-classify="3"
+        :is-qulity-issues="false" :question-type="7" @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus" />
     </div>
-    <el-dialog
-      v-if="merge.visible"
-      v-loading="merge.loading"
-      :visible.sync="merge.visible"
-      :close-on-click-modal="false"
-      :title="$t('trials:reading:lugano:message:merge')"
-      width="500px"
-    >
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
       <div class="merge-table">
         <div class="merge-label">
           <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
@@ -185,40 +174,19 @@
           <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
         </div>
         <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
-        <el-table
-          :data="lesionData"
-          style="width: 450px"
-          size="small"
-          height="200"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="selection"
-            width="45"
-          />
-          <el-table-column
-            prop="OrderMarkName"
-            :label="$t('trials:reading:lugano:label:lesionNumber')"
-            width="100"
-          />
-          <el-table-column
-            prop="Part"
-            :label="$t('trials:reading:lugano:label:lesionLocation')"
-            min-width="120"
-            show-overflow-tooltip
-          />
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
         </el-table>
       </div>
       <div slot="footer" style="text-align:right;">
         <!-- 取消 -->
         <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
         <!-- 确认 -->
-        <el-button
-          type="primary"
-          size="mini"
-          :disabled="mergeList.length === 0"
-          @click="confirmMerge"
-        >
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
           {{ $t('common:button:confirm') }}</el-button>
       </div>
     </el-dialog>
@@ -333,7 +301,7 @@ export default {
     DicomEvent.$on('split', measureData => {
       this.handleSplit(measureData.RowId, measureData.QuestionId)
     })
-    DicomEvent.$on('refreshQuestions', async(obj) => {
+    DicomEvent.$on('refreshQuestions', async (obj) => {
       var triald = this.$router.currentRoute.query.trialId
       await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
       this.$nextTick(() => {
@@ -342,7 +310,7 @@ export default {
         this.$refs['ecrf3'].getQuestions(this.visitTaskId)
       })
     })
-    DicomEvent.$on('refreshSplitTargetLesionPDD', async(callback) => {
+    DicomEvent.$on('refreshSplitTargetLesionPDD', async (callback) => {
       const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
       this.splitTargetLesions = res.Result
       if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
@@ -366,6 +334,9 @@ export default {
     DicomEvent.$off('refreshQuestions')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -529,7 +500,7 @@ export default {
         try {
           const loading = this.$loading({ fullscreen: true })
 
-          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(async() => {
+          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(async () => {
             var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
             if (idx > -1) {
               if (this.visitTaskList[idx].ReadingQuestions.length > 0) {
@@ -561,7 +532,7 @@ export default {
                 })
               })
             })
-          }) 
+          })
           await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
           DicomEvent.$emit('getMeasureData')
           await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: this.$route.query.trialId, visitTaskId: this.visitTaskId })
@@ -655,7 +626,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           } else {
             // 是否确认分裂
             this.$confirm(this.$t('trials:reading:warnning:msg4'), {
@@ -665,7 +636,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           }
         }
       }
@@ -722,7 +693,7 @@ export default {
       })
     },
     confirmMerge() {
-    // '融合后将无法撤销, 是否继续?'
+      // '融合后将无法撤销, 是否继续?'
       this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
         type: 'warning'
       }).then(() => {
@@ -875,7 +846,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -886,7 +857,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
       } else {
         // saveTypeEnum: 0
@@ -1026,7 +997,7 @@ export default {
     async changeLesionType(questionsObj) {
       await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
       // saveTypeEnum: 0
-      var lesionObj = { }
+      var lesionObj = {}
       var questionObj = questionsObj.questionForm
       // 切换到新的病灶集合
       var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
@@ -1343,21 +1314,25 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
-  .container{
+
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -1365,14 +1340,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -1381,21 +1358,24 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .login-cycle{
+
+  .login-cycle {
     width: 5px;
     height: 5px;
     display: inline-block;
@@ -1404,28 +1384,33 @@ export default {
     margin-right: 2px;
     margin-bottom: 2px;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .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;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1434,46 +1419,59 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
-  .merge-table{
-    padding:0 10px;
-    ::v-deep.el-table{
-      background-color:  #1e1e1e !important;
+
+  .merge-table {
+    padding: 0 10px;
+
+    ::v-deep.el-table {
+      background-color: #1e1e1e !important;
       color: #383838;
     }
-    ::v-deep.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+
+    ::v-deep.el-table td.el-table__cell,
+    .el-table th.el-table__cell.is-leaf {
       border-bottom: 1px solid #383838;
     }
-    .el-table--border::after, .el-table--group::after, .el-table::before{
+
+    .el-table--border::after,
+    .el-table--group::after,
+    .el-table::before {
       background-color: #1e1e1e;
     }
-    ::v-deep.el-table__header-wrapper{
-        th{
-          background-color:  #1e1e1e !important;
-          color: #dfdfdf;
-          border-bottom: 1px solid #383838;
-        }
+
+    ::v-deep.el-table__header-wrapper {
+      th {
+        background-color: #1e1e1e !important;
+        color: #dfdfdf;
+        border-bottom: 1px solid #383838;
       }
-    ::v-deep.el-table__body-wrapper{
-      tr{
-        background-color:  #1e1e1e !important;
+    }
+
+    ::v-deep.el-table__body-wrapper {
+      tr {
+        background-color: #1e1e1e !important;
         color: #dfdfdf;
       }
-      tr:hover > td{
-        background-color:  #1e1e1e !important;
+
+      tr:hover>td {
+        background-color: #1e1e1e !important;
       }
     }
-    ::v-deep.el-table__empty-block{
-      background-color:  #1e1e1e !important;
+
+    ::v-deep.el-table__empty-block {
+      background-color: #1e1e1e !important;
     }
-    .merge-label{
-      color:#ddd;
+
+    .merge-label {
+      color: #ddd;
       font-size: 13px;
       margin-bottom: 10px;
-      span{
+
+      span {
         font-size: 15px;
         color: red;
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index 9a90d9a3..5e5ff1f7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="lesionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -19,198 +13,135 @@
         </div>
       </div>
       <div ref="scrollPanel" style="height: 420px;overflow-y: auto;overflow-x: hidden;" @scroll.stop="scrollHandle">
-        <el-form-item
-          :label="$t('trials:reading:title:lesionType')"
-          prop="LesionType"
-          :rules="[
-            { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
-          ]"
-        >
+        <el-form-item :label="$t('trials:reading:title:lesionType')" prop="LesionType" :rules="[
+          { required: true, message: $t('common:ruleMessage:select'), trigger: ['blur'] },
+        ]">
           <!-- 下拉框 -->
-          <el-select
-            :ref="`select_LesionType`"
-            v-model="questionForm.LesionType"
-            filterable
-            :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
-            @change="((val)=>{lesionTypeChange(val)})"
-          >
+          <el-select :ref="`select_LesionType`" v-model="questionForm.LesionType" filterable
+            :disabled="!isCurrentTask || readingTaskState >= 2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
+            @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-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 && (qs.RelevanceValue.includes(questionForm[qs.RelevanceId]))) || (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']},
-          ]"
-        >
+        <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 && (qs.RelevanceValue.includes(questionForm[qs.RelevanceId]))) || (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'">
+          <template v-if="qs.Type === 'input' || qs.Type === 'number'">
+            <div style="display: flex;justify-content: space-between;">
+              <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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || answers.SplitOrMergeType === '1'"
+                @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>
+              <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+                @click.stop="(e) => handleReadingChart({
+                  e,
+                  data: {
+                    TableQuestionId: qs.Id,
+                    RowIndex: questionForm.RowIndex
+                  }
+                })" />
+            </div>
             <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
-            <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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || answers.SplitOrMergeType === '1'"
-              @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}"
-            maxlength="500"
-            :disabled="!isCurrentTask || readingTaskState>=2 || answers.SplitOrMergeType === '1'"
-            @change="((val)=>{formItemChange(val, qs)})"
-          />
+          <el-input v-if="qs.Type === 'textarea'" v-model="questionForm[qs.Id]" type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }" maxlength="500"
+            :disabled="!isCurrentTask || readingTaskState >= 2 || answers.SplitOrMergeType === '1'"
+            @change="((val) => { formItemChange(val, qs) })" />
           <!-- 下拉框 -->
           <!-- :disabled="!isCurrentTask || readingTaskState>=2 || (!isBaseLineTask && qs.QuestionMark === 5 && isCurrentTaskAdd === 'False') || qs.QuestionMark === 2 || (qs.QuestionMark === 8 && !isBaseLineTask && isCurrentTaskAdd === 'False')" -->
 
-          <el-select
-            v-if="qs.Type==='select'"
-            :ref="`select_${qs.Id}`"
-            v-model="questionForm[qs.Id]"
-            filterable
+          <el-select v-if="qs.Type === 'select'" :ref="`select_${qs.Id}`" v-model="questionForm[qs.Id]" filterable
             :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
-            @change="((val)=>{formItemChange(val, qs)})"
-          >
+            :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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
+            @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]"
-              />
+              <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"
-              />
+              <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(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode,parseFloat(answers.LastTaskState))}` : ''"
-              >
+                :label="!isNaN(parseFloat(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode, parseFloat(answers.LastTaskState))}` : ''">
                 <!-- 首次分裂的病灶只能选择存在 -->
-                <template v-if="answers.IsFristAdd=== 'True' && answers.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 v-if="answers.IsFristAdd === 'True' && answers.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 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"
-                  />
+                  <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"
-              />
+              <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"
-              />
+              <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 || answers.SplitOrMergeType === '1'"
-          >
-            <el-radio
-              v-for="val in qs.options.split('|')"
-              :key="val"
-              :label="val"
-              @change="((val)=>{formItemChange(val, qs)})"
-            >
+          <el-radio-group v-if="qs.Type === 'radio'" v-model="questionForm[qs.id]"
+            :disabled="!isCurrentTask || readingTaskState >= 2 || answers.SplitOrMergeType === '1'">
+            <el-radio v-for="val in qs.options.split('|')" :key="val" :label="val"
+              @change="((val) => { formItemChange(val, qs) })">
               {{ val }}
             </el-radio>
           </el-radio-group>
           <template v-if="qs.QuestionMark === 20">
             <div style="display: flex;flex-direction: row;justify-content: flex-start;">
-
-              <el-input
-                v-if="qs.Type==='calculation'"
-                v-model="questionForm[qs.Id]"
-                disabled
-                style="width:120px;"
-                @change="((val)=>{formItemChange(val, qs)})"
-              >
-                <template v-if="qs.Unit" slot="append">
-                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-                </template>
-              </el-input>
-              <viewer
-                v-if="answers.OtherPicturePath"
-                ref="viewer"
-                style="margin:0 10px;"
-                :images="[`${OSSclientConfig.basePath}${answers.OtherPicturePath}`]"
-              >
+              <div style="display: flex;justify-content: space-between;" v-if="qs.Type === 'calculation'">
+                <el-input v-if="qs.Type === 'calculation'" v-model="questionForm[qs.Id]" disabled style="width:120px;"
+                  @change="((val) => { formItemChange(val, qs) })">
+                  <template v-if="qs.Unit" slot="append">
+                    {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                  </template>
+                </el-input>
+                <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+                  @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      TableQuestionId: qs.Id,
+                      RowIndex: questionForm.RowIndex
+                    }
+                  })" />
+              </div>
+              <viewer v-if="answers.OtherPicturePath" ref="viewer" style="margin:0 10px;"
+                :images="[`${OSSclientConfig.basePath}${answers.OtherPicturePath}`]">
                 <span style="color:#409eff;cursor: pointer" @click="previewImage()">
                   {{ $t('trials:lugano:button:suvscreenshot1') }}
                 </span>
-                <img
-                  v-show="false"
-                  crossorigin="anonymous"
-                  :src="`${OSSclientConfig.basePath}${answers.OtherPicturePath}`"
-                  alt="Image"
-                >
+                <img v-show="false" crossorigin="anonymous"
+                  :src="`${OSSclientConfig.basePath}${answers.OtherPicturePath}`" alt="Image">
               </viewer>
               <!-- <img
                 v-if="answers.OtherPicturePath"
@@ -226,45 +157,39 @@
             </div>
           </template>
           <template v-else>
-            <el-input
-              v-if="qs.Type==='calculation'"
-              v-model="questionForm[qs.Id]"
-              disabled
-              @change="((val)=>{formItemChange(val, qs)})"
-            >
-              <template v-if="qs.Unit" slot="append">
-                {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-              </template>
-            </el-input>
+            <div style="display: flex;justify-content: space-between;" v-if="qs.Type === 'calculation'">
+              <el-input v-if="qs.Type === 'calculation'" v-model="questionForm[qs.Id]" disabled
+                @change="((val) => { formItemChange(val, qs) })">
+                <template v-if="qs.Unit" slot="append">
+                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                </template>
+              </el-input>
+              <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+                @click.stop="(e) => handleReadingChart({
+                  e,
+                  data: {
+                    TableQuestionId: qs.Id,
+                    RowIndex: questionForm.RowIndex
+                  }
+                })" />
+            </div>
+
           </template>
         </el-form-item>
       </div>
       <div
-        v-if="isCurrentTask && readingTaskState<2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
-        class="base-dialog-footer"
-        style="text-align:right;margin-top:10px;"
-      >
+        v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+        class="base-dialog-footer" style="text-align:right;margin-top:10px;">
         <!-- 清除标记 -->
-        <el-button
-          v-if="questionForm.MeasureData"
-          size="mini"
-          @click="handleDeleteMeasureData"
-        >
+        <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
           {{ $t('trials:reading:button:removeMark') }}
         </el-button>
         <!-- 删除 -->
-        <el-button
-          v-if="isCurrentTaskAdd !== 'False'"
-          size="mini"
-          @click="handleDelete"
-        >
+        <el-button v-if="isCurrentTaskAdd !== 'False'" size="mini" @click="handleDelete">
           {{ $t('common:button:delete') }}
         </el-button>
         <!-- 保存 -->
-        <el-button
-          size="mini"
-          @click="handleSave"
-        >
+        <el-button size="mini" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
       </div>
@@ -272,7 +197,7 @@
   </el-form>
 </template>
 <script>
-import { submitTableQuestion, deleteReadingRowAnswer, getIsSuvMaxLesionNoPet } from '@/api/trials'
+import { submitTableQuestion, deleteReadingRowAnswer, getIsSuvMaxLesion } from '@/api/trials'
 // import { uploadPrintscreen } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -368,6 +293,9 @@ export default {
     // container.removeEventListener('scroll', this.scrollHandle , true)
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     scrollHandle() {
       for (const k in this.$refs) {
         if (k.indexOf('select_') === -1) continue
@@ -505,11 +433,11 @@ export default {
           if ((ldi > 15 && ldi <= 20) && (pddIncrease >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
             this.stateDisabled = true
           } else if ((ldi > 20) && (pddIncrease >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
-          /** 疾病进展
-           * 当前靶病灶LDi>20 mm
-           * 相比最低点PPD增加百分比 ≥50％
-           * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
-          **/
+            /** 疾病进展
+             * 当前靶病灶LDi>20 mm
+             * 相比最低点PPD增加百分比 ≥50％
+             * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
+            **/
             this.stateDisabled = true
           } else {
             this.stateDisabled = false
@@ -607,8 +535,8 @@ export default {
               type: 'warning',
               distinguishCancelAndClose: true
             })
-              .then(() => {})
-              .catch(() => {})
+              .then(() => { })
+              .catch(() => { })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
           }
@@ -621,7 +549,7 @@ export default {
             this.$confirm(msg, {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
@@ -653,7 +581,7 @@ export default {
       })
     },
     deleteLesionInfo() {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         const loading = this.$loading({ fullscreen: true })
         var param = {
           visitTaskId: this.visitTaskId,
@@ -810,7 +738,7 @@ export default {
             if (this.lesionType === 0) {
               this.calculatePPD()
             }
-            
+
             var status = ''
             if (lesionState) {
               if (this.lesionType === 0 && lesionState === 1) {
@@ -965,31 +893,31 @@ export default {
             this.stateDisabled = false
           }
         } else {
-        /** 疾病进展
-         * 15mm<当前靶病灶LDi≤20mm
-         * 相比最低点PPD增加百分比 ≥50％
-         * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
-        **/
+          /** 疾病进展
+           * 15mm<当前靶病灶LDi≤20mm
+           * 相比最低点PPD增加百分比 ≥50％
+           * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
+          **/
           if ((ldi > 15 && ldi <= 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
             const stateId = this.getQuestionId(7)
             this.$set(this.questionForm, stateId, 4)
             this.stateDisabled = true
           } else if ((ldi > 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
-          /** 疾病进展
-           * 当前靶病灶LDi>20 mm
-           * 相比最低点PPD增加百分比 ≥50％
-           * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
-          **/
+            /** 疾病进展
+             * 当前靶病灶LDi>20 mm
+             * 相比最低点PPD增加百分比 ≥50％
+             * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
+            **/
             const stateId = this.getQuestionId(7)
             this.$set(this.questionForm, stateId, 4)
             this.stateDisabled = true
           } else {
-          // 不符合疾病进展是否需要清空修改前疾病进展的状态
-          // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
-          // if (lesionState === 4) {
-          //   const stateId = this.getQuestionId(7)
-          //   this.$set(this.questionForm, stateId, null)
-          // }
+            // 不符合疾病进展是否需要清空修改前疾病进展的状态
+            // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
+            // if (lesionState === 4) {
+            //   const stateId = this.getQuestionId(7)
+            //   this.$set(this.questionForm, stateId, null)
+            // }
             this.stateDisabled = false
           }
         }
@@ -1132,7 +1060,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState1'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1143,7 +1071,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState2'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1159,7 +1087,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg21'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1170,7 +1098,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState12'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1187,7 +1115,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState3'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1199,7 +1127,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState4'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1215,7 +1143,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg25'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1234,7 +1162,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg26'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1258,7 +1186,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg27'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1270,7 +1198,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg28'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1287,7 +1215,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState5'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1296,7 +1224,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState6'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1318,7 +1246,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg30'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1347,7 +1275,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState7'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1359,7 +1287,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState8'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1376,7 +1304,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg31'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1388,7 +1316,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState9'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1405,7 +1333,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1417,7 +1345,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState10'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1434,7 +1362,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg35'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1446,7 +1374,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg36'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1463,7 +1391,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1475,7 +1403,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg38'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1492,7 +1420,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg39'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1504,7 +1432,7 @@ export default {
               this.$confirm(this.$t('trials:lugano:message:validState11'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1550,7 +1478,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg43'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1562,7 +1490,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg44'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1579,7 +1507,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1591,7 +1519,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg46'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1737,7 +1665,7 @@ export default {
       // 判断该病灶的suvmax是否是最大的
       const suvMax = this.getQuestionVal(20)
       if (this.questionForm.RowId && !!suvMax) {
-        const res = await getIsSuvMaxLesionNoPet({ visitTaskId: this.visitTaskId, rowId: this.questionForm.RowId })
+        const res = await getIsSuvMaxLesion({ visitTaskId: this.visitTaskId, rowId: this.questionForm.RowId })
         if (res.IsSuccess && res.Result.IsSuvMaxLesion) {
           message = this.$t('trials:reading:warnning:msg58')
         }
@@ -1837,51 +1765,62 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  ::v-deep .el-form-item__label{
+.measurement-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
     flex-wrap: wrap;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-input-group__append, .el-input-group__prepend{
+
+  ::v-deep .el-input-group__append,
+  .el-input-group__prepend {
     padding: 0 10px;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+  ::v-deep .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
-  .suv_viewer{
+
+  .suv_viewer {
     ::v-deep .viewer-play {
       display: none;
     }
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
index 94e0ecfc..4badf78e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
@@ -8,11 +8,9 @@
           <span style="margin-left:5px;">{{ 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="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
@@ -25,121 +23,132 @@
           :question-form-change-num="questionFormChangeNum"
           :group-classify="1"
         /> -->
-        <Questions
-          ref="ecrf"
-          :question-form-change-state="true"
-          :question-form-change-num="0"
-          :is-qulity-issues="false"
-          :group-classify="1"
-        />
+        <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+          :group-classify="1" @handleReadingChart="handleReadingChart" />
       </div>
       <!-- 测量问题 -->
       <template v-if="questions.length > 0 && CriterionType !== 10">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
             <div v-for="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
-                <div class="title">{{ item.QuestionName }}</div>
-                <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
+                <div class="title">{{ item.QuestionName }}
+                  <svg-icon v-if="item.LesionType === 0" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0
+                      },
+                    })" />
+                </div>
+                <div v-if="readingTaskState < 2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon"
+                  @click.prevent="handleAdd(item)">
                   <i class="el-icon-plus" />
                 </div>
               </div>
               <!-- @change="handleCollapseChange(qs.Childrens,item)" -->
-              <el-collapse
-                v-if="item.Type === 'table' && item.TableQuestions"
-                v-model="activeName"
-                accordion
-                @change="handleCollapseChange"
-              >
-                <el-collapse-item
-                  v-for="(q,i) in item.TableQuestions.Answers"
-                  :key="`${item.Id}_${q.RowIndex}`"
+              <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
+                @change="handleCollapseChange">
+                <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                   :name="`${item.Id}_${q.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
-                >
+                  @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                   <template slot="title">
-                    <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+                    <div style="width:300px;position: relative;"
+                      :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : '#fff') }">
 
-                      {{ getLesionName(item.OrderMark,q.RowIndex) }}
+                      {{ getLesionName(item.OrderMark, q.RowIndex) }}
                       <!-- 未保存 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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: item.LesionType === 1 && readingTaskState < 2?'58px':'50px',top: '2px'}">
+                      <div
+                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
 
-                        <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
-                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
                               <span class="login-cycle" />
                             </div>
                           </el-tooltip>
                           <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
                             <span class="login-cycle" />
                           </div>
-                          <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                            <div v-if="item.TableQuestions.Answers[i].lesionPart" style="max-width: 100px;overflow: hidden;">
+                          <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                            :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="max-width: 100px;overflow: hidden;">
                               {{ item.TableQuestions.Answers[i].lesionPart }}
                             </div>
                           </el-tooltip>
                           <div v-if="item.LesionType === 0" style="margin:0 5px;">
-                            {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                           </div>
                           <div v-else-if="item.LesionType === 1" style="margin:0 5px;">
-                            {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                           </div>
                           <div v-else style="margin:0 5px;">
-                            {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                           </div>
                           <div v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                            <el-tooltip class="item" effect="dark" :content="`${item.TableQuestions.Answers[i].lesionLength}*${item.TableQuestions.Answers[i].lesionShort}m㎡`" placement="bottom">
-                              <span>{{ item.TableQuestions.Answers[i].lesionLength }}*{{ item.TableQuestions.Answers[i].lesionShort }}m㎡</span>
+                            <el-tooltip class="item" effect="dark"
+                              :content="`${item.TableQuestions.Answers[i].lesionLength}*${item.TableQuestions.Answers[i].lesionShort}m㎡`"
+                              placement="bottom">
+                              <span>{{ item.TableQuestions.Answers[i].lesionLength }}*{{
+                                item.TableQuestions.Answers[i].lesionShort }}m㎡</span>
                             </el-tooltip>
                           </div>
 
                         </div>
                       </div>
-                      <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False' && readingTaskState < 2" style="position: absolute;right: 5px;top: 2px;">
+                      <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False' && readingTaskState < 2"
+                        style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
-                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && ((item.LesionType === 0 && [0,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0))" class="item" :content="$t('trials:reading:button:split')" placement="bottom">
-                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && ((item.LesionType === 0 && [0, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0))"
+                          class="item" :content="$t('trials:reading:button:split')" placement="bottom">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
 
                         <!-- 融合 -->
-                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0,1,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))" class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
-                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;" @click.stop="handleMerge(item.TableQuestions.Answers[i],item.Id,item.OrderMark)" />
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
                         </el-tooltip>
                       </div>
 
                     </div>
 
                   </template>
-                  <QuestionForm
-                    :ref="`${item.Id}_${q.RowIndex}`"
-                    :questions="item.TableQuestions.Questions"
-                    :answers="item.TableQuestions.Answers[i]"
-                    :lesion-type="item.LesionType"
-                    :order-mark="item.OrderMark"
-                    :table-questions="tableQuestions"
-                    :row-index="String(q.RowIndex)"
-                    :question-name="item.QuestionName"
-                    :parent-qs-id="item.Id"
-                    :visit-task-id="visitTaskId"
-                    :is-current-task="isCurrentTask"
-                    :reading-task-state="readingTaskState"
-                    :is-base-line-task="isBaseLineTask"
-                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
-                    @determineExistsUnsavedLession="determineExistsUnsavedLession"
-                    @resetQuestions="resetQuestions"
-                    @close="close"
-                  />
+                  <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName" :parent-qs-id="item.Id" :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask" :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask" @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @determineExistsUnsavedLession="determineExistsUnsavedLession" @resetQuestions="resetQuestions"
+                    @close="close" @handleReadingChart="handleReadingChart" />
                 </el-collapse-item>
 
               </el-collapse>
@@ -149,35 +158,15 @@
       </template>
       <!-- <el-divider /> -->
       <!-- 肝脏评估 -->
-      <Questions
-        ref="ecrf2"
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :group-classify="2"
-        :is-qulity-issues="false"
-        style="margin-top:20px"
-        :question-type="6"
-        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
-      />
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :group-classify="2"
+        :is-qulity-issues="false" style="margin-top:20px" :question-type="6"
+        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus" />
       <!-- 脾脏评估 -->
-      <Questions
-        ref="ecrf3"
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :group-classify="3"
-        :is-qulity-issues="false"
-        :question-type="7"
-        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
-      />
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :group-classify="3"
+        :is-qulity-issues="false" :question-type="7" @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus" />
     </div>
-    <el-dialog
-      v-if="merge.visible"
-      v-loading="merge.loading"
-      :visible.sync="merge.visible"
-      :close-on-click-modal="false"
-      :title="$t('trials:reading:lugano:message:merge')"
-      width="500px"
-    >
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
       <div class="merge-table">
         <div class="merge-label">
           <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
@@ -185,40 +174,19 @@
           <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
         </div>
         <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
-        <el-table
-          :data="lesionData"
-          style="width: 450px"
-          size="small"
-          height="200"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="selection"
-            width="45"
-          />
-          <el-table-column
-            prop="OrderMarkName"
-            :label="$t('trials:reading:lugano:label:lesionNumber')"
-            width="100"
-          />
-          <el-table-column
-            prop="Part"
-            :label="$t('trials:reading:lugano:label:lesionLocation')"
-            min-width="120"
-            show-overflow-tooltip
-          />
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
         </el-table>
       </div>
       <div slot="footer" style="text-align:right;">
         <!-- 取消 -->
         <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
         <!-- 确认 -->
-        <el-button
-          type="primary"
-          size="mini"
-          :disabled="mergeList.length === 0"
-          @click="confirmMerge"
-        >
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
           {{ $t('common:button:confirm') }}</el-button>
       </div>
     </el-dialog>
@@ -333,7 +301,7 @@ export default {
     DicomEvent.$on('split', measureData => {
       this.handleSplit(measureData.RowId, measureData.QuestionId)
     })
-    DicomEvent.$on('refreshQuestions', async(obj) => {
+    DicomEvent.$on('refreshQuestions', async (obj) => {
       var triald = this.$router.currentRoute.query.trialId
       await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
       this.$nextTick(() => {
@@ -342,7 +310,7 @@ export default {
         this.$refs['ecrf3'].getQuestions(this.visitTaskId)
       })
     })
-    DicomEvent.$on('refreshSplitTargetLesionPDD', async(callback) => {
+    DicomEvent.$on('refreshSplitTargetLesionPDD', async (callback) => {
       const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
       this.splitTargetLesions = res.Result
       if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
@@ -366,6 +334,9 @@ export default {
     DicomEvent.$off('refreshQuestions')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -529,7 +500,7 @@ export default {
         try {
           const loading = this.$loading({ fullscreen: true })
 
-          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(async() => {
+          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(async () => {
             var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
             if (idx > -1) {
               if (this.visitTaskList[idx].ReadingQuestions.length > 0) {
@@ -561,7 +532,7 @@ export default {
                 })
               })
             })
-          }) 
+          })
           await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
           DicomEvent.$emit('getMeasureData')
           await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: this.$route.query.trialId, visitTaskId: this.visitTaskId })
@@ -655,7 +626,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           } else {
             // 是否确认分裂
             this.$confirm(this.$t('trials:reading:warnning:msg4'), {
@@ -665,7 +636,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           }
         }
       }
@@ -722,7 +693,7 @@ export default {
       })
     },
     confirmMerge() {
-    // '融合后将无法撤销, 是否继续?'
+      // '融合后将无法撤销, 是否继续?'
       this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
         type: 'warning'
       }).then(() => {
@@ -875,7 +846,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -886,7 +857,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
       } else {
         // saveTypeEnum: 0
@@ -1026,7 +997,7 @@ export default {
     async changeLesionType(questionsObj) {
       await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
       // saveTypeEnum: 0
-      var lesionObj = { }
+      var lesionObj = {}
       var questionObj = questionsObj.questionForm
       // 切换到新的病灶集合
       var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
@@ -1343,21 +1314,25 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
-  .container{
+
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -1365,14 +1340,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -1381,21 +1358,24 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .login-cycle{
+
+  .login-cycle {
     width: 5px;
     height: 5px;
     display: inline-block;
@@ -1404,28 +1384,33 @@ export default {
     margin-right: 2px;
     margin-bottom: 2px;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .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;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1434,46 +1419,59 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
-  .merge-table{
-    padding:0 10px;
-    ::v-deep.el-table{
-      background-color:  #1e1e1e !important;
+
+  .merge-table {
+    padding: 0 10px;
+
+    ::v-deep.el-table {
+      background-color: #1e1e1e !important;
       color: #383838;
     }
-    ::v-deep.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+
+    ::v-deep.el-table td.el-table__cell,
+    .el-table th.el-table__cell.is-leaf {
       border-bottom: 1px solid #383838;
     }
-    .el-table--border::after, .el-table--group::after, .el-table::before{
+
+    .el-table--border::after,
+    .el-table--group::after,
+    .el-table::before {
       background-color: #1e1e1e;
     }
-    ::v-deep.el-table__header-wrapper{
-        th{
-          background-color:  #1e1e1e !important;
-          color: #dfdfdf;
-          border-bottom: 1px solid #383838;
-        }
+
+    ::v-deep.el-table__header-wrapper {
+      th {
+        background-color: #1e1e1e !important;
+        color: #dfdfdf;
+        border-bottom: 1px solid #383838;
       }
-    ::v-deep.el-table__body-wrapper{
-      tr{
-        background-color:  #1e1e1e !important;
+    }
+
+    ::v-deep.el-table__body-wrapper {
+      tr {
+        background-color: #1e1e1e !important;
         color: #dfdfdf;
       }
-      tr:hover > td{
-        background-color:  #1e1e1e !important;
+
+      tr:hover>td {
+        background-color: #1e1e1e !important;
       }
     }
-    ::v-deep.el-table__empty-block{
-      background-color:  #1e1e1e !important;
+
+    ::v-deep.el-table__empty-block {
+      background-color: #1e1e1e !important;
     }
-    .merge-label{
-      color:#ddd;
+
+    .merge-label {
+      color: #ddd;
       font-size: 13px;
       margin-bottom: 10px;
-      span{
+
+      span {
         font-size: 15px;
         color: red;
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
index 3fe2fb0f..43030d6c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -18,183 +12,132 @@
         </div>
       </div>
 
-      <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 && (String(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']},
-        ]"
-        style="flex-wrap: wrap"
-      >
+      <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 && (String(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']
+          },
+        ]" style="flex-wrap: wrap">
 
         <!-- 输入框 -->
-        <template v-if="(qs.Type==='input' || qs.Type==='number') && (qs.QuestionMark === 1101 || qs.QuestionMark === 1102 || qs.QuestionMark === 1103)">
+        <template
+          v-if="(qs.Type === 'input' || qs.Type === 'number') && (qs.QuestionMark === 1101 || qs.QuestionMark === 1102 || qs.QuestionMark === 1103)">
           <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
-            <el-input
-              v-model="questionForm[qs.Id]"
-              disabled
-              style="width: 100px;"
-            >
+            <el-input v-model="questionForm[qs.Id]" disabled style="width: 100px;">
               <template v-if="qs.Unit" slot="append">
                 {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
               </template>
             </el-input>
             <!-- 测量 -->
             <el-button
-              v-if="questionForm[isMeasurableId] && parseInt(questionForm[isMeasurableId]) === 1 && !questionForm[qs.Id] && readingTaskState!== 2"
-              size="mini"
-              type="text"
-              @click="addAnnotation(qs)"
-            >
+              v-if="questionForm[isMeasurableId] && parseInt(questionForm[isMeasurableId]) === 1 && !questionForm[qs.Id] && readingTaskState !== 2"
+              size="mini" type="text" @click="addAnnotation(qs)">
               {{ $t('trials:MRIPDFF:button:measure') }}
             </el-button>
             <!-- 清除标记 -->
-            <el-button
-              v-if="getAnnotationStatus(qs) && readingTaskState!== 2"
-              size="mini"
-              type="text"
-              style="margin-left: 0px"
-              @click="removeAnnotation(qs)"
-            >
+            <el-button v-if="getAnnotationStatus(qs) && readingTaskState !== 2" size="mini" type="text"
+              style="margin-left: 0px" @click="removeAnnotation(qs)">
               {{ $t('trials:MRIPDFF:button:clear') }}
             </el-button>
             <!-- 返回 -->
-            <el-button
-              v-if="questionForm[qs.Id]"
-              size="mini"
-              type="text"
-              style="margin-left: 0px"
-              @click="locateAnnotation(qs)"
-            >
+            <el-button v-if="questionForm[qs.Id]" size="mini" type="text" style="margin-left: 0px"
+              @click="locateAnnotation(qs)">
               {{ $t('trials:MRIPDFF:button:return') }}
             </el-button>
             <!-- 保存 -->
             <el-button
-              v-if="questionForm[isMeasurableId] && parseInt(questionForm[isMeasurableId]) === 1 && questionForm[qs.Id] && readingTaskState!== 2"
-              size="mini"
-              type="text"
-              style="margin-left: 0px"
-              @click="saveAnnotation(qs)"
-            >
+              v-if="questionForm[isMeasurableId] && parseInt(questionForm[isMeasurableId]) === 1 && questionForm[qs.Id] && readingTaskState !== 2"
+              size="mini" type="text" style="margin-left: 0px" @click="saveAnnotation(qs)">
               <!-- 未保存 -->
-              <el-tooltip v-if="getAnnotationSaveEnum(qs) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+              <el-tooltip v-if="getAnnotationSaveEnum(qs) === 0" class="item" effect="dark"
+                :content="$t('trials:reading:button:unsaved')" placement="bottom">
                 <i class="el-icon-warning" style="color:red" />
               </el-tooltip>
               {{ $t('common:button:save') }}
             </el-button>
           </div>
         </template>
-        <template v-else-if="qs.Type==='input' || qs.Type==='number'">
-          <el-input
-            v-model="questionForm[qs.Id]"
-            :disabled="!isCurrentTask || readingTaskState>=2"
-            @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 v-else-if="qs.Type === 'input' || qs.Type === 'number'">
+          <div style="display: flex;justify-content: space-between;">
+            <el-input v-model="questionForm[qs.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
+              @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>
+            <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  TableQuestionId: qs.Id,
+                  RowIndex: questionForm.RowIndex
+                }
+              })" />
+          </div>
         </template>
         <!-- 多行文本输入框 -->
-        <el-input
-          v-else-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-input v-else-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-else-if="qs.Type==='select'"
-          v-model="questionForm[qs.Id]"
-          filterable
+        <el-select v-else-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
           :placeholder="$t('common:placeholder:select')"
-          :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 1106"
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
+          :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 1106"
+          @change="((val) => { formItemChange(val, qs) })">
           <template v-if="qs.TableQuestionType === 1">
-            <el-option
-              v-for="item in organList"
-              :key="item.Id"
-              :label="item[qs.DataTableColumn]"
-              :value="item[qs.DataTableColumn]"
-            />
+            <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">
-            <el-option
-              v-for="item of $d[qs.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <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"
-            />
+            <el-option v-for="val in qs.TypeValue.split('|')" :key="val" :label="val" :value="val" />
           </template>
 
         </el-select>
         <!-- 单选 -->
-        <el-radio-group
-          v-else-if="qs.Type==='radio'"
-          v-model="questionForm[qs.Id]"
-          :disabled="!isCurrentTask || readingTaskState>=2 || (qs.QuestionMark === 1105 && isDisabledMeasurableRadio)"
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
+        <el-radio-group v-else-if="qs.Type === 'radio'" v-model="questionForm[qs.Id]"
+          :disabled="!isCurrentTask || readingTaskState >= 2 || (qs.QuestionMark === 1105 && isDisabledMeasurableRadio)"
+          @change="((val) => { formItemChange(val, qs) })">
           <template v-if="qs.DictionaryCode.length > 0">
-            <el-radio
-              v-for="item in $d[qs.DictionaryCode]"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio v-for="item in $d[qs.DictionaryCode]" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </template>
           <template v-else-if="qs.options.length > 0">
-            <el-radio
-              v-for="val in qs.options.split('|')"
-              :key="val"
-              :label="val"
-            >
+            <el-radio v-for="val in qs.options.split('|')" :key="val" :label="val">
               {{ val }}
             </el-radio>
           </template>
         </el-radio-group>
-        <!-- 自动计算 -->
-        <el-input
-          v-else-if="qs.Type==='calculation'"
-          v-model="questionForm[qs.Id]"
-          disabled
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
-          <template v-if="qs.Unit" slot="append">
-            {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-          </template>
-        </el-input>
+        <div style="display: flex;justify-content: space-between;" v-else-if="qs.Type === 'calculation'">
+          <!-- 自动计算 -->
+          <el-input v-model="questionForm[qs.Id]" disabled @change="((val) => { formItemChange(val, qs) })">
+            <template v-if="qs.Unit" slot="append">
+              {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+            </template>
+          </el-input>
+          <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                TableQuestionId: qs.Id,
+                RowIndex: questionForm.RowIndex
+              }
+            })" />
+        </div>
+
       </el-form-item>
 
     </div>
 
-    <div
-      v-if="isCurrentTask && readingTaskState<2"
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
+    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
+      style="text-align:right;margin-top:10px;">
       <!-- 保存 -->
-      <el-button
-        size="mini"
-        @click="handleSave"
-      >
+      <el-button size="mini" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -290,6 +233,9 @@ export default {
     DicomEvent.$off('handleImageQualityAbnormal')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initForm() {
       this.isRender = false
       this.isMeasurableId = this.getQuestionId(1105)
@@ -503,7 +449,7 @@ export default {
       const orderMarkName = this.getLesionName(this.orderMark, qs.QuestionMark)
       this.activeQuestionId = qs.Id
       this.activeQuestionMark = qs.QuestionMark
-      DicomEvent.$emit('addAnnotation', { question: qs, locateInfo: { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: orderMarkName, lesionType: null, markTool: 'Probe', readingTaskState: this.readingTaskState, isMarked: true }})
+      DicomEvent.$emit('addAnnotation', { question: qs, locateInfo: { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: orderMarkName, lesionType: null, markTool: 'Probe', readingTaskState: this.readingTaskState, isMarked: true } })
     },
     getAnnotationSaveEnum(qs) {
       const i = this.markList.findIndex(i => i.tableQuestionId === qs.Id)
@@ -592,14 +538,14 @@ export default {
             if (confirm !== 'confirm') return
           }
           // 上传截图
-          
+
           DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: measureData.OrderMarkName, lesionType: null, isMarked: !!measureData }, async val => {
             params = Object.assign({}, this.markList[i].measureData)
             if (val) {
               const pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
               params.PicturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
             }
-            
+
             params.Answer = this.questionForm[tableQuestionId]
             params.MeasureData = JSON.stringify(this.markList[i].measureData.MeasureData)
             loading.close()
@@ -754,17 +700,17 @@ export default {
         const valid = await this.$refs.measurementForm.validate()
         if (!valid) return
         if (parseInt(this.questionForm[this.isMeasurableId]) === 1) {
-        // 检验是否有标记为保存
+          // 检验是否有标记为保存
           const i = this.markList.findIndex(i => i.saveEnum === 0)
           if (i > -1) {
-          // 请先保存标注信息！
+            // 请先保存标注信息！
             this.$alert(this.$t('trials:MRIPDFF:message:message1'))
             // this.$message.warning(this.$t('trials:MRIPDFF:message:message1'))
             return
           }
         } else {
-        // 不可测量时，清空测量值，平均值
-        // '是否确认不可测量？'
+          // 不可测量时，清空测量值，平均值
+          // '是否确认不可测量？'
           const confirm = await this.$confirm(
             this.$t('trials:MRIPDFF:message:message2'),
             {
@@ -817,7 +763,7 @@ export default {
           }
           const res = await submitTaskRowInfo(params, 11)
           if (res.IsSuccess) {
-          // 保存成功！
+            // 保存成功！
             this.$message.success(this.$t('common:message:savedSuccessfully'))
             this.$set(this.questionForm, 'saveTypeEnum', 2)
             this.originalQuestionForm = { ...this.questionForm }
@@ -853,45 +799,55 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  ::v-deep .el-form-item__label{
+.measurement-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+  ::v-deep .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  ::v-deep .el-input-group__append, .el-input-group__prepend {
+
+  ::v-deep .el-input-group__append,
+  .el-input-group__prepend {
     padding: 0 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue
index 853205c4..a3a722bc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue
@@ -8,63 +8,62 @@
           <span style="margin-left:5px;">{{ 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="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 非测量问题 -->
       <div class="lesions">
-        <Questions ref="ecrf" :groupClassify="1" :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum" />
+        <Questions ref="ecrf" :groupClassify="1" :question-form-change-state="questionFormChangeState"
+          :question-form-change-num="questionFormChangeNum" @handleReadingChart="handleReadingChart" />
       </div>
       <!-- 测量问题 -->
-      <template >
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+      <template>
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
             <div v-for="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
                 <div class="title">{{ item.QuestionName }}</div>
               </div>
-              <div style="color: #ddd;text-align: left;padding: 5px 10px;border-bottom: 1px solid #5a5a5a;    font-size: 15px;">
-                <el-row >
+              <div
+                style="color: #ddd;text-align: left;padding: 5px 10px;border-bottom: 1px solid #5a5a5a;    font-size: 15px;">
+                <el-row>
                   <!-- 分段 -->
-                  <el-col :span="14">{{$t('trials:MRIPDFF:label:col1')}}</el-col>
+                  <el-col :span="14">{{ $t('trials:MRIPDFF:label:col1') }}</el-col>
                   <!-- 是否可测量 -->
                   <!-- <el-col :span="7">{{$t('trials:MRIPDFF:label:col2')}}</el-col> -->
                   <!-- 平均值 -->
-                  <el-col :span="7">{{$t('trials:MRIPDFF:label:col3')}}</el-col>
+                  <el-col :span="7">{{ $t('trials:MRIPDFF:label:col3') }}</el-col>
                 </el-row>
               </div>
-              
-              <el-collapse
-                v-if="item.Type === 'table' && item.TableQuestions"
-                v-model="activeName"
-                accordion
-                @change="handleCollapseChange"
-              >
-                <el-collapse-item
-                  v-for="(q,i) in item.TableQuestions.Answers"
-                  :key="`${item.Id}_${q.RowIndex}`"
+
+              <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
+                @change="handleCollapseChange">
+                <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                   :name="`${item.Id}_${q.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
-                >
+                  @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                   <template slot="title">
-                    <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+                    <div style="width:300px;position: relative;"
+                      :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : '#fff') }">
 
                       {{ getLesionName(item.TableQuestions.Questions, q) }}
                       <!-- 未保存 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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;right: 0px;top: 2px;">
@@ -73,32 +72,23 @@
                           <!-- <div style="display: inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width:95px">
                             {{ $fd('ReadingYesOrNo', parseInt(item.TableQuestions.Answers[i].isMeasurable)) }}
                           </div> -->
-                          <div style="display: inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width:50px">
-                            {{ isNaN(parseFloat(item.TableQuestions.Answers[i].mean)) ? item.TableQuestions.Answers[i].mean : `${item.TableQuestions.Answers[i].mean}%` }}
+                          <div
+                            style="display: inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width:50px">
+                            {{ isNaN(parseFloat(item.TableQuestions.Answers[i].mean)) ?
+                              item.TableQuestions.Answers[i].mean : `${item.TableQuestions.Answers[i].mean}%` }}
                           </div>
                         </div>
                       </div>
                     </div>
 
                   </template>
-                  <QuestionForm
-                    :ref="`${item.Id}_${q.RowIndex}`"
-                    :questions="item.TableQuestions.Questions"
-                    :answers="item.TableQuestions.Answers[i]"
-                    :lesion-type="item.LesionType"
-                    :order-mark="item.OrderMark"
-                    :table-questions="tableQuestions"
-                    :row-index="String(q.RowIndex)"
-                    :question-name="item.QuestionName"
-                    :parent-qs-id="item.Id"
-                    :visit-task-id="visitTaskId"
-                    :is-current-task="isCurrentTask"
-                    :reading-task-state="readingTaskState"
-                    :is-base-line-task="isBaseLineTask"
-                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
-                    @resetQuestions="resetQuestions"
-                    @close="close"
-                  />
+                  <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName" :parent-qs-id="item.Id" :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask" :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask" @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @resetQuestions="resetQuestions" @close="close" @handleReadingChart="handleReadingChart" />
                 </el-collapse-item>
 
               </el-collapse>
@@ -210,6 +200,9 @@ export default {
     DicomEvent.$off('getAllUnSaveLesions')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -269,7 +262,7 @@ export default {
 
           for (const i in obj.anwsers) {
             if (i === 'MeasureData' && obj.anwsers[i]) {
-             
+
             } else {
               item.TableQuestions.Answers[idx][i] = String(obj.anwsers[i])
             }
@@ -360,11 +353,11 @@ export default {
           })
           await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
           DicomEvent.$emit('getMeasureData')
-          
+
           loading ? loading.close() : ''
           resolve()
-        } catch (e) { 
-          console.log(e) 
+        } catch (e) {
+          console.log(e)
           loading ? loading.close() : ''
         }
       })
@@ -383,13 +376,13 @@ export default {
     },
 
     checkToolCanActive(toolName) {
-       return { isCanActiveTool: true, reason: '' }
+      return { isCanActiveTool: true, reason: '' }
     },
 
     getLesionName(questions, q) {
       let liverSegmentStr = ''
       if (!this.liverSegmentId) {
-        let i = questions.findIndex(i=>i.QuestionMark === 1106)
+        let i = questions.findIndex(i => i.QuestionMark === 1106)
         if (i === -1) return
         this.liverSegmentId = questions[i].Id
         this.liverSegmentDicCode = questions[i].DictionaryCode
@@ -458,7 +451,7 @@ export default {
           }
         })
       } else {
-       
+
       }
     },
     async close(questionsObj) {
@@ -525,23 +518,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -549,14 +545,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -565,42 +563,49 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .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;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -609,7 +614,7 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 10b7cf93..0725bf4c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -17,7 +17,7 @@
       <!-- 影像质量问题 -->
       <div class="lesions">
         <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-          :group-classify="1" />
+          :group-classify="1" @handleReadingChart="handleReadingChart" />
       </div>
 
       <!-- 测量问题 -->
@@ -37,7 +37,8 @@
                       <div class="add-icon" @click.prevent="downloadTpl(item.LesionType)">
                         <i class="el-icon-download" />
                       </div>
-                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
+                      <div class="add-icon" style="margin: 0 5px;"
+                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
                         <i class="el-icon-upload2" />
                       </div>
                       <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
@@ -154,7 +155,7 @@
         <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
           <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
             :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
-            @resetFormItemData="resetFormItemData" />
+            @resetFormItemData="resetFormItemData" @handleReadingChart="handleReadingChart" />
           <el-form-item style="text-align: right">
             <el-button size="small" @click="addOrEdit.visible = false">
               {{ $t('common:button:cancel') }}
@@ -169,7 +170,8 @@
       <!-- 导入 -->
       <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
         :title="upload.title" width="500px">
-        <UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" :TableName="upload.TableName" @close="uploadDlgClose" />
+        <UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" :TableName="upload.TableName"
+          @close="uploadDlgClose" />
       </el-dialog>
     </div>
   </div>
@@ -282,6 +284,9 @@ export default {
     DicomEvent.$off('refreshQuestions')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
index 8500284f..468502b9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
@@ -1,119 +1,66 @@
 <template>
   <div>
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ 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']},
+        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' : '']"
-      >
+        :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-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-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]"
+        <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)})"
-        >
+          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]"
-            />
+            <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"
-            />
+            <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
+            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"
-            />
+            <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)})"
-        >
+        <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)"
-            >
+            <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"
-            >
+            <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"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
+        <el-checkbox-group v-else-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2" @change="((val) => { formItemChange(val, question) })">
+          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
             {{ val }}
           </el-checkbox>
         </el-checkbox-group>
@@ -143,41 +90,38 @@
             @change="((val)=>{formItemChange(val, question)})"
           />
         </template> -->
-        <!-- 数值类型 -->
-        <el-input
-          v-else-if="question.Type==='number'"
-          v-model="questionForm[question.Id]"
-          :disabled="readingTaskState>=2 "
-          type="number"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <template v-if="question.Unit" slot="append">
-            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
-          </template>
-        </el-input>
+        <div style="display: flex;justify-content: space-between;"
+          v-else-if="question.Type === 'calculation' || question.Type === 'number'">
+          <!-- 数值类型 -->
+          <el-input v-if="question.Type === 'number'" v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2" type="number" @change="((val) => { formItemChange(val, question) })">
+            <template v-if="question.Unit" slot="append">
+              {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+            </template>
+          </el-input>
+
+          <el-input v-else-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled
+            @change="((val) => { formItemChange(val, question) })">
+            <template v-if="question.Unit" slot="append">
+              {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+            </template>
+          </el-input>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                TableQuestionId: question.Id,
+                RowIndex: questionForm.RowIndex
+              }
+            })" />
+        </div>
 
-        <el-input
-          v-else-if="question.Type==='calculation'"
-          v-model="questionForm[question.Id]"
-          disabled
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <template v-if="question.Unit" slot="append">
-            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
-          </template>
-        </el-input>
       </el-form-item>
     </template>
 
-    <QuestionTableFormItem
-      v-for="item in question.Childrens"
-      :key="item.Id"
-      :question="item"
-      :question-form="questionForm"
-      :reading-task-state="readingTaskState"
-      @setFormItemData="setFormItemData"
-      @resetFormItemData="resetFormItemData"
-    />
+    <QuestionTableFormItem v-for="item in question.Childrens" :key="item.Id" :question="item"
+      :question-form="questionForm" :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
+      @resetFormItemData="resetFormItemData" @handleReadingChart="handleReadingChart"/>
   </div>
 </template>
 <script>
@@ -214,6 +158,9 @@ export default {
     this.digitPlaces = Number(localStorage.getItem('digitPlaces'))
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     formItemChange(v, question) {
       if (question.Childrens && question.Childrens.length > 0) {
         this.resetChild(question.Childrens)
@@ -269,29 +216,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.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;
-  }
+
+::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/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
index e544a84a..8cc6293f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -20,177 +14,108 @@
         </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="true"
-        >
-          <el-option
-            v-for="item of $d.LesionType"
-            v-show="!(isBaseLineTask && item.value === 2)"
-            :key="item.id"
-            :value="item.value"
-            :label="item.label"
-          />
+      <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="true">
+          <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="qs.QuestionMark===11?[
-          { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue))) && qs.Type!=='group' && qs.Type!=='summary',
-            message: ['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},{validator:validateLesionCount, trigger: ['blur', 'change']}]:[
-              { 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']}]"
-      >
+      <el-form-item v-for="qs in questions" v-show="qs.ShowQuestion !== 2" :key="qs.Id" :label="`${qs.QuestionName}`"
+        :prop="qs.Id" :rules="qs.QuestionMark === 11 ? [
+          {
+            required: (qs.IsRequired === 0 || (qs.IsRequired === 1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue))) && qs.Type !== 'group' && qs.Type !== 'summary',
+            message: ['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+          }, { validator: validateLesionCount, trigger: ['blur', 'change'] }] : [
+          {
+            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']
+          }]">
         <!-- {{ isCurrentTaskAdd }}
         {{ questionForm.IsCanEditPosition }} -->
 
         <!-- 输入框    min="1"
               @input="questionForm[qs.Id]=questionForm[qs.Id].replace(/^(0+)|[^\d]+/g,'')"-->
-        <template v-if="qs.Type==='input' || qs.Type==='number'">
-          <template v-if="qs.QuestionMark===11">
-            <el-input
-              v-model="questionForm[qs.Id]"
-              :disabled="!isCurrentTask || readingTaskState>=2 "
-              type="number"
+        <template v-if="qs.Type === 'input' || qs.Type === 'number'">
+          <template v-if="qs.QuestionMark === 11">
+            <div style="display: flex;justify-content: space-between;">
+              <el-input v-model="questionForm[qs.Id]" :disabled="!isCurrentTask || readingTaskState >= 2" type="number"
+                @focus="focusQs = { ...qs }" @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>
+              <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+                @click.stop="(e) => handleReadingChart({
+                  e,
+                  data: {
+                    TableQuestionId: qs.Id,
+                    RowIndex: questionForm.RowIndex
+                  }
+                })" />
+            </div>
 
-              @focus="focusQs = {...qs}"
-              @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>
           <template v-else>
-            <el-input
-              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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False') && lesionType !== 2) || qs.QuestionMark === 9 || (qs.QuestionMark === 10 && isCurrentTaskAdd === 'False')"
-              @focus="focusQs = {...qs}"
-              @change="((val)=>{formItemChange(val, qs)})"
-            >
-              <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
+            <el-input 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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False') && lesionType !== 2) || qs.QuestionMark === 9 || (qs.QuestionMark === 10 && isCurrentTaskAdd === 'False')"
+              @focus="focusQs = { ...qs }" @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>
         </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
-          :disabled="((!isBaseLineTask && qs.QuestionMark === 11) || (isBaseLineTask || lesionType === 2) && qs.QuestionMark === 7) || !isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName) && lesionType !== 2)"
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
+        <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
+          :disabled="((!isBaseLineTask && qs.QuestionMark === 11) || (isBaseLineTask || lesionType === 2) && qs.QuestionMark === 7) || !isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2)"
+          @change="((val) => { formItemChange(val, qs) })">
           <template v-if="qs.TableQuestionType === 1">
-            <el-option
-              v-for="item in organList"
-              :key="item.Id"
-              :label="item[qs.DataTableColumn]"
-              :value="item[qs.DataTableColumn]"
-            />
+            <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]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[qs.DictionaryCode]" :key="item.id" :value="item.value" :label="item.label" />
           </template>
           <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && !isBaseLineTask">
-            <el-option
-              v-for="item of $d[qs.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[qs.DictionaryCode]" :key="item.id" :value="item.value" :label="item.label" />
           </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"
-            />
+            <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"
-            />
+            <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"
-          >
+        <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>
-    <div
-      v-if="isCurrentTask && readingTaskState<2"
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
+    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
+      style="text-align:right;margin-top:10px;">
       <!-- 清除标记 -->
-      <el-button
-        v-if="questionForm.MeasureData"
-        size="mini"
-        style="padding:7px 10px"
-        @click="handleDeleteMeasureData"
-      >
+      <el-button v-if="questionForm.MeasureData" size="mini" style="padding:7px 10px" @click="handleDeleteMeasureData">
         {{ $t('trials:reading:button:removeMark') }}
       </el-button>
       <!-- 删除 -->
-      <el-button
-        v-if="isCurrentTaskAdd !== 'False'"
-        size="mini"
-        style="margin-left: 5px;padding:7px 10px"
-        @click="handleDelete"
-      >
+      <el-button v-if="isCurrentTaskAdd !== 'False'" size="mini" style="margin-left: 5px;padding:7px 10px"
+        @click="handleDelete">
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button
-        size="mini"
-        style="margin-left: 5px;padding:7px 10px"
-        @click="handleSave"
-      >
+      <el-button size="mini" style="margin-left: 5px;padding:7px 10px" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -287,6 +212,9 @@ export default {
     DicomEvent.$off('handleImageQualityAbnormal')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     validateLesionCount(rule, value, callback) {
       // const reg = /^[1-9][0-9]?$|^100$/
       // const reg = /^(0+)|[^\d]+/g
@@ -647,7 +575,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg2'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -660,7 +588,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg3'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -672,7 +600,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg4'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -684,7 +612,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg5'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -696,7 +624,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg6'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -855,7 +783,7 @@ export default {
           type: 'warning',
           distinguishCancelAndClose: true
         })
-          .then(async() => {
+          .then(async () => {
             // 移除新建病灶并关闭窗口
             if (this.questionForm.MeasureData) {
               var remark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
@@ -864,7 +792,7 @@ export default {
             DicomEvent.$emit('getMeasureData')
             this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
           })
-          .catch(() => {})
+          .catch(() => { })
       } else {
         if (this.questionForm.isSave === false) {
           // '当前病灶信息有更新，未保存，是否继续？'
@@ -875,7 +803,7 @@ export default {
             .then(() => {
               this.$emit('close')
             })
-            .catch(() => {})
+            .catch(() => { })
         } else {
           this.$emit('close')
         }
@@ -900,39 +828,45 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  ::v-deep .el-form-item__label{
+.measurement-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
index 29226581..2f9c34f1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
@@ -8,58 +8,55 @@
           <span style="margin-left:5px;">{{ 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="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
       <!-- 非测量问题 -->
       <div class="lesions">
-        <Questions
-          ref="ecrf"
-          :question-form-change-state="questionFormChangeState"
-          :question-form-change-num="questionFormChangeNum"
-          :is-first-change-task="isFirstChangeTask"
-        />
+        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState"
+          :question-form-change-num="questionFormChangeNum" :is-first-change-task="isFirstChangeTask"
+          @handleReadingChart="handleReadingChart" />
       </div>
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <div v-for="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2) && !(isBaseLineTask && item.LesionType === 3)" :key="item.Id">
+            <div v-for="item in qs.Childrens"
+              v-show="!(isBaseLineTask && item.LesionType === 2) && !(isBaseLineTask && item.LesionType === 3)"
+              :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
                 <div class="title">{{ item.QuestionName }}</div>
-                <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
+                <div v-if="readingTaskState < 2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon"
+                  @click.prevent="handleAdd(item)">
                   <i class="el-icon-plus" />
                 </div>
               </div>
-              <el-collapse
-                v-if="item.Type === 'table' && item.TableQuestions"
-                v-model="activeName"
-                accordion
-                @change="handleCollapseChange"
-              >
-                <el-collapse-item
-                  v-for="(q,i) in item.TableQuestions.Answers"
-                  :key="`${item.Id}_${q.RowIndex}`"
+              <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
+                @change="handleCollapseChange">
+                <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                   :name="`${item.Id}_${q.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
-                >
+                  @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                   <template slot="title">
-                    <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
-                      {{ getLesionName(item.OrderMark,q.RowIndex, qs.Childrens) }}
+                    <div style="width:300px;position: relative;"
+                      :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : '#fff') }">
+                      {{ getLesionName(item.OrderMark, q.RowIndex, qs.Childrens) }}
                       <!-- 未保存 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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: 60px;top: 2px;">
@@ -68,37 +65,29 @@
                             {{ item.TableQuestions.Answers[i].lesionPart }}
                           </div>
                           <div v-if="item.TableQuestions.Answers[i].lesionState" style="margin-left:10px;">
-                            {{ $fd('EvaluationOfState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            {{ $fd('EvaluationOfState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                           </div>
-                          <div v-if="item.TableQuestions.Answers[i].lesionType" style="margin-left:10px;margin-bottom:5px;">
+                          <div v-if="item.TableQuestions.Answers[i].lesionType"
+                            style="margin-left:10px;margin-bottom:5px;">
                             {{ item.TableQuestions.Answers[i].lesionType }}
                           </div>
-                          <div v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionNum)) && item.LesionType === 4" style="margin-left:10px;">
+                          <div
+                            v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionNum)) && item.LesionType === 4"
+                            style="margin-left:10px;">
                             {{ item.TableQuestions.Answers[i].lesionNum }}
                           </div>
                         </div>
                       </div>
                     </div>
                   </template>
-                  <QuestionForm
-                    :ref="`${item.Id}_${q.RowIndex}`"
-                    :questions="item.TableQuestions.Questions"
-                    :answers="item.TableQuestions.Answers[i]"
-                    :lesion-type="item.LesionType"
-                    :order-mark="item.OrderMark"
-                    :table-questions="tableQuestions"
-                    :row-index="String(q.RowIndex)"
-                    :question-name="item.QuestionName"
-                    :parent-qs-id="item.Id"
-                    :visit-task-id="visitTaskId"
-                    :is-current-task="isCurrentTask"
-                    :reading-task-state="readingTaskState"
-                    :is-base-line-task="isBaseLineTask"
-                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
-                    @determineExistsUnsavedLession="determineExistsUnsavedLession"
-                    @resetQuestions="resetQuestions"
-                    @close="close"
-                  />
+                  <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName" :parent-qs-id="item.Id" :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask" :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask" @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @determineExistsUnsavedLession="determineExistsUnsavedLession" @resetQuestions="resetQuestions"
+                    @close="close" @handleReadingChart="handleReadingChart" />
                 </el-collapse-item>
 
               </el-collapse>
@@ -218,6 +207,9 @@ export default {
     DicomEvent.$off('getUnSaveTarget')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -519,7 +511,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -530,7 +522,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
       } else {
         var obj = { saveTypeEnum: 0 }
@@ -798,23 +790,26 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -822,14 +817,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -838,42 +835,49 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .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;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -882,10 +886,9 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
 }
 </style>
-
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index 571830b6..a2d9de0b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -6,47 +6,53 @@
     >
       {{ question.GroupName }}
     </div> -->
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ language === 'en' ? question.GroupEnName : question.GroupName }}
       </h4>
     </div>
     <template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" />
     <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']},
+        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' : '']"
-      >
+        :class="[question.Type === 'group' ? 'mb' : (question.Type === 'upload' || question.QuestionName.length > 15) ? 'uploadWrapper' : '']">
         <template v-if="question.QuestionType === 60 || question.QuestionType === 61">
           <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
+            <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
+              <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled
+                style="width: 130px;">
+                <template v-if="question.Unit" slot="append">
+                  {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+                </template>
+              </el-input>
+              <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart"
+                class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
+                  e,
+                  data: {
+                    QuestionId: question.Id
+                  }
+                })" />
+            </div>
 
-            <el-input
-              v-if="question.Type==='calculation'"
-              v-model="questionForm[question.Id]"
-              disabled
-              style="width: 130px;"
-            >
-              <template v-if="question.Unit" slot="append">
-                {{ $fd('ValueUnit', parseInt(question.Unit)) }}
-              </template>
-            </el-input>
             <!-- 测量 -->
-            <el-button v-if="!questionForm[question.Id] && readingTaskState!== 2" size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
+            <el-button v-if="!questionForm[question.Id] && readingTaskState !== 2" size="mini" type="text"
+              @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
             <!-- 清除标记 -->
-            <el-button v-if="questionForm[question.Id]&& readingTaskState!== 2" size="mini" type="text" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
+            <el-button v-if="questionForm[question.Id] && readingTaskState !== 2" size="mini" type="text"
+              @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
             <!-- 定位 -->
-            <el-button v-if="questionForm[question.Id]" size="mini" type="text" @click="locateAnnotation(question)">{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
+            <el-button v-if="questionForm[question.Id]" size="mini" type="text" @click="locateAnnotation(question)">{{
+              $t('trials:lugano:button:locateAnnotation') }}</el-button>
             <!-- 保存 -->
-            <el-button v-if="readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" @click="saveAnnotation(question)">
+            <el-button v-if="readingTaskState !== 2 && question.SaveEnum === 1" size="mini" type="text"
+              @click="saveAnnotation(question)">
               <!-- 未保存 -->
               <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                 <i class="el-icon-warning" style="color:red" />
@@ -56,157 +62,100 @@
           </div>
         </template>
 
-        <template v-else-if="question.QuestionType === 48 || question.QuestionType === 51 || question.QuestionType === 52 || question.QuestionType === 53">
-          <el-input
-            v-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>
+        <template
+          v-else-if="question.QuestionType === 48 || question.QuestionType === 51 || question.QuestionType === 52 || question.QuestionType === 53">
+          <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
+            <el-input v-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>
+            <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  QuestionId: question.Id
+                }
+              })" />
+          </div>
+
         </template>
 
         <!-- 输入框 -->
-        <el-input
-          v-else-if="question.Type==='input'"
-          v-model="questionForm[question.Id]"
+        <el-input v-else-if="question.Type === 'input'" v-model="questionForm[question.Id]"
           :disabled="readingTaskState >= 2 || isFirstChangeTask"
-          @change="((val)=>{formItemChange(val, question)})"
-        />
+          @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 || isFirstChangeTask"
-          @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 || isFirstChangeTask"
+          @change="((val) => { formItemChange(val, question) })" />
         <!-- 下拉框 -->
-        <el-select
-          v-else-if="question.Type==='select'"
-          v-model="questionForm[question.Id]"
+        <el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
           :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode) || isFirstChangeTask || question.QuestionType === 50 || question.QuestionType === 55"
-          clearable
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+          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]"
-            />
+            <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]" />
           </template>
           <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 47 && question.IsBaseLineTask">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              v-show="item.value === 1 ||item.value === 2 || item.value === 5 "
-              :key="item.id"
-              :value="String(item.value)"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[question.DictionaryCode]"
+              v-show="item.value === 1 || item.value === 2 || item.value === 5" :key="item.id"
+              :value="String(item.value)" :label="item.label" />
           </template>
-          <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 47 && !question.IsBaseLineTask">
+          <template
+            v-else-if="question.QuestionGenre === 3 && question.QuestionType === 47 && !question.IsBaseLineTask">
             <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-            >
-              <el-option
-                v-for="item of $d[question.DictionaryCode]"
-                v-show="item.value === 1 ||item.value === 3|| item.value === 4 || item.value === 5"
-                :key="item.id"
-                :value="String(item.value)"
-                :label="item.label"
-              />
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
+              <el-option v-for="item of $d[question.DictionaryCode]"
+                v-show="item.value === 1 || item.value === 3 || item.value === 4 || item.value === 5" :key="item.id"
+                :value="String(item.value)" :label="item.label" />
             </el-option-group>
           </template>
           <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 49 && question.IsBaseLineTask">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              v-show="item.value === 1 ||item.value === 5 || item.value === 6 "
-              :key="item.id"
-              :value="String(item.value)"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[question.DictionaryCode]"
+              v-show="item.value === 1 || item.value === 5 || item.value === 6" :key="item.id"
+              :value="String(item.value)" :label="item.label" />
           </template>
-          <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 49 && !question.IsBaseLineTask">
+          <template
+            v-else-if="question.QuestionGenre === 3 && question.QuestionType === 49 && !question.IsBaseLineTask">
             <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-            >
-              <el-option
-                v-for="item of $d[question.DictionaryCode]"
-                v-show="item.value === 1 ||item.value === 2 || item.value === 3 || item.value === 4 || item.value === 5"
-                :key="item.id"
-                :value="String(item.value)"
-                :label="item.label"
-              />
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
+              <el-option v-for="item of $d[question.DictionaryCode]"
+                v-show="item.value === 1 || item.value === 2 || item.value === 3 || item.value === 4 || item.value === 5"
+                :key="item.id" :value="String(item.value)" :label="item.label" />
             </el-option-group>
           </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"
-            />
+            <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
+            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"
-            />
+            <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 || isFirstChangeTask"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+        <el-radio-group v-else-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || isFirstChangeTask" @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)"
-            >
+            <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"
-            >
+            <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 || isFirstChangeTask"
-        >
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
+        <el-checkbox-group v-else-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || isFirstChangeTask">
+          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
             {{ val }}
           </el-checkbox>
         </el-checkbox-group>
@@ -217,80 +166,52 @@
           :disabled="readingTaskState >= 2 || isFirstChangeTask"
           :precision="2"
         /> -->
-        <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 || isFirstChangeTask"
-          />
-          <el-input-number
-            v-else-if="question.ValueType === 3"
-            v-model="questionForm[question.Id]"
-            :disabled="readingTaskState >= 2 || isFirstChangeTask"
-          />
-          <el-input-number
-            v-else-if="question.ValueType === 1 || question.ValueType === 2"
-            v-model="questionForm[question.Id]"
-            :precision="digitPlaces"
-            :disabled="readingTaskState >= 2 || isFirstChangeTask"
-          />
-        </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)) }}
+        <div style="display: flex;justify-content: space-between;"
+          v-else-if="question.Type === 'number' || question.Type === 'calculation'">
+          <template v-if="question.Type === 'number'">
+            <el-input-number v-if="question.ValueType === 0" v-model="questionForm[question.Id]" :precision="0"
+              :disabled="readingTaskState >= 2 || isFirstChangeTask" />
+            <el-input-number v-else-if="question.ValueType === 3" v-model="questionForm[question.Id]"
+              :disabled="readingTaskState >= 2 || isFirstChangeTask" />
+            <el-input-number v-else-if="question.ValueType === 1 || question.ValueType === 2"
+              v-model="questionForm[question.Id]" :precision="digitPlaces"
+              :disabled="readingTaskState >= 2 || isFirstChangeTask" />
           </template>
-        </el-input>
+          <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>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                QuestionId: question.Id
+              }
+            })" />
+        </div>
+
         <!-- 上传图像 -->
-        <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 || isFirstChangeTask"
-        >
+        <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 || isFirstChangeTask">
           <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=""
-            >
+            <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)"
-              >
+              <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)"
-              >
+              <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-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>
@@ -300,17 +221,9 @@
       </el-form-item>
     </template>
 
-    <QuestionItem
-      v-for="(item) in question.Childrens"
-      :key="item.Id"
-      :question="item"
-      :reading-task-state="readingTaskState"
-      :is-first-change-task="isFirstChangeTask"
-      :question-form="questionForm"
-      :visit-task-id="visitTaskId"
-      @setFormItemData="setFormItemData"
-      @resetFormItemData="resetFormItemData"
-    />
+    <QuestionItem v-for="(item) in question.Childrens" :key="item.Id" :question="item"
+      :reading-task-state="readingTaskState" :is-first-change-task="isFirstChangeTask" :question-form="questionForm"
+      :visit-task-id="visitTaskId" @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
   </div>
 </template>
 <script>
@@ -423,7 +336,7 @@ export default {
         .then(() => {
           DicomEvent.$emit('removeAnnotation', question)
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     locateAnnotation(question) {
       DicomEvent.$emit('locateAnnotation', question)
@@ -479,29 +392,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.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;
-  }
+
+::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/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index a465a15a..80f17222 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -3,7 +3,8 @@
     <el-form v-if="questions.length > 0" ref="questions" size="small" :model="questionForm">
       <QuestionItem v-for="question of questions" :key="question.Id" :question="question" :question-form="questionForm"
         :reading-task-state="readingTaskState" :is-first-change-task="isFirstChangeTask" :visit-task-id="visitTaskId"
-        @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
+        @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData"
+        @handleReadingChart="handleReadingChart" />
 
       <el-form-item v-if="readingTaskState < 2 && !isFirstChangeTask">
         <div class="ecrf-footer">
@@ -140,6 +141,9 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async getQuestions(visitTaskId, isRefresh = false) {
       var isChangeVisitTask = this.visitTaskId !== visitTaskId
       this.visitTaskId = visitTaskId
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 3a07458c..5bd2e7ad 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -44,10 +44,12 @@
           :is-reading-show-subject-info="isReadingShowSubjectInfo" :studyShow="studyShow"
           :is-reading-task-view-in-order="isReadingTaskViewInOrder" :is-exists-manual="isExistsManual"
           :isReadKeyFile="isReadKeyFile" :isHaveKeyFile="isHaveKeyFile"
-          :iseCRFShowInDicomReading="iseCRFShowInDicomReading" @previewCD="previewCD" />
+          :iseCRFShowInDicomReading="iseCRFShowInDicomReading" @previewCD="previewCD"
+          @handleReadingChart="handleReadingChart" />
       </div>
 
     </div>
+    <readingChart ref="readingChart" />
   </div>
 </template>
 <script>
@@ -62,6 +64,7 @@ import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import { workSpeedclose } from "@/utils"
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+import readingChart from '@/components/readingChart'
 // import metaDataProvider from '@/utils/metaDataProvider'
 // cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 var config = {
@@ -82,7 +85,8 @@ export default {
   name: 'ReadPage',
   components: {
     DicomViewer,
-    StudyList
+    StudyList,
+    readingChart
   },
   props: {
     trialId: {
@@ -233,6 +237,7 @@ export default {
     window.addEventListener('beforeunload', e => {
       cornerstone.imageCache.purgeCache()
     })
+    document.addEventListener("click", this.foo);
   },
   beforeDestroy() {
     cornerstone.imageCache.purgeCache()
@@ -246,6 +251,21 @@ export default {
     workSpeedclose(true)
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.visitTaskId
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart) return false
+      this.$refs.readingChart.foo()
+    },
     clickShow() {
       this.studyShow = !this.studyShow
       this.$nextTick(() => {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index e1ae2648..34107fa9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -19,28 +13,16 @@
         </div>
       </div>
 
-      <el-form-item
-        :label="$t('trials:reading:title:lesionType')"
-        prop="LesionType"
-        :rules="[
-          { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
-        ]"
-      >
+      <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-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-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>
@@ -48,140 +30,95 @@
           { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue))) && qs.Type!=='group' && qs.Type!=='summary' && qs.QuestionMark !== 4 && qs.QuestionMark !== 6 && qs.QuestionMark !== 2,
             message: '请注明', trigger: ['blur']},
         ]" -->
-      <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']},
-        ]"
-      >
+      <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']
+          },
+        ]">
         <!-- {{ isCurrentTaskAdd }}
         {{ questionForm.IsCanEditPosition }} -->
 
         <!-- 输入框 -->
-        <template v-if="qs.Type==='input' || qs.Type==='number'">
+        <template v-if="qs.Type === 'input' || qs.Type === 'number'">
+          <div style="display: flex;justify-content: space-between;">
+            <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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.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>
+            <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  TableQuestionId: qs.Id,
+                  RowIndex: questionForm.RowIndex
+                }
+              })" />
+          </div>
           <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
-          <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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.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-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) })" />
         <!-- 下拉框 -->
         <!-- :disabled="!isCurrentTask || readingTaskState>=2 || (!isBaseLineTask && qs.QuestionMark === 5 && isCurrentTaskAdd === 'False') || qs.QuestionMark === 2 || (qs.QuestionMark === 8 && !isBaseLineTask && isCurrentTaskAdd === 'False')" -->
 
-        <el-select
-          v-if="qs.Type==='select'"
-          v-model="questionForm[qs.Id]"
-          filterable
+        <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
           :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
+          :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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.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]"
-            />
+            <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"
-            />
+            <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(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode,parseFloat(answers.LastTaskState))}` : ''"
-            >
+              :label="!isNaN(parseFloat(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode, parseFloat(answers.LastTaskState))}` : ''">
               <!-- 首次分裂的病灶只能选择存在 -->
-              <template v-if="answers.IsFristAdd=== 'True' && answers.SplitOrMergeType === '0'">
+              <template v-if="answers.IsFristAdd === 'True' && answers.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"
-                />
+                <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 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"
-                />
+                <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"
-            />
+            <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"
-            />
+            <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"
-          >
+        <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>
@@ -189,33 +126,19 @@
 
     </div>
 
-    <div
-      v-if="isCurrentTask && readingTaskState<2"
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
+    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
+      style="text-align:right;margin-top:10px;">
 
       <!-- 清除标记 -->
-      <el-button
-        v-if="questionForm.MeasureData"
-        size="mini"
-        @click="handleDeleteMeasureData"
-      >
+      <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
         {{ $t('trials:reading:button:removeMark') }}
       </el-button>
       <!-- 删除 -->
-      <el-button
-        v-if="isCurrentTaskAdd !== 'False'"
-        size="mini"
-        @click="handleDelete"
-      >
+      <el-button v-if="isCurrentTaskAdd !== 'False'" size="mini" @click="handleDelete">
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button
-        size="mini"
-        @click="handleSave"
-      >
+      <el-button size="mini" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -307,6 +230,9 @@ export default {
     DicomEvent.$off('handleImageQualityAbnormal')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initForm() {
       const loading = this.$loading({ fullscreen: true })
       this.questions.forEach(item => {
@@ -352,12 +278,12 @@ export default {
         await this.setMeasureData(this.answers.measureObj, true)
       } else {
         if (this.questionForm.MeasureData) {
-        // 十字线工具 且是靶病灶  器官只能是淋巴结类型
+          // 十字线工具 且是靶病灶  器官只能是淋巴结类型
           if (this.questionForm.MeasureData.type === 'Bidirectional') {
             this.organList = []
             await this.getOrganInfoList(1)
           } else if (this.questionForm.MeasureData.type === 'Length') {
-          // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
+            // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
             this.organList = []
             await this.getOrganInfoList(0)
           } else {
@@ -469,8 +395,8 @@ export default {
               type: 'warning',
               distinguishCancelAndClose: true
             })
-              .then(() => {})
-              .catch(() => {})
+              .then(() => { })
+              .catch(() => { })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
           }
@@ -483,7 +409,7 @@ export default {
             this.$confirm(msg, {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
@@ -657,7 +583,7 @@ export default {
             var lesionShort = this.getQuestionVal(1)
             // 当前添加的新病灶不做处理
             if (!(this.isCurrentTaskAdd === 'True')) {
-            // 非基线时，非淋巴结病灶长径>=10mm，自动给“存在”状态，如果淋巴结病灶短径>=10mm，自动给“存在”状态。
+              // 非基线时，非淋巴结病灶长径>=10mm，自动给“存在”状态，如果淋巴结病灶短径>=10mm，自动给“存在”状态。
               if (!this.isBaseLineTask && ((measureData.type === 'Length' && lesionLength >= 10) || (measureData.type === 'Bidirectional' && lesionShort >= 10))) {
                 const stateId = this.getQuestionId(7)
                 this.$set(this.questionForm, stateId, 0)
@@ -673,7 +599,7 @@ export default {
               }
             }
 
-           
+
             var status = ''
             if (lesionState) {
               if (this.lesionType === 0 && lesionState === 1) {
@@ -855,7 +781,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg19'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -867,7 +793,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg20'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -884,7 +810,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg21'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -896,7 +822,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg22'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -914,7 +840,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg23'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -926,7 +852,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg24'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -942,7 +868,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg25'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -958,7 +884,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg26'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -979,7 +905,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg27'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -991,7 +917,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg28'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1026,7 +952,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg29'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1038,7 +964,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg30'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1059,7 +985,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg31'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1071,7 +997,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg32'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1088,7 +1014,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1100,7 +1026,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg34'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1117,7 +1043,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg35'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1129,7 +1055,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg36'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1146,7 +1072,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1158,7 +1084,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg38'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1175,7 +1101,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg39'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1187,7 +1113,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg40'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1204,7 +1130,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg41'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1216,7 +1142,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg42'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1233,7 +1159,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg43'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1245,7 +1171,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg44'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1262,7 +1188,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1274,7 +1200,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg46'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1330,7 +1256,7 @@ export default {
           }
           const res = await submitTableQuestion(params)
           if (res.IsSuccess) {
-          // 保存成功！
+            // 保存成功！
             this.$message.success(this.$t('common:message:savedSuccessfully'))
             this.currentMarkTool = measureData ? measureData.type : ''
             // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
@@ -1500,42 +1426,50 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  ::v-deep .el-form-item__label{
+.measurement-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+  ::v-deep .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index d3483c22..7b70e8de 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -8,119 +8,123 @@
           <span style="margin-left:5px;">{{ 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="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 非测量问题 -->
       <div class="lesions">
-        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum" />
+        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState"
+          :question-form-change-num="questionFormChangeNum" @handleReadingChart="handleReadingChart" />
       </div>
       <!-- 测量问题 -->
       <template v-if="questions.length > 0 && CriterionType !== 10">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
             <div v-for="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
-                <div class="title">{{ item.QuestionName }}</div>
-                <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
+                <div class="title">{{ item.QuestionName }}
+                  <svg-icon v-if="item.LesionType === 0" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0
+                      },
+                    })" />
+                </div>
+                <div v-if="readingTaskState < 2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon"
+                  @click.prevent="handleAdd(item)">
                   <i class="el-icon-plus" />
                 </div>
               </div>
               <!-- @change="handleCollapseChange(qs.Childrens,item)" -->
-              <el-collapse
-                v-if="item.Type === 'table' && item.TableQuestions"
-                v-model="activeName"
-                accordion
-                @change="handleCollapseChange"
-              >
-                <el-collapse-item
-                  v-for="(q,i) in item.TableQuestions.Answers"
-                  :key="`${item.Id}_${q.RowIndex}`"
+              <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
+                @change="handleCollapseChange">
+                <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                   :name="`${item.Id}_${q.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
-                >
+                  @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                   <template slot="title">
-                    <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+                    <div style="width:300px;position: relative;"
+                      :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : '#fff') }">
 
-                      {{ getLesionName(item.OrderMark,q.RowIndex) }}
+                      {{ getLesionName(item.OrderMark, q.RowIndex) }}
                       <!-- 未保存 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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;">
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
                         <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div
-                            v-if="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
-                          >
-                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                               <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
                             </el-tooltip>
                           </div>
-                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
                             <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else>
-                              {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                            <template
+                              v-if="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
                               {{ item.TableQuestions.Answers[i].lesionShort }}mm
                             </template>
-                            <template v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                            <template
+                              v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
                               {{ item.TableQuestions.Answers[i].lesionLength }}mm
                             </template>
                           </div>
                         </div>
                       </div>
-                      <div v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                      <div
+                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
-                        <el-tooltip v-show="readingTaskState<2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false" class="item" :content="$t('trials:reading:button:split')" placement="left">
-                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />
+                        <el-tooltip
+                          v-show="readingTaskState < 2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
+                          class="item" :content="$t('trials:reading:button:split')" placement="left">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
                       </div>
 
                     </div>
 
                   </template>
-                  <QuestionForm
-                    :ref="`${item.Id}_${q.RowIndex}`"
-                    :questions="item.TableQuestions.Questions"
-                    :answers="item.TableQuestions.Answers[i]"
-                    :lesion-type="item.LesionType"
-                    :order-mark="item.OrderMark"
-                    :table-questions="tableQuestions"
-                    :row-index="String(q.RowIndex)"
-                    :question-name="item.QuestionName"
-                    :parent-qs-id="item.Id"
-                    :visit-task-id="visitTaskId"
-                    :is-current-task="isCurrentTask"
-                    :reading-task-state="readingTaskState"
-                    :is-base-line-task="isBaseLineTask"
-                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
-                    @determineExistsUnsavedLession="determineExistsUnsavedLession"
-                    @resetQuestions="resetQuestions"
-                    @close="close"
-                  />
+                  <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName" :parent-qs-id="item.Id" :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask" :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask" @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @determineExistsUnsavedLession="determineExistsUnsavedLession" @resetQuestions="resetQuestions"
+                    @close="close" @handleReadingChart="handleReadingChart" />
                 </el-collapse-item>
 
               </el-collapse>
@@ -240,6 +244,9 @@ export default {
     DicomEvent.$off('getUnSaveTarget')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -495,7 +502,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           } else {
             // 是否确认分裂
             this.$confirm(this.$t('trials:reading:warnning:msg4'), {
@@ -505,7 +512,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           }
         }
       }
@@ -631,7 +638,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -642,7 +649,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
       } else {
         // saveTypeEnum: 0
@@ -781,7 +788,7 @@ export default {
     async changeLesionType(questionsObj) {
       await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
       // saveTypeEnum: 0
-      var lesionObj = { }
+      var lesionObj = {}
       var questionObj = questionsObj.questionForm
       // 切换到新的病灶集合
       var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
@@ -1058,23 +1065,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -1082,14 +1092,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -1098,42 +1110,49 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .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;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1142,7 +1161,7 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index 27f64a0f..af0dc531 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -18,160 +12,103 @@
         </div>
       </div>
 
-      <el-form-item
-        :label="$t('trials:reading:title:lesionType')"
-        prop="LesionType"
-        :rules="[
-          { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
-        ]"
-      >
+      <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-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-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']},
-        ]"
-      >
+      <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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.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 v-if="qs.Type === 'input' || qs.Type === 'number'">
+          <div style="display: flex;justify-content: space-between;">
+            <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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.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>
+            <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  TableQuestionId: qs.Id,
+                  RowIndex: questionForm.RowIndex
+                }
+              })" />
+          </div>
+
         </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-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
+        <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
           :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
+          :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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.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]"
-            />
+            <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"
-            />
+            <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(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode,parseFloat(answers.LastTaskState))}` : ''"
-            >
+              :label="!isNaN(parseFloat(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode, parseFloat(answers.LastTaskState))}` : ''">
               <!-- 首次分裂的病灶只能选择存在 -->
-              <template v-if="answers.IsFristAdd=== 'True' && answers.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 v-if="answers.IsFristAdd === 'True' && answers.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 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"
-                />
+                <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"
-            />
+            <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"
-            />
+            <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"
-          >
+        <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>
@@ -179,33 +116,19 @@
 
     </div>
 
-    <div
-      v-if="isCurrentTask && readingTaskState<2"
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
+    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
+      style="text-align:right;margin-top:10px;">
 
       <!-- 清除标记 -->
-      <el-button
-        v-if="questionForm.MeasureData"
-        size="mini"
-        @click="handleDeleteMeasureData"
-      >
+      <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
         {{ $t('trials:reading:button:removeMark') }}
       </el-button>
       <!-- 删除 -->
-      <el-button
-        v-if="isCurrentTaskAdd !== 'False'"
-        size="mini"
-        @click="handleDelete"
-      >
+      <el-button v-if="isCurrentTaskAdd !== 'False'" size="mini" @click="handleDelete">
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button
-        size="mini"
-        @click="handleSave"
-      >
+      <el-button size="mini" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -297,6 +220,9 @@ export default {
     DicomEvent.$off('handleImageQualityAbnormal')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initForm() {
       const loading = this.$loading({ fullscreen: true })
       this.questions.forEach(item => {
@@ -427,8 +353,8 @@ export default {
               type: 'warning',
               distinguishCancelAndClose: true
             })
-              .then(() => {})
-              .catch(() => {})
+              .then(() => { })
+              .catch(() => { })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
           }
@@ -440,7 +366,7 @@ export default {
             this.$confirm(msg, {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
@@ -584,7 +510,7 @@ export default {
 
             // 当前添加的新病灶不做处理
             if (!(this.isCurrentTaskAdd === 'True')) {
-            // 非基线时，非淋巴结病灶长径>=10mm，自动给“存在”状态，如果淋巴结病灶短径>=10mm，自动给“存在”状态。
+              // 非基线时，非淋巴结病灶长径>=10mm，自动给“存在”状态，如果淋巴结病灶短径>=10mm，自动给“存在”状态。
               if (!this.isBaseLineTask && ((measureData.type === 'Length' && lesionLength >= 10) || (measureData.type === 'Bidirectional' && lesionShort >= 10))) {
                 const stateId = this.getQuestionId(7)
                 this.$set(this.questionForm, stateId, 0)
@@ -600,7 +526,7 @@ export default {
               }
             }
 
-           
+
             var status = ''
             if (lesionState) {
               if (this.lesionType === 0 && lesionState === 1) {
@@ -779,7 +705,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg06'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -793,7 +719,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg07'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -808,7 +734,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg08'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -821,7 +747,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg09'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -839,7 +765,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg10'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -853,7 +779,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg11'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -871,7 +797,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg12'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -885,7 +811,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg13'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -899,7 +825,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg14'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -913,7 +839,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg15'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -927,7 +853,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg16'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -941,7 +867,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg17'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -955,7 +881,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg18'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -969,7 +895,7 @@ export default {
             this.$confirm(this.$t('trials:readingBM:warnning:msg19'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -1182,42 +1108,50 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  ::v-deep .el-form-item__label{
+.measurement-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+  ::v-deep .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index 8a51cd85..c33c4331 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -8,78 +8,86 @@
           <span style="margin-left:5px;">{{ 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="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
       <!-- 非测量问题 -->
       <div class="lesions">
-        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum" />
+        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState"
+          :question-form-change-num="questionFormChangeNum" @handleReadingChart="handleReadingChart" />
       </div>
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
             <div v-for="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
-                <div class="title">{{ item.QuestionName }}</div>
-                <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
+                <div class="title">{{ item.QuestionName }}
+                  <svg-icon v-if="item.LesionType === 0" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0
+                      },
+                    })" />
+                </div>
+                <div v-if="readingTaskState < 2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon"
+                  @click.prevent="handleAdd(item)">
                   <i class="el-icon-plus" />
                 </div>
               </div>
-              <el-collapse
-                v-if="item.Type === 'table' && item.TableQuestions"
-                v-model="activeName"
-                accordion
-                @change="handleCollapseChange"
-              >
-                <el-collapse-item
-                  v-for="(q,i) in item.TableQuestions.Answers"
-                  :key="`${item.Id}_${q.RowIndex}`"
+              <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
+                @change="handleCollapseChange">
+                <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                   :name="`${item.Id}_${q.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
-                >
+                  @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                   <template slot="title">
-                    <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+                    <div style="width:300px;position: relative;"
+                      :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : '#fff') }">
 
-                      {{ getLesionName(item.OrderMark,q.RowIndex) }}
+                      {{ getLesionName(item.OrderMark, q.RowIndex) }}
                       <!-- 未保存 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
-                          >
-                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                               <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
                             </el-tooltip>
                           </div>
-                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
                             <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else>
-                              {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                           </div>
-                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
 
                             <template v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
                               {{ item.TableQuestions.Answers[i].lesionLength }}mm
@@ -87,35 +95,29 @@
                           </div>
                         </div>
                       </div>
-                      <div v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                      <div
+                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
-                        <el-tooltip v-show="readingTaskState<2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false" class="item" :content="$t('trials:reading:button:split')" placement="left">
-                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />
+                        <el-tooltip
+                          v-show="readingTaskState < 2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
+                          class="item" :content="$t('trials:reading:button:split')" placement="left">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
                       </div>
 
                     </div>
 
                   </template>
-                  <QuestionForm
-                    :ref="`${item.Id}_${q.RowIndex}`"
-                    :questions="item.TableQuestions.Questions"
-                    :answers="item.TableQuestions.Answers[i]"
-                    :lesion-type="item.LesionType"
-                    :order-mark="item.OrderMark"
-                    :table-questions="tableQuestions"
-                    :row-index="String(q.RowIndex)"
-                    :question-name="item.QuestionName"
-                    :parent-qs-id="item.Id"
-                    :visit-task-id="visitTaskId"
-                    :is-current-task="isCurrentTask"
-                    :reading-task-state="readingTaskState"
-                    :is-base-line-task="isBaseLineTask"
-                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
-                    @determineExistsUnsavedLession="determineExistsUnsavedLession"
-                    @resetQuestions="resetQuestions"
-                    @close="close"
-                  />
+                  <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName" :parent-qs-id="item.Id" :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask" :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask" @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @determineExistsUnsavedLession="determineExistsUnsavedLession" @resetQuestions="resetQuestions"
+                    @close="close" @handleReadingChart="handleReadingChart" />
                 </el-collapse-item>
 
               </el-collapse>
@@ -237,6 +239,9 @@ export default {
     DicomEvent.$off('setReadingState')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -488,7 +493,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           } else {
             // 是否确认分裂
             this.$confirm(this.$t('trials:reading:warnning:msg4'), {
@@ -498,7 +503,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           }
         }
       }
@@ -604,7 +609,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -614,7 +619,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
       } else {
         var obj = { saveTypeEnum: 0 }
@@ -742,7 +747,7 @@ export default {
     async changeLesionType(questionsObj) {
       await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
       // saveTypeEnum: 0
-      var lesionObj = { }
+      var lesionObj = {}
       var questionObj = questionsObj.questionForm
       // 切换到新的病灶集合
       var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
@@ -987,23 +992,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -1011,14 +1019,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -1027,42 +1037,49 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .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;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1071,7 +1088,7 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index b4a47e17..3b15129e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -40,7 +40,19 @@
             <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>
+                  scope.row.QuestionName }}
+                <svg-icon
+                  v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1)"
+                  icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
+                      TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
+                      RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
+                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null
+                    }
+                  })" />
+              </span>
               <span v-else style="font-weight: bold;font-size: 16px;color: #f44336;">
                 {{ language === 'en' ? scope.row.GroupEnName : scope.row.GroupName }}
               </span>
@@ -206,6 +218,7 @@
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
+    <readingChart ref="readingChart_report" />
   </div>
 </template>
 <script>
@@ -221,9 +234,10 @@ import { mapGetters } from 'vuex'
 import { changeURLStatic } from '@/utils/history.js'
 import AdditionalAssessment from './AdditionalAssessment'
 import { openWindow } from "@/utils/splitScreen";
+import readingChart from '@/components/readingChart'
 export default {
   name: 'ReportPage',
-  components: { SignForm, AdditionalAssessment },
+  components: { SignForm, AdditionalAssessment, readingChart },
   props: {
     visitTaskId: {
       type: String,
@@ -298,6 +312,7 @@ export default {
       }
     })
     this.getReportInfo()
+    document.addEventListener("click", this.foo);
   },
   beforeDestroy() {
     DicomEvent.$off('getReportInfo')
@@ -307,6 +322,22 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      obj.key = 'readingChart_report'
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart_report.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart_report) return false
+      this.$refs.readingChart_report.foo()
+    },
     myConfirm(msg) {
       return new Promise(resolve => {
         this.$confirm(msg, {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index 9d03a965..bc0cb9a1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -391,7 +391,7 @@
         <div ref="form-container" class="form-container">
           <!-- 激活canvas测量数据 -->
           <MeasurementList ref="measurementList" :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading"
-            :is-reading-show-subject-info="isReadingShowSubjectInfo" />
+            :is-reading-show-subject-info="isReadingShowSubjectInfo" @handleReadingChart="handleReadingChart" />
         </div>
       </div>
     </div>
@@ -864,6 +864,9 @@ export default {
     DicomEvent.$off('loadLinkedImageStack')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async handleSubmitKeyDoc() {
       try {
         let data = {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
index e4af2322..4dc1257c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
@@ -1,14 +1,12 @@
 <template>
-  <div class="measurement-wrapper" :style="{'height':height+10+'px'}" style="position: relative">
+  <div class="measurement-wrapper" :style="{ 'height': height + 10 + 'px' }" style="position: relative">
 
-    <div class="container" :style="{'height':height+'px'}" style="padding-bottom: 50px;overflow-y: auto;">
+    <div class="container" :style="{ 'height': height + 'px' }" style="padding-bottom: 50px;overflow-y: auto;">
       <div class="basic-info">
         <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="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
         <h3 v-if="isReadingShowSubjectInfo">
@@ -16,73 +14,48 @@
           <span style="margin-left:5px;">{{ taskBlindName }}</span>
         </h3>
       </div>
-      <QuestionsPreview
-        ref="QuestionsPreview"
-        v-if="ecrfShow && TrialReadingCriterionId"
-        :visitTaskId="visitTaskId"
-        :criterionId="TrialReadingCriterionId">
+      <QuestionsPreview ref="QuestionsPreview" v-if="ecrfShow && TrialReadingCriterionId" :visitTaskId="visitTaskId"
+        :criterionId="TrialReadingCriterionId" @handleReadingChart="handleReadingChart">
       </QuestionsPreview>
     </div>
     <div class="questions-footer">
-      <i class="el-icon-warning feedback-icon" @click="openFeedBackTable" :style="{color: isExistUnprocessedFeedback ? '#ffeb3b' : '#fff'}"/>
-      <el-button v-if="readingTaskState<2" style="margin-right: 10px" type="primary" size="small" @click="handleSave(true)">
-        {{$t('common:button:save')}}
+      <i class="el-icon-warning feedback-icon" @click="openFeedBackTable"
+        :style="{ color: isExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }" />
+      <el-button v-if="readingTaskState < 2" style="margin-right: 10px" type="primary" size="small"
+        @click="handleSave(true)">
+        {{ $t('common:button:save') }}
       </el-button>
-      <el-button v-if="readingTaskState<2 && IseCRFShowInDicomReading" type="primary" style="margin-right: 10px" size="small" @click="skipTask">
+      <el-button v-if="readingTaskState < 2 && IseCRFShowInDicomReading" type="primary" style="margin-right: 10px"
+        size="small" @click="skipTask">
         <!-- 跳过 -->
         {{ $t('trials:readingReport:button:skip') }}
       </el-button>
-      <el-button style="margin-right: 10px" type="primary" size="small" v-if="readingTaskState<2 && IseCRFShowInDicomReading" @click="handleConfirm">
+      <el-button style="margin-right: 10px" type="primary" size="small"
+        v-if="readingTaskState < 2 && IseCRFShowInDicomReading" @click="handleConfirm">
         {{ $t('common:button:submit') }}</el-button>
     </div>
     <!-- 签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
+    <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>
+        <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>
-    <el-dialog
-      v-if="measuredDataVisible"
-      :visible.sync="measuredDataVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
-      <el-form
-        ref="measuredDataForm"
-        :model="form"
-        :rules="rules"
-        v-loading="loading"
-        label-width="120px"
-        size="small"
-      >
-        <el-form-item
-          :label="$t('trials:reading:title:measuredDataName')"
-          prop="measuredDataName"
-        >
+    <el-dialog v-if="measuredDataVisible" :visible.sync="measuredDataVisible" :close-on-click-modal="false"
+      width="600px" custom-class="base-dialog-wrapper">
+      <el-form ref="measuredDataForm" :model="form" :rules="rules" v-loading="loading" label-width="120px" size="small">
+        <el-form-item :label="$t('trials:reading:title:measuredDataName')" prop="measuredDataName">
           <el-input v-model="form.measuredDataName"></el-input>
         </el-form-item>
         <el-form-item style="text-align:right;">
           <!-- Cancel -->
-          <el-button
-            type="primary"
-            @click="handleMeasuredDataCancel"
-          >
+          <el-button type="primary" @click="handleMeasuredDataCancel">
             {{ $t('common:button:cancel') }}
           </el-button>
           <!-- Save -->
-          <el-button
-            type="primary"
-            @click="handleMeasuredDataSave"
-          >
+          <el-button type="primary" @click="handleMeasuredDataSave">
             {{ $t('common:button:save') }}
           </el-button>
         </el-form-item>
@@ -140,7 +113,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['visitTaskList','lastCanvasTaskId', 'currentReadingTaskState'])
+    ...mapGetters(['visitTaskList', 'lastCanvasTaskId', 'currentReadingTaskState'])
   },
   watch: {
     lastCanvasTaskId: {
@@ -185,7 +158,10 @@ export default {
     DicomEvent.$off('getCustomTableQuestionAnswer')
   },
   methods: {
-   async initList(){
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
+    async initList() {
       if (this.visitTaskId !== this.lastCanvasTaskId) {
         this.ecrfShow = true
         var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
@@ -215,15 +191,15 @@ export default {
             loading.close()
           }
           this.$nextTick(() => {
-            if(this.$refs['QuestionsPreview']){
-              this.$refs['QuestionsPreview'].getCustomTableQuestionAnswer(this.visitTaskId )
+            if (this.$refs['QuestionsPreview']) {
+              this.$refs['QuestionsPreview'].getCustomTableQuestionAnswer(this.visitTaskId)
             }
           })
         }
       }
     },
     getCustomTag() {
-      getCustomTag({visitTaskId: this.visitTaskId}).then(res => {
+      getCustomTag({ visitTaskId: this.visitTaskId }).then(res => {
         console.log(res)
       })
     },
@@ -236,10 +212,10 @@ export default {
     modifyMeasuredData(measureData) {
       measureData.visitTaskId = this.visitTaskId
       measureData.measureData.pictureBaseStr = ''
-      if (this.readingTaskState >=2) {
+      if (this.readingTaskState >= 2) {
         this.measuredDataVisible = false
         store.dispatch('reading/addCustomizeMeasuredData', { visitTaskId: this.visitTaskId, measureData: measureData.measureData })
-      }else{
+      } else {
         let params = JSON.parse(JSON.stringify(measureData))
         params.measureData = JSON.stringify(measureData.measureData)
         params.Id = params.questionInfo.Id
@@ -253,10 +229,10 @@ export default {
           // this.$message.success(this.$t('common:message:savedSuccessfully'))
         })
       }
-      
+
     },
     async moveMeasureData(measureData) {
-     console.log('measureData', measureData)
+      console.log('measureData', measureData)
       await store.dispatch('reading/removeCustomizeMeasuredData', { visitTaskId: this.visitTaskId, ...measureData })
       DicomEvent.$emit('updateImage')
     },
@@ -265,42 +241,42 @@ export default {
       // DicomEvent.$emit('updateImage')
     },
     handleMeasuredDataSave() {
-     this.$refs.measuredDataForm.validate(valid => {
-       if (!valid) return
-       // 是否同名验证
-       let isValid = this.validateRemarkName(this.form.measuredDataName)
-       if (!isValid) {
-        // '存在同名标记，不允许保存！'
-        this.$message.error(this.$t('trials:customReading:error:validMarkName'))
-        return
-       }
-       this.measureData.data.remark = this.form.measuredDataName
-       this.measureData.pictureBaseStr = ''
-       if (this.readingTaskState >=2) {
-        this.measuredDataVisible = false
-        this.form.measuredDataName = ''
-        store.dispatch('reading/addCustomizeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.measureData })
-        DicomEvent.$emit('updateImage')
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-       } else {
-        let params = JSON.parse(JSON.stringify(this.measureData))
-        params.measureData = JSON.stringify(this.measureData)
-        params.NumberOfFrames = this.measureData.frame
-        submitCustomTag(params).then(async (res) => {
+      this.$refs.measuredDataForm.validate(valid => {
+        if (!valid) return
+        // 是否同名验证
+        let isValid = this.validateRemarkName(this.form.measuredDataName)
+        if (!isValid) {
+          // '存在同名标记，不允许保存！'
+          this.$message.error(this.$t('trials:customReading:error:validMarkName'))
+          return
+        }
+        this.measureData.data.remark = this.form.measuredDataName
+        this.measureData.pictureBaseStr = ''
+        if (this.readingTaskState >= 2) {
           this.measuredDataVisible = false
           this.form.measuredDataName = ''
-          await store.dispatch('reading/addCustomizeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.measureData, id: res.Result  })
-          await store.dispatch('reading/getCustomizeMeasuredData', this.visitTaskId)
+          store.dispatch('reading/addCustomizeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.measureData })
           DicomEvent.$emit('updateImage')
           this.$message.success(this.$t('common:message:savedSuccessfully'))
-        })
-       }
-     })
+        } else {
+          let params = JSON.parse(JSON.stringify(this.measureData))
+          params.measureData = JSON.stringify(this.measureData)
+          params.NumberOfFrames = this.measureData.frame
+          submitCustomTag(params).then(async (res) => {
+            this.measuredDataVisible = false
+            this.form.measuredDataName = ''
+            await store.dispatch('reading/addCustomizeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.measureData, id: res.Result })
+            await store.dispatch('reading/getCustomizeMeasuredData', this.visitTaskId)
+            DicomEvent.$emit('updateImage')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          })
+        }
+      })
     },
     validateRemarkName(remark) {
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       var measureData = this.visitTaskList[idx].MeasureData
-      let i = measureData.findIndex(i=>i.MeasureData.data.remark === remark)
+      let i = measureData.findIndex(i => i.MeasureData.data.remark === remark)
       return i === -1
     },
     // 关闭签名框
@@ -393,7 +369,7 @@ export default {
         this.loading = false
         if (res.IsSuccess) {
           // 刷新标注、表单、报告页信息
-          this.$refs['QuestionsPreview'].getCustomTableQuestionAnswer(this.visitTaskId )
+          this.$refs['QuestionsPreview'].getCustomTableQuestionAnswer(this.visitTaskId)
           await store.dispatch('reading/refreshCustomizeMeasuredData', this.visitTaskId)
           DicomEvent.$emit('getMeasureData')
           DicomEvent.$emit('getReportInfo', true)
@@ -432,7 +408,7 @@ export default {
         type: 'imgfail',
         trialId: this.$route.query.trialId,
         visitTaskId: this.visitTaskId,
-        callBack: async() => {
+        callBack: async () => {
           console.log('callBack')
           const confirm = await this.$confirm(
             this.$t('trials:reading:confirm:feedbackmsg'),
@@ -460,23 +436,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
       flex-direction: row-reverse;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -484,14 +463,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -500,41 +481,48 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .el-collapse{
-    border-bottom:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .el-collapse {
+    border-bottom: none;
+
+    ::v-deep .el-collapse-item {
+      background-color: #000 !important;
       color: #ddd;
 
     }
-    ::v-deep .el-collapse-item__header{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -543,13 +531,14 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
-  .questions-footer{
+
+  .questions-footer {
     position: absolute;
-    bottom:0;
+    bottom: 0;
     left: 0;
     z-index: 10;
     background: #000;
@@ -558,13 +547,15 @@ export default {
     justify-content: right;
     align-items: center;
     height: 50px;
-    .feedback-icon{
+
+    .feedback-icon {
       padding: 0 10px;
       color: #fff;
       font-weight: 400;
       font-size: 24px;
       cursor: pointer;
-      &:hover{
+
+      &:hover {
         color: #68a2d5;
       }
     }
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
index e0bc9c84..fb51c5e3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
@@ -122,39 +122,53 @@
         <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 4" type="number"
           :disabled="!question.ClassifyEditType || readingTaskState === 2" v-model="questionForm[question.Id]"
           @change="(val) => { formItemNumberChange(val, question) }" />
-        <!-- 自动计算 -->
-        <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
-          @input="value = value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
         <!-- 自增 -->
         <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
-        <!-- 数值 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-          @change="(val) => { formItemNumberChange(val, question) }" :disabled="readingTaskState === 2">
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
-        </el-select>
-        <el-input type="text" v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
-          @change="(val) => { formItemNumberChange(val, question) }" @input="numberInput(question.Id)"
-          @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          v-model.trim="questionForm[question.Id]" :disabled="readingTaskState === 2">
-          <!-- <template slot="append">1</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template slot="append" v-else-if="question.ValueType === 2">%</template>
-        </el-input>
-        <el-input type="text" @input="numberInput(question.Id)"
-          v-if="question.Type === 'number' && !question.TypeValue && question.DataSource === 1"
-          @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          :disabled="question.DataSource === 1 || readingTaskState === 2" v-model.trim="questionForm[question.Id]">
-          <!-- <template slot="append">2</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template slot="append" v-else-if="question.ValueType === 2">%</template>
-        </el-input>
+        <div style="display: flex;justify-content: space-between;"
+          v-if="question.Type === 'number' || question.Type === 'calculation'">
+          <!-- 自动计算 -->
+          <!-- :precision="2" :step="0.1" :max="10" -->
+          <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
+            @input="value = value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
+          <!-- 数值 -->
+          <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]"
+            clearable @change="(val) => { formItemNumberChange(val, question) }" :disabled="readingTaskState === 2">
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()"
+              :value="val.trim()" />
+            <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit)
+              :
+              question.CustomUnit }}</template>
+            <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
+          </el-select>
+          <el-input type="text" v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
+            @change="(val) => { formItemNumberChange(val, question) }" @input="numberInput(question.Id)"
+            @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
+            v-model.trim="questionForm[question.Id]" :disabled="readingTaskState === 2">
+            <!-- <template slot="append">1</template> -->
+            <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit)
+              :
+              question.CustomUnit }}</template>
+            <template slot="append" v-else-if="question.ValueType === 2">%</template>
+          </el-input>
+          <el-input type="text" @input="numberInput(question.Id)"
+            v-if="question.Type === 'number' && !question.TypeValue && question.DataSource === 1"
+            @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
+            :disabled="question.DataSource === 1 || readingTaskState === 2" v-model.trim="questionForm[question.Id]">
+            <!-- <template slot="append">2</template> -->
+            <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit)
+              :
+              question.CustomUnit }}</template>
+            <template slot="append" v-else-if="question.ValueType === 2">%</template>
+          </el-input>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                QuestionId: question.Id
+              }
+            })" />
+        </div>
         <!-- 上传图像 -->
         <el-upload v-if="question.Type === 'upload'" :disabled="readingTaskState === 2" action
           :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
@@ -179,7 +193,7 @@
         :IsBaseline="IsBaseline" :reading-task-state="readingTaskState" :question-form="questionForm"
         :visit-task-id="visitTaskId" :criterion-id="criterionId" :CalculationList="CalculationList"
         @formItemNumberChange="formItemNumberChange" @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData" />
+        @resetFormItemData="resetFormItemData" @handleReadingChart="handleReadingChart" />
     </template>
     <base-model :config="addOrEdit" class="my_dialog" :close-on-click-modal="false" width="400px" append-to-body>
       <template slot="dialog-body">
@@ -188,7 +202,8 @@
             :IsBaseline="IsBaseline" :reading-task-state="readingTaskState" :question-form="QuestionsForm"
             :visit-task-id="visitTaskId" :criterion-id="criterionId" :type="addOrEdit.type"
             :CalculationList="CalculationTabelList" @formItemTableNumberChange="formItemTableNumberChange"
-            @resetFormItemData="resetTableFormItemData" @setFormItemData="setFormTableItemData" />
+            @resetFormItemData="resetTableFormItemData" @setFormItemData="setFormTableItemData"
+            @handleReadingChart="handleReadingChart" />
         </el-form>
       </template>
       <template slot="dialog-footer">
@@ -347,6 +362,9 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     numberInput(id) {
       this.questionForm[id] = this.questionForm[id].toUpperCase();
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
index 1eaef741..f7c69a17 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
@@ -71,36 +71,47 @@
           {{ item.trim() }}
         </el-radio>
       </el-radio-group>
-      <!-- 自动计算 -->
-      <!-- :precision="2" :step="0.1" :max="10" -->
-      <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
-        oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
       <!-- 自增 -->
       <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
-      <!-- 数值 -->
-      <!-- :precision="2" :step="0.1" :max="10" -->
-      <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-        @change="(val) => { formItemNumberChange(val, question) }"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')">
-        <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-        <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
-        <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
-      </el-select>
-      <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        @change="((val) => { formItemNumberChange(val, question) })" @input="numberInput(question.Id)"
-        @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-        v-model.trim="questionForm[question.Id]">
-        <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
-      </el-input>
-      <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource === 1"
-        :disabled="question.DataSource === 1" @input="numberInput(question.Id, true)"
-        @blur="handleCalculationBlur(calculationValue)" v-model.trim="calculationValue">
-        <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
-      </el-input>
+      <div style="display: flex;justify-content: space-between;"
+        v-if="question.Type === 'number' || question.Type === 'calculation'">
+        <!-- 自动计算 -->
+        <!-- :precision="2" :step="0.1" :max="10" -->
+        <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
+          oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
+        <!-- 数值 -->
+        <!-- :precision="2" :step="0.1" :max="10" -->
+        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
+          @change="(val) => { formItemNumberChange(val, question) }"
+          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')">
+          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
+          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
+            question.CustomUnit }}</template>
+          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
+        </el-select>
+        <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
+          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+          @change="((val) => { formItemNumberChange(val, question) })" @input="numberInput(question.Id)"
+          @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
+          v-model.trim="questionForm[question.Id]">
+          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
+            question.CustomUnit }}</template>
+        </el-input>
+        <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource === 1"
+          :disabled="question.DataSource === 1" @input="numberInput(question.Id, true)"
+          @blur="handleCalculationBlur(calculationValue)" v-model.trim="calculationValue">
+          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
+            question.CustomUnit }}</template>
+        </el-input>
+        <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+          @click.stop="(e) => handleReadingChart({
+            e,
+            data: {
+              TableQuestionId: question.Id,
+              RowIndex: questionForm.RowIndex
+            }
+          })" />
+      </div>
       <!-- 上传图像 -->
       <el-upload v-if="question.Type === 'upload'" action :accept="question.FileType"
         :limit="question.ImageCount === 0 ? 100 : question.ImageCount" :on-preview="handlePictureCardPreview"
@@ -251,6 +262,9 @@ export default {
     // }
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     numberInput(id, notId = false) {
       if (notId) {
         this.calculationValue = this.calculationValue.toUpperCase();
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue
index 1ba3b2f6..61fac838 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue
@@ -1,26 +1,12 @@
 <template>
   <div v-loading="loading" style="min-height: 500px;">
-    <el-form
-      v-if="isRender"
-      ref="questions"
-      size="small"
-      :model="questionForm"
-      :disabled="readingTaskState >= 2"
-    >
+    <el-form v-if="isRender" ref="questions" size="small" :model="questionForm" :disabled="readingTaskState >= 2">
       <template>
-        <QuestionFormItem
-          v-for="question of questions"
-          :key="question.Id"
-          :visitTaskId="visitTaskId"
-          :question="question"
-          :question-form="questionForm"
-          :reading-task-state="readingTaskState"
-          :criterion-id="criterionId"
-          :CalculationList="CalculationList"
-          :IsBaseline="IsBaseline"
-          @resetFormItemData="resetFormItemData"
-          @setFormItemData="setFormItemData"
-        />
+        <QuestionFormItem v-for="question of questions" :key="question.Id" :visitTaskId="visitTaskId"
+          :question="question" :question-form="questionForm" :reading-task-state="readingTaskState"
+          :criterion-id="criterionId" :CalculationList="CalculationList" :IsBaseline="IsBaseline"
+          @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData"
+          @handleReadingChart="handleReadingChart" />
       </template>
     </el-form>
   </div>
@@ -75,6 +61,9 @@ export default {
     DicomEvent.$off('reGetQuestionAnswer')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     handleSave(isMsg) {
       return new Promise(resolve => {
         console.log('handleSave')
@@ -86,7 +75,7 @@ export default {
           this.loading = true
           var answers = []
           for (const k in this.questionForm) {
-            if (this.questionForm[k] instanceof Array) {} else {
+            if (this.questionForm[k] instanceof Array) { } else {
               answers.push({ id: k, answer: this.questionForm[k] })
             }
           }
@@ -134,7 +123,7 @@ export default {
             this.$set(this.questionForm, v.Id, v.TableQuestions.Answers)
           }
           if (v.Type === 'class') {
-            this.classArr.push({triggerId: v.ClassifyQuestionId, classId: v.Id, classifyAlgorithms: v.ClassifyAlgorithms, classifyType: v.ClassifyType})
+            this.classArr.push({ triggerId: v.ClassifyQuestionId, classId: v.Id, classifyAlgorithms: v.ClassifyAlgorithms, classifyType: v.ClassifyType })
           }
           if (v.Type === 'number') {
             this.$set(this.questionForm, v.Id, isNaN(parseFloat(v.Answer)) ? v.Answer : parseFloat(v.Answer).toFixed(this.digitPlaces))
@@ -205,7 +194,7 @@ export default {
     },
     setChild(obj) {
       obj.forEach(i => {
-        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table'  && i.Type !== 'basicTable') {
+        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table' && i.Type !== 'basicTable') {
           this.$set(this.questionForm, i.Id, i.Answer)
         }
         if (i.Type === 'table' || i.Type === 'basicTable') {
@@ -219,7 +208,7 @@ export default {
           this.$set(this.questionForm, i.Id, i.TableQuestions.Answers)
         }
         if (i.Type === 'class') {
-          this.classArr.push({triggerId: i.ClassifyQuestionId, classId: i.Id, classifyAlgorithms: i.ClassifyAlgorithms, classifyType: i.ClassifyType})
+          this.classArr.push({ triggerId: i.ClassifyQuestionId, classId: i.Id, classifyAlgorithms: i.ClassifyAlgorithms, classifyType: i.ClassifyType })
         }
         if (i.Type === 'number') {
           this.$set(this.questionForm, i.Id, isNaN(parseFloat(i.Answer)) ? i.Answer : parseFloat(i.Answer).toFixed(this.digitPlaces))
@@ -234,7 +223,7 @@ export default {
     },
     setFormItemData(obj) {
       this.$set(this.questionForm, obj.key, JSON.parse(JSON.stringify(obj.val)))
-      this.classArr.map(i=>{
+      this.classArr.map(i => {
         if (i.triggerId === obj.key) {
           let answer = null
           let list = JSON.parse(i.classifyAlgorithms)
@@ -245,12 +234,12 @@ export default {
                 parseFloat(obj.val) < parseFloat(v.lt)
               )
             })
-            answer = o ? o.label : null 
+            answer = o ? o.label : null
           } else if (i.classifyType === 1) {
             let o = list.find(v => {
               return v.val.includes(obj.val)
             })
-            answer = o ? o.label.trim() : null 
+            answer = o ? o.label.trim() : null
           }
           this.$set(this.questionForm, i.classId, answer)
         }
@@ -284,15 +273,17 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::-webkit-scrollbar {
-    width: 7px;
-    height: 7px;
-  }
-  ::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    background: #d0d0d0;
-  }
-.tabContent{
-  height:300px;
+  width: 7px;
+  height: 7px;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #d0d0d0;
+}
+
+.tabContent {
+  height: 300px;
   overflow-y: auto;
 
 }
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
index 313c6b5e..4968fbe1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
@@ -34,9 +34,11 @@
           :is-reading-show-subject-info="isReadingShowSubjectInfo"
           :is-reading-task-view-in-order="isReadingTaskViewInOrder" :isExistsManual="isExistsManual"
           :isReadKeyFile="isReadKeyFile" :isHaveKeyFile="isHaveKeyFile"
-          :IseCRFShowInDicomReading="IseCRFShowInDicomReading" @previewCD="previewCD" />
+          :IseCRFShowInDicomReading="IseCRFShowInDicomReading" @previewCD="previewCD"
+          @handleReadingChart="handleReadingChart" />
       </div>
     </div>
+    <readingChart ref="readingChart" />
   </div>
 </template>
 <script>
@@ -50,6 +52,7 @@ import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import { workSpeedclose } from "@/utils"
+import readingChart from '@/components/readingChart'
 // import metaDataProvider from '@/utils/metaDataProvider'
 // cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 var config = {
@@ -71,6 +74,7 @@ export default {
   components: {
     DicomViewer,
     StudyList,
+    readingChart
   },
   props: {
     isReadingShowSubjectInfo: {
@@ -233,6 +237,7 @@ export default {
     window.addEventListener('beforeunload', e => {
       cornerstone.imageCache.purgeCache()
     })
+    document.addEventListener("click", this.foo);
   },
   beforeDestroy() {
     DicomEvent.$off("getNextVisitInfo");
@@ -245,6 +250,21 @@ export default {
     workSpeedclose(true)
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.visitTaskId
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart) return false
+      this.$refs.readingChart.foo()
+    },
     async getVisitInfo() {
       const loading = this.$loading({ fullscreen: true });
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
index ee1a2f81..ae40c687 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
@@ -26,7 +26,19 @@
           <el-table-column prop="" label="" show-overflow-tooltip width="350px">
             <template slot-scope="scope">
               <span v-if="scope.row.QuestionName">{{ scope.row.BlindName ? scope.row.QuestionName :
-                scope.row.QuestionName }}</span>
+                scope.row.QuestionName }}
+                <svg-icon
+                  v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1)"
+                  icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
+                      TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
+                      RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
+                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null
+                    }
+                  })" />
+              </span>
               <span v-else style="font-weight: bold;font-size: 16px;color: #f44336;">
                 {{ scope.row.GroupName }}
               </span>
@@ -235,6 +247,7 @@
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
+    <readingChart ref="readingChart_report" />
   </div>
 </template>
 <script>
@@ -247,9 +260,10 @@ import const_ from '@/const/sign-code'
 import SignForm from '@/views/trials/components/newSignForm'
 import { getToken } from '@/utils/auth'
 import store from '@/store'
+import readingChart from '@/components/readingChart'
 export default {
   name: 'CustomizeReportPage',
-  components: { SignForm, CustomizeReportPageUpload },
+  components: { SignForm, CustomizeReportPageUpload, readingChart },
   props: {
     visitTaskId: {
       type: String,
@@ -317,11 +331,28 @@ export default {
     })
     await this.getQuestionCalculateRelation()
     this.getReportInfo()
+    document.addEventListener("click", this.foo);
   },
   beforeDestroy() {
     DicomEvent.$off('getReportInfo')
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      obj.key = 'readingChart_report'
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart_report.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart_report) return false
+      this.$refs.readingChart_report.foo()
+    },
     limitInput(value, a, b) {
       if (value.indexOf('.') > -1) {
         if (value.split('.')[1].length >= this.digitPlaces) {
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 4562ac64..55fe7b07 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -324,16 +324,16 @@
                 :reading-task-state="currentVisitInfo.VisitTaskId === taskInfo.VisitTaskId ? readingTaskState : 2"
                 :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
                 @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
-                @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations"
-                @setToolToTarget="setToolToTarget" />
+                @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations" @setToolToTarget="setToolToTarget"
+                @handleReadingChart="handleReadingChart" />
               <recisit
                 v-else-if="lastViewportTaskId && criterionType === 1 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
                 :reading-task-state="currentVisitInfo.VisitTaskId === taskInfo.VisitTaskId ? readingTaskState : 2"
                 :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
                 @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
-                @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations"
-                @setToolToTarget="setToolToTarget" />
+                @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations" @setToolToTarget="setToolToTarget"
+                @handleReadingChart="handleReadingChart" />
               <customize-question-list
                 v-else-if="lastViewportTaskId && criterionType === 0 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
@@ -560,7 +560,7 @@ export default {
       trialId: '',
       visitTaskList: [],
       selectArr: [],
-      taskInfo: null,
+      taskInfo: {},
       activeTaskId: null,
       activeTaskIndex: -1,
       activeStudyIndex: -1,
@@ -766,19 +766,24 @@ export default {
     DicomEvent.$on('addNoneDicomMeasureData', data => {
       this.open.postMessage({ type: 'addNoneDicomMeasureData', data: data }, window.location)
     })
+    document.addEventListener("click", this.foo);
   },
   methods: {
     handleReadingChart(row) {
       let { e, data } = row
       let obj = Object.assign({}, data)
       obj.TrialId = this.$route.query.trialId
-      obj.VisitTaskId = this.taskInfo.VisitTaskI
+      obj.VisitTaskId = this.taskInfo.VisitTaskId
       let zIndex = 9
       if (obj.RowIndex) {
         zIndex = 9999
       }
       this.$refs.readingChart.init(e, obj, zIndex)
     },
+    foo() {
+      if (!this.$refs.readingChart) return false
+      this.$refs.readingChart.foo()
+    },
     async handleSubmitKeyDoc() {
       try {
         let data = {
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
index ed44a6ba..b9108d52 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
@@ -1,197 +1,115 @@
 <template>
   <div>
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ 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']},
+        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' : '']"
-      >
+        :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-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-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]"
+        <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)})"
-        >
+          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]"
-            />
+            <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"
-            />
+            <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
+            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"
-            />
+            <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)})"
-        >
+        <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)"
-            >
+            <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"
-            >
+            <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"
-          >
+        <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)) }}
+        <div style="display: flex;justify-content: space-between;"
+          v-else-if="question.Type === 'number' || question.Type === 'calculation'">
+          <!-- 数值 -->
+          <template v-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>
+          <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>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                QuestionId: question.Id
+              }
+            })" />
+        </div>
+
         <!-- 上传图像 -->
-        <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"
-        >
+        <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=""
-            >
+            <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)"
-              >
+              <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)"
-              >
+              <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-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>
@@ -201,16 +119,9 @@
       </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"
-      @resetFormItemData="resetFormItemData"
-      @setFormItemData="setFormItemData"
-    />
+    <question-form-item v-for="(item) in question.Childrens" :key="item.Id" :question="item"
+      :question-form="questionForm" :reading-task-state="readingTaskState" :visitTaskId="visitTaskId"
+      @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData" />
   </div>
 </template>
 <script>
@@ -267,6 +178,9 @@ export default {
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
   },
   methods: {
+    handleReadingChart(row) {
+      this.$emit('handleReadingChart', row)
+    },
     formItemChange(v, question) {
       console.log('formItemChange')
       if (question.Childrens.length > 0) {
@@ -293,33 +207,40 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.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{
+
+::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{
+
+::v-deep .el-select.is-disabled .el-input__inner {
   background-color: #646464a1;
 }
+
 // ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
 //   background-color: #428bca;
 //   border-color: #428bca;
-// }
-</style>
+// }</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
index 88b8226d..2bfa2558 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -40,7 +40,15 @@
           <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 class="title">{{ table.QuestionName }}
+                  <svg-icon v-if="table.LesionType === 0" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0
+                      },
+                    })" />
+                </div>
                 <div v-if="readingTaskState < 2 && (isBaseLineTask || table.LesionType === 2)" class="add-icon"
                   @click.prevent="addTarget(table)">
                   <i class="el-icon-plus" />
@@ -246,6 +254,9 @@ export default {
     window.addEventListener('message', this.receiveMsg)
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     // 获取器官信息
     async getOrganList() {
       try {
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
index fbb49226..646b304c 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -9,160 +9,102 @@
         <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-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-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-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']},
-      ]"
-    >
+    <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'">
+      <template v-if="qs.Type === 'input' || qs.Type === 'number'">
+        <div style="display: flex;justify-content: space-between;">
+          <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>
+          <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                TableQuestionId: qs.Id,
+                RowIndex: qsForm.RowIndex
+              }
+            })" />
+        </div>
 
-        <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-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
+      <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)})"
-      >
+        :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]"
-          />
+          <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"
-          />
+          <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))}` : ''"
-          >
+            :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'">
+            <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"
-              />
+              <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 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"
-              />
+              <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"
-          />
+          <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"
-          />
+          <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"
-        >
+      <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>
@@ -254,6 +196,9 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(row) {
+      this.$emit('handleReadingChart', row)
+    },
     lesionTypeChange(v) {
       this.$emit('lesionTypeChange', { tableId: this.tableInfo.Id, rowIndex: this.answer.RowIndex, newLesionType: v })
     },
@@ -316,42 +261,50 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.table-question-form{
-  ::v-deep .el-form-item__label{
+.table-question-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+  ::v-deep .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>
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 9807d7fc..20ab0537 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -40,7 +40,19 @@
             <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>
+                  scope.row.QuestionName }}
+                <svg-icon
+                  v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1)"
+                  icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
+                      TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
+                      RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
+                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null
+                    }
+                  })" />
+              </span>
               <span v-else style="font-weight: bold;font-size: 16px;color: #f44336;">
                 {{ language === 'en' ? scope.row.GroupEnName : scope.row.GroupName }}
               </span>
@@ -205,6 +217,7 @@
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
+    <readingChart ref="readingChart_report" />
   </div>
 </template>
 <script>
@@ -219,9 +232,10 @@ import { mapGetters } from 'vuex'
 import { changeURLStatic } from '@/utils/history.js'
 import AdditionalAssessment from '@/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment'
 import { openWindow } from "@/utils/splitScreen";
+import readingChart from '@/components/readingChart'
 export default {
   name: 'ReportPage',
-  components: { SignForm, AdditionalAssessment },
+  components: { SignForm, AdditionalAssessment, readingChart },
   data() {
     return {
       currentUser: zzSessionStorage.getItem('userName'),
@@ -281,6 +295,7 @@ export default {
       this.setScrollTop()
     })
     this.getReportInfo()
+    document.addEventListener("click", this.foo);
   },
   beforeDestroy() {
     if (this.openWindow) {
@@ -288,6 +303,22 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      obj.key = 'readingChart_report'
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart_report.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart_report) return false
+      this.$refs.readingChart_report.foo()
+    },
     myConfirm(msg) {
       return new Promise(resolve => {
         this.$confirm(msg, {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 7a7597b7..ac5e50b0 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -148,12 +148,20 @@
           @change="(val) => { formItemNumberChange(val, question) }" />
         <!-- 自动计算 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
-          @input="value = value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
+        <div style="display: flex;justify-content: space-between;">
+          <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
+            @input="value = value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                QuestionId: question.Id
+              }
+            })" />
+        </div>
         <!-- 自增 -->
         <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
         <!-- 数值 -->
-
         <template v-if="question.Type === 'number' && (question.ImageMarkEnum === 1 || question.ImageMarkEnum === 2)">
           <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
             <el-input type="text" @change="(val) => { formItemNumberChange(val, question) }"
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index 9c3f3382..ec813f4e 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -75,8 +75,18 @@
       </el-radio-group>
       <!-- 自动计算 -->
       <!-- :precision="2" :step="0.1" :max="10" -->
-      <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
-        oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
+      <div style="display: flex;justify-content: space-between;">
+        <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
+          oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
+        <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+          @click.stop="(e) => handleReadingChart({
+            e,
+            data: {
+              TableQuestionId: question.Id,
+              RowIndex: questionForm.RowIndex
+            }
+          })" />
+      </div>
       <!-- 自增 -->
       <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
       <!-- 数值 -->
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
index 3871653a..d6b894b7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
@@ -23,7 +23,19 @@
           <el-table-column prop="" label="" show-overflow-tooltip width="350px">
             <template slot-scope="scope">
               <span v-if="scope.row.QuestionName">{{ scope.row.BlindName ? scope.row.QuestionName :
-                scope.row.QuestionName }}</span>
+                scope.row.QuestionName }}
+                <svg-icon
+                  v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1)"
+                  icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
+                      TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
+                      RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
+                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null
+                    }
+                  })" />
+              </span>
               <span v-else style="font-weight: bold;font-size: 16px;color: #f44336;">
                 {{ scope.row.GroupName }}
               </span>
@@ -206,6 +218,7 @@
 
       <img v-show="false" :src="`${OSSclientConfig.basePath}${currentPath}`" alt="Image" />
     </viewer>
+    <readingChart ref="readingChart_report" />
   </div>
 </template>
 <script>
@@ -216,9 +229,10 @@ import const_ from '@/const/sign-code'
 import SignForm from '@/views/trials/components/newSignForm'
 import { getToken } from '@/utils/auth'
 import { openWindow } from "@/utils/splitScreen";
+import readingChart from '@/components/readingChart'
 export default {
   name: 'CustomizeReportPage',
-  components: { SignForm },
+  components: { SignForm, readingChart },
   data() {
     return {
       trialId: '',
@@ -289,8 +303,21 @@ export default {
     })
     await this.getQuestionCalculateRelation()
     this.getReportInfo()
+    document.addEventListener("click", this.foo);
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      obj.key = 'readingChart_report'
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart_report.init(e, obj, zIndex)
+    },
     limitBlur(questionForm, id, valueType) {
       const value = questionForm[id]
       if (valueType === 0) {
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
index 42f94b6a..5b6c5f57 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
@@ -1,197 +1,115 @@
 <template>
   <div>
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ 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']},
+        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' : '']"
-      >
+        :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-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-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]"
+        <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)})"
-        >
+          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]"
-            />
+            <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"
-            />
+            <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
+            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"
-            />
+            <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)})"
-        >
+        <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)"
-            >
+            <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"
-            >
+            <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"
-          >
+        <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)) }}
+        <div style="display: flex;justify-content: space-between;"
+          v-else-if="question.Type === 'number' || question.Type === 'calculation'">
+          <!-- 数值 -->
+          <template v-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>
+          <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>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                QuestionId: question.Id
+              }
+            })" />
+        </div>
+
         <!-- 上传图像 -->
-        <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"
-        >
+        <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=""
-            >
+            <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)"
-              >
+              <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)"
-              >
+              <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-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>
@@ -201,16 +119,9 @@
       </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"
-      @resetFormItemData="resetFormItemData"
-      @setFormItemData="setFormItemData"
-    />
+    <question-form-item v-for="(item) in question.Childrens" :key="item.Id" :question="item"
+      :question-form="questionForm" :reading-task-state="readingTaskState" :visitTaskId="visitTaskId"
+      @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData" />
   </div>
 </template>
 <script>
@@ -267,6 +178,9 @@ export default {
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
   },
   methods: {
+    handleReadingChart(row) {
+      this.$emit('handleReadingChart', row)
+    },
     formItemChange(v, question) {
       if (question.Childrens.length > 0) {
         this.resetChild(question.Childrens)
@@ -292,33 +206,40 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.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{
+
+::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{
+
+::v-deep .el-select.is-disabled .el-input__inner {
   background-color: #646464a1;
 }
+
 // ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
 //   background-color: #428bca;
 //   border-color: #428bca;
-// }
-</style>
+// }</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
index 910887fd..a3141f8b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -8,35 +8,25 @@
           <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 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"
-            @resetFormItemData="resetOuterFormItemData"
-            @setFormItemData="setOuterFormItemData"
-          />
+        <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"
+            @resetFormItemData="resetOuterFormItemData" @setFormItemData="setOuterFormItemData"
+            @handleReadingChart="handleReadingChart" />
           <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" />
+              <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>
@@ -44,147 +34,126 @@
       </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 }}
+        <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)"
-                >
+            <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 }}
+                  <svg-icon v-if="table.LesionType === 0" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0
+                      },
+                    })" />
+                </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)"
-                >
+              <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:innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ?'#5fb4ff':'#fff'}"
-                      :title="innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? $t('trials:mRecist:text:text1') : ''"
-                    >
-                      {{ getLesionName(table.OrderMark,answer.RowIndex) }}
+                    <div style="width:340px;position: relative;"
+                      :style="{ color: innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? '#5fb4ff' : '#fff' }"
+                      :title="innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? $t('trials:mRecist:text:text1') : ''">
+                      {{ 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">
+                      <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">
+                      <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', color: innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? '#5fb4ff' : '#fff'}">
+                      <div
+                        :style="{ position: 'absolute', left: '50px', top: '2px', color: innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? '#5fb4ff' : '#fff' }">
                         <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div
-                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                          <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"
-                          >
+                            :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">
+                          <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)) }}
+                              {{
+                                $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)) }}
+                              {{
+                                $fd('NoTargetState',
+                                  parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
+                              }}
                             </span>
                             <span v-else>
-                              {{ $fd('NewLesionState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                              {{
+                                $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}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
+                          <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}`].IsLymphNodes && !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}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                            <template
+                              v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphNodes && !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)" />
+                      <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
-                      :ref="`form_${table.Id}_${answer.RowIndex}`"
-                      :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-form :ref="`${table.Id}_${answer.RowIndex}`" size="small"
+                    :model="innerFormData[`${table.Id}_${answer.RowIndex}`]">
+                    <table-question-form-item :ref="`form_${table.Id}_${answer.RowIndex}`" :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" @handleReadingChart="handleReadingChart" />
+                    <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)"
-                      >
+                      <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)"
-                      >
+                      <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)"
-                      >
+                      <el-button size="mini" @click="saveLesion(table, answer.RowIndex)">
                         {{ $t('common:button:save') }}
                       </el-button>
                     </div>
@@ -286,6 +255,9 @@ export default {
     this.getTableQuestions()
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     // 获取器官信息
     async getOrganList() {
       try {
@@ -345,7 +317,7 @@ export default {
       this.$set(this.outerForm, v, null)
     },
     setOuterFormItemData(obj) {
-      
+
     },
     // 获取表格问题
     async getTableQuestions() {
@@ -676,7 +648,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -687,7 +659,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -895,7 +867,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg19'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -905,7 +877,7 @@ export default {
                 this.$confirm(this.$t('trials:mRecist:warnning:msg2'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -917,7 +889,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg20'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -934,7 +906,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg21'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -946,7 +918,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg22'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -964,7 +936,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg23'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -976,7 +948,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg24'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -992,7 +964,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg25'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1009,7 +981,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg26'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1031,7 +1003,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg27'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1043,7 +1015,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg28'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1059,7 +1031,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg29'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1071,7 +1043,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg30'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1093,7 +1065,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg31'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1105,7 +1077,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg32'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1122,7 +1094,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1134,7 +1106,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg34'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1151,7 +1123,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg35'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1163,7 +1135,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg36'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1180,7 +1152,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1192,7 +1164,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg38'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1209,7 +1181,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg39'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1221,7 +1193,7 @@ export default {
                 this.$confirm(this.$t('trials:mRecist:warnning:msg6'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1231,7 +1203,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg40'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1241,7 +1213,7 @@ export default {
                 this.$confirm(this.$t('trials:mRecist:warnning:msg3'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1258,7 +1230,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg41'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1269,7 +1241,7 @@ export default {
                 this.$confirm(this.$t('trials:mRecist:warnning:msg6'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1280,7 +1252,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg42'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1290,7 +1262,7 @@ export default {
                 this.$confirm(this.$t('trials:mRecist:warnning:msg4'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1307,7 +1279,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg43'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1319,7 +1291,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg44'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1336,7 +1308,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1348,7 +1320,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg46'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => {}
+                  callback: action => { }
                 })
                 loading.close()
                 return
@@ -1576,7 +1548,7 @@ export default {
           this.$confirm(msg, {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           return
         }
@@ -1679,7 +1651,7 @@ export default {
         type: 'imgfail',
         trialId: this.$route.query.trialId,
         visitTaskId: this.visitTaskId,
-        callBack: async() => {
+        callBack: async () => {
           const confirm = await this.$confirm(
             this.$t('trials:reading:confirm:feedbackmsg'),
             {
@@ -1716,7 +1688,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
         return
@@ -1733,7 +1705,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
         return
@@ -1744,7 +1716,7 @@ export default {
         this.$confirm(this.$t(' trials:reading:warnning:msg15'), {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
         return
@@ -1957,23 +1929,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.questionList-wrapper{
+.questionList-wrapper {
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -1981,64 +1956,75 @@ export default {
       }
     }
   }
-  .outer_form_wrapper{
-    ::v-deep .el-form-item__label{
+
+  .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{
+
+    ::v-deep .el-input__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
 
-    ::v-deep .el-form-item{
+    ::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{
+
+    ::v-deep .el-form-item__content {
       flex: 1;
     }
-    ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+    ::v-deep .el-button--mini,
+    .el-button--mini.is-round {
       padding: 7px 10px;
     }
-    ::v-deep .el-form-item__content
-    .el-select{
+
+    ::v-deep .el-form-item__content .el-select {
       width: 100%;
     }
-    .outer_form-footer{
+
+    .outer_form-footer {
       display: flex;
       flex-direction: row;
       justify-content: flex-end;
       align-items: center;
-      .feedback-icon{
+
+      .feedback-icon {
         padding: 0 10px;
         color: #fff;
         font-weight: 400;
         font-size: 22px;
         cursor: pointer;
-        &:hover{
+
+        &:hover {
           color: #68a2d5;
         }
       }
     }
 
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -2047,42 +2033,49 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .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;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -2091,7 +2084,7 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
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
index 6af663ff..bfee6051 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
@@ -9,168 +9,112 @@
         <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-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-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-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"
-      :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.QuestionMark === 21 && (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']},
-      ]"
-    >
-      <span slot="label" style="display:inline-block;" >
-        <el-tooltip v-if="qs.QuestionMark === 0 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2) && questionForm.IntrahepaticLesion" effect="dark" :content="$t('trials:mRecist:warnning:msg1')" placement="bottom">
+    <el-form-item v-for="qs in questions" v-show="qs.ShowQuestion !== 2" :key="qs.Id" :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.QuestionMark === 21 && (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']
+      },
+    ]">
+      <span slot="label" style="display:inline-block;">
+        <el-tooltip
+          v-if="qs.QuestionMark === 0 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2) && questionForm.IntrahepaticLesion"
+          effect="dark" :content="$t('trials:mRecist:warnning:msg1')" placement="bottom">
           <i class='el-icon-warning' />
         </el-tooltip>
         {{ qs.QuestionName }}
       </span>
-      
-      <!-- 输入框 -->
-      <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 v-if="qs.Type === 'input' || qs.Type === 'number'">
+        <div style="display: flex;justify-content: space-between;">
+          <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>
+          <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                TableQuestionId: qs.Id,
+                RowIndex: qsForm.RowIndex
+              }
+            })" />
+        </div>
+
       </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-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
+      <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)) || (qs.QuestionMark === 21 && (isCurrentTaskAdd === 'False'|| !!answer.SplitOrMergeLesionName)) || (questionForm.LesionOrgan && questionForm.LesionOrgan !== '肝脏' && questionForm.LesionOrgan !== 'Liver' && qs.QuestionMark === 21)"
-        @change="((val)=>{formItemChange(val, qs)})"
-      >
+        :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)) || (qs.QuestionMark === 21 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName)) || (questionForm.LesionOrgan && questionForm.LesionOrgan !== '肝脏' && questionForm.LesionOrgan !== 'Liver' && qs.QuestionMark === 21)"
+        @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]"
-          />
+          <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"
-          />
+          <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))}` : ''"
-          >
+            :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'">
+            <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"
-              />
+              <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 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"
-              />
+              <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"
-          />
+          <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"
-          />
+          <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"
-        >
+      <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>
@@ -262,6 +206,9 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(row) {
+      this.$emit('handleReadingChart', row)
+    },
     lesionTypeChange(v) {
       this.$emit('lesionTypeChange', { tableId: this.tableInfo.Id, rowIndex: this.answer.RowIndex, newLesionType: v })
     },
@@ -324,42 +271,50 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.table-question-form{
-  ::v-deep .el-form-item__label{
+.table-question-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+  ::v-deep .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index 6930a9e6..c4c7b33b 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -176,6 +176,7 @@ export default {
       this.$refs.readingChart.init(e, obj, zIndex)
     },
     foo() {
+      if (!this.$refs.readingChart) return false
       this.$refs.readingChart.foo()
     },
     getEcrf(data) {
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
index 62b91fa5..62405f0d 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
@@ -23,7 +23,17 @@
           <el-table-column prop="" label="" show-overflow-tooltip width="350px">
             <template slot-scope="scope">
               <span v-if="scope.row.QuestionName">{{ scope.row.BlindName ? scope.row.QuestionName :
-                scope.row.QuestionName }}</span>
+                scope.row.QuestionName }}
+                <svg-icon v-if="scope.row.ShowChartTypeEnum > 0" icon-class="readingChart"
+                  class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
+                      TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
+                      RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
+                    }
+                  })" />
+              </span>
               <span v-else style="font-weight: bold;font-size: 16px;color: #f44336;">
                 {{ scope.row.GroupName }}
               </span>
@@ -206,6 +216,7 @@
         <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
       </div>
     </el-dialog>
+    <readingChart ref="readingChart_report" />
   </div>
 </template>
 <script>
@@ -218,9 +229,10 @@ import PreviewFile from '@/components/PreviewFile/index'
 import { getToken } from '@/utils/auth'
 import store from '@/store'
 import { openWindow } from "@/utils/splitScreen";
+import readingChart from '@/components/readingChart'
 export default {
   name: 'CustomizeReportPage',
-  components: { SignForm, PreviewFile },
+  components: { SignForm, PreviewFile, readingChart },
   data() {
     return {
       trialId: '',
@@ -278,8 +290,25 @@ export default {
     })
     await this.getQuestionCalculateRelation()
     this.getReportInfo()
+    document.addEventListener("click", this.foo);
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      obj.key = 'readingChart_report'
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart_report.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart_report) return false
+      this.$refs.readingChart_report.foo()
+    },
     limitBlur(questionForm, id, valueType) {
       const value = questionForm[id]
       if (valueType === 0) {

From 3f9beb6dee85313d99ffda22a3f57ff2f2b2e355 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 20 Nov 2025 18:00:01 +0800
Subject: [PATCH 097/333] 1

---
 .../trials-panel/reading/dicoms/components/ReportPage.vue       | 2 +-
 .../reading/dicoms/customize/CustomizeReportPage.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 3b15129e..2f0b8146 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -326,7 +326,7 @@ export default {
       let { e, data } = row
       let obj = Object.assign({}, data)
       obj.TrialId = this.$route.query.trialId
-      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      obj.VisitTaskId = this.visitTaskId
       obj.key = 'readingChart_report'
       let zIndex = 9
       if (obj.RowIndex) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
index ae40c687..54bdffd4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
@@ -341,7 +341,7 @@ export default {
       let { e, data } = row
       let obj = Object.assign({}, data)
       obj.TrialId = this.$route.query.trialId
-      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      obj.VisitTaskId = this.visitTaskId
       obj.key = 'readingChart_report'
       let zIndex = 9
       if (obj.RowIndex) {

From 0d9db63f88ebb901c71850519d9dc0c8f6d3e19f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 21 Nov 2025 14:55:13 +0800
Subject: [PATCH 098/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/readingChart/index.vue         | 49 ++++++++++++++-----
 .../reading/dicoms/components/DicomViewer.vue |  9 ++--
 .../components/IRecist/QuestionForm.vue       |  3 +-
 .../components/IRecist/QuestionList.vue       |  3 +-
 .../dicoms/components/IVUS/QuestionList.vue   |  3 +-
 .../components/IVUS/QuestionTableFormItem.vue |  3 +-
 .../dicoms/components/Lugano/QuestionForm.vue |  9 ++--
 .../dicoms/components/Lugano/QuestionList.vue |  3 +-
 .../LuganoWithoutPET/QuestionForm.vue         |  9 ++--
 .../LuganoWithoutPET/QuestionList.vue         |  3 +-
 .../components/MRIPDFF/QuestionForm.vue       |  6 ++-
 .../components/OCT/QuestionTableFormItem.vue  |  5 +-
 .../dicoms/components/PCWG/QuestionForm.vue   |  3 +-
 .../dicoms/components/QuestionItem.vue        |  9 ++--
 .../dicoms/components/Recist/QuestionForm.vue |  3 +-
 .../dicoms/components/Recist/QuestionList.vue |  3 +-
 .../components/RecistBM/QuestionForm.vue      |  3 +-
 .../components/RecistBM/QuestionList.vue      |  3 +-
 .../reading/dicoms/components/ReportPage.vue  |  3 +-
 .../dicoms/customize/CustomizeDicomViewer.vue |  9 ++--
 .../customize/CustomizeQuestionFormItem.vue   |  7 +--
 .../CustomizeQuestionTableFormItem.vue        |  7 +--
 .../dicoms/customize/CustomizeReportPage.vue  |  3 +-
 .../reading/dicoms3D/components/ReadPage.vue  | 10 ++--
 .../components/Recist/QuestionFormItem.vue    |  3 +-
 .../components/Recist/QuestionList.vue        |  3 +-
 .../Recist/TableQuestionFormItem.vue          |  3 +-
 .../dicoms3D/components/ReportPage.vue        |  3 +-
 .../components/customize/QuestionFormItem.vue | 22 +++++----
 .../customize/QuestionTableFormItem.vue       | 25 ++++++----
 .../components/customize/ReportPage.vue       |  3 +-
 .../components/mRecist/QuestionFormItem.vue   |  3 +-
 .../components/mRecist/QuestionList.vue       |  3 +-
 .../mRecist/TableQuestionFormItem.vue         |  3 +-
 .../visit-review/components/FileViewer.vue    | 10 ++--
 .../visit-review/components/ReportPage.vue    |  1 +
 36 files changed, 167 insertions(+), 83 deletions(-)

diff --git a/src/components/readingChart/index.vue b/src/components/readingChart/index.vue
index 08468337..60619e82 100644
--- a/src/components/readingChart/index.vue
+++ b/src/components/readingChart/index.vue
@@ -64,7 +64,7 @@ export default {
         },
         async getInfo(data) {
             try {
-                let { VisitTaskId = null, TrialId = null, QuestionId = null, TableQuestionId = null, RowIndex = null, ReportChartTypeEnum = null } = data
+                let { VisitTaskId = null, TrialId = null, QuestionId = null, QuestionName = null, TableQuestionId = null, RowIndex = null, ReportChartTypeEnum = null } = data
                 let params = {
                     VisitTaskId, TrialId, QuestionId, TableQuestionId, RowIndex, ReportChartTypeEnum
                 }
@@ -72,16 +72,23 @@ export default {
                 let res = await getReportsChartData(params)
                 this.loading = false
                 if (res.IsSuccess) {
+                    let LatestScanDateList = res.Result.LatestScanDateList.map(item => item.split(" ")[0])
                     let obj = {
-                        xAxisData: res.Result.LatestScanDateList || [],
-                        series: []
+                        title: QuestionName,
+                        xAxisData: LatestScanDateList || [],
+                        series: [],
+                        unit: this.$fd("ValueUnit", res.Result.Unit),
+                        visitName: res.Result.VisitTaskNameList
                     }
-                    res.Result.ChartDataList.forEach(item => {
+                    res.Result.ChartDataList.forEach((item) => {
+                        let arr = []
+                        item.Value.forEach((d, index) => {
+                            arr.push([LatestScanDateList[index], d])
+                        })
                         obj.series.push({
                             name: item.Name,
-                            data: item.Value,
+                            data: arr,
                             type: 'line'
-
                         })
                     });
                     this.initChart(obj)
@@ -100,11 +107,25 @@ export default {
             this.chart = echarts.init(this.$refs.chartContainer);
             // ...图表配置
             const option = {
-                title: { text: '' },
+                title: {
+                    text: obj.title,
+                    textStyle: {
+                        color: "#fff"
+                    }
+                },
                 tooltip: {
-                    trigger: 'axis'
+                    trigger: 'axis',
+                    formatter: function (params) {
+                        let index = obj.xAxisData.findIndex(item => item === params[0].value[0])
+                        let result = obj.visitName[index] + ' ' + params[0].value[0] + '<br>'; // 显示类目名（如日期）
+                        params.forEach(function (item) {
+                            result += item.marker + ' ' + item.seriesName + ': ' + item.value[1] + '<br>'; // 显示每个系列的图例、系列名和值
+                        });
+                        return result;
+                    }
                 },
                 xAxis: {
+                    type: 'time',
                     data: obj.xAxisData,
                     axisLine: { // 设置 x 轴线颜色
                         lineStyle: {
@@ -115,9 +136,13 @@ export default {
                         textStyle: {
                             color: '#fff'
                         }
-                    }
+                    },
+                    splitLine: {
+                        show: false // 隐藏网格线
+                    },
                 },
                 yAxis: {
+                    name: obj.unit,
                     type: 'value',
                     axisLabel: {
                         textStyle: {
@@ -128,7 +153,7 @@ export default {
                         lineStyle: {
                             color: '#fff',
                         }
-                    }
+                    },
                 },
                 series: obj.series
             };
@@ -164,8 +189,8 @@ export default {
     list-style-type: none;
     min-height: 300px;
     max-height: 80vh;
-    overflow: hidden;
-    overflow-y: auto;
+    // overflow: hidden;
+    // overflow-y: auto;
     box-sizing: border-box;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 59d026c6..e37329fb 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -399,7 +399,7 @@
           <div style="padding:5px;display: flex;">
             <!-- 手册 -->
             <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
-              v-if="isExistsManual || isHaveKeyFile">
+              v-if="(isExistsManual || isHaveKeyFile) && readingTaskState < 2">
               <div class="tool-wrapper">
                 <div class="icon" @click.prevent="previewManuals(false)">
                   <svg-icon icon-class="constitution" class="svg-icon" />
@@ -558,7 +558,7 @@
       </span>
       <div style="height: 100%;margin:0;">
         <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
-        <div slot="footer" style="text-align:right;" v-if="openManuals">
+        <div slot="footer" style="text-align:right;" v-if="openManuals && !ManualsClose">
           <!-- 确认 -->
           <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
             {{ $t('common:button:confirm') }}</el-button>
@@ -904,7 +904,9 @@ export default {
 
       fullScreenIndex: -1,
       fullScreenWidth: window.innerWidth - 570 + 'px',
-      fullScreenHeight: window.innerHeight - 130 + 'px'
+      fullScreenHeight: window.innerHeight - 130 + 'px',
+
+      ManualsClose: false
     }
   },
 
@@ -1169,6 +1171,7 @@ export default {
         let res = await setReadKeyFile(data)
         if (res.IsSuccess) {
           this.manualsDialog.visible = false
+          this.ManualsClose = true
         }
       } catch (err) {
         console.log(err)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index ef1b47d2..3de86373 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -50,7 +50,8 @@
                 e,
                 data: {
                   TableQuestionId: qs.Id,
-                  RowIndex: questionForm.RowIndex
+                  RowIndex: questionForm.RowIndex,
+                  QuestionName: qs.QuestionName
                 }
               })" />
           </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index 8bd4a380..6f9d65d7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -42,7 +42,8 @@
                     class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                       e,
                       data: {
-                        ReportChartTypeEnum: 0
+                        ReportChartTypeEnum: 0,
+                        QuestionName: item.QuestionName
                       },
                     })" />
                 </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 17c2b431..be8e7418 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -109,7 +109,8 @@
                             class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
                               e,
                               data: {
-                                QuestionId: item.Id
+                                QuestionId: item.Id,
+                                QuestionName: item.QuestionName
                               }
                             })" />
                         </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
index fa6ee2be..eacf1a0d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
@@ -111,7 +111,8 @@
               e,
               data: {
                 TableQuestionId: question.Id,
-                RowIndex: questionForm.RowIndex
+                RowIndex: questionForm.RowIndex,
+                QuestionName: question.QuestionName
               }
             })" />
         </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 5e5ff1f7..2532eabe 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -49,7 +49,8 @@
                   e,
                   data: {
                     TableQuestionId: qs.Id,
-                    RowIndex: questionForm.RowIndex
+                    RowIndex: questionForm.RowIndex,
+                    QuestionName: qs.QuestionName
                   }
                 })" />
             </div>
@@ -131,7 +132,8 @@
                     e,
                     data: {
                       TableQuestionId: qs.Id,
-                      RowIndex: questionForm.RowIndex
+                      RowIndex: questionForm.RowIndex,
+                      QuestionName: qs.QuestionName
                     }
                   })" />
               </div>
@@ -169,7 +171,8 @@
                   e,
                   data: {
                     TableQuestionId: qs.Id,
-                    RowIndex: questionForm.RowIndex
+                    RowIndex: questionForm.RowIndex,
+                    QuestionName: qs.QuestionName
                   }
                 })" />
             </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 36e7c707..a2c5e6d1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -40,7 +40,8 @@
                     class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                       e,
                       data: {
-                        ReportChartTypeEnum: 0
+                        ReportChartTypeEnum: 0,
+                        QuestionName: item.QuestionName
                       },
                     })" />
                 </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index 5e5ff1f7..2532eabe 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -49,7 +49,8 @@
                   e,
                   data: {
                     TableQuestionId: qs.Id,
-                    RowIndex: questionForm.RowIndex
+                    RowIndex: questionForm.RowIndex,
+                    QuestionName: qs.QuestionName
                   }
                 })" />
             </div>
@@ -131,7 +132,8 @@
                     e,
                     data: {
                       TableQuestionId: qs.Id,
-                      RowIndex: questionForm.RowIndex
+                      RowIndex: questionForm.RowIndex,
+                      QuestionName: qs.QuestionName
                     }
                   })" />
               </div>
@@ -169,7 +171,8 @@
                   e,
                   data: {
                     TableQuestionId: qs.Id,
-                    RowIndex: questionForm.RowIndex
+                    RowIndex: questionForm.RowIndex,
+                    QuestionName: qs.QuestionName
                   }
                 })" />
             </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
index 4badf78e..15b65e75 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
@@ -40,7 +40,8 @@
                     class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                       e,
                       data: {
-                        ReportChartTypeEnum: 0
+                        ReportChartTypeEnum: 0,
+                        QuestionName: item.QuestionName
                       },
                     })" />
                 </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
index 43030d6c..8dc07374 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -71,7 +71,8 @@
                 e,
                 data: {
                   TableQuestionId: qs.Id,
-                  RowIndex: questionForm.RowIndex
+                  RowIndex: questionForm.RowIndex,
+                  QuestionName: qs.QuestionName
                 }
               })" />
           </div>
@@ -125,7 +126,8 @@
               e,
               data: {
                 TableQuestionId: qs.Id,
-                RowIndex: questionForm.RowIndex
+                RowIndex: questionForm.RowIndex,
+                QuestionName: qs.QuestionName
               }
             })" />
         </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
index 468502b9..5af06485 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
@@ -111,7 +111,8 @@
               e,
               data: {
                 TableQuestionId: question.Id,
-                RowIndex: questionForm.RowIndex
+                RowIndex: questionForm.RowIndex,
+                QuestionName: question.QuestionName
               }
             })" />
         </div>
@@ -121,7 +122,7 @@
 
     <QuestionTableFormItem v-for="item in question.Childrens" :key="item.Id" :question="item"
       :question-form="questionForm" :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
-      @resetFormItemData="resetFormItemData" @handleReadingChart="handleReadingChart"/>
+      @resetFormItemData="resetFormItemData" @handleReadingChart="handleReadingChart" />
   </div>
 </template>
 <script>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
index 8cc6293f..661182db 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
@@ -52,7 +52,8 @@
                   e,
                   data: {
                     TableQuestionId: qs.Id,
-                    RowIndex: questionForm.RowIndex
+                    RowIndex: questionForm.RowIndex,
+                    QuestionName: qs.QuestionName
                   }
                 })" />
             </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index a2d9de0b..0c92fd77 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -36,7 +36,8 @@
                 class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
                   e,
                   data: {
-                    QuestionId: question.Id
+                    QuestionId: question.Id,
+                    QuestionName: question.QuestionName
                   }
                 })" />
             </div>
@@ -74,7 +75,8 @@
               @click.stop="(e) => handleReadingChart({
                 e,
                 data: {
-                  QuestionId: question.Id
+                  QuestionId: question.Id,
+                  QuestionName: question.QuestionName
                 }
               })" />
           </div>
@@ -186,7 +188,8 @@
             @click.stop="(e) => handleReadingChart({
               e,
               data: {
-                QuestionId: question.Id
+                QuestionId: question.Id,
+                QuestionName: question.QuestionName
               }
             })" />
         </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index 34107fa9..cdd95e92 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -55,7 +55,8 @@
                 e,
                 data: {
                   TableQuestionId: qs.Id,
-                  RowIndex: questionForm.RowIndex
+                  RowIndex: questionForm.RowIndex,
+                  QuestionName: qs.QuestionName
                 }
               })" />
           </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index 7b70e8de..39730027 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -34,7 +34,8 @@
                     class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                       e,
                       data: {
-                        ReportChartTypeEnum: 0
+                        ReportChartTypeEnum: 0,
+                        QuestionName: item.QuestionName
                       },
                     })" />
                 </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index af0dc531..9a44ca37 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -48,7 +48,8 @@
                 e,
                 data: {
                   TableQuestionId: qs.Id,
-                  RowIndex: questionForm.RowIndex
+                  RowIndex: questionForm.RowIndex,
+                  QuestionName: qs.QuestionName
                 }
               })" />
           </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index c33c4331..b3ef5be3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -33,7 +33,8 @@
                     class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                       e,
                       data: {
-                        ReportChartTypeEnum: 0
+                        ReportChartTypeEnum: 0,
+                        QuestionName: item.QuestionName
                       },
                     })" />
                 </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 2f0b8146..ddb411ba 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -49,7 +49,8 @@
                       QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
                       TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
                       RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
-                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null
+                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null,
+                      QuestionName: scope.row.QuestionName
                     }
                   })" />
               </span>
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index bc0cb9a1..ee39ac29 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -340,7 +340,7 @@
         <div style="margin-left: auto">
           <div style="padding: 5px">
             <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
-              v-if="isExistsManual || isHaveKeyFile">
+              v-if="(isExistsManual || isHaveKeyFile) && readingTaskState < 2">
               <div class="tool-wrapper">
                 <div class="icon" @click.prevent="previewManuals()">
                   <svg-icon icon-class="constitution" class="svg-icon" />
@@ -429,7 +429,7 @@
       </span>
       <div style="height: 100%; margin: 0">
         <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
-        <div slot="footer" style="text-align:right;" v-if="openManuals">
+        <div slot="footer" style="text-align:right;" v-if="openManuals && !ManualsClose">
           <!-- 确认 -->
           <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
             {{ $t('common:button:confirm') }}</el-button>
@@ -681,7 +681,9 @@ export default {
       taskId: '',
       fullScreenIndex: -1,
       fullScreenWidth: window.innerWidth - 570 + 'px',
-      fullScreenHeight: window.innerHeight - 128 + 'px'
+      fullScreenHeight: window.innerHeight - 128 + 'px',
+
+      ManualsClose: false
     }
   },
 
@@ -875,6 +877,7 @@ export default {
         let res = await setReadKeyFile(data)
         if (res.IsSuccess) {
           this.manualsDialog.visible = false
+          this.ManualsClose = true
         }
       } catch (err) {
         console.log(err)
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
index fb51c5e3..bb416450 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
@@ -161,11 +161,12 @@
               question.CustomUnit }}</template>
             <template slot="append" v-else-if="question.ValueType === 2">%</template>
           </el-input>
-          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-            @click.stop="(e) => handleReadingChart({
+          <svg-icon v-if="question.ShowChartTypeEnum > 0 && $router.currentRoute.query.isReadingTaskViewInOrder === 1"
+            icon-class="readingChart" class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
               e,
               data: {
-                QuestionId: question.Id
+                QuestionId: question.Id,
+                QuestionName: question.QuestionName
               }
             })" />
         </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
index f7c69a17..fd4dd121 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
@@ -103,12 +103,13 @@
           <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
             question.CustomUnit }}</template>
         </el-input>
-        <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-          @click.stop="(e) => handleReadingChart({
+        <svg-icon v-if="qs.ShowChartTypeEnum > 0 && $router.currentRoute.query.isReadingTaskViewInOrder"
+          icon-class="readingChart" class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
             e,
             data: {
               TableQuestionId: question.Id,
-              RowIndex: questionForm.RowIndex
+              RowIndex: questionForm.RowIndex,
+              QuestionName: question.QuestionName
             }
           })" />
       </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
index 54bdffd4..34255a73 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
@@ -35,7 +35,8 @@
                       QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
                       TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
                       RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
-                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null
+                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null,
+                      QuestionName: scope.row.QuestionName
                     }
                   })" />
               </span>
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 55fe7b07..19c0a625 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -270,7 +270,8 @@
           <div style="display: flex;">
             <!-- 手册 -->
             <div class="tool-item" :title="$t('trials:reading:button:handbooks')"
-              v-if="taskInfo && (taskInfo.ExistsManual || taskInfo.IsHaveKeyFile)" @click.prevent="previewManuals()">
+              v-if="taskInfo && (taskInfo.ExistsManual || taskInfo.IsHaveKeyFile) && readingTaskState < 2"
+              @click.prevent="previewManuals()">
               <svg-icon icon-class="constitution" class="svg-icon" />
             </div>
             <!-- 临床数据 -->
@@ -373,7 +374,7 @@
         <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
         <div slot="footer" style="text-align:right;" v-if="openManuals">
           <!-- 确认 -->
-          <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
+          <el-button type="primary" size="mini" @click="handleSubmitKeyDoc && !ManualsClose">
             {{ $t('common:button:confirm') }}</el-button>
         </div>
       </div>
@@ -642,7 +643,9 @@ export default {
       curOperation: {
         type: '',
         annotation: null
-      }
+      },
+
+      ManualsClose: false
     }
   },
   computed: {
@@ -792,6 +795,7 @@ export default {
         let res = await setReadKeyFile(data)
         if (res.IsSuccess) {
           this.manualsDialog.visible = false
+          this.ManualsClose = true
         }
       } catch (err) {
         console.log(err)
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
index b9108d52..665f14bd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
@@ -85,7 +85,8 @@
             @click.stop="(e) => handleReadingChart({
               e,
               data: {
-                QuestionId: question.Id
+                QuestionId: question.Id,
+                QuestionName: question.QuestionName
               }
             })" />
         </div>
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
index 2bfa2558..8a0370c5 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -45,7 +45,8 @@
                     class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                       e,
                       data: {
-                        ReportChartTypeEnum: 0
+                        ReportChartTypeEnum: 0,
+                        QuestionName: table.QuestionName
                       },
                     })" />
                 </div>
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
index 646b304c..8d2fb470 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -44,7 +44,8 @@
               e,
               data: {
                 TableQuestionId: qs.Id,
-                RowIndex: qsForm.RowIndex
+                RowIndex: qsForm.RowIndex,
+                QuestionName: question.QuestionName
               }
             })" />
         </div>
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 20ab0537..f416aee2 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -49,7 +49,8 @@
                       QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
                       TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
                       RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
-                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null
+                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null,
+                      QuestionName: scope.row.QuestionName
                     }
                   })" />
               </span>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index ac5e50b0..38903ab6 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -151,11 +151,12 @@
         <div style="display: flex;justify-content: space-between;">
           <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
             @input="value = value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
-          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-            @click.stop="(e) => handleReadingChart({
+          <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1"
+            icon-class="readingChart" class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
               e,
               data: {
-                QuestionId: question.Id
+                QuestionId: question.Id,
+                QuestionName: question.QuestionName
               }
             })" />
         </div>
@@ -175,11 +176,12 @@
                 {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
               </template>
             </el-input>
-            <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1" icon-class="readingChart" class="svg-icon svg-readingChart"
               @click.stop="(e) => handleReadingChart({
                 e,
                 data: {
-                  QuestionId: question.Id
+                  QuestionId: question.Id,
+                  QuestionName: question.QuestionName
                 }
               })" />
             <!-- 测量 -->
@@ -257,11 +259,12 @@
                 question.CustomUnit }}</template>
               <template slot="append" v-else-if="question.ValueType === 2">%</template>
             </el-input>
-            <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1" icon-class="readingChart" class="svg-icon svg-readingChart"
               @click.stop="(e) => handleReadingChart({
                 e,
                 data: {
-                  QuestionId: question.Id
+                  QuestionId: question.Id,
+                  QuestionName: question.QuestionName
                 }
               })" />
           </div>
@@ -402,7 +405,8 @@ export default {
       // currentPath: '',
       // currentType: '',
       markTableQuestions: [],
-      parentQsId: ''
+      parentQsId: '',
+      taskInfo: {}
     }
   },
   computed: {
@@ -469,6 +473,7 @@ export default {
   mounted() {
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     // if (this.question.Type === 'class') {
     //   this.ClassifyAlgorithmsList = JSON.parse(this.question.ClassifyAlgorithms)
     // }
@@ -530,7 +535,6 @@ export default {
   },
   methods: {
     handleReadingChart(row) {
-      console.log(row, 'row')
       this.$emit('handleReadingChart', row)
     },
     numberInput(id) {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index ec813f4e..68d5b022 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -78,12 +78,13 @@
       <div style="display: flex;justify-content: space-between;">
         <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
           oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
-        <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-          @click.stop="(e) => handleReadingChart({
+        <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1"
+          icon-class="readingChart" class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
             e,
             data: {
               TableQuestionId: question.Id,
-              RowIndex: questionForm.RowIndex
+              RowIndex: questionForm.RowIndex,
+              QuestionName: question.QuestionName
             }
           })" />
       </div>
@@ -103,12 +104,13 @@
               {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
             </template>
           </el-input>
-          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-            @click.stop="(e) => handleReadingChart({
+          <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1"
+            icon-class="readingChart" class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
               e,
               data: {
                 TableQuestionId: question.Id,
-                RowIndex: question.RowIndex
+                RowIndex: question.RowIndex,
+                QuestionName: question.QuestionName
               }
             })" />
           <!-- 测量 -->
@@ -180,12 +182,13 @@
               :
               question.CustomUnit }}</template>
           </el-input>
-          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-            @click.stop="(e) => handleReadingChart({
+          <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1"
+            icon-class="readingChart" class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
               e,
               data: {
                 TableQuestionId: question.Id,
-                RowIndex: questionForm.RowIndex
+                RowIndex: questionForm.RowIndex,
+                QuestionName: question.QuestionName
               }
             })" />
         </div>
@@ -285,7 +288,8 @@ export default {
       QuestionsList: [],
       QuestionsForm: {},
       digitPlaces: 2,
-      rowId: ''
+      rowId: '',
+      taskInfo: {}
     }
   },
   watch: {
@@ -310,6 +314,7 @@ export default {
     }
   },
   mounted() {
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     if (this.question.Type === 'upload' || this.question.Type === 'screenshot') {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
index d6b894b7..571cc344 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
@@ -32,7 +32,8 @@
                       QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
                       TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
                       RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
-                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null
+                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null,
+                      QuestionName: scope.row.QuestionName
                     }
                   })" />
               </span>
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
index 5b6c5f57..b721cd74 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
@@ -85,7 +85,8 @@
             @click.stop="(e) => handleReadingChart({
               e,
               data: {
-                QuestionId: question.Id
+                QuestionId: question.Id,
+                QuestionName: question.QuestionName
               }
             })" />
         </div>
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
index a3141f8b..e9cbad5d 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -46,7 +46,8 @@
                     class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                       e,
                       data: {
-                        ReportChartTypeEnum: 0
+                        ReportChartTypeEnum: 0,
+                        QuestionName: table.QuestionName
                       },
                     })" />
                 </div>
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
index bfee6051..81d42831 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
@@ -54,7 +54,8 @@
               e,
               data: {
                 TableQuestionId: qs.Id,
-                RowIndex: qsForm.RowIndex
+                RowIndex: qsForm.RowIndex,
+                QuestionName: qs.QuestionName
               }
             })" />
         </div>
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 129bb4f7..a874ede7 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -117,7 +117,8 @@
       <div style="display: flex;">
         <!-- 手册 -->
         <div class="tool-item" :title="$t('trials:reading:button:handbooks')"
-          v-if="taskInfo && (taskInfo.ExistsManual || taskInfo.IsHaveKeyFile)" @click.prevent="previewManuals">
+          v-if="taskInfo && (taskInfo.ExistsManual || taskInfo.IsHaveKeyFile) && readingTaskState < 2"
+          @click.prevent="previewManuals">
           <svg-icon icon-class="constitution" class="svg-icon" />
         </div>
         <!-- 个性化配置 -->
@@ -255,7 +256,7 @@
       </span>
       <div style="height: 100%;margin:0;">
         <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
-        <div slot="footer" style="text-align:right;" v-if="openManuals">
+        <div slot="footer" style="text-align:right;" v-if="openManuals && !ManualsClose">
           <!-- 确认 -->
           <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
             {{ $t('common:button:confirm') }}</el-button>
@@ -391,7 +392,9 @@ export default {
       },
       loading: false,
       manualsDialog: { visible: false, isFullscreen: false },
-      trialId: null
+      trialId: null,
+
+      ManualsClose: false
     }
   },
   computed: {
@@ -499,6 +502,7 @@ export default {
         let res = await setReadKeyFile(data)
         if (res.IsSuccess) {
           this.manualsDialog.visible = false
+          this.ManualsClose = true
         }
       } catch (err) {
         console.log(err)
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
index 62405f0d..81fc4c94 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
@@ -31,6 +31,7 @@
                       QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
                       TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
                       RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
+                      QuestionName: scope.row.QuestionName
                     }
                   })" />
               </span>

From ca99572f1914d8fc092623de92bdb0a3ecfdb769 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 24 Nov 2025 13:29:59 +0800
Subject: [PATCH 099/333] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index f2c463bc..9ed37dc4 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -92,7 +92,7 @@
                   Date().getFullYear() }}{{ $t('common:date:today') }}{{ new Date().getMonth() +
                     1 }}{{ $t('common:date:month') }}{{ new Date().getDate() }}{{ $t('common:date:day') }}，{{ dayOfWeek }}
                 </div> -->
-                <div style="font-size: .75rem;line-height: 18px;color:#999">{{ moment().format('DD/MMM/YYYY') }}，{{
+                <div style="font-size: .75rem;line-height: 18px;color:#999">{{ moment().format('DDMMMYYYY') }}，{{
                   dayOfWeek }}
                 </div>
               </div>

From f79084b599be25fe8549b7bae1f286e195659735 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 24 Nov 2025 15:27:15 +0800
Subject: [PATCH 100/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/readingChart/index.vue         | 44 ++++++++++++++++++-
 .../components/customize/QuestionFormItem.vue | 12 ++---
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/components/readingChart/index.vue b/src/components/readingChart/index.vue
index 60619e82..c061e946 100644
--- a/src/components/readingChart/index.vue
+++ b/src/components/readingChart/index.vue
@@ -8,6 +8,7 @@
 
 <script>
 import { getReportsChartData } from "@/api/reading"
+import moment from "moment"
 let echarts = require('echarts/lib/echarts');
 
 // 按需引入图表
@@ -78,7 +79,9 @@ export default {
                         xAxisData: LatestScanDateList || [],
                         series: [],
                         unit: this.$fd("ValueUnit", res.Result.Unit),
-                        visitName: res.Result.VisitTaskNameList
+                        visitName: res.Result.VisitTaskNameList,
+                        min: null,
+                        max: null
                     }
                     res.Result.ChartDataList.forEach((item) => {
                         let arr = []
@@ -91,6 +94,43 @@ export default {
                             type: 'line'
                         })
                     });
+                    if (Array.isArray(res.Result.LatestScanDateList) && res.Result.LatestScanDateList.length >= 2) {
+                        let hours = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'hours');
+                        let days = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'days');
+                        let months = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'months');
+                        console.log(hours, 'hours')
+                        console.log(days, 'days')
+                        console.log(months, 'months')
+                        if (hours < 24) {
+                            obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                            obj.max = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 23:59:59'
+                        }
+                        if (days >= 1 && days <= 7) {
+                            obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                            obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'days').format('YYYY-MM-DD') + ' 23:59:59'
+                        }
+                        if (days > 7 && days < 30) {
+                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                            obj.max = moment(res.Result.LatestScanDateList[0]).endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                        }
+                        if (months >= 1 && months <= 3) {
+                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                            obj.max = moment(res.Result.LatestScanDateList[0]).add(4, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                        }
+                        if (months > 3 && months <= 6) {
+                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                            obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                        }
+                        if (months > 6 && months <= 12) {
+                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                            obj.max = moment(res.Result.LatestScanDateList[0]).add(13, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                        }
+                        if (months > 12) {
+                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                            obj.max = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).add(1, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                        }
+                    }
+                    console.log(obj)
                     this.initChart(obj)
                 }
             } catch (err) {
@@ -140,6 +180,8 @@ export default {
                     splitLine: {
                         show: false // 隐藏网格线
                     },
+                    min: obj.min,
+                    max: obj.max
                 },
                 yAxis: {
                     name: obj.unit,
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 38903ab6..35b368f1 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -148,8 +148,8 @@
           @change="(val) => { formItemNumberChange(val, question) }" />
         <!-- 自动计算 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <div style="display: flex;justify-content: space-between;">
-          <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
+        <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
+          <el-input v-model="questionForm[question.Id]"
             @input="value = value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
           <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1"
             icon-class="readingChart" class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
@@ -176,8 +176,8 @@
                 {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
               </template>
             </el-input>
-            <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1" icon-class="readingChart" class="svg-icon svg-readingChart"
-              @click.stop="(e) => handleReadingChart({
+            <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1"
+              icon-class="readingChart" class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
                 e,
                 data: {
                   QuestionId: question.Id,
@@ -259,8 +259,8 @@
                 question.CustomUnit }}</template>
               <template slot="append" v-else-if="question.ValueType === 2">%</template>
             </el-input>
-            <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1" icon-class="readingChart" class="svg-icon svg-readingChart"
-              @click.stop="(e) => handleReadingChart({
+            <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1"
+              icon-class="readingChart" class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
                 e,
                 data: {
                   QuestionId: question.Id,

From 423b71c70291657baab2df09a9bedac6133b1476 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 24 Nov 2025 17:12:10 +0800
Subject: [PATCH 101/333] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=87=E6=8D=A2=E5=9B=BE=E5=83=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BE=E5=83=8F=E5=8F=AF=E4=BB=A5=E5=BE=AA=E7=8E=AF=E7=9A=84?=
 =?UTF-8?q?=E4=BB=8E=E5=A4=B4=E5=88=B0=E5=B0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomCanvas.vue |   2 +-
 .../dicoms/customize/CustomizeDicomCanvas.vue |   5 +-
 .../reading/dicoms3D/components/ReadPage.vue  |   4 +-
 .../visit-review/components/ImageViewer.vue   | 132 ++++++++----------
 4 files changed, 65 insertions(+), 78 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 8d7b0811..3cba61c9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -1194,7 +1194,7 @@ export default {
             cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool)
           }
           if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) {
-            cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)
+            cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool, { configuration: { loop: true, } })
           }
           cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {})
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index 759c3645..eea7bdf4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -35,7 +35,8 @@
     </div>
     <div class="info-image">
       <div v-show="mousePosition.mo">
-        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) : '' }}
+        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) :
+        '' }}
       </div>
       <div
         v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
@@ -1139,7 +1140,7 @@ export default {
             cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool)
           }
           if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) {
-            cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)
+            cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool, { configuration: { loop: true, } })
           }
           cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {})
 
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 19c0a625..0faceb8a 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -1120,7 +1120,9 @@ export default {
         const toolGroupId = viewportId
         const toolGroup = ToolGroupManager.createToolGroup(toolGroupId)
         toolGroup.addViewport(viewportId, renderingEngineId)
-        toolGroup.addTool(StackScrollTool.toolName)
+        toolGroup.addTool(StackScrollTool.toolName, {
+            loop: true,        // 启用循环滚动
+        })
         toolGroup.addTool(ScaleOverlayTool.toolName)
 
         toolGroup.addTool(PanTool.toolName)
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ImageViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/ImageViewer.vue
index d4a78d51..2183a1a0 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ImageViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ImageViewer.vue
@@ -16,43 +16,30 @@
         </el-dropdown>
       </div>
       <!-- 缩放 -->
-      <div
-        :class="['tool-item', activeTool === 'Zoom' ? 'tool-item-active' : '']"
-        :title="$t('trials:reading:button:zoom')"
-        @click.prevent="setToolActive('Zoom')"
-      >
+      <div :class="['tool-item', activeTool === 'Zoom' ? 'tool-item-active' : '']"
+        :title="$t('trials:reading:button:zoom')" @click.prevent="setToolActive('Zoom')">
         <svg-icon icon-class="magnifier" class="svg-icon" />
       </div>
       <!-- 移动 -->
-      <div
-        :class="['tool-item', activeTool === 'Pan' ? 'tool-item-active' : '']"
-        :title="$t('trials:reading:button:move')"
-        @click.prevent="setToolActive('Pan')"
-      >
+      <div :class="['tool-item', activeTool === 'Pan' ? 'tool-item-active' : '']"
+        :title="$t('trials:reading:button:move')" @click.prevent="setToolActive('Pan')">
         <svg-icon icon-class="move" class="svg-icon" />
       </div>
       <!-- 旋转 -->
-      <div
-        :class="['tool-item', activeTool === 'PlanarRotate' ? 'tool-item-active' : '']"
-        :title="$t('trials:reading:button:rotate')"
-        @click.prevent="setToolActive('PlanarRotate')"
-      >
+      <div :class="['tool-item', activeTool === 'PlanarRotate' ? 'tool-item-active' : '']"
+        :title="$t('trials:reading:button:rotate')" @click.prevent="setToolActive('PlanarRotate')">
         <svg-icon icon-class="rotate" class="svg-icon" />
       </div>
       <!-- 箭头工具 -->
       <div
         :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'ArrowAnnotate' ? 'tool-item-active' : '']"
-        :title="$t('trials:reading:button:arrowAnnotate')"
-        @click.prevent="setAnnotateToolActive('ArrowAnnotate')"
-      >
+        :title="$t('trials:reading:button:arrowAnnotate')" @click.prevent="setAnnotateToolActive('ArrowAnnotate')">
         <svg-icon icon-class="arrow" class="svg-icon" />
       </div>
       <!-- 清除标注 -->
       <div
         :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Eraser' ? 'tool-item-active' : '']"
-        :title="$t('trials:dicom-show:Eraser')"
-        @click.prevent="setAnnotateToolActive('Eraser')"
-      >
+        :title="$t('trials:dicom-show:Eraser')" @click.prevent="setAnnotateToolActive('Eraser')">
         <svg-icon icon-class="clear" class="svg-icon" />
       </div>
       <!-- 截图 -->
@@ -64,74 +51,50 @@
         <svg-icon icon-class="image" class="svg-icon" />
       </div> -->
       <!-- 重置 -->
-      <div
-        class="tool-item"
-        :title="$t('trials:reading:button:reset')"
-        @click.prevent="resetViewport"
-      >
+      <div class="tool-item" :title="$t('trials:reading:button:reset')" @click.prevent="resetViewport">
         <svg-icon icon-class="refresh" class="svg-icon" />
       </div>
     </div>
     <!-- viewports -->
     <div class="viewports-wrapper">
       <div class="grid-container" :style="gridStyle">
-        <div
-          v-for="(v, index) in viewportInfos"
-          v-show="index < cells.length"
-          :key="index"
-          :style="cellStyle"
+        <div v-for="(v, index) in viewportInfos" v-show="index < cells.length" :key="index" :style="cellStyle"
           :class="['grid-cell', index === activeCanvasIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
-          @dblclick="toggleFullScreen($event, index)"
-          @click="activeCanvas(index)"
-          @mouseup="sliderMouseup($event, index)"
-          @mousemove="sliderMousemove($event, index)"
-        >
+          @dblclick="toggleFullScreen($event, index)" @click="activeCanvas(index)"
+          @mouseup="sliderMouseup($event, index)" @mousemove="sliderMousemove($event, index)">
           <div :ref="`canvas-${index}`" class="content">
             <div class="left-top-text">
-              <div
-                v-if="v.taskInfo.IsExistsClinicalData"
-                class="cd-info"
-                :title="$t('trials:reading:button:clinicalData')"
-                @click.stop="viewCD($event)"
-              >
+              <div v-if="v.taskInfo.IsExistsClinicalData" class="cd-info"
+                :title="$t('trials:reading:button:clinicalData')" @click.stop="viewCD($event)">
                 <svg-icon icon-class="documentation" class="svg-icon" />
               </div>
-              <h2
-                v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo"
-                class="subject-info"
-              >
+              <h2 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo" class="subject-info">
                 {{ `${taskInfo.SubjectCode} ${v.taskInfo.TaskBlindName} ` }}
               </h2>
               <div v-if="v.currentFileName">{{ v.currentFileName }}</div>
             </div>
-            <div
-              v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo"
-              class="top-center-tool"
-            >
+            <div v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo" class="top-center-tool">
               <div class="toggle-visit-container">
-                <div
-                  class="arrw_icon"
-                  :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff': '#6b6b6b' }"
+                <div class="arrw_icon"
+                  :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff' : '#6b6b6b' }"
                   @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, -1)"
-                  @dblclick.stop="preventDefault($event)"
-                >
+                  @dblclick.stop="preventDefault($event)">
                   <i class="el-icon-caret-left" />
                 </div>
                 <div class="arrow_text">
                   {{ v.taskInfo.TaskBlindName }}
                 </div>
-                <div
-                  class="arrw_icon"
-                  :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff': '#6b6b6b' }"
+                <div class="arrw_icon"
+                  :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff' : '#6b6b6b' }"
                   @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, 1)"
-                  @dblclick.stop="preventDefault($event)"
-                >
+                  @dblclick.stop="preventDefault($event)">
                   <i class="el-icon-caret-right" />
                 </div>
               </div>
             </div>
             <div :ref="`sliderBox-${index}`" class="right-slider-box" @click.stop="clickSlider($event, index)">
-              <div :style="{top: v.height + '%'}" class="slider" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event, index)" />
+              <div :style="{ top: v.height + '%' }" class="slider" @click.stop.prevent="() => { return }"
+                @mousedown.stop="sliderMousedown($event, index)" />
             </div>
           </div>
         </div>
@@ -318,16 +281,18 @@ export default {
         const toolGroupId = `canvas-${i}`
         const toolGroup = ToolGroupManager.createToolGroup(toolGroupId)
         toolGroup.addViewport(viewportId, renderingEngineId)
-        toolGroup.addTool(StackScrollTool.toolName)
+        toolGroup.addTool(StackScrollTool.toolName, {
+          loop: true,        // 启用循环滚动
+        })
         toolGroup.addTool(PanTool.toolName)
         toolGroup.addTool(ZoomTool.toolName)
         toolGroup.addTool(PlanarRotateTool.toolName)
         toolGroup.addTool(ArrowAnnotateTool.toolName, {
           arrowHeadStyle: 'standard',
-          changeTextCallback: async(data, eventData, doneChangingTextCallback) => {
+          changeTextCallback: async (data, eventData, doneChangingTextCallback) => {
             return doneChangingTextCallback(await this.customPrompt())
           },
-          getTextCallback: async(doneChangingTextCallback) => {
+          getTextCallback: async (doneChangingTextCallback) => {
             return doneChangingTextCallback(await this.customPrompt())
           }
         })
@@ -730,9 +695,10 @@ export default {
 .none-dicom-viewer {
   display: flex;
   flex-direction: column;
-  width:100%;
+  width: 100%;
   height: 100%;
   user-select: none;
+
   .tools-wrapper {
     height: 50px;
     display: flex;
@@ -741,6 +707,7 @@ export default {
     align-items: center;
     border-bottom: 1px solid #727272;
     color: #ddd;
+
     .tool-item {
       padding: 5px;
       margin: 0 5px;
@@ -748,15 +715,19 @@ export default {
       font-size: 20px;
       cursor: pointer;
     }
+
     .tool-item-active {
       background-color: #607d8b;
     }
+
     .tool-disabled {
       cursor: not-allowed;
     }
   }
+
   .viewports-wrapper {
     flex: 1;
+
     .grid-container {
       display: grid;
       height: 100%;
@@ -765,14 +736,17 @@ export default {
     }
 
     .grid-cell {
-      border: 1px dashed #ccc;;
+      border: 1px dashed #ccc;
+      ;
       display: flex;
       align-items: center;
       justify-content: center;
     }
+
     .cell_active {
-      border-color: #fafa00!important;
+      border-color: #fafa00 !important;
     }
+
     .cell-full-screen {
       grid-column: 1 / -1;
       grid-row: 1 / -1;
@@ -782,6 +756,7 @@ export default {
       width: 100%;
       height: 100%;
       position: relative;
+
       .left-top-text {
         position: absolute;
         left: 5px;
@@ -789,27 +764,32 @@ export default {
         color: #ddd;
         z-index: 1;
         font-size: 12px;
+
         .cd-info {
           color: #ddd;
           font-size: 18px;
           cursor: pointer;
         }
+
         .subject-info {
-          color:#f44336;
+          color: #f44336;
           padding: 5px 0px;
           margin: 0;
         }
       }
+
       .top-center-tool {
         position: absolute;
-        left:50%;
+        left: 50%;
         top: 5px;
         transform: translateX(-50%);
         z-index: 1;
+
         .toggle-visit-container {
           display: flex;
         }
-        .arrw_icon{
+
+        .arrw_icon {
           width: 20px;
           height: 20px;
           background-color: #3f3f3f;
@@ -817,15 +797,17 @@ export default {
           line-height: 20px;
           border-radius: 10%;
         }
-        .arrow_text{
+
+        .arrow_text {
           height: 20px;
           line-height: 20px;
           background-color: #00000057;
           color: #fff;
-          padding:0 10px;
+          padding: 0 10px;
           font-size: 14px;
         }
       }
+
       .right-slider-box {
         position: absolute;
         right: 1px;
@@ -837,7 +819,8 @@ export default {
         z-index: 1;
         cursor: pointer;
       }
-      .right-slider-box:after{
+
+      .right-slider-box:after {
         content: '';
         position: absolute;
         bottom: -20px;
@@ -846,12 +829,13 @@ export default {
         width: 100%;
         background: #333;
       }
+
       .slider {
         height: 20px;
         width: 100%;
         position: absolute;
         top: 0;
-        z-index:10;
+        z-index: 10;
         background: #9e9e9e;
         cursor: move
       }

From 8aa067e52fb60c80a13305da33c6a4f02195117c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 24 Nov 2025 17:17:47 +0800
Subject: [PATCH 102/333] =?UTF-8?q?=E9=9D=9Edicom=E6=9B=B4=E6=AD=A3?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/qc-check/components/qualityAssurance.vue             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index b772a12f..a391c5be 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -2308,7 +2308,8 @@ export default {
             ModifyReason: this.noneDicomForm.ModifyReason,
             Modality: this.noneDicomForm.Modality,
             BodyPart: this.noneDicomForm.BodyParts.join(', '),
-            ImageDate: this.noneDicomForm.ImageDate
+            ImageDate: this.noneDicomForm.ImageDate,
+            BodyPartForEditOther: this.noneDicomForm.BodyPartForEditOther,
           },
           signInfo
         }

From f002fed9e2e20101c43728cd992874b151c5daa9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 25 Nov 2025 10:30:52 +0800
Subject: [PATCH 103/333] =?UTF-8?q?=E5=9C=A8=E6=9F=A5=E7=9C=8B=E5=A4=9A?=
 =?UTF-8?q?=E5=B8=A7=E6=96=87=E4=BB=B6=E6=97=B6=EF=BC=8C=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E5=83=8F=E6=95=B0=E5=AD=97=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E4=BA=86=EF=BC=9A31/1=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-study.vue | 2 +-
 src/views/dicom-show/dicom-visit.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 8dac860a..c84b0fc8 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -83,7 +83,7 @@
                             {{ item.description }}
                           </div>
                           <div v-if="!item.keySeries" style="padding: 1px;">
-                            {{ item.imageloadedArr.length }}/{{ item.instanceCount }}
+                            {{ series.imageloadedArr.length <= series.instanceCount ? series.imageloadedArr.length : series.instanceCount }}/{{ item.instanceCount }}
                           </div>
 
                         </div>
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index b69b3005..914c1c2f 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -113,7 +113,7 @@
                                 </div>
                               </el-tooltip>
                               <div style="padding: 1px;">
-                                {{ series.imageloadedArr.length }}/{{ series.instanceCount }}
+                                {{ series.imageloadedArr.length <= series.instanceCount ? series.imageloadedArr.length : series.instanceCount }}/{{ series.instanceCount }}
                               </div>
                               <div />
                             </div>

From 196a20cbc0073927d0493d0f3d4fb651e6de2405 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 25 Nov 2025 10:36:20 +0800
Subject: [PATCH 104/333] =?UTF-8?q?=E3=80=90=E5=9F=B9=E8=AE=AD=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E6=96=B0=E5=BB=BA=E5=9F=B9=E8=AE=AD=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=EF=BC=8C=E6=9C=AA=E5=8F=91=E5=B8=83=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E4=B8=8B=E7=BA=BF=EF=BC=8C=E5=8F=91=E5=B8=83=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=BB=8D=E5=8F=AF=E4=BB=A5=E7=82=B9=E5=87=BB=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/setting/attachment/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/attachment/index.vue b/src/views/trials/trials-panel/setting/attachment/index.vue
index 97b8ea6f..1e1643e5 100644
--- a/src/views/trials/trials-panel/setting/attachment/index.vue
+++ b/src/views/trials/trials-panel/setting/attachment/index.vue
@@ -142,7 +142,7 @@
           <el-button v-hasPermi="['trials:trials-panel:setting:attachment:edit']" circle
             :title="$t('trials:attachment:action:edit')" icon="el-icon-edit-outline"
             :disabled="scope.row.IsSomeUserSigned || scope.row.IsDeleted" @click="handleEdit(scope.row)" />
-          <el-button :disabled="scope.row.IsPublish" circle icon="el-icon-position"
+          <el-button :disabled="scope.row.IsPublish || scope.row.IsDeleted" circle icon="el-icon-position"
             :title="$t('dictionary:signature:button:publish')" @click="publishTrialDocument([scope.row])">
           </el-button>
           <!-- 废除 -->

From e65e6e22088d8b1983e8352f885e5727f8e660ab Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 25 Nov 2025 14:15:47 +0800
Subject: [PATCH 105/333] =?UTF-8?q?=E6=B7=8B=E5=B7=B4=E7=BB=93=E9=9D=9E?=
 =?UTF-8?q?=E9=9D=B6=E7=97=85=E7=81=B6=E5=92=8C=E6=B7=8B=E5=B7=B4=E7=BB=93?=
 =?UTF-8?q?=E6=96=B0=E7=97=85=E7=81=B6=E5=9C=A8=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1=E6=97=B6=EF=BC=8C=E5=85=81=E8=AE=B8=E6=B5=8B?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue             | 2 +-
 .../reading/dicoms/components/IRecist/QuestionForm.vue    | 4 ++--
 .../reading/dicoms/components/Lugano/QuestionForm.vue     | 8 ++++----
 .../dicoms/components/LuganoWithoutPET/QuestionForm.vue   | 8 ++++----
 .../reading/dicoms/components/Recist/QuestionForm.vue     | 4 ++--
 .../reading/dicoms/customize/CustomizeDicomViewer.vue     | 2 +-
 .../reading/dicoms3D/components/Recist/QuestionList.vue   | 4 ++--
 .../reading/dicoms3D/components/mRecist/QuestionList.vue  | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index e37329fb..b33996c4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -399,7 +399,7 @@
           <div style="padding:5px;display: flex;">
             <!-- 手册 -->
             <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
-              v-if="(isExistsManual || isHaveKeyFile) && readingTaskState < 2">
+              v-if="(isExistsManual || isHaveKeyFile) && currentReadingTaskState < 2">
               <div class="tool-wrapper">
                 <div class="icon" @click.prevent="previewManuals(false)">
                   <svg-icon icon-class="constitution" class="svg-icon" />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 3de86373..1f3bfe5b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -1118,7 +1118,7 @@ export default {
         if (this.lesionType === 1 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
@@ -1292,7 +1292,7 @@ export default {
         if (this.lesionType === 2 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 2532eabe..2d35316b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -713,8 +713,8 @@ export default {
               this.$set(this.questionForm, stateId, 0)
             }
             var lesionLength = this.getQuestionVal(0)
-            // 当前添加的新病灶不做处理
-            if (!(this.isCurrentTaskAdd === 'True') && this.lesionType === 0 && !this.isBaseLineTask && measureData.type === 'Bidirectional') {
+            // 当前添加的新病灶不做处理 && this.lesionType === 0
+            if (!(this.isCurrentTaskAdd === 'True') && !this.isBaseLineTask && measureData.type === 'Bidirectional') {
               if (isLymphLesion) {
                 // 淋巴结靶病灶
                 if (lesionLength > 15) {
@@ -1389,7 +1389,7 @@ export default {
         if (this.lesionType === 1 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
@@ -1505,7 +1505,7 @@ export default {
         if (this.lesionType === 2 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index 2532eabe..2d35316b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -713,8 +713,8 @@ export default {
               this.$set(this.questionForm, stateId, 0)
             }
             var lesionLength = this.getQuestionVal(0)
-            // 当前添加的新病灶不做处理
-            if (!(this.isCurrentTaskAdd === 'True') && this.lesionType === 0 && !this.isBaseLineTask && measureData.type === 'Bidirectional') {
+            // 当前添加的新病灶不做处理 && this.lesionType === 0
+            if (!(this.isCurrentTaskAdd === 'True') && !this.isBaseLineTask && measureData.type === 'Bidirectional') {
               if (isLymphLesion) {
                 // 淋巴结靶病灶
                 if (lesionLength > 15) {
@@ -1389,7 +1389,7 @@ export default {
         if (this.lesionType === 1 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
@@ -1505,7 +1505,7 @@ export default {
         if (this.lesionType === 2 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index cdd95e92..8afa776a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -1068,7 +1068,7 @@ export default {
         if (this.lesionType === 1 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
@@ -1184,7 +1184,7 @@ export default {
         if (this.lesionType === 2 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index ee39ac29..1f635265 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -340,7 +340,7 @@
         <div style="margin-left: auto">
           <div style="padding: 5px">
             <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
-              v-if="(isExistsManual || isHaveKeyFile) && readingTaskState < 2">
+              v-if="(isExistsManual || isHaveKeyFile) && currentReadingTaskState < 2">
               <div class="tool-wrapper">
                 <div class="icon" @click.prevent="previewManuals()">
                   <svg-icon icon-class="constitution" class="svg-icon" />
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
index 8a0370c5..8640080a 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -1126,7 +1126,7 @@ export default {
           if (lesionType === 1 && lesionState === 3) {
             if (lymphNodes === 1) {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || measureData.markTool === 'Bidirectional'))) {
                 // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                   type: 'warning',
@@ -1242,7 +1242,7 @@ export default {
           if (lesionType === 2 && lesionState === 3) {
             if (lymphNodes === 1) {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || measureData.markTool === 'Bidirectional'))) {
                 // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                   type: 'warning',
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
index e9cbad5d..5bcaab84 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -1148,7 +1148,7 @@ export default {
           if (lesionType === 1 && lesionState === 3) {
             if (lymphNodes === 1) {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || measureData.markTool === 'Bidirectional'))) {
                 // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                   type: 'warning',
@@ -1304,7 +1304,7 @@ export default {
           if (lesionType === 2 && lesionState === 3) {
             if (lymphNodes === 1) {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
+              if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || measureData.markTool === 'Bidirectional'))) {
                 // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                   type: 'warning',

From f2d50e7465ccc56de6203bbc88a6e5437dd85d4d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 25 Nov 2025 14:23:15 +0800
Subject: [PATCH 106/333] =?UTF-8?q?=E3=80=90=E9=82=AE=E4=BB=B6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E3=80=91=E9=82=AE=E4=BB=B6=E6=97=A5=E5=BF=97=E4=B8=AD?=
 =?UTF-8?q?=E6=94=B6=E4=BB=B6=E4=BA=BA=E3=80=81=E6=8A=84=E9=80=81=E4=BA=BA?=
 =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=8F=91=E9=80=81=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/email/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/email/index.vue b/src/views/system/email/index.vue
index 830ee4d9..6c418b54 100644
--- a/src/views/system/email/index.vue
+++ b/src/views/system/email/index.vue
@@ -50,7 +50,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
-                                item.RecipientName).join(", ") : ''
+                                item.RecipientAddress).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>
@@ -59,7 +59,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
-                                item.RecipientName).join(", ") : ''
+                                item.RecipientAddress).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>

From 633a169467701377b5df0ea7bf8c2b8d1be59802 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 25 Nov 2025 14:28:58 +0800
Subject: [PATCH 107/333] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=B3=A8=E6=84=8F=E4=BA=8B=E9=A1=B9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/site-research/components/ImageManual.vue      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
index 0f330542..14a84b6f 100644
--- a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
@@ -113,6 +113,10 @@ export default {
                     if (Array.isArray(res.Result.ModifyFiledList) && res.Result.ModifyFiledList.length > 0) {
                         this.form.ReplaceContent = res.Result.ModifyFiledList[0].ReplaceContent.split('<p>').join('').split('</p>').filter(item => isNaN(item)).join("\n")
                         this.form.ReplaceContentCN = res.Result.ModifyFiledList[0].ReplaceContentCN.split('<p>').join('').split('</p>').filter(item => isNaN(item)).join("\n")
+                    } else {
+                        let arr = [this.$t('trials:equiptResearch:form:item1'), this.$t('trials:equiptResearch:form:item2'), this.$t('trials:equiptResearch:form:item3'), this.$t('trials:equiptResearch:form:item4')]
+                        this.form.ReplaceContent = arr.join("\n")
+                        this.form.ReplaceContentCN = arr.join("\n")
                     }
                 }
             } catch (err) {

From c675e21c409604f9e17c96be2234b87a645119b7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 26 Nov 2025 14:57:44 +0800
Subject: [PATCH 108/333] =?UTF-8?q?=E9=9D=B6=E6=AE=B5=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../downloadDicomAndNonedicom/index.vue       |  5 ++--
 .../uploadDicomAndNonedicom/dicomFile.vue     | 26 ++++++++++---------
 .../uploadDicomAndNonedicom/nonedicomFile.vue | 20 +++++++++++---
 src/views/dicom-show/dicom-visit.vue          |  2 +-
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 60efa567..4c3582a2 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -35,8 +35,7 @@
       <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
         show-overflow-tooltip />
       <!--访视名称-->
-      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" sortable="custom"
-        v-if="IsImageSegment" />
+      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" sortable v-if="IsImageSegment" />
       <!--任务名称-->
       <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
         sortable v-else />
@@ -307,7 +306,7 @@ export default {
       let files = [],
         name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
       if (this.IsImageSegment) {
-        name = `${list[0].SubjectCode}_${list[0].VisitName}.zip`
+        name = `${list[0].SubjectCode}.zip`
       } else {
         if (this.IsReadingTaskViewInOrder === 1) {
           name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 3f91050c..a727fc00 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -11,8 +11,10 @@
     <el-table :data="list" style="width: 100%" height="300" :loading="loading">
       <!--受试者-->
       <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
+      <!--访视名称-->
+      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" v-if="IsImageSegment" />
       <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" v-else />
       <!--原始检查数-->
       <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
         <template slot-scope="scope">
@@ -445,10 +447,10 @@ export default {
           params.VisitTaskId = this.TaskId
         }
         if (this.IsImageSegment) {
-          this.searchData.IsImageSegmentLabel = true
+          params.IsImageSegmentLabel = true
         }
         else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
-          this.searchData.IsImageSegmentLabel = false
+          params.IsImageSegmentLabel = false
         }
         this.loading = true
         let res = await getSubjectImageUploadList(params)
@@ -531,7 +533,7 @@ export default {
     // 打开弹窗
     handleOpenDialog(item, list, isUpload = false) {
       this.openIsUpload = isUpload
-      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
+      this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName}`
       this.modelList = item[list]
       this.model_cfg.visible = true
     },
@@ -578,7 +580,7 @@ export default {
           let item = checkFiles[i]
           var dicom = await parseDicom(item, ['StudyInstanceUid', 'Modality'])
           if (!dicom.StudyInstanceUid) continue
-          if (this.IsImageSegment && dicom.Modality !== 'US') continue
+          if (this.IsImageSegment && dicom.Modality !== 'IVUS') continue
           let has = true,
             has2 = false,
             has3 = false
@@ -632,8 +634,8 @@ export default {
         if (this.errStudyUidList && this.errStudyUidList.length > 0) {
           for (let i = 0; i < checkFiles.length; i++) {
             let item = checkFiles[i]
-            var dicom = await parseDicom(item, 'StudyInstanceUid')
-            if (!!~this.errStudyUidList.indexOf(dicom.StudyInstanceUid)) {
+            var dicom = await parseDicom(item, ['StudyInstanceUid', 'Modality'])
+            if (!!~this.errStudyUidList.indexOf(dicom.StudyInstanceUid) || (this.IsImageSegment && dicom.Modality !== 'IVUS')) {
               this.hasOtherStudy = true
               checkFiles.splice(i, 1)
               i--
@@ -1168,7 +1170,7 @@ export default {
                                 o.instanceUid +
                                 params.trialId
                               )}`
-                            if (this.IsImageSegment) {
+                            if (scope.IsImageSegment) {
                               path = `/${params.trialId}/Image/${params.subjectId
                                 }/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId
                                 }/${scope.getGuid(
@@ -1211,7 +1213,7 @@ export default {
                                     o.imageRows
                                   )
                                   let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
-                                  if (this.IsImageSegment) {
+                                  if (scope.IsImageSegment) {
                                     thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                   }
                                   let OSSclient = scope.OSSclient
@@ -1305,7 +1307,7 @@ export default {
               let text = JSON.stringify(Record)
               let logJsonBlob = scope.generateTxtFile(text)
               let logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
-              if (this.IsImageSegment) {
+              if (scope.IsImageSegment) {
                 logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
               }
               let logRes
@@ -1336,7 +1338,7 @@ export default {
                     v.instanceList[0].imageRows
                   )
                   let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
-                  if (this.IsImageSegment) {
+                  if (scope.IsImageSegment) {
                     thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                   }
                   let OSSclient = scope.OSSclient
@@ -1356,7 +1358,7 @@ export default {
                 if (scope.isClose) return false
                 console.log(params)
                 params.VisitTaskId = dicomInfo.visitTaskId
-                if (this.IsImageSegment) {
+                if (scope.IsImageSegment) {
                   params.IsImageSegmentLabel = true
                 }
                 addOrUpdateArchiveTaskStudy(params)
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index e2046cd7..c8e6455c 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -4,7 +4,10 @@
       <span>{{ $t('upload:nonedicom:title') }}</span>
       <div class="tip">
         <i class="el-icon-warning-outline"></i>
-        <div v-html="$t('upload:nonedicom:tip:message')"></div>
+        <div v-html="$t('upload:nonedicom:tip:message').replace(
+          'xxx',
+          relationInfo.ImageFormatList.join('、')
+        )"></div>
       </div>
     </div>
     <!--检查列表-->
@@ -131,7 +134,10 @@
       <!-- 多文件上传 -->
       <form id="inputForm" ref="uploadForm">
         <el-divider content-position="left">{{
-          $t('trials:uploadNonDicoms:label:fileType')
+          $t('trials:uploadNonDicoms:label:fileType').replace(
+            'xxx',
+            relationInfo.ImageFormatList.join('、')
+          )
         }}</el-divider>
         <div class="form-group">
           <div class="upload" style="margin-right: 10px">
@@ -273,7 +279,10 @@ export default {
       currentRow: {},
       studyMonitorId: null,
       open: null,
-      BodyPart: {}
+      BodyPart: {},
+      relationInfo: {
+        ImageFormatList: []
+      }
     }
   },
   watch: {
@@ -329,6 +338,11 @@ export default {
         this.loading = false
         if (res.IsSuccess) {
           this.list = res.Result
+          this.relationInfo = res.OtherInfo
+          this.faccept = []
+          this.relationInfo.ImageFormatList.forEach((item) => {
+            this.faccept.push(`.${item}`)
+          })
         }
       } catch (err) {
         this.loading = false
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index b69b3005..7bba0caa 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -364,7 +364,7 @@ export default {
       try {
         let res = null
         if (this.page === 'upload') {
-          res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId })
+          res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId !== 'undefined' ? this.visitTaskId : null, subjectVisitId: this.subjectVisitId })
         } else if (this.page === 'download') {
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
         } else {

From a0372097703f27bdb747e557e9699b8ff4f0a454 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 26 Nov 2025 16:08:55 +0800
Subject: [PATCH 109/333] 1

---
 src/components/uploadDicomAndNonedicom/study-view.vue | 8 ++++----
 src/views/dicom-show/dicom-visit.vue                  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index 4d5eb91e..28be2ef4 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -39,13 +39,13 @@
           <!--检查时间-->
           <el-table-column prop="ImageDate" :label="$t('trials:uploadImage:table:StudyTime')" v-if="!IsDicom"
             min-width="130" />
-          <el-table-column :label="$t('common:action:action')" fixed="right" width="80">
+          <el-table-column :label="$t('common:action:action')" fixed="right" width="80" v-if="isUpload">
             <template slot-scope="scope">
               <!--预览--->
-              <el-button circle icon="el-icon-view" :title="$t('trials:uploadImage:button:preview')" v-if="!isUpload"
-                @click.stop="preview(scope.row)" />
+              <!-- <el-button circle icon="el-icon-view" :title="$t('trials:uploadImage:button:preview')" v-if="!isUpload"
+                @click.stop="preview(scope.row)" /> -->
               <!--编辑--->
-              <el-button circle icon="el-icon-edit-outline" :title="$t('trials:uploadImage:button:edit')" v-else
+              <el-button circle icon="el-icon-edit-outline" :title="$t('trials:uploadImage:button:edit')"
                 @click.stop="openEdit(scope.row)" />
             </template>
           </el-table-column>
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 7bba0caa..65cdd535 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -154,7 +154,7 @@
                 <div class="viewerSidethumbinner">
 
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
-                    <template v-for="item in relationStudyListByVisitName">
+                    <template v-for="item in relationStudyListByVisitName" >
                       <div :key="`${item.VisitName}`">
                         <div v-show="item.VisitName" class="text-desc" style="background-color: #1f1f1f;">
                           {{ item.VisitName }}

From b57076d41db3ee4c1bc78b1dfa73cbb3d579e894 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 26 Nov 2025 16:20:22 +0800
Subject: [PATCH 110/333] =?UTF-8?q?=E9=98=85=E7=89=87=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CriterionQuestionForm.vue       | 14 +++++++-------
 .../template/components/TableQsForm.vue        | 14 +++++++-------
 .../reading-unit/components/TableQsForm.vue    | 18 +++++++++---------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 267ba854..221038d8 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -217,13 +217,6 @@
         ]">
           <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
         </el-form-item>
-        <!-- 图表展示-->
-        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
-          <el-radio-group v-model="form.ShowChartTypeEnum">
-            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <!-- 适用于Lugano 2014标准 -->
         <!-- 问题分类 -->
         <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')"
@@ -357,6 +350,13 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 表格类型标识 -->
         <el-form-item v-if="form.Type === 'table'" :label="$t('dictionary:template:criterionConfig:table:tableType')"
           prop="LesionType">
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index 5b5fc499..879f571c 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -140,13 +140,6 @@
         ]">
           <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
         </el-form-item>
-        <!-- 图表展示-->
-        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
-          <el-radio-group v-model="form.ShowChartTypeEnum">
-            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <!-- 重复出现最大次数 -->
         <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')"
           v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
@@ -285,6 +278,13 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 最大上传个数 -->
         <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')"
           prop="ImageCount">
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index d11b1a6f..e32b8521 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -51,15 +51,6 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <!-- 是否预设 -->
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
-          :label="$t('trials:qcCfg:table:IsPreinstall')" prop="IsPreinstall">
-          <el-radio-group v-model="form.IsPreinstall">
-            <el-radio v-for="item of $d.YesOrNo" :key="`QuestionIsPreinstall${item.value}`" :label="item.value">
-              {{ item.label }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
         <!-- 显示时依赖父问题 -->
         <el-form-item v-if="form.ShowQuestion === 1" :label="$t('trials:readingUnit:qsList:title:parentId')"
           prop="ParentId">
@@ -259,6 +250,15 @@
               $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2') }}
           </div>
         </div>
+        <!-- 是否预设 -->
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
+          :label="$t('trials:qcCfg:table:IsPreinstall')" prop="IsPreinstall">
+          <el-radio-group v-model="form.IsPreinstall">
+            <el-radio v-for="item of $d.YesOrNo" :key="`QuestionIsPreinstall${item.value}`" :label="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 图表展示-->
         <el-form-item v-if="(form.Type === 'number' || form.Type === 'calculation') && !isFromSystem"
           :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">

From c31bc89746ec580ee1372f2c7a685cf2d8c81e6f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Nov 2025 09:40:32 +0800
Subject: [PATCH 111/333] =?UTF-8?q?=E9=9D=B6=E6=AE=B5=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../downloadDicomAndNonedicom/index.vue       |  2 +-
 .../uploadDicomAndNonedicom/dicomFile.vue     |  5 ++-
 .../uploadDicomAndNonedicom/study-view.vue    | 10 ++++-
 .../reading-task/components/TargetSection.vue | 43 ++++++++++++++++---
 4 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 4c3582a2..cf60e9ab 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -479,7 +479,7 @@ export default {
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+        path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
       })
       this.open = window.open(routeData.href, '_blank')
     },
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index a727fc00..842eef4f 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -301,7 +301,8 @@
       </el-table-column>
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
-      :modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
+      :subjectVisitId="openSubjectVisitId" :modelList="modelList" :isUpload="openIsUpload"
+      :TrialModality="TrialModality" @getList="getList" />
   </div>
 </template>
 <script>
@@ -415,6 +416,7 @@ export default {
       open: null,
       bodyPart: {},
       openIsUpload: false,
+      openSubjectVisitId: null,
       TrialModality: [],
     }
   },
@@ -533,6 +535,7 @@ export default {
     // 打开弹窗
     handleOpenDialog(item, list, isUpload = false) {
       this.openIsUpload = isUpload
+      this.openSubjectVisitId = item.SubjectVisitId || item.SourceSubjectVisitId
       this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName}`
       this.modelList = item[list]
       this.model_cfg.visible = true
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index 28be2ef4..f0215efb 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -2,6 +2,9 @@
   <div v-if="model_cfg.visible">
     <base-model :config="model_cfg">
       <div slot="dialog-body">
+        <el-button v-if="!isUpload" type='primary' size="small" style="float:right;" @click="preview">
+          {{ $t("common:button:preview") }}
+        </el-button>
         <el-table :data="modelList" style="width: 100%" height="300">
           <!--检查编号-->
           <el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')" />
@@ -109,6 +112,10 @@ export default {
     visitTaskId: {
       type: String,
     },
+    subjectVisitId: {
+      type: String,
+      default: ''
+    },
     IsDicom: {
       required: true,
       type: Boolean,
@@ -153,8 +160,9 @@ export default {
       let routeData = null
       if (this.IsDicom) {
         var token = getToken()
+        let trialId = this.$route.query.trialId
         routeData = this.$router.resolve({
-          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}&isReading=true`,
+          path: `/showvisitdicoms?trialId=${trialId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}`,
         })
       } else {
         let trialId = this.$route.query.trialId
diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
index ddc0fab8..60d7a846 100644
--- a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -1,5 +1,23 @@
 <template>
     <BaseContainer>
+        <div slot="search-container">
+            <el-form :inline="true">
+                <!-- 受试者编号 -->
+                <el-form-item :label="$t('trials:pendingReadingTasks:table:subjectCode')">
+                    <el-input v-model="searchData.SubjectCode" style="width: 130px" clearable />
+                </el-form-item>
+                <el-form-item>
+                    <!-- 查询 -->
+                    <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+                        {{ $t('common:button:search') }}
+                    </el-button>
+                    <!-- 重置 -->
+                    <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+                        {{ $t('common:button:reset') }}
+                    </el-button>
+                </el-form-item>
+            </el-form>
+        </div>
         <div slot="main-container">
             <el-table v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100" @sort-change="handleSortChange"
                 v-loading="loading">
@@ -18,23 +36,26 @@
                     sortable="custom" />
                 <!-- 访视数量 -->
                 <el-table-column prop="VisitCount" :label="$t('trials:pendingReadingTasks:table:VisitCount')"
-                    show-overflow-tooltip />
+                    show-overflow-tooltip sortable="custom" />
                 <!-- dicom检查数量 -->
                 <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
-                    show-overflow-tooltip />
+                    show-overflow-tooltip sortable="custom" />
                 <!-- 非dicom检查数量 -->
                 <el-table-column prop="NoneDicomStudyCount"
-                    :label="$t('trials:pendingReadingTasks:table:NoneDicomStudyCount')" show-overflow-tooltip />
+                    :label="$t('trials:pendingReadingTasks:table:NoneDicomStudyCount')" show-overflow-tooltip
+                    sortable="custom" />
                 <!-- 标记访视数量 -->
                 <el-table-column prop="MarkVisitCount" :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')"
-                    show-overflow-tooltip />
+                    show-overflow-tooltip sortable="custom" />
                 <!-- 标记dicom检查数量 -->
                 <el-table-column prop="MarkDicomStudyCount"
-                    :label="$t('trials:pendingReadingTasks:table:MarkDicomStudyCount')" show-overflow-tooltip />
+                    :label="$t('trials:pendingReadingTasks:table:MarkDicomStudyCount')" show-overflow-tooltip
+                    sortable="custom" />
                 <!-- 标记非dicom检查数量 -->
                 <el-table-column prop="MarkNoneDicomStudyCount"
-                    :label="$t('trials:pendingReadingTasks:table:MarkNoneDicomStudyCount')" show-overflow-tooltip />
-                <el-table-column :label="$t('common:action:action')" width="250" fixed="right">
+                    :label="$t('trials:pendingReadingTasks:table:MarkNoneDicomStudyCount')" show-overflow-tooltip
+                    sortable="custom" />
+                <el-table-column :label="$t('common:action:action')" width="100" fixed="right">
                     <template slot-scope="scope">
                         <!-- 阅片 -->
                         <!-- <el-button :disabled="scope.row.ExistReadingApply" circle :title="scope.row.ExistReadingApply
@@ -118,6 +139,14 @@ export default {
         this.getList()
     },
     methods: {
+        handleSearch() {
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+        handleReset() {
+            this.searchData = searchDataDefault()
+            this.getList()
+        },
         async getList() {
             try {
                 this.searchData.TrialId = this.$route.query.trialId

From 6f2bc9f7f5ded70f2fa264a614f4bb469f32cc67 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Nov 2025 10:29:59 +0800
Subject: [PATCH 112/333] =?UTF-8?q?=E9=9D=B6=E6=AE=B5=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  4 ++--
 .../downloadDicomAndNonedicom/index.vue       | 18 +++++++++++----
 .../uploadDicomAndNonedicom/study-view.vue    | 23 ++++++++++++++++---
 src/views/none-dicom-show/index.vue           |  3 ++-
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 664adc5c..86e4d0f5 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -1405,9 +1405,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false, isImageSegmentLabel = '') {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?isImageSegmentLabel=${isImageSegmentLabel}&subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
     method: 'get'
   })
 }
diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index cf60e9ab..5995a728 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -77,7 +77,8 @@
       </el-table-column>
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
-      :IsDicom="IsDicom" :visitTaskId="modelTaskId" />
+      :subjectVisitId="modelSubjectVisitId" :IsDicom="IsDicom" :visitTaskId="modelTaskId"
+      :IsImageSegment="IsImageSegment" :Criterion="Criterion" />
   </el-dialog>
 </template>
 <script>
@@ -157,6 +158,7 @@ export default {
       IsReadingTaskViewInOrder: 0, // 阅片规则
       bodyPart: {},
       modelTaskId: null,
+      modelSubjectVisitId: null,
     }
   },
   async mounted() {
@@ -450,6 +452,7 @@ export default {
         })
       }
       this.modelTaskId = item.VisitTaskId
+      this.modelSubjectVisitId = item.SourceSubjectVisitId
       this.IsDicom = item.IsDicom
       this.model_cfg.visible = true
     },
@@ -478,9 +481,16 @@ export default {
       }
       let trialId = this.$route.query.trialId
       var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
-      })
+      let routeData = null
+      if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
+        routeData = this.$router.resolve({
+          path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+        })
+      } else {
+        routeData = this.$router.resolve({
+          path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+        })
+      }
       this.open = window.open(routeData.href, '_blank')
     },
     // 预览阅片影像
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index f0215efb..f41ee4f6 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -125,6 +125,16 @@ export default {
       type: Boolean,
       default: false,
     },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
   },
   components: {
     'base-model': baseModel,
@@ -167,9 +177,16 @@ export default {
       } else {
         let trialId = this.$route.query.trialId
         var token = getToken()
-        routeData = this.$router.resolve({
-          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}&isReading=true`,
-        })
+        if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
+          routeData = this.$router.resolve({
+            path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
+          })
+        } else {
+          routeData = this.$router.resolve({
+            path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
+          })
+        }
+
       }
       window.open(routeData.href, '_blank')
     },
diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index ec4b07c0..df9d1834 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -278,7 +278,8 @@ export default {
         this.studyId,
         false,
         this.$route.query.visitTaskId,
-        !!this.$route.query.isReading
+        !!this.$route.query.isReading,
+        this.$route.query.isImageSegmentLabel,
       )
         .then((res) => {
           this.studyList = res.Result

From 010a5867b5f6ab5d6824da5381b8064e9019ac91 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Nov 2025 13:30:42 +0800
Subject: [PATCH 113/333] =?UTF-8?q?=E9=9D=B6=E6=AE=B5=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/downloadDicomAndNonedicom/index.vue    |  2 +-
 src/components/uploadDicomAndNonedicom/dicomFile.vue  |  4 +++-
 src/components/uploadDicomAndNonedicom/study-view.vue |  8 ++++++--
 src/views/dicom-show/dicom-visit.vue                  | 11 +++++++----
 .../reading/reading-task/components/TargetSection.vue |  8 ++++----
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 5995a728..05f623dd 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -77,7 +77,7 @@
       </el-table-column>
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
-      :subjectVisitId="modelSubjectVisitId" :IsDicom="IsDicom" :visitTaskId="modelTaskId"
+      :subjectVisitId="modelSubjectVisitId" :IsDicom="IsDicom" :isDownload="true" :visitTaskId="modelTaskId"
       :IsImageSegment="IsImageSegment" :Criterion="Criterion" />
   </el-dialog>
 </template>
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 842eef4f..0c00b0f7 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -302,7 +302,7 @@
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
       :subjectVisitId="openSubjectVisitId" :modelList="modelList" :isUpload="openIsUpload"
-      :TrialModality="TrialModality" @getList="getList" />
+      :visitTaskId="openVisitTaskId" :TrialModality="TrialModality" @getList="getList" />
   </div>
 </template>
 <script>
@@ -417,6 +417,7 @@ export default {
       bodyPart: {},
       openIsUpload: false,
       openSubjectVisitId: null,
+      openVisitTaskId: null,
       TrialModality: [],
     }
   },
@@ -536,6 +537,7 @@ export default {
     handleOpenDialog(item, list, isUpload = false) {
       this.openIsUpload = isUpload
       this.openSubjectVisitId = item.SubjectVisitId || item.SourceSubjectVisitId
+      this.openVisitTaskId = item.VisitTaskId
       this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName}`
       this.modelList = item[list]
       this.model_cfg.visible = true
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index f41ee4f6..14ae0aa3 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -2,7 +2,7 @@
   <div v-if="model_cfg.visible">
     <base-model :config="model_cfg">
       <div slot="dialog-body">
-        <el-button v-if="!isUpload" type='primary' size="small" style="float:right;" @click="preview">
+        <el-button v-if="!isUpload && !isDownload" type='primary' size="small" style="float:right;" @click="preview">
           {{ $t("common:button:preview") }}
         </el-button>
         <el-table :data="modelList" style="width: 100%" height="300">
@@ -129,6 +129,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isDownload: {
+      type: Boolean,
+      default: false,
+    },
     Criterion: {
       type: Object,
       default: () => {
@@ -172,7 +176,7 @@ export default {
         var token = getToken()
         let trialId = this.$route.query.trialId
         routeData = this.$router.resolve({
-          path: `/showvisitdicoms?trialId=${trialId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}`,
+          path: `/showvisitdicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}`,
         })
       } else {
         let trialId = this.$route.query.trialId
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 65cdd535..71cea67d 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -154,7 +154,7 @@
                 <div class="viewerSidethumbinner">
 
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
-                    <template v-for="item in relationStudyListByVisitName" >
+                    <template v-for="item in relationStudyListByVisitName">
                       <div :key="`${item.VisitName}`">
                         <div v-show="item.VisitName" class="text-desc" style="background-color: #1f1f1f;">
                           {{ item.VisitName }}
@@ -365,10 +365,13 @@ export default {
         let res = null
         if (this.page === 'upload') {
           res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId !== 'undefined' ? this.visitTaskId : null, subjectVisitId: this.subjectVisitId })
-        } else if (this.page === 'download') {
+        }
+        // else if (this.page === 'download') {
+        //   res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
+        // }
+        else {
+          // res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
-        } else {
-          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
         }
         if (res.IsSuccess) {
           res.Result.forEach((study, studyIndex) => {
diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
index 60d7a846..969152e0 100644
--- a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -38,12 +38,12 @@
                 <el-table-column prop="VisitCount" :label="$t('trials:pendingReadingTasks:table:VisitCount')"
                     show-overflow-tooltip sortable="custom" />
                 <!-- dicom检查数量 -->
-                <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
-                    show-overflow-tooltip sortable="custom" />
+                <!-- <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
+                    show-overflow-tooltip sortable="custom" /> -->
                 <!-- 非dicom检查数量 -->
-                <el-table-column prop="NoneDicomStudyCount"
+                <!-- <el-table-column prop="NoneDicomStudyCount"
                     :label="$t('trials:pendingReadingTasks:table:NoneDicomStudyCount')" show-overflow-tooltip
-                    sortable="custom" />
+                    sortable="custom" /> -->
                 <!-- 标记访视数量 -->
                 <el-table-column prop="MarkVisitCount" :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')"
                     show-overflow-tooltip sortable="custom" />

From 47f885b5510beb2cf55da6fc98ab230a211ee64e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Nov 2025 14:15:41 +0800
Subject: [PATCH 114/333] 1

---
 src/components/uploadDicomAndNonedicom/dicomFile.vue | 1 +
 src/views/dicom-show/dicom-visit.vue                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 0c00b0f7..6d1c35e9 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -504,6 +504,7 @@ export default {
         if (confirm !== 'confirm') return
         let params = {
           VisitTaskId: item.VisitTaskId,
+          SubjectVisitId: item.SourceSubjectVisitId || item.SubjectVisitId,
           IsDicom: true,
         }
         let res = await deleteTaskStudy(params)
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 71cea67d..9d1f2ccd 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -371,7 +371,7 @@ export default {
         // }
         else {
           // res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
-          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
+          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId !== 'undefined' ? this.visitTaskId : null)
         }
         if (res.IsSuccess) {
           res.Result.forEach((study, studyIndex) => {

From b8dfcfea1d35e4461cef089d36394207f149c55b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Nov 2025 14:46:26 +0800
Subject: [PATCH 115/333] 1

---
 src/components/uploadDicomAndNonedicom/dicomFile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 6d1c35e9..6d166de1 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -1461,7 +1461,7 @@ export default {
       var token = getToken()
       let trialId = this.$route.query.trialId
       const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+        path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${this.IsImageSegment ? 'undefined' : row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },

From 38d8ac5ae531bb3274824cdb791b71108398a5fc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Nov 2025 17:28:11 +0800
Subject: [PATCH 116/333] =?UTF-8?q?=E5=90=8E=E5=A4=84=E7=90=86=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=BD=B1=E5=83=8F=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/dicomFile.vue         | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 6d166de1..97d6dad4 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -470,7 +470,7 @@ export default {
                 data.SubjectId = item.SubejctId
                 data.VisitTaskId = item.VisitTaskId
                 data.SourceSubjectVisitId = item.SourceSubjectVisitId
-                this.subjectVisitId = item.SourceSubjectVisitId
+                // this.subjectVisitId = item.SourceSubjectVisitId
                 this.StudyInstanceUidList.push(data)
               })
             }
@@ -1057,10 +1057,17 @@ export default {
       var scope = this
       return new Promise(function (resolve, reject) {
         try {
+          let subjectVisitId = null;
+          scope.StudyInstanceUidList.forEach(item => {
+            if (item.StudyInstanceUid === scope.uploadQueues[index].dicomInfo.studyUid) {
+              subjectVisitId = item.SourceSubjectVisitId
+            }
+          })
+          if (!subjectVisitId) return reject()
           preArchiveDicomStudy({
             trialId: scope.trialId,
             subjectId: scope.SubjectId,
-            subjectVisitId: scope.subjectVisitId,
+            subjectVisitId: subjectVisitId,
             fileSize: scope.uploadQueues[index].dicomInfo.fileSize,
             fileCount: scope.uploadQueues[index].dicomInfo.fileCount,
             IsDicomReUpload:
@@ -1076,7 +1083,7 @@ export default {
               dicomInfo.seriesNum = seriesNum
               dicomInfo.fileNum = fileNum
               dicomInfo.subjectId = scope.SubjectId
-              dicomInfo.subjectVisitId = scope.subjectVisitId
+              dicomInfo.subjectVisitId = subjectVisitId
               let t = setInterval(() => {
                 dicomUploadInProgress({
                   trialId: scope.trialId,
@@ -1096,7 +1103,7 @@ export default {
               let params = {
                 trialId: scope.trialId,
                 subjectId: scope.SubjectId,
-                subjectVisitId: scope.subjectVisitId,
+                subjectVisitId: subjectVisitId,
                 studyMonitorId: res.Result,
                 failedFileCount: 0,
                 RecordPath: null,

From 7a91ccac80b4374e6d8e63cdde72c40c8fe5081b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 28 Nov 2025 10:50:43 +0800
Subject: [PATCH 117/333] =?UTF-8?q?=E6=B7=8B=E5=B7=B4=E7=BB=93=E9=9D=9E?=
 =?UTF-8?q?=E9=9D=B6=E7=97=85=E7=81=B6=E5=92=8C=E6=B7=8B=E5=B7=B4=E7=BB=93?=
 =?UTF-8?q?=E6=96=B0=E7=97=85=E7=81=B6=E5=9C=A8=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1=E6=97=B6=E4=B8=94=E9=95=BF=E7=9F=AD=E5=BE=84?=
 =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E5=90=88=E6=A0=87=E5=87=86=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IRecist/QuestionForm.vue    | 4 ++--
 .../reading/dicoms/components/Lugano/QuestionForm.vue     | 8 ++++----
 .../dicoms/components/LuganoWithoutPET/QuestionForm.vue   | 8 ++++----
 .../reading/dicoms/components/Recist/QuestionForm.vue     | 4 ++--
 .../reading/dicoms3D/components/Recist/QuestionList.vue   | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 1f3bfe5b..c1badfd8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -1118,7 +1118,7 @@ export default {
         if (this.lesionType === 1 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionShort < 10)))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
@@ -1292,7 +1292,7 @@ export default {
         if (this.lesionType === 2 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionShort < 10)))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 2d35316b..ce9b71e6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -1389,9 +1389,9 @@ export default {
         if (this.lesionType === 1 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionLength < 15)))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg37'), {
+              this.$confirm(this.$t('trials:reading:warnning:lgmsg37'), {
                 type: 'warning',
                 showCancelButton: false,
                 callback: action => { }
@@ -1505,9 +1505,9 @@ export default {
         if (this.lesionType === 2 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionLength < 15)))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg45'), {
+              this.$confirm(this.$t('trials:reading:warnning:lgmsg45'), {
                 type: 'warning',
                 showCancelButton: false,
                 callback: action => { }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index 2d35316b..ce9b71e6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -1389,9 +1389,9 @@ export default {
         if (this.lesionType === 1 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionLength < 15)))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg37'), {
+              this.$confirm(this.$t('trials:reading:warnning:lgmsg37'), {
                 type: 'warning',
                 showCancelButton: false,
                 callback: action => { }
@@ -1505,9 +1505,9 @@ export default {
         if (this.lesionType === 2 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionLength < 15)))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg45'), {
+              this.$confirm(this.$t('trials:reading:warnning:lgmsg45'), {
                 type: 'warning',
                 showCancelButton: false,
                 callback: action => { }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index 8afa776a..27e52181 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -1068,7 +1068,7 @@ export default {
         if (this.lesionType === 1 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionShort < 10)))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
@@ -1184,7 +1184,7 @@ export default {
         if (this.lesionType === 2 && lesionState === 3) {
           if (lymphNodes === 1) {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionShort < 10)))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
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
index 8640080a..13bf30bf 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -1126,7 +1126,7 @@ export default {
           if (lesionType === 1 && lesionState === 3) {
             if (lymphNodes === 1) {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || measureData.markTool === 'Bidirectional'))) {
+              if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || (measureData.markTool === 'Bidirectional' && lesionShort < 10)))) {
                 // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                   type: 'warning',
@@ -1242,7 +1242,7 @@ export default {
           if (lesionType === 2 && lesionState === 3) {
             if (lymphNodes === 1) {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || measureData.markTool === 'Bidirectional'))) {
+              if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || (measureData.markTool === 'Bidirectional' && lesionShort < 10)))) {
                 // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                   type: 'warning',

From 17f738aa5ddbf0fe4ccba4ed27db723ae3b963c6 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 28 Nov 2025 14:34:09 +0800
Subject: [PATCH 118/333] 1

---
 src/main.js                                   |  3 +-
 src/utils/index.js                            | 37 +++++++++++++++++++
 .../dicoms/components/Lugano/QuestionList.vue |  7 +++-
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index b82918cf..4ca2d123 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,8 +26,9 @@ Vue.use(VueClipboard)
 import permission from './utils/permission'
 Vue.use(permission)
 
-import { formatSize } from "./utils"
+import { formatSize, guidToColor } from "./utils"
 Vue.prototype.$FormatSize = formatSize
+Vue.prototype.$GuidToColor = guidToColor
 
 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
diff --git a/src/utils/index.js b/src/utils/index.js
index 2cf77d16..65d535e3 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -222,4 +222,41 @@ export async function readEntry(entry) {
   }
 
   return files;
+}
+// RGB转十六进制
+function rgbToHex(r, g, b) {
+  return "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1).toUpperCase();
+}
+export function guidToColor(guid) {
+  // 移除GUID中的连字符和花括号（如果有）
+  const cleanGuid = guid.replace(/[{}()-]/g, '');
+
+  // 使用GUID的前6个字符作为颜色基础（确保一致性）
+  const colorBase = cleanGuid.substring(0, 6);
+
+  // 将每个字符转换为数字并映射到0-255范围
+  let r = 0, g = 0, b = 0;
+
+  for (let i = 0; i < 6; i++) {
+    const charCode = colorBase.charCodeAt(i);
+    if (i < 2) {
+      r = (r * 16 + (charCode % 16)) % 256;
+    } else if (i < 4) {
+      g = (g * 16 + (charCode % 16)) % 256;
+    } else {
+      b = (b * 16 + (charCode % 16)) % 256;
+    }
+  }
+
+  // 确保颜色有足够的饱和度（避免生成过于灰暗的颜色）
+  if (r + g + b < 100) {
+    r = Math.min(255, r + 100);
+    g = Math.min(255, g + 50);
+  } else if (r + g + b > 600) {
+    r = Math.max(0, r - 100);
+    b = Math.max(0, b - 50);
+  }
+
+  // 返回RGB对象
+  return rgbToHex(r, g, b);
 }
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index a2c5e6d1..6f3290c0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -86,11 +86,13 @@
                             :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
                             placement="bottom">
                             <div
-                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
+                              @click="acvd(item.TableQuestions.Answers[i])">
                               <span class="login-cycle" />
                             </div>
                           </el-tooltip>
-                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'"
+                            @click="acvd(item.TableQuestions.Answers[i])">
                             <span class="login-cycle" />
                           </div>
                           <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
@@ -335,6 +337,7 @@ export default {
     DicomEvent.$off('refreshQuestions')
   },
   methods: {
+    acvd(item) { console.log(item) },
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },

From 5cce828ad93ae9b499e764bd999b0bdebb7e6daa Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 28 Nov 2025 15:19:03 +0800
Subject: [PATCH 119/333] =?UTF-8?q?=E5=90=8E=E5=A4=84=E7=90=86=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=AE=BF=E8=A7=86id=E8=8E=B7=E5=8F=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/dicomFile.vue     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 97d6dad4..87d7f9e7 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -1058,12 +1058,20 @@ export default {
       return new Promise(function (resolve, reject) {
         try {
           let subjectVisitId = null;
-          scope.StudyInstanceUidList.forEach(item => {
-            if (item.StudyInstanceUid === scope.uploadQueues[index].dicomInfo.studyUid) {
-              subjectVisitId = item.SourceSubjectVisitId
-            }
-          })
-          if (!subjectVisitId) return reject()
+          if (scope.VisitTaskId) {
+            scope.StudyInstanceUidList.forEach(item => {
+              if (item.VisitTaskId === scope.VisitTaskId) {
+                subjectVisitId = item.SourceSubjectVisitId
+              }
+            })
+          } else {
+            scope.StudyInstanceUidList.forEach(item => {
+              if (item.StudyInstanceUid === scope.uploadQueues[index].dicomInfo.studyUid) {
+                subjectVisitId = item.SourceSubjectVisitId
+              }
+            })
+          }
+          if (!subjectVisitId) return reject('subjectVisitId is notFind')
           preArchiveDicomStudy({
             trialId: scope.trialId,
             subjectId: scope.SubjectId,

From ba6cb87648b25828915dd86400dc510e0f4d7651 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 28 Nov 2025 16:30:29 +0800
Subject: [PATCH 120/333] =?UTF-8?q?=E9=98=85=E7=89=87=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E5=8C=BA=E5=88=86=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.js                            | 81 ++++++++++++-------
 .../dicoms/components/Lugano/QuestionList.vue | 13 ++-
 2 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 65d535e3..3007efcb 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -223,40 +223,67 @@ export async function readEntry(entry) {
 
   return files;
 }
+// 使用FNV-1a哈希算法确保相同GUID产生相同结果
+function fnv1aHash(str) {
+  const FNV_OFFSET_BASIS = 2166136261;
+  const FNV_PRIME = 16777619;
+
+  let hash = FNV_OFFSET_BASIS;
+  for (let i = 0; i < str.length; i++) {
+    hash ^= str.charCodeAt(i);
+    hash = (hash * FNV_PRIME) >>> 0; // 使用无符号右移确保结果为无符号32位整数
+  }
+  return hash;
+}
 // RGB转十六进制
 function rgbToHex(r, g, b) {
   return "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1).toUpperCase();
 }
+// HSL转RGB函数
+function hslToRgb(h, s, l) {
+  let r, g, b;
+
+  if (s === 0) {
+    r = g = b = l; // 灰色
+  } else {
+    const hue2rgb = (p, q, t) => {
+      if (t < 0) t += 1;
+      if (t > 1) t -= 1;
+      if (t < 1 / 6) return p + (q - p) * 6 * t;
+      if (t < 1 / 2) return q;
+      if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+      return p;
+    };
+
+    const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+    const p = 2 * l - q;
+
+    r = hue2rgb(p, q, h + 1 / 3);
+    g = hue2rgb(p, q, h);
+    b = hue2rgb(p, q, h - 1 / 3);
+  }
+
+  return { r, g, b };
+}
 export function guidToColor(guid) {
   // 移除GUID中的连字符和花括号（如果有）
-  const cleanGuid = guid.replace(/[{}()-]/g, '');
+  let cleanGuid = guid.replace(/[{}()-]/g, '');
+  // 计算GUID的哈希值
+  const hash = fnv1aHash(cleanGuid);
 
-  // 使用GUID的前6个字符作为颜色基础（确保一致性）
-  const colorBase = cleanGuid.substring(0, 6);
-
-  // 将每个字符转换为数字并映射到0-255范围
-  let r = 0, g = 0, b = 0;
-
-  for (let i = 0; i < 6; i++) {
-    const charCode = colorBase.charCodeAt(i);
-    if (i < 2) {
-      r = (r * 16 + (charCode % 16)) % 256;
-    } else if (i < 4) {
-      g = (g * 16 + (charCode % 16)) % 256;
-    } else {
-      b = (b * 16 + (charCode % 16)) % 256;
-    }
-  }
-
-  // 确保颜色有足够的饱和度（避免生成过于灰暗的颜色）
-  if (r + g + b < 100) {
-    r = Math.min(255, r + 100);
-    g = Math.min(255, g + 50);
-  } else if (r + g + b > 600) {
-    r = Math.max(0, r - 100);
-    b = Math.max(0, b - 50);
-  }
+  // 使用哈希值生成HLS颜色（确保高区分度）
+  // 将哈希值映射到0-1之间
+  const h = (hash & 0xFFFF) / 0xFFFF; // 使用前16位作为色相
+  const s = ((hash >> 16) & 0xFF) / 0xFF * 0.6 + 0.4; // 饱和度在0.4-1.0之间
+  const l = ((hash >> 24) & 0xFF) / 0xFF * 0.4 + 0.4; // 亮度在0.3-0.7之间，避免太暗或太亮
 
   // 返回RGB对象
-  return rgbToHex(r, g, b);
+  let rgb = hslToRgb(h, s, l);
+  let obj = {
+    r: Math.round(rgb.r * 255),
+    g: Math.round(rgb.g * 255),
+    b: Math.round(rgb.b * 255)
+  }
+  let str = rgbToHex(obj.r, obj.g, obj.b)
+  return str;
 }
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 6f3290c0..fb7f527a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -86,14 +86,14 @@
                             :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
                             placement="bottom">
                             <div
-                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
-                              @click="acvd(item.TableQuestions.Answers[i])">
-                              <span class="login-cycle" />
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
                             </div>
                           </el-tooltip>
-                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'"
-                            @click="acvd(item.TableQuestions.Answers[i])">
-                            <span class="login-cycle" />
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
                           </div>
                           <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
                             :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
@@ -337,7 +337,6 @@ export default {
     DicomEvent.$off('refreshQuestions')
   },
   methods: {
-    acvd(item) { console.log(item) },
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },

From 612270eaad3c92a1e59be6846a6860b83a8dee6d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 28 Nov 2025 16:36:20 +0800
Subject: [PATCH 121/333] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/uploadDicomAndNonedicom/dicomFile.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 87d7f9e7..c9981b17 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -10,11 +10,11 @@
     <!--检查列表-->
     <el-table :data="list" style="width: 100%" height="300" :loading="loading">
       <!--受试者-->
-      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
+      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" sortable />
       <!--访视名称-->
-      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" v-if="IsImageSegment" />
+      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" v-if="IsImageSegment" sortable />
       <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" v-else />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" v-else sortable />
       <!--原始检查数-->
       <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
         <template slot-scope="scope">

From eefb42c3f6af3114bdec5c54f09b3b140d3bbe3a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 2 Dec 2025 09:12:53 +0800
Subject: [PATCH 122/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=9B=BE=E5=83=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/readingChart/index.vue         | 108 +++++++++---------
 .../customize/QuestionTableFormItem.vue       |   2 +-
 2 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/src/components/readingChart/index.vue b/src/components/readingChart/index.vue
index c061e946..4d51866d 100644
--- a/src/components/readingChart/index.vue
+++ b/src/components/readingChart/index.vue
@@ -86,7 +86,8 @@ export default {
                     res.Result.ChartDataList.forEach((item) => {
                         let arr = []
                         item.Value.forEach((d, index) => {
-                            arr.push([LatestScanDateList[index], d])
+                            // arr.push([LatestScanDateList[index], d])
+                            arr.push(d)
                         })
                         obj.series.push({
                             name: item.Name,
@@ -94,43 +95,43 @@ export default {
                             type: 'line'
                         })
                     });
-                    if (Array.isArray(res.Result.LatestScanDateList) && res.Result.LatestScanDateList.length >= 2) {
-                        let hours = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'hours');
-                        let days = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'days');
-                        let months = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'months');
-                        console.log(hours, 'hours')
-                        console.log(days, 'days')
-                        console.log(months, 'months')
-                        if (hours < 24) {
-                            obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
-                            obj.max = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 23:59:59'
-                        }
-                        if (days >= 1 && days <= 7) {
-                            obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
-                            obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'days').format('YYYY-MM-DD') + ' 23:59:59'
-                        }
-                        if (days > 7 && days < 30) {
-                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
-                            obj.max = moment(res.Result.LatestScanDateList[0]).endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
-                        }
-                        if (months >= 1 && months <= 3) {
-                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
-                            obj.max = moment(res.Result.LatestScanDateList[0]).add(4, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
-                        }
-                        if (months > 3 && months <= 6) {
-                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
-                            obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
-                        }
-                        if (months > 6 && months <= 12) {
-                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
-                            obj.max = moment(res.Result.LatestScanDateList[0]).add(13, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
-                        }
-                        if (months > 12) {
-                            obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
-                            obj.max = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).add(1, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
-                        }
-                    }
-                    console.log(obj)
+                    // if (Array.isArray(res.Result.LatestScanDateList) && res.Result.LatestScanDateList.length >= 2) {
+                    //     let hours = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'hours');
+                    //     let days = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'days');
+                    //     let months = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'months');
+                    //     console.log(hours, 'hours')
+                    //     console.log(days, 'days')
+                    //     console.log(months, 'months')
+                    //     if (hours < 24) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (days >= 1 && days <= 7) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'days').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (days > 7 && days < 30) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months >= 1 && months <= 3) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(4, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 3 && months <= 6) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 6 && months <= 12) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(13, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 12) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).add(1, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    // }
+                    // console.log(obj)
                     this.initChart(obj)
                 }
             } catch (err) {
@@ -155,18 +156,19 @@ export default {
                 },
                 tooltip: {
                     trigger: 'axis',
-                    formatter: function (params) {
-                        let index = obj.xAxisData.findIndex(item => item === params[0].value[0])
-                        let result = obj.visitName[index] + ' ' + params[0].value[0] + '<br>'; // 显示类目名（如日期）
-                        params.forEach(function (item) {
-                            result += item.marker + ' ' + item.seriesName + ': ' + item.value[1] + '<br>'; // 显示每个系列的图例、系列名和值
-                        });
-                        return result;
-                    }
+                    // formatter: function (params) {
+                    //     let index = obj.xAxisData.findIndex(item => item === params[0].value[0])
+                    //     let result = obj.visitName[index] + ' ' + params[0].value[0] + '<br>'; // 显示类目名（如日期）
+                    //     params.forEach(function (item) {
+                    //         result += item.marker + ' ' + item.seriesName + ': ' + item.value[1] + '<br>'; // 显示每个系列的图例、系列名和值
+                    //     });
+                    //     return result;
+                    // }
                 },
                 xAxis: {
-                    type: 'time',
-                    data: obj.xAxisData,
+                    // type: 'time',
+                    // data: obj.xAxisData,
+                    data: obj.visitName,
                     axisLine: { // 设置 x 轴线颜色
                         lineStyle: {
                             color: '#fff',
@@ -177,11 +179,11 @@ export default {
                             color: '#fff'
                         }
                     },
-                    splitLine: {
-                        show: false // 隐藏网格线
-                    },
-                    min: obj.min,
-                    max: obj.max
+                    // splitLine: {
+                    //     show: false // 隐藏网格线
+                    // },
+                    // min: obj.min,
+                    // max: obj.max
                 },
                 yAxis: {
                     name: obj.unit,
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index 68d5b022..c2685030 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -75,7 +75,7 @@
       </el-radio-group>
       <!-- 自动计算 -->
       <!-- :precision="2" :step="0.1" :max="10" -->
-      <div style="display: flex;justify-content: space-between;">
+      <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
         <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
           oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
         <svg-icon v-if="question.ShowChartTypeEnum > 0 && taskInfo.IsReadingTaskViewInOrder === 1"

From 653d3c622834dd9747755ae52bf050cd4dbc073e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 2 Dec 2025 13:31:29 +0800
Subject: [PATCH 123/333] =?UTF-8?q?=E6=8B=96=E6=8B=BD=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E6=9C=AA=E8=AF=BB=E5=8F=96=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E6=96=87=E4=BB=B6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 3007efcb..605ec1a0 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -197,16 +197,32 @@ export function workSpeedclose(isForce = false) {
   imageId = null;
   percentageById = {};
 }
+function readDirectoryEntries(directoryReader) {
+  return new Promise((resolve, reject) => {
+    let entries = [];
+    function readBatch() {
+      directoryReader.readEntries(
+        (results) => {
+          if (results.length) {
+            entries = entries.concat(results);
+            readBatch();
+          } else {
+            resolve(entries);
+          }
+        },
+        (error) => reject(error)
+      );
+    }
+    readBatch();
+  });
+}
 export async function readEntry(entry) {
   const files = [];
 
   // 如果是文件夹，创建读取器并递归读取其内容
   if (entry.isDirectory) {
     const directoryReader = entry.createReader();
-    const entries = await new Promise((resolve, reject) => {
-      directoryReader.readEntries(resolve, reject); // readEntries是异步的
-    });
-
+    const entries = await readDirectoryEntries(directoryReader)
     // 递归读取文件夹内的每一项
     for (const subEntry of entries) {
       const subFiles = await readEntry(subEntry);

From cc5ac4c2a9690e500665f0feb5d9e302c75dfea2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 2 Dec 2025 16:28:42 +0800
Subject: [PATCH 124/333] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89dicom?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E6=B7=BB=E5=8A=A0mpr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icons/svg/mpr.svg                         |   1 +
 .../dicoms3D/components/PetCtViewport.vue     |  63 +-
 .../reading/dicoms3D/components/ReadPage.vue  | 185 +++--
 .../dicoms3D/components/VolumeViewport.vue    | 742 ++++++++++++++++++
 4 files changed, 877 insertions(+), 114 deletions(-)
 create mode 100644 src/icons/svg/mpr.svg
 create mode 100644 src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue

diff --git a/src/icons/svg/mpr.svg b/src/icons/svg/mpr.svg
new file mode 100644
index 00000000..1f23e360
--- /dev/null
+++ b/src/icons/svg/mpr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1764646377457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7057" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M192 170.666667a21.333333 21.333333 0 0 0-21.333333 21.333333v640a21.333333 21.333333 0 0 0 21.333333 21.333333h640a21.333333 21.333333 0 0 0 21.333333-21.333333v-640a21.333333 21.333333 0 0 0-21.333333-21.333333h-640zM85.333333 192A106.666667 106.666667 0 0 1 192 85.333333h640A106.666667 106.666667 0 0 1 938.666667 192v640a106.666667 106.666667 0 0 1-106.666667 106.666667h-640A106.666667 106.666667 0 0 1 85.333333 832v-640z" fill="#e6e6e6" p-id="7058"></path><path d="M173.653333 170.666667c-1.621333 5.034667-2.986667 12.373333-2.986666 21.333333v640c0 8.96 1.365333 16.298667 2.986666 21.333333h292.693334c1.621333-5.034667 2.986667-12.373333 2.986666-21.333333v-640c0-8.96-1.365333-16.298667-2.986666-21.333333H173.653333zM99.157333 127.658667C107.306667 111.530667 126.293333 85.333333 160 85.333333h320c33.706667 0 52.736 26.197333 60.8 42.325334 9.301333 18.688 13.866667 41.472 13.866667 64.341333v640c0 22.869333-4.565333 45.653333-13.866667 64.341333-8.106667 16.128-27.093333 42.325333-60.8 42.325334h-320c-33.706667 0-52.736-26.197333-60.8-42.325334C89.856 877.653333 85.333333 854.869333 85.333333 832v-640c0-22.869333 4.522667-45.653333 13.866667-64.341333z" fill="#e6e6e6" p-id="7059"></path><path d="M170.666667 170.666667v298.666666h298.666666V170.666667H170.666667z m-85.333334-10.666667C85.333333 118.784 118.784 85.333333 160 85.333333h320c41.216 0 74.666667 33.450667 74.666667 74.666667v320A74.666667 74.666667 0 0 1 480 554.666667h-320A74.666667 74.666667 0 0 1 85.333333 480v-320z" fill="#e6e6e6" p-id="7060"></path></svg>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
index bc191c69..168c452b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
@@ -95,34 +95,20 @@
 <script>
 // import * as cornerstonejs from '@cornerstonejs/core'
 import {
-  // RenderingEngine,
   Enums,
-  // imageLoader,
   metaData,
   getRenderingEngine,
-  volumeLoader,
-  // eventTarget,
+  cache,
   utilities as csUtils,
 } from '@cornerstonejs/core'
 import * as cornerstoneTools from '@cornerstonejs/tools'
-import { utilities as cstUtils } from '@cornerstonejs/tools';
 import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader';
 import vtkColorMaps from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction/ColorMaps'
 import { createImageIdsAndCacheMetaData } from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/createImageIdsAndCacheMetaData'
 import setCtTransferFunctionForVolumeActor from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/setCtTransferFunctionForVolumeActor'
-import setPetTransferFunctionForVolumeActor from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/setPetTransferFunctionForVolumeActor'
 import { setPetColorMapTransferFunctionForVolumeActor } from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/setPetColorMapTransferFunctionForVolumeActor'
-const {
-  ToolGroupManager,
-  MIPJumpToClickTool,
-  VolumeRotateTool,
-  Enums: csToolsEnums,
-} = cornerstoneTools
 const { BlendModes, OrientationAxis } = Enums;
-const { MouseBindings } = csToolsEnums
-const { getColormap, getColormapNames } = csUtils.colormap;
-const { ViewportColorbar } = cstUtils.voi.colorbar;
-const { ColorbarRangeTextPosition } = cstUtils.voi.colorbar.Enums;
+const { getColormap } = csUtils.colormap;
 import { vec3, mat4 } from 'gl-matrix'
 export default {
   name: 'ImageViewport',
@@ -360,7 +346,7 @@ export default {
       const viewport = renderingEngine.getViewport(this.viewportId)
 
       if (isPlay) {
-        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: false })
+        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: true })
       } else {
         cornerstoneTools.utilities.cine.stopClip(viewport.element)
       }
@@ -435,27 +421,6 @@ export default {
         colorMap = getColormap(presetName)
       }
       if (!colorMap) return false
-      // let colormaps = getColormapNames().map(name => getColormap(name))
-      // console.log(colormaps)
-      // const canvas = document.getElementById('colorBar_Canvas')
-      // this.Colorbar = new ViewportColorbar({
-      //   id: this.volumeId,
-      //   element: this.element,
-      //   container: canvas,
-      //   colormaps,
-      //   activeColormapName: presetName,
-      //   ticks: {
-      //     position: ColorbarRangeTextPosition.Left,
-      //     style: {
-      //       font: '12px Arial',
-      //       color: '#fff',
-      //       maxNumTicks: 8,
-      //       tickSize: 5,
-      //       tickWidth: 1,
-      //       labelMargin: 3,
-      //     },
-      //   },
-      // });
       const rgbPoints = colorMap.RGBPoints
       const canvas = document.getElementById(`colorBar_Canvas_${this.viewportId}`)
       if (!canvas) return false
@@ -512,7 +477,7 @@ export default {
     },
     async setSeriesInfo(obj, option = {}) {
       try {
-        let { data, volumeId } = obj
+        let { data } = obj
         if (this.series && data.Id === this.series.Id && data.Description === this.series.Description) {
           data.SliceIndex = this.series.SliceIndex
         }
@@ -523,37 +488,32 @@ export default {
         this.isMip = isMip;
         const renderingEngine = getRenderingEngine(this.renderingEngineId)
         const viewport = renderingEngine.getViewport(this.viewportId)
+        this.volumeId = data.SeriesInstanceUid
         if (this.isFusion) {
           this.$nextTick(() => {
             this.renderColorBar(this.presetName)
           })
-          let { ct, data, ctVolumeId, ptVolumeId, fusionVolumeId } = obj
+          this.ptVolumeId = `fusion_${this.volumeId}`
+          let { ct, data } = obj
           this.series = { ...data }
           this.ctSeries = { ...ct }
           this.petSeries = { ...data }
-          // const maxCount = Math.max(this.ctSeries.ImageIds.length, this.petSeries.ImageIds.length)
-          // this.$set(this.ctSeries, 'imageMaxLength', maxCount)
-          // this.$set(this.petSeries, 'imageMaxLength', maxCount)
-          // await this.createImageIdsAndCacheMetaData(this.ctSeries)
-          // await this.createImageIdsAndCacheMetaData(this.petSeries)
-          this.volumeId = ptVolumeId
-          this.ptVolumeId = fusionVolumeId
           await viewport
             .setVolumes([
               {
-                volumeId: this.ptVolumeId, callback: (r) => {
+                volumeId: this.volumeId, callback: (r) => {
                   setPetColorMapTransferFunctionForVolumeActor(r)
                   console.log("融合pet渲染成功");
                 }
               },
               {
-                volumeId: ctVolumeId, callback: (r) => {
+                volumeId: ct.SeriesInstanceUid, callback: (r) => {
                   setCtTransferFunctionForVolumeActor(r)
                   console.log("融合ct渲染成功")
                 }
               },
               {
-                volumeId: this.volumeId, callback: (r) => {
+                volumeId: this.ptVolumeId, callback: (r) => {
                   setPetColorMapTransferFunctionForVolumeActor(r)
                   console.log("融合pet渲染成功");
                 }
@@ -565,9 +525,8 @@ export default {
             })
         } else {
           this.series = { ...data }
-          this.volumeId = volumeId
           if (this.isMip) {
-            let { volume } = obj
+            let volume = cache.getVolume(this.volumeId)
             const ptVolumeDimensions = volume.dimensions;
             const slabThickness = Math.sqrt(
               ptVolumeDimensions[0] * ptVolumeDimensions[0] +
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 0faceb8a..b831618b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -160,6 +160,11 @@
               <svg-icon v-if="forceFitToWindow" icon-class="fitToWindow" class="svg-icon" />
               <svg-icon v-else icon-class="fitToImage" class="svg-icon" />
             </div>
+            <!-- MPR -->
+            <div class="tool-item" :title="`${$t('trials:reading:button:mpr')}`" @click.prevent="openMPRViewport"
+              v-if="criterionType === 0 && readingTool === 0">
+              <svg-icon icon-class="mpr" class="svg-icon" />
+            </div>
             <!--融合-->
             <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')"
               @click.prevent="openFusion">
@@ -289,10 +294,10 @@
           <!-- viewports -->
           <div class="viewports-wrapper">
             <div ref="container" class="grid-container">
-              <div :class="['viewports-box', isFusion ? 'viewports-box-down' : '']" :style="gridStyle">
+              <div :class="['viewports-box', isFusion || isMPR ? 'viewports-box-down' : '']" :style="gridStyle">
                 <div v-for="(v, index) in cellsMax" v-show="index < cells.length" :key="`viewport-${index}`"
                   :style="cellStyle"
-                  :class="['grid-cell', index === activeViewportIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
+                  :class="['grid-cell', isMPR && index === 2 ? 'grid-cell-3' : '', index === activeViewportIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
                   @dblclick="toggleFullScreen($event, index)" @click="activeViewport(index)">
                   <Viewport :ref="`viewport-${index}`" :data-viewport-uid="`viewport-${index}`"
                     :rendering-engine-id="renderingEngineId" :viewport-id="`viewport-${index}`" :viewport-index="index"
@@ -300,6 +305,18 @@
                     @renderAnnotations="renderAnnotations" @contentMouseup="contentMouseup" />
                 </div>
               </div>
+              <div v-if="criterionType === 0 && readingTool === 0"
+                :class="['viewports-box', !isMPR ? 'viewports-box-down' : '']" :style="gridStyle">
+                <div v-for="(v, index) in 3" :key="`viewport-volume-${index}`" :style="cellStyle"
+                  :class="['grid-cell', isMPR && index === 2 ? 'grid-cell-3' : '', index === activeViewportIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
+                  @dblclick="toggleFullScreen($event, index)" @click="activeViewport(index)">
+                  <VolumeViewport :ref="`viewport-volume-${index}`" :data-viewport-uid="`viewport-volume-${index}`"
+                    :rendering-engine-id="renderingEngineId" :viewport-id="`viewport-volume-${index}`"
+                    :viewport-index="index" @activeViewport="activeViewport"
+                    @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD"
+                    @renderAnnotations="renderAnnotations" @contentMouseup="contentMouseup" />
+                </div>
+              </div>
               <div v-if="readingTool === 2" :class="['viewports-box', !isFusion ? 'viewports-box-down' : '']"
                 :style="gridStyle">
                 <div v-for="(v, index) in cellsMax" v-show="index < cells.length" :key="`viewport-fusion-${index}`"
@@ -457,6 +474,7 @@ import { getTools, getCustomizeStandardsTools, config } from './toolConfig'
 import StudyList from './StudyList'
 import Viewport from './Viewport'
 import PetCtViewport from './PetCtViewport'
+import VolumeViewport from './VolumeViewport'
 import mRecisit from './mRecist/QuestionList'
 import recisit from './Recist/QuestionList'
 import customizeQuestionList from './customize/QuestionList'
@@ -534,6 +552,7 @@ export default {
     StudyList,
     Viewport,
     PetCtViewport,
+    VolumeViewport,
     mRecisit,
     recisit,
     customizeQuestionList,
@@ -622,7 +641,6 @@ export default {
       fusionVisible: false,
       isFusion: false,
       studyList: [],
-      volumeData: {},
       fusionSerieId: {},
       loadingText: null,
       toolNames: ['Length', 'Bidirectional', 'RectangleROI', 'ArrowAnnotate', 'CircleROI', 'Eraser'],
@@ -645,7 +663,9 @@ export default {
         annotation: null
       },
 
-      ManualsClose: false
+      ManualsClose: false,
+
+      isMPR: false
     }
   },
   computed: {
@@ -670,7 +690,7 @@ export default {
       return Array(this.rows * this.cols).fill(0)
     },
     viewportKey() {
-      return this.isFusion ? 'viewport-fusion' : 'viewport'
+      return this.isMPR ? 'viewport-volume' : this.isFusion ? 'viewport-fusion' : 'viewport'
     },
     openManuals() {
       return !this.taskInfo.IsReadKeyFile && this.taskInfo.IsHaveKeyFile
@@ -1021,11 +1041,13 @@ export default {
       if (!renderingEngine) {
         renderingEngine = new RenderingEngine(renderingEngineId)
       }
+      let viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
+      const fusionViewportIds = ['viewport-fusion-0', 'viewport-fusion-1', 'viewport-fusion-2', 'viewport-fusion-3']
       const element1 = this.$refs['viewport-0'][0].$el
       const element2 = this.$refs['viewport-1'][0].$el
       const element3 = this.$refs['viewport-2'][0].$el
       const element4 = this.$refs['viewport-3'][0].$el
-
+      console.log(Enums.OrientationAxis)
       let viewportInputArray = [
         {
           viewportId: 'viewport-0',
@@ -1048,8 +1070,40 @@ export default {
           element: element4
         }
       ]
-      let viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
-      const fusionViewportIds = ['viewport-fusion-0', 'viewport-fusion-1', 'viewport-fusion-2', 'viewport-fusion-3']
+      if (this.criterionType === 0 && this.readingTool === 0) {
+        let volumeViewportIds = ['viewport-volume-0', 'viewport-volume-1', 'viewport-volume-2']
+        const volumeElement1 = this.$refs['viewport-volume-0'][0].$el
+        const volumeElement2 = this.$refs['viewport-volume-1'][0].$el
+        const volumeElement3 = this.$refs['viewport-volume-2'][0].$el
+        const arr = [
+          {
+            viewportId: 'viewport-volume-0',
+            type: ViewportType.ORTHOGRAPHIC,
+            element: volumeElement1,
+            defaultOptions: {
+              orientation: Enums.OrientationAxis.AXIAL
+            }
+          },
+          {
+            viewportId: 'viewport-volume-1',
+            type: ViewportType.ORTHOGRAPHIC,
+            element: volumeElement2,
+            defaultOptions: {
+              orientation: Enums.OrientationAxis.CORONAL
+            }
+          },
+          {
+            viewportId: 'viewport-volume-2',
+            type: ViewportType.ORTHOGRAPHIC,
+            element: volumeElement3,
+            defaultOptions: {
+              orientation: Enums.OrientationAxis.SAGITTAL
+            }
+          },
+        ]
+        viewportInputArray = [...viewportInputArray, ...arr]
+        viewportIds = viewportIds.concat(volumeViewportIds)
+      }
       if (this.readingTool === 2) {
         const fusionElement1 = this.$refs['viewport-fusion-0'][0].$el
         const fusionElement2 = this.$refs['viewport-fusion-1'][0].$el
@@ -1121,7 +1175,7 @@ export default {
         const toolGroup = ToolGroupManager.createToolGroup(toolGroupId)
         toolGroup.addViewport(viewportId, renderingEngineId)
         toolGroup.addTool(StackScrollTool.toolName, {
-            loop: true,        // 启用循环滚动
+          loop: true,        // 启用循环滚动
         })
         toolGroup.addTool(ScaleOverlayTool.toolName)
 
@@ -1450,7 +1504,9 @@ export default {
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
         const referencedImageId = annotation.metadata.referencedImageId
+        console.log(annotation, 'annotation')
         const params = this.getInstanceInfo(referencedImageId)
+        console.log(params, 'params')
         annotation.visitTaskId = series.TaskInfo.VisitTaskId
         annotation.studyId = series.StudyId
         annotation.seriesId = series.Id
@@ -2033,7 +2089,10 @@ export default {
     },
     setToolsPassive() {
       if (!this.activeTool) return
-      const toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`, `${this.viewportKey}-3`]
+      let toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`, `${this.viewportKey}-3`]
+      if (this.isMPR) {
+        toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
+      }
       toolGroupIds.forEach(toolGroupId => {
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
         toolGroup.setToolPassive(this.activeTool)
@@ -2042,7 +2101,10 @@ export default {
     },
     setToolEnabled() {
       if (!this.activeTool) return
-      const toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`, `${this.viewportKey}-3`]
+      let toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`, `${this.viewportKey}-3`]
+      if (this.isMPR) {
+        toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
+      }
       toolGroupIds.forEach(toolGroupId => {
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
         toolGroup.setToolEnabled(this.activeTool)
@@ -2381,7 +2443,10 @@ export default {
             })
           }
           const renderingEngine = getRenderingEngine(renderingEngineId)
-          const viewportIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`, `${this.viewportKey}-3`]
+          let viewportIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`, `${this.viewportKey}-3`]
+          if (this.isMPR) {
+            viewportIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
+          }
           renderingEngine.renderViewports(viewportIds)
         }
         event.stopImmediatePropagation()
@@ -2413,10 +2478,11 @@ export default {
       }
     },
     async toggleTask(taskInfo, taskIndex) {
-      if (this.isFusion) {
+      if (this.isFusion || this.isMPR) {
         const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
         if (!confirm) return false
         this.isFusion = false
+        this.isMPR = false
         this.fullScreenIndex = null
         this.setToolsPassive()
       }
@@ -2485,7 +2551,7 @@ export default {
       this.setToolsPassive()
     },
     async activeSeries(obj) {
-      if (this.isFusion) {
+      if (this.isFusion || this.isMPR) {
         const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
         if (!confirm) return false
         this.isFusion = false
@@ -2494,6 +2560,7 @@ export default {
         this.cols = 1
         this.activeViewportIndex = 0
         this.fullScreenIndex = null
+        this.isMPR = false
         return this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(obj)
       }
       if (!obj.IsDicom) {
@@ -2863,12 +2930,14 @@ export default {
     },
     getInstanceInfo(imageId) {
       const params = {}
-      const searchParams = new URLSearchParams(imageId.split('?')[1])
-      for (const [key, value] of searchParams.entries()) {
-        params[key] = value
-      }
-      if (isNaN(params.frame)) {
-        params.frame = null
+      if (imageId) {
+        const searchParams = new URLSearchParams(imageId.split('?')[1])
+        for (const [key, value] of searchParams.entries()) {
+          params[key] = value
+        }
+        if (isNaN(params.frame)) {
+          params.frame = null
+        }
       }
       return params
     },
@@ -3021,6 +3090,25 @@ export default {
         this.$refs[id][0].voiChange(v)
       })
     },
+    async openMPRViewport() {
+      this.isMPR = true
+      this.rows = 2
+      this.cols = 2
+      this.loading = true
+      this.loadingText = this.$t('trials:lugano:message:loadVolumes')
+      const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+      this.activeViewportIndex = 0
+      this.$refs[`viewport-0`][0].setSeriesInfo(series)
+      this.$refs[`viewport-1`][0].setSeriesInfo(series)
+      this.$refs[`viewport-2`][0].setSeriesInfo(series)
+      this.$refs[`viewport-3`][0].setSeriesInfo(series)
+      await this.getVolume(series)
+      this.loading = false
+      this.loadingText = null
+      this.$refs[`viewport-volume-0`][0].setSeriesInfo(Object.assign({ orientation: 'AXIAL' }, series))
+      this.$refs[`viewport-volume-1`][0].setSeriesInfo(Object.assign({ orientation: 'CORONAL' }, series))
+      this.$refs[`viewport-volume-2`][0].setSeriesInfo(Object.assign({ orientation: 'SAGITTAL' }, series))
+    },
     async handleFusion(data) {
       try {
         this.fusionVisible = false
@@ -3030,9 +3118,6 @@ export default {
         const { ct, pt } = data
         this.loading = true
         this.loadingText = this.$t('trials:lugano:message:loadVolumes')
-        // this.resetAnnotation = true
-        // console.log(cornerstoneTools.annotation.state.getAllAnnotations(),'cornerstoneTools.annotation.state')
-        // cornerstoneTools.annotation.state.removeAllAnnotations()
         this.renderedTaskIds = []
         if (this.verifyFusionData(ct, pt)) {
           this.loading = false
@@ -3056,21 +3141,14 @@ export default {
         this.loading = false
         this.loadingText = null
         const ctData = {
-          data: ct,
-          volumeId: this.volumeData[ct.SeriesInstanceUid].volumeId
+          data: ct
         }
         const ptData = {
-          data: pt,
-          volumeId: this.volumeData[pt.SeriesInstanceUid].volumeId,
-          volume: this.volumeData[pt.SeriesInstanceUid].volume
+          data: pt
         }
         const fusionData = {
           ct,
           data: pt,
-          volumeId: this.volumeData[pt.SeriesInstanceUid].volumeId,
-          ctVolumeId: this.volumeData[ct.SeriesInstanceUid].volumeId,
-          ptVolumeId: this.volumeData[pt.SeriesInstanceUid].volumeId,
-          fusionVolumeId: this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId
         }
         this.$refs[`viewport-0`][0].setSeriesInfo(ct)
         this.$refs[`viewport-1`][0].setSeriesInfo(pt)
@@ -3092,43 +3170,22 @@ export default {
       }
     },
     verifyFusionData(ct, pt) {
-      if (this.fusionSerieId.ct === ct.SeriesInstanceUid && this.fusionSerieId.pt === pt.SeriesInstanceUid && cache.getVolume(this.volumeData[ct.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[pt.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId)) {
+      if (this.fusionSerieId.ct === ct.SeriesInstanceUid && this.fusionSerieId.pt === pt.SeriesInstanceUid && cache.getVolume(ct.SeriesInstanceUid) && cache.getVolume(pt.SeriesInstanceUid) && cache.getVolume(`fusion_${pt.SeriesInstanceUid}`)) {
         return true
       }
       return false
     },
     async getVolume(serie, isFusion = false) {
       return new Promise(async res => {
-        let volumeId = null; let volume = null
-        const key = isFusion ? `fusion_${serie.SeriesInstanceUid}` : serie.SeriesInstanceUid
-        if (!this.volumeData[key] || !cache.getVolume(this.volumeData[key].volumeId)) {
-          // if (serie.Modality === 'PT' && !isFusion) {
-          //   serie.ImageIds.forEach(async id => {
-          //     const imageLoadObject = cache.getImage(id)
-          //     if (imageLoadObject) {
-          //       await new Promise(res => {
-          //         cache.removeImageLoadObject(id, { force: true }) // 从缓存中删除
-          //         res()
-          //       })
-          //     }
-          //   })
-          // }
-          volumeId = `${isFusion ? 'fusion' : serie.Modality}Volume` + ':' + serie.SeriesInstanceUid
-          if (cache.getVolume(volumeId)) {
-            volume = cache.getVolume(volumeId)
-          } else {
-            await this.$refs[`viewport-fusion-0`][0].createImageIdsAndCacheMetaData(serie)
-            volume = await volumeLoader.createAndCacheVolume(volumeId, { imageIds: serie.ImageIds })
-            volume.load()
-          }
-          this.volumeData[key] = {}
-          this.volumeData[key].volumeId = volumeId
-          this.volumeData[key].volume = volume
+        let volumeId = `${isFusion ? 'fusion_' : ''}` + serie.SeriesInstanceUid;
+        let volume = null;
+        if (cache.getVolume(volumeId)) {
+          volume = cache.getVolume(volumeId)
         } else {
-          volumeId = this.volumeData[key].volumeId
-          volume = this.volumeData[key].volume
+          await this.$refs[`${this.viewportKey}-0`][0].createImageIdsAndCacheMetaData(serie)
+          volume = await volumeLoader.createAndCacheVolume(volumeId, { imageIds: serie.ImageIds })
+          volume.load()
         }
-
         res({ volumeId, volume })
       })
     },
@@ -3506,13 +3563,17 @@ export default {
 
         .grid-cell {
           border: 1px dashed #ccc;
-          ;
           display: flex;
           align-items: center;
           justify-content: center;
           z-index: 1;
         }
 
+        .grid-cell-3 {
+          grid-column: 2 / 3;
+          grid-row: 1 / 3;
+        }
+
         .cell_active {
           border-color: #fafa00 !important;
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
new file mode 100644
index 00000000..e5145bf8
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
@@ -0,0 +1,742 @@
+<template>
+    <div ref="viewport-volume" class="viewport-wrapper" v-loading="loading" :element-loading-text="NSTip"
+        element-loading-background="rgba(0, 0, 0, 0.8)" @mouseup="sliderMouseup" @mousemove="sliderMousemove"
+        @mouseleave="sliderMouseleave" :style="{ color: '#ddd' }">
+        <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)" />
+            </div>
+            <h2 v-if="taskInfo.IsReadingShowSubjectInfo && series.TaskInfo" class="subject-info">
+                {{ `${series.TaskInfo.SubjectCode} ${series.TaskInfo.TaskBlindName} ` }}
+            </h2>
+            <div>Series: #{{ series.SeriesNumber }}</div>
+            <div v-if="series.Stack">Image: #{{ `${series.SliceIndex + 1}/${imageInfo.total}` }}</div>
+            <div>{{ series.Modality }}</div>
+        </div>
+        <div v-if="series" class="right-top-text">
+            <div>{{ series.Description }}</div>
+        </div>
+        <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>
+            <div
+                v-if="(series.Modality === 'CT' || series.Modality === 'DR' || series.Modality === 'CR') && mousePosition.value">
+                HU: {{ mousePosition.value }}
+            </div>
+            <div v-else-if="(series.Modality === 'PT' && mousePosition.value)">
+                SUVbw(g/ml): {{ digitPlaces === -1 ? mousePosition.value.toFixed(3) :
+                    mousePosition.value.toFixed(digitPlaces)
+                }}
+            </div>
+            <div v-else-if="mousePosition.value">
+                Density: {{ mousePosition.value }}
+            </div>
+            <div v-show="imageInfo.size">
+                W*H: {{ imageInfo.size }}
+            </div>
+        </div>
+        <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>
+        </div>
+        <div class="orientation-top">
+            {{ markers.top }}
+        </div>
+        <div class="orientation-right">
+            {{ markers.right }}
+        </div>
+
+        <div class="orientation-bottom">
+            {{ markers.bottom }}
+        </div>
+        <div class="orientation-left">
+            {{ markers.left }}
+        </div>
+        <div ref="sliderBox" class="right-slider-box" @click.stop="clickSlider($event)">
+            <div :style="{ top: sliderInfo.height + '%' }" class="slider" @click.stop.prevent="() => { return }"
+                @mousedown.stop="sliderMousedown($event)" />
+        </div>
+    </div>
+</template>
+<script>
+import {
+    metaData,
+    getRenderingEngine,
+    utilities as csUtils,
+} from '@cornerstonejs/core'
+import * as cornerstoneTools from '@cornerstonejs/tools'
+import { createImageIdsAndCacheMetaData } from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/createImageIdsAndCacheMetaData'
+import setCtTransferFunctionForVolumeActor from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/setCtTransferFunctionForVolumeActor'
+import { setPetColorMapTransferFunctionForVolumeActor } from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/setPetColorMapTransferFunctionForVolumeActor'
+import { vec3, mat4 } from 'gl-matrix'
+export default {
+    name: 'ImageViewport',
+    props: {
+        renderingEngineId: {
+            type: String,
+            required: true
+        },
+        viewportId: {
+            type: String,
+            required: true
+        },
+        viewportIndex: {
+            type: Number,
+            required: true
+        },
+    },
+    data() {
+        return {
+            element: '',
+            series: {},
+            ctSeries: {},
+            petSeries: {},
+            taskInfo: null,
+            sliderInfo: {
+                oldB: null,
+                oldM: null,
+                isMove: false,
+                height: 0
+            },
+            mousePosition: {
+                index: [],
+                value: null,
+                modalityUnit: '',
+                world: []
+            },
+            imageInfo: {
+                zoom: null,
+                size: null,
+                location: null,
+                sliceThickness: null,
+                wwwc: null,
+                total: 0
+            },
+            digitPlaces: 2,
+            orientationMarkers: [],
+            originalMarkers: [],
+            markers: { top: '', right: '', bottom: '', left: '' },
+            playClipState: false,
+            wwwcIdx: 2,
+            presetName: '',
+            volumeId: null,
+            defaultWindowLevel: {},
+            rotateAngle: 0,
+            rotateBarLeft: 0,
+            loading: false,
+        }
+    },
+    mounted() {
+        this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
+        const digitPlaces = Number(localStorage.getItem('digitPlaces'))
+        this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+        this.$nextTick(() => {
+            this.initViewport()
+        })
+    },
+    methods: {
+        initViewport() {
+            this.element = this.$refs['viewport-volume']
+            const resizeObserver = new ResizeObserver(() => {
+                const renderingEngine = getRenderingEngine(this.renderingEngineId)
+                if (renderingEngine) {
+                    renderingEngine.resize(true, false)
+                }
+            })
+            this.element.oncontextmenu = (e) => e.preventDefault()
+            // resizeObserver.observe(this.element)
+            this.element.addEventListener("CORNERSTONE_VOLUME_NEW_IMAGE", this.stackNewImage)
+            this.element.addEventListener('CORNERSTONE_VOI_MODIFIED', this.voiModified)
+            this.element.addEventListener('wheel', (e) => {
+                console.log('CORNERSTONE_STACK_VIEWPORT_SCROLL')
+                const renderingEngine = getRenderingEngine(this.renderingEngineId)
+                const viewport = renderingEngine.getViewport(this.viewportId)
+                const currentImageIdIndex = viewport.getCurrentImageIdIndex()
+                const totalImages = this.imageInfo.total;
+
+                // 手动实现循环逻辑
+                if (currentImageIdIndex >= totalImages - 1) {
+                    // 滚动到最后一张时跳回第一张
+                    csUtils.jumpToSlice(viewport.element, { imageIndex: 0 });
+                } else if (currentImageIdIndex <= 0) {
+                    // 滚动到第一张时跳回最后一张
+                    csUtils.jumpToSlice(viewport.element, { imageIndex: totalImages - 1 });
+                }
+            });
+            this.element.addEventListener('CORNERSTONE_TOOLS_MOUSE_MOVE', this.cornerstoneToolsMouseMove)
+            // this.element.addEventListener(cornerstoneTools.Enums.Events.MOUSE_WHEEL, this.handletoolsMouseWheel)
+            this.element.addEventListener('mouseleave', () => {
+                this.mousePosition.index = []
+                this.mousePosition.value = null
+            })
+            document.addEventListener('mouseup', () => {
+                this.sliderMouseup()
+            })
+            document.addEventListener('mousemove', (e) => {
+                this.sliderMousemove(e)
+
+            })
+        },
+        stackNewImage(e) {
+            const { detail } = e
+            this.series.SliceIndex = detail.imageIndex
+            this.sliderInfo.height = detail.imageIndex * 100 / detail.numberOfSlices
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const viewport = renderingEngine.getViewport(this.viewportId)
+            const zoom = viewport.getZoom()
+            this.imageInfo.zoom = zoom.toFixed(4)
+            let imageIds = viewport.getImageIds(this.volumeId)
+            let imageId = imageIds[0]
+            if (this.series.orientation === 'AXIAL') imageId = viewport.getCurrentImageId()
+            if (imageId) {
+                const imagePlaneModule = metaData.get('imagePlaneModule', imageId)
+                if (this.series.orientation === 'AXIAL') {
+                    this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}`
+                    this.imageInfo.location = imagePlaneModule.sliceLocation
+                    this.imageInfo.total = imageIds.length
+                }
+                if (this.series.orientation === 'CORONAL') {
+                    this.imageInfo.size = `${imagePlaneModule.columns}*${imageIds.length}`
+                    this.imageInfo.total = imagePlaneModule.rows
+                }
+                if (this.series.orientation === 'SAGITTAL') {
+                    this.imageInfo.size = `${imagePlaneModule.rows}*${imageIds.length}`
+                    this.imageInfo.total = imagePlaneModule.columns
+                }
+
+                this.getOrientationMarker()
+                let properties = viewport.getProperties(this.volumeId)
+                if (properties && properties.voiRange) {
+                    var { lower, upper } = properties.voiRange
+                    const windowWidth = upper - lower
+                    const windowCenter = (upper + lower) / 2
+                    this.defaultWindowLevel.windowWidth = windowWidth
+                    this.defaultWindowLevel.windowCenter = windowCenter
+                    this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
+                }
+            }
+            const toolGroupId = this.viewportId
+            const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId)
+            toolGroup.setToolEnabled('ScaleOverlay')
+
+        },
+        setFullScreen(index) {
+            setTimeout(() => {
+                const renderingEngine = getRenderingEngine(this.renderingEngineId)
+                const viewport = renderingEngine.getViewport(
+                    this.viewportId
+                )
+                csUtils.jumpToSlice(viewport.element, { imageIndex: index })
+                viewport.render()
+            })
+        },
+        voiModified(e) {
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const viewport = renderingEngine.getViewport(this.viewportId)
+            let properties = viewport.getProperties()
+            if (properties && properties.voiRange) {
+                var { lower, upper } = properties.voiRange
+                const { windowWidth, windowCenter } = csUtils.windowLevel.toWindowLevel(
+                    lower,
+                    upper
+                )
+                this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
+                this.$emit('upperRangeChange', Math.round(windowWidth))
+            }
+        },
+        getOrientationMarker() {
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const viewport = renderingEngine.getViewport(this.viewportId)
+            const { viewUp, viewPlaneNormal } = viewport.getCamera()
+
+            const viewRight = vec3.create()
+            vec3.cross(viewRight, viewUp, viewPlaneNormal)
+
+            const columnCosines = [-viewUp[0], -viewUp[1], -viewUp[2]]
+            const rowCosines = viewRight
+            const rowString = cornerstoneTools.utilities.orientation.getOrientationStringLPS(rowCosines)
+            const columnString = cornerstoneTools.utilities.orientation.getOrientationStringLPS(columnCosines)
+            const oppositeRowString = cornerstoneTools.utilities.orientation.invertOrientationStringLPS(rowString)
+            const oppositeColumnString = cornerstoneTools.utilities.orientation.invertOrientationStringLPS(columnString)
+            this.markers.top = oppositeColumnString
+            this.markers.right = rowString
+            this.markers.bottom = columnString
+            this.markers.left = oppositeRowString
+            this.orientationMarkers = [oppositeColumnString, rowString, columnString, oppositeRowString]
+            if (this.originalMarkers.length === 0) {
+                this.originalMarkers = [...this.orientationMarkers]
+            }
+        },
+        setMarkers() {
+            const markers = [...this.orientationMarkers]
+            for (const key in this.markers) {
+                const v = markers.shift(0)
+                this.markers[key] = v
+            }
+        },
+        resetOrientationMarkers() {
+            if (this.originalMarkers.length > 0) {
+                this.orientationMarkers = [...this.originalMarkers]
+                this.setMarkers()
+            }
+        },
+        rotateOrientationMarkers(type) {
+            if (this.orientationMarkers.length > 0) {
+                if (type === 1) {
+                    this.resetOrientationMarkers()
+                    return
+                }
+                const markers = [...this.orientationMarkers]
+                if (type === 2) {
+                    // 垂直翻转
+                    this.orientationMarkers[0] = markers[2]
+                    this.orientationMarkers[2] = markers[0]
+                } else if (type === 3) {
+                    // 水平翻转
+                    this.orientationMarkers[1] = markers[3]
+                    this.orientationMarkers[3] = markers[1]
+                } else if (type === 4) {
+                    // 左转90度
+                    this.orientationMarkers = markers.slice(1, 4).concat(markers[0])
+                } else if (type === 5) {
+                    // 右转90度
+                    this.orientationMarkers = [markers[3]].concat(markers.slice(0, 3))
+                }
+                this.setMarkers()
+            }
+        },
+        toggleClipPlay(isPlay, framesPerSecond) {
+            this.playClipState = isPlay
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const viewport = renderingEngine.getViewport(this.viewportId)
+
+            if (isPlay) {
+                cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: true })
+            } else {
+                cornerstoneTools.utilities.cine.stopClip(viewport.element)
+            }
+        },
+        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
+            if (type === 0) {
+                newImageIdIndex = 0
+            } else if (type === -1) {
+                newImageIdIndex = currentImageIdIndex === 0 ? currentImageIdIndex : currentImageIdIndex - 1
+            } else if (type === 1) {
+                newImageIdIndex = currentImageIdIndex === numImages - 1 ? currentImageIdIndex : currentImageIdIndex + 1
+            } else if (type === 99999) {
+                newImageIdIndex = numImages - 1
+            }
+            // viewport.setImageIdIndex(newImageIdIndex)
+            csUtils.jumpToSlice(viewport.element, { imageIndex: newImageIdIndex })
+            cornerstoneTools.utilities.cine.stopClip(viewport.element)
+        },
+        setZoom(ratio) {
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const viewport = renderingEngine.getViewport(this.viewportId)
+
+            const zoom = viewport.getZoom()
+            if (ratio > 0) {
+                viewport.setZoom(zoom * 1.05)
+            } else {
+                viewport.setZoom(zoom / 1.05)
+            }
+            viewport.render()
+        },
+        resize(forceFitToWindow) {
+            console.log('resize: ', forceFitToWindow)
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const viewport = renderingEngine.getViewport(this.viewportId)
+            if (!forceFitToWindow) {
+                viewport.setZoom(0.5)
+                viewport.render()
+            } else {
+                viewport.setZoom(1)
+                viewport.render()
+            }
+        },
+        voiChange(v) {
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const voiRange = { lower: 0, upper: v }
+            const viewport = renderingEngine.getViewport(this.viewportId)
+            if (!viewport) return
+            let volumeId = this.volumeId
+            const viewportsContainingVolumeUID = csUtils.getViewportsWithVolumeId(
+                volumeId,
+                viewport.renderingEngineId
+            )
+
+            viewport.setProperties({ voiRange }, volumeId)
+            viewportsContainingVolumeUID.forEach((vp) => {
+                vp.render()
+                // this.$refs[vp.id].voiModified()
+                this.voiModified()
+            })
+        },
+        setPreset(presetName) {
+            this.presetName = presetName
+        },
+        async createImageIdsAndCacheMetaData(obj) {
+            this.loading = true
+            await createImageIdsAndCacheMetaData({
+                modality: obj.Modality,
+                imageIds: obj.ImageIds
+            })
+            this.loading = false
+        },
+        async setSeriesInfo(obj) {
+            try {
+                let data = obj
+                if (this.series && data.Id === this.series.Id && data.Description === this.series.Description) {
+                    data.SliceIndex = this.series.SliceIndex
+                }
+                this.series = {}
+                const renderingEngine = getRenderingEngine(this.renderingEngineId)
+                const viewport = renderingEngine.getViewport(this.viewportId)
+                this.volumeId = data.SeriesInstanceUid
+                this.series = { ...data }
+                viewport
+                    .setVolumes([{
+                        volumeId: this.volumeId, callback: (r) => {
+                            if (this.series.Modality === 'PT') {
+                                setPetColorMapTransferFunctionForVolumeActor(r, true)
+                            } else {
+                                setCtTransferFunctionForVolumeActor(r)
+                            }
+                            console.log("渲染成功")
+                        }
+                    }])
+                viewport.render()
+            } catch (e) {
+                console.log(e)
+            }
+
+        },
+        cornerstoneToolsMouseMove(e) {
+            const { currentPoints } = e.detail
+            const worldPoint = currentPoints.world
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const viewport = renderingEngine.getViewport(this.viewportId)
+            const imageData = viewport.getImageData()
+            if (!imageData) return
+            const index = imageData.imageData.worldToIndex(worldPoint)
+            index[0] = Math.floor(index[0])
+            index[1] = Math.floor(index[1])
+            index[2] = Math.floor(index[2])
+            this.mousePosition.index = index
+        },
+        toggleTask(evt, visitTaskNum, i) {
+            this.$emit('activeViewport', this.viewportIndex)
+            const num = visitTaskNum + i
+            if (num >= 0 && num <= this.taskInfo.VisitNum) {
+                this.$emit('toggleTaskByViewport', { series: this.series, visitTaskNum: num })
+            }
+
+            evt.stopImmediatePropagation()
+            evt.stopPropagation()
+            evt.preventDefault()
+        },
+        viewCD(taskId) {
+            this.$emit('previewCD', taskId)
+        },
+        setWwwcIdx(idx) {
+            this.wwwcIdx = idx
+        },
+        clickSlider(e) {
+            const height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
+            this.sliderInfo.height = height
+            let sliceIdx = Math.trunc(this.series.Stack.length * height / 100)
+            sliceIdx = sliceIdx >= this.series.Stack.length ? this.series.Stack.length - 1 : sliceIdx < 0 ? 0 : sliceIdx
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const viewport = renderingEngine.getViewport(
+                this.viewportId
+            )
+            // viewport.setImageIdIndex(sliceIdx)
+            csUtils.jumpToSlice(viewport.element, { imageIndex: sliceIdx })
+            viewport.render()
+        },
+        sliderMouseup(e) {
+            this.sliderInfo.isMove = false
+            this.$emit('contentMouseup', e)
+        },
+        sliderMousedown(e) {
+            const boxHeight = this.$refs['sliderBox'].clientHeight
+            this.sliderInfo.oldB = parseInt(e.srcElement.style.top) * boxHeight / 100
+            this.sliderInfo.oldM = e.clientY
+            this.sliderInfo.isMove = true
+            e.stopImmediatePropagation()
+            e.stopPropagation()
+            e.preventDefault()
+        },
+        sliderMousemove(e) {
+            if (!this.sliderInfo.isMove) return
+            const delta = this.sliderInfo.oldB - (this.sliderInfo.oldM - e.clientY)
+            const boxHeight = this.$refs['sliderBox'].clientHeight
+            if (delta < 0) return
+            if (delta > boxHeight) return
+            const height = delta * 100 / boxHeight
+            let sliceIdx = Math.trunc(this.series.Stack.length * height / 100)
+            sliceIdx = sliceIdx >= this.series.Stack.length ? this.series.Stack.length - 1 : sliceIdx < 0 ? 0 : sliceIdx
+            this.sliderInfo.height = height
+            const renderingEngine = getRenderingEngine(this.renderingEngineId)
+            const viewport = renderingEngine.getViewport(
+                this.viewportId
+            )
+            // viewport.setImageIdIndex(sliceIdx)
+            csUtils.jumpToSlice(viewport.element, { imageIndex: sliceIdx })
+            viewport.render()
+        },
+        sliderMouseleave(e) {
+            if (!this.sliderInfo.isMove) return
+            this.sliderInfo.isMove = false
+        },
+        rotate(angle) {
+            let renderingEngine = getRenderingEngine(this.renderingEngineId)
+            let viewport = renderingEngine.getViewport(this.viewportId)
+            const camera = viewport.getCamera()
+            const { viewUp, position, focalPoint } = camera
+            const [cx, cy, cz] = focalPoint
+            const [ax, ay, az] = [0, 0, 1]
+            const newPosition = [0, 0, 0]
+            const newFocalPoint = [0, 0, 0]
+            const newViewUp = [0, 0, 0]
+
+            const transform = mat4.identity(new Float32Array(16))
+            mat4.translate(transform, transform, [cx, cy, cz])
+            mat4.rotate(transform, transform, angle, [ax, ay, az])
+            mat4.translate(transform, transform, [-cx, -cy, -cz])
+            vec3.transformMat4(newPosition, position, transform)
+            vec3.transformMat4(newFocalPoint, focalPoint, transform)
+
+            mat4.identity(transform)
+            mat4.rotate(transform, transform, angle, [ax, ay, az])
+            vec3.transformMat4(newViewUp, viewUp, transform)
+
+            viewport.setCamera({
+                position: newPosition,
+                viewUp: newViewUp,
+                focalPoint: newFocalPoint
+            })
+
+            viewport.render()
+        },
+        clickRotate(e) {
+            // console.log('clickRotate')
+            const container = document.getElementById('rotateBar')
+            const containerWidth = container.offsetWidth
+            const slider = document.getElementById('rotateSlider')
+            const sliderWidth = slider.offsetWidth
+            const x = Math.trunc(e.offsetX)
+            const deltaX = x - this.rotateBarLeft
+            const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+            this.rotate(angle)
+            this.rotateBarLeft = x
+        },
+        preventDefault(e) {
+            e.stopImmediatePropagation()
+            e.stopPropagation()
+            e.preventDefault()
+        }
+    },
+    computed: {
+        NSTip() {
+            return `NS: ${this.$store.state.trials.uploadTip}`
+        }
+    },
+}
+</script>
+<style lang="scss" scoped>
+.viewport-wrapper {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    cursor: default !important;
+
+    .left-top-text {
+        position: absolute;
+        left: 5px;
+        top: 5px;
+        // color: #ddd; 
+        z-index: 1;
+        font-size: 12px;
+
+        .cd-info {
+            // color: #ddd; 
+            font-size: 18px;
+        }
+
+        .subject-info {
+            color: #f44336;
+            padding: 5px 0px;
+            margin: 0;
+        }
+    }
+
+    .top-center-tool {
+        position: absolute;
+        left: 50%;
+        top: 5px;
+        transform: translateX(-50%);
+        z-index: 1;
+
+        .toggle-visit-container {
+            display: flex;
+        }
+
+        .arrw_icon {
+            width: 20px;
+            height: 20px;
+            background-color: #3f3f3f;
+            text-align: center;
+            line-height: 20px;
+            border-radius: 10%;
+        }
+
+        .arrow_text {
+            height: 20px;
+            line-height: 20px;
+            background-color: #00000057;
+            color: #fff;
+            padding: 0 10px;
+            font-size: 14px;
+        }
+    }
+
+    .right-top-text {
+        position: absolute;
+        right: 5px;
+        top: 5px;
+        // color: #ddd;
+        z-index: 1;
+        font-size: 12px;
+    }
+
+    .left-bottom-text {
+        position: absolute;
+        left: 5px;
+        bottom: 5px;
+        // color: #ddd;
+        z-index: 1;
+        font-size: 12px;
+    }
+
+    .right-bottom-text {
+        position: absolute;
+        right: 5px;
+        bottom: 5px;
+        // color: #ddd;
+        z-index: 1;
+        font-size: 12px;
+    }
+
+    .right-slider-box {
+        position: absolute;
+        right: 1px;
+        height: calc(100% - 140px);
+        transform: translateY(-50%);
+        top: calc(50% - 30px);
+        width: 10px;
+        background: #333;
+        z-index: 1;
+        cursor: pointer;
+    }
+
+    .right-slider-box:after {
+        content: '';
+        position: absolute;
+        bottom: -20px;
+        left: 0;
+        height: 20px;
+        width: 100%;
+        background: #333;
+    }
+
+    .slider {
+        height: 20px;
+        width: 100%;
+        position: absolute;
+        top: 0;
+        z-index: 10;
+        background: #9e9e9e;
+        cursor: move
+    }
+
+    .orientation-top {
+        position: absolute;
+        left: 50%;
+        top: 30px;
+        color: #f44336;
+        transform: translateX(-50%);
+        z-index: 1;
+    }
+
+    .orientation-bottom {
+        position: absolute;
+        left: 50%;
+        bottom: 15px;
+        color: #f44336;
+        transform: translateX(-50%);
+        z-index: 1;
+    }
+
+    .orientation-left {
+        position: absolute;
+        top: 50%;
+        left: 15px;
+        color: #f44336;
+        transform: translateY(-50%);
+        z-index: 1;
+    }
+
+    .orientation-right {
+        position: absolute;
+        top: 50%;
+        right: 15px;
+        color: #f44336;
+        transform: translateY(-50%);
+        z-index: 1;
+    }
+}
+
+.color_bar {
+    position: absolute;
+    transform: rotate(-90deg);
+    transform-origin: right;
+    left: -150px;
+    top: 30%;
+    z-index: 1;
+}
+
+.rotate_slider_box {
+    position: absolute;
+    width: 380px;
+    height: 10px;
+    bottom: 5px;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #333;
+    z-index: 10;
+    cursor: pointer;
+
+    .box {
+        z-index: 10;
+        background: #9e9e9e;
+        height: 100%;
+        width: 20px;
+        position: absolute;
+        top: 0;
+        cursor: move
+    }
+}
+</style>
\ No newline at end of file

From c2cb5b1999f409b0f5be981b73b44e1f520c4023 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 2 Dec 2025 17:12:49 +0800
Subject: [PATCH 125/333] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        | 113 +++--
 .../dicoms/components/Fusion/QuestionItem.vue | 393 +++++++-----------
 .../dicoms/components/Fusion/Questions.vue    | 121 +++---
 .../components/Fusion/TableQuestionItem.vue   | 286 ++++++-------
 .../components/Fusion/TableQuestions.vue      | 161 +++----
 .../dicoms/components/PCWG/QuestionList.vue   |  11 +-
 .../reading/dicoms/components/ReadPage.vue    |   2 +-
 .../reading/dicoms/components/ReportPage.vue  |   7 +-
 .../dicoms/customize/CustomizeReportPage.vue  |   3 +-
 .../dicoms3D/components/ReportPage.vue        |   3 +-
 .../global-review/components/PCWG3Table.vue   | 164 +++-----
 .../components/GlobalReview.vue               | 200 +++------
 .../trials-panel/visit/crc-upload/index.vue   |   2 +-
 .../trials-panel/visit/qc-check/index.vue     |   3 +-
 14 files changed, 630 insertions(+), 839 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 32cc9003..156123e4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -214,56 +214,25 @@
       <!--  @dblclick.native="reloadViewport('CT_AXIAL')" -->
       <div ref="dicomContainer" class="dicom-container box box_2_2" style="position: relative;"
         @dblclick="reloadViewport">
-        <Viewport 
-          ref="CT_AXIAL" 
-          :index="1" 
-          :active-index="activeIndex"
-          :is-reading-show-subject-info="isReadingShowSubjectInfo" 
-          :series-info="ctSeries"
-          :rendering-engine-id="renderingEngineId" 
-          viewport-id="CT_AXIAL" :volume="ctVolume"
-          :measure-datas="measureDatas" 
-          :style="1 === activeIndex ? viewportStyle : {}" 
-          @upperRangeChange="upperRangeChange"
-        />
-        <Viewport 
-          ref="PT_AXIAL" 
-          :index="2" 
-          :active-index="activeIndex"
-          :is-reading-show-subject-info="isReadingShowSubjectInfo" 
-          :series-info="petSeries"
-          :rendering-engine-id="renderingEngineId" 
-          viewport-id="PT_AXIAL" 
-          :volume="ptVolume"
-          :measure-datas="measureDatas" 
-          :style="2 === activeIndex ? viewportStyle : {}" 
-           @upperRangeChange="upperRangeChange"
-        />
-        <Viewport 
-          ref="FUSION_AXIAL" 
-          :index="3" 
-          :active-index="activeIndex"
-          :is-reading-show-subject-info="isReadingShowSubjectInfo" 
-          :series-info="petSeries"
-          :rendering-engine-id="renderingEngineId" 
-          viewport-id="FUSION_AXIAL" 
-          :volume="ptVolume"
-          :measure-datas="measureDatas" 
-          :rgb-preset-name="rgbPresetName"
-          :style="3 === activeIndex ? viewportStyle : {}" 
-           @upperRangeChange="upperRangeChange"
-        />
-        <Viewport 
-          ref="PET_MIP_CORONAL" 
-          :index="4" 
-          :active-index="activeIndex"
-          :is-reading-show-subject-info="isReadingShowSubjectInfo" 
-          :series-info="petSeries"
-          :rendering-engine-id="renderingEngineId" 
-          viewport-id="PET_MIP_CORONAL" :measure-datas="measureDatas"
-          :style="4 === activeIndex ? viewportStyle : {}" 
-           @upperRangeChange="upperRangeChange"
-        />
+        <Viewport ref="CT_AXIAL" :index="1" :active-index="activeIndex"
+          :is-reading-show-subject-info="isReadingShowSubjectInfo" :series-info="ctSeries"
+          :rendering-engine-id="renderingEngineId" viewport-id="CT_AXIAL" :volume="ctVolume"
+          :measure-datas="measureDatas" :style="1 === activeIndex ? viewportStyle : {}"
+          @upperRangeChange="upperRangeChange" />
+        <Viewport ref="PT_AXIAL" :index="2" :active-index="activeIndex"
+          :is-reading-show-subject-info="isReadingShowSubjectInfo" :series-info="petSeries"
+          :rendering-engine-id="renderingEngineId" viewport-id="PT_AXIAL" :volume="ptVolume"
+          :measure-datas="measureDatas" :style="2 === activeIndex ? viewportStyle : {}"
+          @upperRangeChange="upperRangeChange" />
+        <Viewport ref="FUSION_AXIAL" :index="3" :active-index="activeIndex"
+          :is-reading-show-subject-info="isReadingShowSubjectInfo" :series-info="petSeries"
+          :rendering-engine-id="renderingEngineId" viewport-id="FUSION_AXIAL" :volume="ptVolume"
+          :measure-datas="measureDatas" :rgb-preset-name="rgbPresetName" :style="3 === activeIndex ? viewportStyle : {}"
+          @upperRangeChange="upperRangeChange" />
+        <Viewport ref="PET_MIP_CORONAL" :index="4" :active-index="activeIndex"
+          :is-reading-show-subject-info="isReadingShowSubjectInfo" :series-info="petSeries"
+          :rendering-engine-id="renderingEngineId" viewport-id="PET_MIP_CORONAL" :measure-datas="measureDatas"
+          :style="4 === activeIndex ? viewportStyle : {}" @upperRangeChange="upperRangeChange" />
       </div>
       <!-- 表单 -->
       <div class="form-container" style="overflow-y: auto;">
@@ -273,19 +242,22 @@
             <span style="margin-left:5px;">{{ taskBlindName }}</span>
           </h3>
 
-          <TableQuestions ref="tableQuestions" />
-          <Questions ref="questions" @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus" />
+          <TableQuestions ref="tableQuestions" @handleReadingChart="handleReadingChart" />
+          <Questions ref="questions" @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
+            @handleReadingChart="handleReadingChart" />
         </div>
       </div>
     </div>
     <el-dialog v-if="customWwc.visible" :visible.sync="customWwc.visible" :close-on-click-modal="false"
       :title="customWwc.title" width="400px" custom-class="base-dialog-wrapper">
-      <custom-wwwc-form :ww="activeCanvasWW" :wc="activeCanvasWC" @close="customWwc.visible = false" @setWwwc="setWwwc" />
+      <custom-wwwc-form :ww="activeCanvasWW" :wc="activeCanvasWC" @close="customWwc.visible = false"
+        @setWwwc="setWwwc" />
     </el-dialog>
     <el-dialog :visible.sync="fusion.visible" :close-on-click-modal="false" :title="$t('trials:lugano:button:record')"
       width="850px">
       <fusion-form @close="fusion.visible = false" />
     </el-dialog>
+    <readingChart ref="readingChart" />
   </div>
 </template>
 <script>
@@ -333,6 +305,7 @@ import vtkPiecewiseFunction from '@kitware/vtk.js/Common/DataModel/PiecewiseFunc
 // import vtkOrientationMarkerWidget from '@kitware/vtk.js/Interaction/Widgets/OrientationMarkerWidget'
 import { mat4, vec3 } from 'gl-matrix'
 import html2canvas from 'html2canvas'
+import readingChart from '@/components/readingChart'
 // import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction'
 // import vtkMath from '@kitware/vtk.js/Common/Core/Math'
 // import CircleROITool from './tools/CircleROITool'
@@ -420,7 +393,8 @@ export default {
     Questions,
     TableQuestions,
     CustomWwwcForm,
-    FusionForm
+    FusionForm,
+    readingChart
   },
   data() {
     return {
@@ -582,6 +556,7 @@ export default {
       this.screenshotWindow = window.open(routeData.href, '_blank')
     })
     window.addEventListener('beforeunload', e => { this.beforeUnloadHandler(e) })
+    document.addEventListener("click", this.foo);
   },
   beforeDestroy() {
     if (this.screenshotWindow) {
@@ -604,7 +579,21 @@ export default {
     window.removeEventListener('beforeunload', e => { this.beforeUnloadHandler(e) })
   },
   methods: {
-
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.$route.query.visitTaskId
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart) return false
+      this.$refs.readingChart.foo()
+    },
     initPage() {
       const resizeObserver = new ResizeObserver(() => {
         if (element_ct.style.width) {
@@ -1715,7 +1704,7 @@ export default {
     },
     voiChange(v) {
       let viewportIds = ['FUSION_AXIAL', 'PT_AXIAL', 'PET_MIP_CORONAL']
-      viewportIds.map(viewportId=>{
+      viewportIds.map(viewportId => {
         // const volumeId = viewportId === 'viewportId' ? ptVolumeId : ctVolumeId
         const volumeId = ptVolumeId
         const voiRange = { lower: 0, upper: v }
@@ -1738,14 +1727,14 @@ export default {
         //   console.log(vp.id)
         // }) 
       })
-      
+
     },
     async setColorMap(rgbPresetName) {
       this.rgbPresetName = rgbPresetName
       let viewports = ['FUSION_AXIAL', 'PT_AXIAL', 'PET_MIP_CORONAL']
-      viewports.map(v=>{
+      viewports.map(v => {
         this.$refs[v].setPreset(this.rgbPresetName)
-        this.$refs[v].renderColorBar(this.rgbPresetName) 
+        this.$refs[v].renderColorBar(this.rgbPresetName)
         this.createColorBar(this.rgbPresetName, 'colorBarCanvas', 256, 15)
         const renderingEngine = getRenderingEngine(renderingEngineId)
 
@@ -1862,8 +1851,8 @@ export default {
       const renderingEngine = getRenderingEngine(renderingEngineId)
       const viewport = renderingEngine.getViewport(viewporId)
       const { invert } = viewport.getProperties()
-      if ( this.isFusion ) {
-        viewport.setProperties({ invert: !invert }, volumeId )
+      if (this.isFusion) {
+        viewport.setProperties({ invert: !invert }, volumeId)
       }
       viewport.setProperties({ invert: !invert })
       viewport.render()
@@ -1987,7 +1976,7 @@ export default {
       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.setProperties({ voiRange: { upper: upper, lower: lower } })
       viewport.render()
       this.customWwc.visible = false
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index e07799d4..3e79ae4d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -1,305 +1,219 @@
 <template>
   <div>
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ language === 'en' ? question.GroupEnName : question.GroupName }}
       </h4>
     </div>
     <template v-else-if="((question.QuestionType === 56) && question.IsBaseLineTask)" />
     <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'?'uploadWrapper':'']"
-      >
+        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' ? 'uploadWrapper' : '']">
         <template v-if="question.QuestionType === 51 || question.QuestionType === 52">
           <!-- question.QuestionType === 51 || question.QuestionType === 52 -->
           <div style="display: flex;flex-direction: row;justify-content: flex-start;">
-            <el-input
-              v-if="question.Type==='calculation'"
-              v-model="questionForm[question.Id]"
-              disabled
-              style="width: 120px;"
-            >
-              <template v-if="question.Unit" slot="append">
-                {{ $fd('ValueUnit', parseInt(question.Unit)) }}
-              </template>
-            </el-input>
+            <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
+              <el-input v-model="questionForm[question.Id]" disabled style="width: 120px;">
+                <template v-if="question.Unit" slot="append">
+                  {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+                </template>
+                <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart"
+                  class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      QuestionId: question.Id,
+                      RowIndex: questionForm.RowIndex,
+                      QuestionName: question.QuestionName
+                    }
+                  })" />
+              </el-input>
+            </div>
+
             <!-- 测量 -->
-            <el-button v-if="(!questionForm[question.Id] && ((question.QuestionType === 51 && liverIsInsideVolume) || (question.QuestionType === 52 && lungIsInsideVolume)) && readingTaskState!== 2)" size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
+            <el-button
+              v-if="(!questionForm[question.Id] && ((question.QuestionType === 51 && liverIsInsideVolume) || (question.QuestionType === 52 && lungIsInsideVolume)) && readingTaskState !== 2)"
+              size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation')
+              }}</el-button>
             <!-- 清除标记 -->
-            <el-button v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume)) && readingTaskState!== 2" size="mini" type="text" style="padding: 7px 5px;margin-left:5px;" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
+            <el-button
+              v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume)) && readingTaskState !== 2"
+              size="mini" type="text" style="padding: 7px 5px;margin-left:5px;" @click="removeAnnotation(question)">{{
+                $t('trials:lugano:button:clearAnnotation') }}</el-button>
             <!-- 定位 -->
             <el-button
               v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume))"
-              size="mini"
-              type="text"
-              style="padding: '7px 5px';margin-left:-5px;"
-              @click="locateAnnotation(question)"
-            >{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
+              size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;"
+              @click="locateAnnotation(question)">{{
+                $t('trials:lugano:button:locateAnnotation') }}</el-button>
             <!-- 保存 -->
-            <el-button v-if="readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="saveAnnotation(question)">
+            <el-button v-if="readingTaskState !== 2 && question.SaveEnum === 1" size="mini" type="text"
+              style="padding: '7px 5px';margin-left:-5px;" @click="saveAnnotation(question)">
               <!-- 未保存 -->
               <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                 <i class="el-icon-warning" style="color:red" />
               </el-tooltip>
               {{ $t('common:button:save') }}
             </el-button>
-            <el-button v-if="!question.IsBaseLineTask" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="viewAnnotations(question)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
+            <el-button v-if="!question.IsBaseLineTask" size="mini" type="text"
+              style="padding: '7px 5px';margin-left:-5px;" @click="viewAnnotations(question)">{{
+                $t('trials:lugano:button:suvscreenshot') }}</el-button>
           </div>
         </template>
         <template v-else-if="question.QuestionType === 53">
-          <el-input
-            v-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>
+          <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
+            <el-input v-model="questionForm[question.Id]" disabled>
+              <template v-if="question.Unit" slot="append">
+                {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+              </template>
+            </el-input>
+            <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  QuestionId: question.Id,
+                  RowIndex: questionForm.RowIndex,
+                  QuestionName: question.QuestionName
+                }
+              })" />
+          </div>
+
         </template>
         <template v-else-if="question.QuestionType === 55">
-          <el-select
-            v-model="questionForm[question.Id]"
-            :disabled="readingTaskState >= 2 "
-            clearable
-            @change="((val)=>{formItemChange(val, question)})"
-          >
+          <el-select v-model="questionForm[question.Id]" :disabled="readingTaskState >= 2" clearable
+            @change="((val) => { formItemChange(val, question) })">
             <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-            >
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
               <template>
-                <el-option
-                  v-for="item of $d[question.DictionaryCode]"
-                  :key="item.id"
-                  :value="String(item.value)"
-                  :label="item.label"
-                />
+                <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
+                  :label="item.label" />
               </template>
             </el-option-group>
           </el-select>
         </template>
         <template v-else-if="question.QuestionType === 56">
-          <el-select
-            v-model="questionForm[question.Id]"
-            :disabled="readingTaskState >= 2 "
-            clearable
-            @change="((val)=>{formItemChange(val, question)})"
-          >
+          <el-select v-model="questionForm[question.Id]" :disabled="readingTaskState >= 2" clearable
+            @change="((val) => { formItemChange(val, question) })">
             <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${parseFloat(question.LastTaskAnswer) === 5 ? 'NA' : $fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-            >
-              <template v-if="pet5PS*1=== -1">
-                <el-option
-                  v-for="item of $d[question.DictionaryCode]"
-                  v-show="item.value !== 4"
-                  :key="item.id"
-                  :value="String(item.value)"
-                  :label="item.label"
-                />
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${parseFloat(question.LastTaskAnswer) === 5 ? 'NA' : $fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
+              <template v-if="pet5PS * 1 === -1">
+                <el-option v-for="item of $d[question.DictionaryCode]" v-show="item.value !== 4" :key="item.id"
+                  :value="String(item.value)" :label="item.label" />
               </template>
               <template v-else>
-                <el-option
-                  v-for="item of $d[question.DictionaryCode]"
-                  :key="item.id"
-                  :value="String(item.value)"
-                  :label="item.label"
-                />
+                <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
+                  :label="item.label" />
               </template>
             </el-option-group>
           </el-select>
         </template>
         <template v-else-if="question.QuestionType === 57">
-          <el-select
-            v-model="questionForm[question.Id]"
-            :disabled="readingTaskState >= 2 "
-            clearable
-            @change="((val)=>{formItemChange(val, question)})"
-          >
+          <el-select v-model="questionForm[question.Id]" :disabled="readingTaskState >= 2" clearable
+            @change="((val) => { formItemChange(val, question) })">
             <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-            >
-              <template v-if="pet5PS*1=== -1">
-                <el-option
-                  v-for="item of $d[question.DictionaryCode]"
-                  v-show="item.value !== 1"
-                  :key="item.id"
-                  :value="String(item.value)"
-                  :label="item.label"
-                />
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
+              <template v-if="pet5PS * 1 === -1">
+                <el-option v-for="item of $d[question.DictionaryCode]" v-show="item.value !== 1" :key="item.id"
+                  :value="String(item.value)" :label="item.label" />
               </template>
               <template v-else>
-                <el-option
-                  v-for="item of $d[question.DictionaryCode]"
-                  :key="item.id"
-                  :value="String(item.value)"
-                  :label="item.label"
-                />
+                <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
+                  :label="item.label" />
               </template>
             </el-option-group>
           </el-select>
         </template>
         <!-- 输入框 -->
-        <el-input
-          v-else-if="question.Type==='input'"
-          v-model="questionForm[question.Id]"
-          :disabled="readingTaskState >= 2"
-        />
+        <el-input v-else-if="question.Type === 'input'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2" />
         <!-- 多行文本输入框 -->
-        <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"
-        />
+        <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" />
         <!-- 下拉框 -->
-        <el-select
-          v-else-if="question.Type==='select'"
-          v-model="questionForm[question.Id]"
+        <el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
           :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode) || question.QuestionType === 50"
-          clearable
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+          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]"
-            />
+            <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"
-            />
+            <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
+            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"
-            />
+            <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)})"
-        >
+        <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)"
-            >
+            <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"
-            >
+            <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"
-          >
+        <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>
         <!-- 数值 -->
-        <el-input-number
-          v-else-if="question.Type==='number'"
-          v-model="questionForm[question.Id]"
-          :disabled="readingTaskState >= 2"
-        />
-        <el-input
-          v-else-if="question.Type==='calculation'"
-          v-model="questionForm[question.Id]"
-          disabled
-        />
+
+        <div style="display: flex;justify-content: space-between;"
+          v-else-if="question.Type === 'calculation' || question.Type === 'number'">
+          <el-input-number v-if="question.Type === 'number'" v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2" />
+          <el-input v-model="questionForm[question.Id]" disabled v-else />
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                QuestionId: question.Id,
+                RowIndex: questionForm.RowIndex,
+                QuestionName: question.QuestionName
+              }
+            })" />
+        </div>
+
         <!-- 上传图像 -->
-        <el-upload
-          v-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"
-        >
+        <el-upload v-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=""
-            >
+            <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)"
-              >
+              <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)"
-              >
+              <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-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>
@@ -309,19 +223,11 @@
       </el-form-item>
     </template>
     <template v-for="item of question.Childrens">
-      <QuestionItem
-        v-if="item.QuestionClassify === 0"
-        :key="item.Id"
-        :question="item"
-        :reading-task-state="readingTaskState"
-        :question-form="questionForm"
-        :visit-task-id="visitTaskId"
-        :pet5p-s="pet5PS"
-        :lung-is-inside-volume="lungIsInsideVolume"
-        :liver-is-inside-volume="liverIsInsideVolume"
-        @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData"
-      />
+      <QuestionItem v-if="item.QuestionClassify === 0" :key="item.Id" :question="item"
+        :reading-task-state="readingTaskState" :question-form="questionForm" :visit-task-id="visitTaskId"
+        :pet5p-s="pet5PS" :lung-is-inside-volume="lungIsInsideVolume" :liver-is-inside-volume="liverIsInsideVolume"
+        @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData"
+        @handleReadingChart="handleReadingChart" />
     </template>
   </div>
 </template>
@@ -406,6 +312,9 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     formItemChange(v, question) {
       if (question.QuestionType === 55) {
         this.$emit('setFormItemData', { key: question.Id, val: v })
@@ -441,7 +350,7 @@ export default {
         .then(() => {
           FusionEvent.$emit('removeAnnotation', question)
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     locateAnnotation(question) {
       FusionEvent.$emit('locateAnnotation', question)
@@ -503,26 +412,32 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.uploadWrapper {
   display: flex;
   flex-direction: column;
   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 5px;
-  }
-  ::v-deep .el-select.is-disabled .el-input__inner{
-    background-color: #646464a1;
-  }
+
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: #646464a1;
+}
+
+::v-deep .el-input-group__append,
+.el-input-group__prepend {
+  padding: 0 5px;
+}
+
+::v-deep .el-select.is-disabled .el-input__inner {
+  background-color: #646464a1;
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index e308b6e2..9b4e9303 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -1,29 +1,17 @@
 <template>
   <div v-loading="loading" class="ecrf-wrapper">
-    <el-form
-      v-if="questions.length > 0"
-      ref="questions"
-      size="small"
-      :model="questionForm"
-    >
+    <el-form v-if="questions.length > 0" ref="questions" size="small" :model="questionForm">
       <template v-for="question of questions">
-        <QuestionItem
-          v-if="question.QuestionClassify === 0"
-          :key="question.Id"
-          :question="question"
-          :question-form="questionForm"
-          :reading-task-state="readingTaskState"
-          :visit-task-id="visitTaskId"
-          :pet5p-s="questionForm[pet5PSId]"
-          :lung-is-inside-volume="lungIsInsideVolume"
-          :liver-is-inside-volume="liverIsInsideVolume"
-          @setFormItemData="setFormItemData"
-          @resetFormItemData="resetFormItemData"
-        />
+        <QuestionItem v-if="question.QuestionClassify === 0" :key="question.Id" :question="question"
+          :question-form="questionForm" :reading-task-state="readingTaskState" :visit-task-id="visitTaskId"
+          :pet5p-s="questionForm[pet5PSId]" :lung-is-inside-volume="lungIsInsideVolume"
+          :liver-is-inside-volume="liverIsInsideVolume" @setFormItemData="setFormItemData"
+          @resetFormItemData="resetFormItemData" @handleReadingChart="handleReadingChart" />
       </template>
       <el-form-item v-if="readingTaskState < 2">
         <div style="text-align:right">
-          <el-button :disabled="!questionFormChangeState" :type="questionFormChangeState ? 'primary' : null" size="mini" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+          <el-button :disabled="!questionFormChangeState" :type="questionFormChangeState ? 'primary' : null" size="mini"
+            @click="handleSave">{{ $t('common:button:save') }}</el-button>
         </div>
       </el-form-item>
     </el-form>
@@ -132,6 +120,9 @@ export default {
     FusionEvent.$off('locateAnnotation')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     getQuestions1() {
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
 
@@ -139,17 +130,17 @@ export default {
         this.readingTaskState = this.visitTaskList[idx].ReadingTaskState
         var questions = this.visitTaskList[idx].Questions
         this.questions =
-        questions.map((v) => {
-          if (v.QuestionClassify === 0) {
-            if (v.Type === 'group' && v.Childrens.length === 0) return
-            if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-              this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
+          questions.map((v) => {
+            if (v.QuestionClassify === 0) {
+              if (v.Type === 'group' && v.Childrens.length === 0) return
+              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+                this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
+              }
+              if (v.Childrens.length > 0) {
+                this.setChild(v.Childrens)
+              }
             }
-            if (v.Childrens.length > 0) {
-              this.setChild(v.Childrens)
-            }
-          }
-        })
+          })
         this.questions = questions
       }
     },
@@ -185,7 +176,7 @@ export default {
               this.setChild(v.Childrens)
             }
           })
-          console.log(this.questionForm,questions)
+          console.log(this.questionForm, questions)
           this.questions = questions
           this.setPet5PSCommentDisplay()
           this.measurements = []
@@ -759,39 +750,43 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .ecrf-wrapper{
+.ecrf-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 {
+  ::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;
   }
-    .el-form-item__content
-    .el-select{
-      width: 100%;
-    }
+
+  .el-form-item__content .el-select {
+    width: 100%;
   }
-
-  </style>
-
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index de8c341e..9b995844 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="lesionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -19,184 +13,151 @@
         </div>
       </div>
 
-      <el-form-item
-        :label="$t('trials:reading:title:lesionType')"
-        prop="LesionType"
-        :rules="[
-          { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
-        ]"
-      >
+      <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-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-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>
 
       <template v-for="qs in questions">
-        <el-form-item
-          v-if="qs.ShowQuestion!==2 && qs.QuestionClassify === 0"
-          :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']},
-          ]"
-        >
+        <el-form-item v-if="qs.ShowQuestion !== 2 && qs.QuestionClassify === 0" :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']
+            },
+          ]">
           <!-- {{ isCurrentTaskAdd }}
         {{ questionForm.IsCanEditPosition }} -->
 
           <!-- 输入框 -->
-          <template v-if="qs.Type==='input' || qs.Type==='number'">
-            <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
-            <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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.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 v-if="qs.Type === 'input' || qs.Type === 'number'">
+            <div style="display: flex;justify-content: space-between;">
+              <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
+              <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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.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>
+                <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+                  @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      TableQuestionId: qs.Id,
+                      RowIndex: questionForm.RowIndex,
+                      QuestionName: qs.QuestionName
+                    }
+                  })" />
+              </el-input>
+
+            </div>
+
           </template>
           <!-- 多行文本输入框 -->
-          <el-input
-            v-if="qs.Type==='textarea'"
-            v-model="questionForm[qs.Id]"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4}"
-            maxlength="500"
-            :disabled="!isCurrentTask || readingTaskState>=2"
-            @change="((val)=>{formItemChange(val, qs)})"
-          />
+          <el-input v-if="qs.Type === 'textarea'" v-model="questionForm[qs.Id]" type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }" maxlength="500" :disabled="!isCurrentTask || readingTaskState >= 2"
+            @change="((val) => { formItemChange(val, qs) })" />
           <!-- 下拉框 -->
 
-          <el-select
-            v-if="qs.Type==='select'"
-            v-model="questionForm[qs.Id]"
-            filterable
+          <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
             :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
-            @change="((val)=>{formItemChange(val, qs)})"
-          >
+            :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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.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]"
-              />
+              <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">
-              <el-option
-                v-for="item of $d[qs.DictionaryCode]"
-                :key="item.id"
-                :value="item.value"
-                :label="item.label"
-              />
+              <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"
-              />
+              <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"
-            >
+          <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>
-          <template v-if="qs.QuestionMark === 20 && qs.Type==='calculation'">
+          <template v-if="qs.QuestionMark === 20 && qs.Type === 'calculation'">
             <div style="display: flex;flex-direction: row;justify-content: flex-start;">
-              <el-input
-                v-if="qs.Type==='calculation'"
-                v-model="questionForm[qs.Id]"
-                disabled
-                style="width:120px;"
-              >
-                <template v-if="qs.Unit" slot="append">
-                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-                </template>
-              </el-input>
+              <div style="display: flex;justify-content: space-between;">
+                <el-input v-if="qs.Type === 'calculation'" v-model="questionForm[qs.Id]" disabled style="width:120px;">
+                  <template v-if="qs.Unit" slot="append">
+                    {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                  </template>
+                </el-input>
+                <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+                  @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      TableQuestionId: qs.Id,
+                      RowIndex: questionForm.RowIndex,
+                      QuestionName: qs.QuestionName
+                    }
+                  })" />
+              </div>
+
               <!-- <span style="color:#409eff;cursor: pointer" @click="previewImages(answers.RowId)">
                 {{ $t('trials:lugano:button:suvscreenshot') }}
               </span> -->
-              <el-button v-if="!isBaseLineTask" type="text" @click="previewImages(answers.RowId)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
+              <el-button v-if="!isBaseLineTask" type="text" @click="previewImages(answers.RowId)">{{
+                $t('trials:lugano:button:suvscreenshot') }}</el-button>
             </div>
           </template>
-          <el-input
-            v-else-if="qs.Type==='calculation' && qs.QuestionMark !== 20"
-            v-model="questionForm[qs.Id]"
-            disabled
-          >
-            <template v-if="qs.Unit" slot="append">
-              {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-            </template>
-          </el-input>
+          <div style="display: flex;justify-content: space-between;"
+            v-else-if="qs.Type === 'calculation' && qs.QuestionMark !== 20">
+            <el-input v-model="questionForm[qs.Id]" disabled>
+              <template v-if="qs.Unit" slot="append">
+                {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+              </template>
+            </el-input>
+            <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  TableQuestionId: qs.Id,
+                  RowIndex: questionForm.RowIndex,
+                  QuestionName: qs.QuestionName
+                }
+              })" />
+          </div>
+
         </el-form-item>
       </template>
 
     </div>
 
-    <div
-      v-if="isCurrentTask && readingTaskState<2"
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
+    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
+      style="text-align:right;margin-top:10px;">
 
       <!-- 清除标记  -->
-      <el-button
-        v-if="questionForm.OtherMeasureData"
-        size="mini"
-        @click="handleDeleteMeasureData"
-      >
+      <el-button v-if="questionForm.OtherMeasureData" size="mini" @click="handleDeleteMeasureData">
         {{ $t('trials:reading:button:removeMark') }}
       </el-button>
       <!-- 删除 -->
-      <el-button
-        v-if="isCurrentTaskAdd !== 'False'"
-        size="mini"
-        @click="handleDelete"
-      >
+      <el-button v-if="isCurrentTaskAdd !== 'False'" size="mini" @click="handleDelete">
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button
-        size="mini"
-        @click="handleSave"
-      >
+      <el-button size="mini" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -288,6 +249,9 @@ export default {
 
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initForm(isRerender = false) {
       const loading = this.$loading({ fullscreen: true })
       this.questions.forEach(item => {
@@ -341,7 +305,7 @@ export default {
         await this.setMeasureData(this.answers.measureObj, true)
       } else {
         if (this.questionForm.MeasureData) {
-        // 十字线工具 且是靶病灶  器官只能是淋巴结类型
+          // 十字线工具 且是靶病灶  器官只能是淋巴结类型
           // if (this.answers.MarkTool === 'Bidirectional') {
           //   this.organList = []
           //   await this.getOrganInfoList(1)
@@ -446,8 +410,8 @@ export default {
               type: 'warning',
               distinguishCancelAndClose: true
             })
-              .then(() => {})
-              .catch(() => {})
+              .then(() => { })
+              .catch(() => { })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
           }
@@ -459,7 +423,7 @@ export default {
             this.$confirm(msg, {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
@@ -786,7 +750,7 @@ export default {
           this.$confirm(this.$t('trials:reading:lugano:warnning:outsideVolume'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
 
           return
@@ -800,7 +764,7 @@ export default {
           this.$confirm(this.$t('trials:reading:lugano:warnning:cannotMeasuredSUV'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           return
         }
@@ -813,7 +777,7 @@ export default {
             this.$confirm(this.$t('trials:reading:lugano:warnning:suvis0'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             return
           }
@@ -1054,47 +1018,57 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  ::v-deep .el-form-item__label{
+.measurement-form {
+  ::v-deep .el-form-item__label {
     color: #c3c3c3;
     // text-align: left;
   }
-  ::v-deep .el-input .el-input__inner{
+
+  ::v-deep .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  ::v-deep .el-form-item{
+
+  ::v-deep .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
     flex-wrap: wrap;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     flex: 1;
   }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-input-group__append, .el-input-group__prepend{
+
+  ::v-deep .el-input-group__append,
+  .el-input-group__prepend {
     padding: 0 10px;
   }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
+  ::v-deep .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+  ::v-deep .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% - 60px)!important;
+
+  .input-width1 {
+    width: calc(100% - 60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 5063e432..6e46f6c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -3,75 +3,88 @@
 
     <div class="container">
       <!-- 测量问题 -->
-      <template v-for="(qs,index) in questions">
+      <template v-for="(qs, index) in questions">
         <div v-if="qs.QuestionClassify === 0" :key="index" v-loading="loading" class="lesions lesions_wrapper">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
             <template v-for="item in qs.Childrens">
               <div v-if="item.QuestionClassify === 0 && !(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
                 <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
-                  <div class="title">{{ item.QuestionName }}</div>
-                  <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
+                  <div class="title">{{ item.QuestionName }}
+                    <svg-icon v-if="item.LesionType === 0" icon-class="readingChart"
+                      class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                        e,
+                        data: {
+                          ReportChartTypeEnum: 0,
+                          QuestionName: item.QuestionName
+                        },
+                      })" />
+                  </div>
+                  <div v-if="readingTaskState < 2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon"
+                    @click.prevent="handleAdd(item)">
                     <i class="el-icon-plus" />
                   </div>
                 </div>
                 <!-- @change="handleCollapseChange(qs.Childrens,item)" -->
-                <el-collapse
-                  v-if="item.Type === 'table' && item.TableQuestions"
-                  v-model="activeName"
-                  accordion
-                  @change="handleCollapseChange"
-                >
-                  <el-collapse-item
-                    v-for="(q,i) in item.TableQuestions.Answers"
-                    :key="`${item.Id}_${q.RowIndex}`"
+                <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
+                  @change="handleCollapseChange">
+                  <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                     :name="`${item.Id}_${q.RowIndex}`"
-                    @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
-                  >
+                    @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                     <template slot="title">
-                      <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+                      <div style="width:300px;position: relative;"
+                        :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : '#fff') }">
 
-                        {{ getLesionName(item.OrderMark,q.RowIndex) }}
+                        {{ getLesionName(item.OrderMark, q.RowIndex) }}
                         <!-- 未保存 -->
-                        <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                        <el-tooltip
+                          v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                        <el-tooltip
+                          v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].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;">
                           <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
                           <div style="font-size: 11px;width:220px;height: 30px;">
-                            <div
-                              v-if="item.TableQuestions.Answers[i].lesionPart"
-                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
-                            >
-                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                                 <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
                               </el-tooltip>
                             </div>
-                            <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                            <div
+                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
                               <span v-if="item.LesionType === 0">
-                                {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                               </span>
                               <span v-else-if="item.LesionType === 1">
-                                {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                               </span>
                               <span v-else>
-                                {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                               </span>
                             </div>
-                            <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px;color:red;">
-                              <template v-if="item.TableQuestions.Answers[i].suvMax && !isNaN(parseFloat(item.TableQuestions.Answers[i].suvMax))">
+                            <div
+                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px;color:red;">
+                              <template
+                                v-if="item.TableQuestions.Answers[i].suvMax && !isNaN(parseFloat(item.TableQuestions.Answers[i].suvMax))">
                                 {{ item.TableQuestions.Answers[i].suvMax }} SUV
                               </template>
                             </div>
                           </div>
                         </div>
-                        <div v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        <div
+                          v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                          style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                           <!-- 分裂 -->
                           <!-- <el-tooltip v-show="readingTaskState<2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask" class="item" :content="$t('trials:reading:button:split')" placement="left">
                             <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />
@@ -81,25 +94,14 @@
                       </div>
 
                     </template>
-                    <QuestionForm
-                      :ref="`${item.Id}_${q.RowIndex}`"
-                      :questions="item.TableQuestions.Questions"
-                      :answers="item.TableQuestions.Answers[i]"
-                      :lesion-type="item.LesionType"
-                      :order-mark="item.OrderMark"
-                      :table-questions="tableQuestions"
-                      :row-index="String(q.RowIndex)"
-                      :question-name="item.QuestionName"
-                      :parent-qs-id="item.Id"
-                      :visit-task-id="visitTaskId"
-                      :is-current-task="isCurrentTask"
-                      :reading-task-state="readingTaskState"
-                      :is-base-line-task="isBaseLineTask"
-                      @changeLesionType="changeLesionType"
-                      @resetQuestions="resetQuestions"
-                      @determineExistsUnsavedLession="determineExistsUnsavedLession"
-                      @close="close"
-                    />
+                    <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
+                      :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
+                      :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
+                      :question-name="item.QuestionName" :parent-qs-id="item.Id" :visit-task-id="visitTaskId"
+                      :is-current-task="isCurrentTask" :reading-task-state="readingTaskState"
+                      :is-base-line-task="isBaseLineTask" @changeLesionType="changeLesionType"
+                      @resetQuestions="resetQuestions" @determineExistsUnsavedLession="determineExistsUnsavedLession"
+                      @close="close" @handleReadingChart="handleReadingChart" />
                   </el-collapse-item>
 
                 </el-collapse>
@@ -170,6 +172,9 @@ export default {
   beforeDestroy() {
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     initList(isRerender = false) {
       this.loading = true
       this.activeName = ''
@@ -345,7 +350,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           } else {
             // 是否确认分裂
             this.$confirm(this.$t('trials:reading:warnning:msg4'), {
@@ -355,7 +360,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           }
         }
       }
@@ -429,7 +434,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -439,7 +444,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
       } else {
         // saveTypeEnum: 0
@@ -582,7 +587,7 @@ export default {
       // await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
       this.questions = this.findQuestionAndRemoveLesion(this.questions, { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex })
       // saveTypeEnum: 0
-      var lesionObj = { }
+      var lesionObj = {}
       var questionObj = questionsObj.questionForm
       // 切换到新的病灶集合
       var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
@@ -817,19 +822,20 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
 
   // .container{
   //   padding: 10px;
   // }
-  .title{
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -838,42 +844,49 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    ::v-deep .el-collapse-item{
-      background-color: #000!important;
+
+  .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;
+
+    ::v-deep .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    ::v-deep .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    ::v-deep .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    ::v-deep .el-collapse-item__content{
-      width:260px;
+
+    ::v-deep .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -882,7 +895,7 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
index 2f9c34f1..b04fc35e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
@@ -31,7 +31,16 @@
               v-show="!(isBaseLineTask && item.LesionType === 2) && !(isBaseLineTask && item.LesionType === 3)"
               :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
-                <div class="title">{{ item.QuestionName }}</div>
+                <div class="title">{{ item.QuestionName }}
+                  <svg-icon v-if="item.LesionType === 4" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0,
+                        QuestionName: item.QuestionName
+                      },
+                    })" />
+                </div>
                 <div v-if="readingTaskState < 2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon"
                   @click.prevent="handleAdd(item)">
                   <i class="el-icon-plus" />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 5bd2e7ad..a509698a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -737,7 +737,7 @@ export default {
         line-height: 25px;
         text-align: center;
         border: 1px solid #607d8b;
-        top: 65px;
+        top: 45px;
         right: -25px;
         z-index: 99;
         color: #d5d5d5;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index ddb411ba..9e1b542e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -42,14 +42,14 @@
                 :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 }}
                 <svg-icon
-                  v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1)"
+                  v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) || (scope.row.LesionType === 4 && scope.row.ReportLayType === 1)"
                   icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                     e,
                     data: {
                       QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
                       TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
                       RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
-                      ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null,
+                      ReportChartTypeEnum: (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) || (scope.row.LesionType === 4 && scope.row.ReportLayType === 1) ? 0 : null,
                       QuestionName: scope.row.QuestionName
                     }
                   })" />
@@ -169,7 +169,8 @@
                   <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] === '-2' ? "NA" : scope.row.Answers[task.VisitTaskId] === '-1' ?
+                    $t('trials:readingReport:title:unknow') :
                     scope.row.Answers[task.VisitTaskId] }}
                 </template>
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
index 34255a73..e935303b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
@@ -206,7 +206,8 @@
                   :initUrl="scope.row.Answers[task.VisitTaskId]"></customize-report-page-upload>
               </template>
               <template v-else-if="scope.row.QuestionType === 22">
-                {{ scope.row.Answers[task.VisitTaskId] === '-1' ? '未知' : scope.row.Answers[task.VisitTaskId] }}
+                {{ scope.row.Answers[task.VisitTaskId] === '-2' ? "NA" : scope.row.Answers[task.VisitTaskId] === '-1' ?
+                  '未知' : scope.row.Answers[task.VisitTaskId] }}
               </template>
               <template v-else-if="scope.row.DictionaryCode">
                 {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}
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 f416aee2..4db9dbab 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -168,7 +168,8 @@
                   <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] === '-2' ? "NA" : scope.row.Answers[task.VisitTaskId] === '-1' ?
+                    $t('trials:readingReport:title:unknow') :
                     scope.row.Answers[task.VisitTaskId] }}
                 </template>
 
diff --git a/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue b/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
index ac16f696..c2d47e02 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
@@ -1,112 +1,76 @@
 <template>
   <el-form v-if="globalForm.taskList.length > 0" ref="globalRuleForm" :model="globalForm" class="global-form">
-    <el-table
-      v-loading="loading"
-      :data="globalForm.taskList"
-    >
-      <el-table-column
-        prop="BlindName"
-        :label="$t('trials:globalReview:table:visitName')"
-        show-overflow-tooltip
-        width="150"
-      />
+    <el-table v-loading="loading" :data="globalForm.taskList">
+      <el-table-column prop="BlindName" :label="$t('trials:globalReview:table:visitName')" show-overflow-tooltip
+        width="150" />
       <!-- 评估结果 -->
-      <el-table-column
-        :label="$t('trials:medicalFeedback:table:visitPointCount')"
-        align="center"
-        prop=""
-      >
+      <el-table-column :label="$t('trials:medicalFeedback:table:visitPointCount')" align="center" prop="">
         <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.evaluationQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="200"
-          >
+          <el-table-column v-for="(qs, index) in globalInfo.evaluationQsList" :key="index" prop="" :label="qs"
+            show-overflow-tooltip width="200">
             <template slot-scope="scope">
-              <template v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===4)">
-                <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer">
+              <template
+                v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 4)">
+                <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
                   <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                    {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
+                    {{
+                      $fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
+                    }}
                   </span>
-                  <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{ scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:readingReport:title:unknow') : scope.row.BeforeQuestionList[index].Answer }}</span>
+                  <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{
+                    scope.row.BeforeQuestionList[index].Answer === '-2' ? "NA" :
+                      scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:readingReport:title:unknow') :
+                    scope.row.BeforeQuestionList[index].Answer }}</span>
                   <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
                 </div>
               </template>
-          </template>
+            </template>
           </el-table-column>
         </template>
       </el-table-column>
 
       <!-- 评估结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:evaluationRes')"
-        align="center"
-        prop=""
-      >
+      <el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
         <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.adjustedQsList"
-            v-if="qs.isShow"
-            :key="index"
-            prop=""
-            :label="qs.questionName"
-            :width="index > 0 ? '300' : '200'"
-          >
+          <el-table-column v-for="(qs, index) in globalInfo.adjustedQsList" v-if="qs.isShow" :key="index" prop=""
+            :label="qs.questionName" :width="index > 0 ? '300' : '200'">
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
+              <div
+                v-if="readingTaskState < 2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
                 <!-- <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
                   {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].VisitAnswer)) }}
                 </span> -->
                 <el-form-item
-                  :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
-                  label=""
-                  :rules="[
-                    { required: parseInt(scope.row.AfterQuestionList[index].GlobalAnswerType) !== 1 || scope.row.AfterQuestionList[index].isChange,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  ]"
-                >
-                  <label v-if="scope.row.AfterQuestionList[index].GlobalAnswerType !== 1 || scope.row.AfterQuestionList[index].isChange" />
-                  <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 0 ">
+                  :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : scope.row.AfterQuestionList[index].GlobalAnswerType}`"
+                  label="" :rules="[
+                    { required: parseInt(scope.row.AfterQuestionList[index].GlobalAnswerType) !== 1 || scope.row.AfterQuestionList[index].isChange, message: $t('common:ruleMessage:specify'), trigger: ['change', 'blur'] },
+                  ]">
+                  <label
+                    v-if="scope.row.AfterQuestionList[index].GlobalAnswerType !== 1 || scope.row.AfterQuestionList[index].isChange" />
+                  <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 0">
                     <!-- 下拉框 -->
                     <!-- cope.row.AfterQuestionList[index].Answer -->
                     <el-select
-                      v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
-                      style="width:90%;"
-                      @change="(v) => {
+                      v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                      style="width:90%;" @change="(v) => {
                         selectChange(v, scope.row, index)
-                      }"
-                    >
+                      }">
                       <template v-if="scope.row.AfterQuestionList[index].TypeValue">
-                        <el-option
-                          v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
-                          :key="val"
-                          :label="val"
-                          :value="val"
-                        />
+                        <el-option v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')" :key="val"
+                          :label="val" :value="val" />
                       </template>
                       <template v-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                        <el-option
-                          v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                        <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
                           v-show="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalAnswerType === 0 && item.value === 5) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalAnswerType === 0 && item.value !== 5)"
-                          :key="item.id"
-                          :value="String(item.value)"
-                          :label="item.label"
-                        />
+                          :key="item.id" :value="String(item.value)" :label="item.label" />
                       </template>
                     </el-select>
                   </template>
                   <!-- 全局阅片备注 GlobalAnswerType:1 -->
-                  <el-input
-                    v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 1"
-                    v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
-                    maxlength="300"
-                    show-word-limit
-                    type="textarea"
-                    style="width:90%;"
-                    :autosize="{ minRows: 2, maxRows: 4}"
-                  />
+                  <el-input v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 1"
+                    v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                    maxlength="300" show-word-limit type="textarea" style="width:90%;"
+                    :autosize="{ minRows: 2, maxRows: 4 }" />
                 </el-form-item>
               </div>
               <div v-else>
@@ -115,7 +79,9 @@
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
+                  }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
               </div>
@@ -124,17 +90,10 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('common:action:action')"
-        width="200"
-      >
+      <el-table-column :label="$t('common:action:action')" width="200">
         <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:globalReview:table:view')"
-            icon="el-icon-view"
-            @click="handleView(scope.row)"
-          />
+          <el-button circle :title="$t('trials:globalReview:table:view')" icon="el-icon-view"
+            @click="handleView(scope.row)" />
           <!-- v-if="readingTaskState < 2 && scope.row.AgreeOrNot[0].Answer==='0'" -->
           <!-- <el-button
             v-if="readingTaskState < 2 "
@@ -232,11 +191,11 @@ export default {
                 if (i.QuestionId) {
                   obj.questionId = i.QuestionId
                   obj.globalAnswerType = i.GlobalAnswerType
-                  obj.answer = this.globalForm[ `${index}${i.QuestionId}`]
+                  obj.answer = this.globalForm[`${index}${i.QuestionId}`]
                 } else {
                   obj.questionId = ''
                   obj.globalAnswerType = i.GlobalAnswerType
-                  obj.answer = this.globalForm[ `${index}${i.GlobalAnswerType}`]
+                  obj.answer = this.globalForm[`${index}${i.GlobalAnswerType}`]
                 }
                 answerList.push(obj)
               })
@@ -255,17 +214,17 @@ export default {
             }
             this.$emit('getGlInfo')
             resolve(true)
-            
+
           } else {
             resolve(false)
           }
-        } catch(e) {
+        } catch (e) {
           console.log(e)
           this.loading = false
           resolve(false)
-        } 
-        
-        
+        }
+
+
       })
     }
   }
@@ -274,18 +233,21 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item label:before {
-    content: '*';
-    color: #F56C6C;
-    margin-right: 4px;
+  content: '*';
+  color: #F56C6C;
+  margin-right: 4px;
 }
-::v-deep .el-form-item--medium .el-form-item__content{
+
+::v-deep .el-form-item--medium .el-form-item__content {
   display: flex;
 }
-.global-form{
-  ::v-deep .el-form-item__content{
+
+.global-form {
+  ::v-deep .el-form-item__content {
     padding-bottom: 10px;
   }
-  ::v-deep .form-item .el-form-item__error{
+
+  ::v-deep .form-item .el-form-item__error {
     top: 60%;
   }
 }
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index 01ee9a75..bf56fe72 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -5,53 +5,41 @@
       <el-button v-if="auditInfo.IsExistsClinicalData" type="text" @click="previewCD">
         {{ $t('trials:adReview:title:clinicalData') }}
       </el-button>
-      <el-button v-if="auditInfo.GlobalInfo.OtherGlobalTaskId" type="text" @click="handleView(auditInfo.GlobalInfo.OtherGlobalTaskId)">{{ $t('trials:medicalFeedback:title:otherReader') }}</el-button>
+      <el-button v-if="auditInfo.GlobalInfo.OtherGlobalTaskId" type="text"
+        @click="handleView(auditInfo.GlobalInfo.OtherGlobalTaskId)">{{ $t('trials:medicalFeedback:title:otherReader')
+        }}</el-button>
 
       <!-- 关联裁判任务 -->
-      <el-button v-if="auditInfo.GlobalInfo.JudgeTaskName" type="text" @click="handleView(auditInfo.GlobalInfo.JudgeTaskId)">{{ auditInfo.GlobalInfo.JudgeTaskName }}</el-button>
+      <el-button v-if="auditInfo.GlobalInfo.JudgeTaskName" type="text"
+        @click="handleView(auditInfo.GlobalInfo.JudgeTaskId)">{{ auditInfo.GlobalInfo.JudgeTaskName }}</el-button>
     </div>
 
-    <el-table
-      v-if="rowData.CriterionType === 10"
-      :data="taskList"
-    >
-      <el-table-column
-        prop="BlindName"
-        :label="$t('trials:medicalFeedback:table:taskBlindName')"
-        show-overflow-tooltip
-        width="150"
-      >
+    <el-table v-if="rowData.CriterionType === 10" :data="taskList">
+      <el-table-column prop="BlindName" :label="$t('trials:medicalFeedback:table:taskBlindName')" show-overflow-tooltip
+        width="150">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleView(scope.row.VisitTaskId)"
-          >
+          <el-button type="text" @click="handleView(scope.row.VisitTaskId)">
             {{ scope.row.BlindName }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 访视点计数 -->
-      <el-table-column
-        :label="$t('trials:medicalFeedback:table:visitPointCount')"
-        align="center"
-        prop=""
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:medicalFeedback:table:visitPointCount')" align="center" prop=""
+        show-overflow-tooltip>
         <template>
-          <el-table-column
-            v-for="(qs,index) in evaluationQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
-              <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer">
+              <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
+                  }}
                 </span>
-                <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{ scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:medicalFeedback:table:unKnow') : scope.row.BeforeQuestionList[index].Answer }}</span>
+                <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{
+                  scope.row.BeforeQuestionList[index].Answer === '-2' ? "NA" : scope.row.BeforeQuestionList[index].Answer
+                    === '-1' ? $t('trials:medicalFeedback:table:unKnow') : scope.row.BeforeQuestionList[index].Answer
+                  }}</span>
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
               </div>
             </template>
@@ -60,48 +48,35 @@
       </el-table-column>
 
       <!-- 是否同意访视结果 -->
-      <el-table-column
-        v-for="(qs, index) in agreeOrNotList"
-        :key="index"
-        prop=""
-        :label="$t('trials:medicalFeedback:table:agreeToVisitPointCount')"
-        show-overflow-tooltip
-        width="170"
-      >
+      <el-table-column v-for="(qs, index) in agreeOrNotList" :key="index" prop=""
+        :label="$t('trials:medicalFeedback:table:agreeToVisitPointCount')" show-overflow-tooltip width="170">
         <template slot-scope="scope">
           <el-tag v-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 1" type="primary">
-            {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}
+            {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}
           </el-tag>
-          <el-tag v-else-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
+          <el-tag v-else-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{
+            $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
           <span v-else />
         </template>
       </el-table-column>
 
       <!-- 评估结果 -->
-      <el-table-column
-        :label="$t('trials:medicalFeedback:table:assessmentResults')"
-        align="center"
-        prop=""
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:medicalFeedback:table:assessmentResults')" align="center" prop=""
+        show-overflow-tooltip>
         <template>
-          <el-table-column
-            v-for="(qs,index) in adjustedQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in adjustedQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
               <!-- {{ scope.row.AfterQuestionList.length>index?scope.row.AfterQuestionList[index].Answer:'' }} -->
-              <div v-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-if="scope.row.AfterQuestionList.length > index && scope.row.AfterQuestionList[index].Answer">
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
+                  }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
               </div>
@@ -110,60 +85,35 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('common:action:action')"
-        width="100"
-      >
+      <el-table-column :label="$t('common:action:action')" width="100">
         <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:medicalFeedback:table:view')"
-            icon="el-icon-view"
-            @click="handleView(scope.row.VisitTaskId)"
-          />
+          <el-button circle :title="$t('trials:medicalFeedback:table:view')" icon="el-icon-view"
+            @click="handleView(scope.row.VisitTaskId)" />
         </template>
       </el-table-column>
     </el-table>
 
-    <el-table
-      v-else
-      :data="taskList"
-    >
+    <el-table v-else :data="taskList">
       <!-- 访视名称 -->
-      <el-table-column
-        prop="BlindName"
-        :label="$t('trials:globalReview:table:visitName')"
-        show-overflow-tooltip
-        width="150"
-      >
+      <el-table-column prop="BlindName" :label="$t('trials:globalReview:table:visitName')" show-overflow-tooltip
+        width="150">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleView(scope.row.VisitTaskId)"
-          >
+          <el-button type="text" @click="handleView(scope.row.VisitTaskId)">
             {{ scope.row.BlindName }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 评估结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:evaluationRes')"
-        align="center"
-        prop=""
-      >
+      <el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
         <template>
-          <el-table-column
-            v-for="(qs,index) in evaluationQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
-              <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer">
+              <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
+                  }}
                 </span>
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
               </div>
@@ -172,46 +122,33 @@
         </template>
       </el-table-column>
       <!-- 是否同意访视结果 -->
-      <el-table-column
-        v-for="(qs,index) in agreeOrNotList"
-        :key="index"
-        prop=""
-        :label="$t('trials:globalReview:table:isAgreeEvaluationRes')"
-        show-overflow-tooltip
-        width="170"
-      >
+      <el-table-column v-for="(qs, index) in agreeOrNotList" :key="index" prop=""
+        :label="$t('trials:globalReview:table:isAgreeEvaluationRes')" show-overflow-tooltip width="170">
         <template slot-scope="scope">
           <el-tag v-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 1" type="primary">
-            {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}
+            {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}
           </el-tag>
-          <el-tag v-else-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
+          <el-tag v-else-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{
+            $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
           <span v-else />
         </template>
       </el-table-column>
 
       <!-- 调整后结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:adjustedRes')"
-        align="center"
-        prop=""
-      >
+      <el-table-column :label="$t('trials:globalReview:table:adjustedRes')" align="center" prop="">
         <template>
-          <el-table-column
-            v-for="(qs,index) in adjustedQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in adjustedQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
-              <div v-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-if="scope.row.AfterQuestionList.length > index && scope.row.AfterQuestionList[index].Answer">
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
+                  }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
               </div>
@@ -220,18 +157,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('common:action:action')"
-        width="120"
-        :fixed="adjustedQsList.length > 4 ? 'right' : false"
-      >
+      <el-table-column :label="$t('common:action:action')" width="120"
+        :fixed="adjustedQsList.length > 4 ? 'right' : false">
         <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:globalReview:table:view')"
-            icon="el-icon-view"
-            @click="handleView(scope.row.VisitTaskId)"
-          />
+          <el-button circle :title="$t('trials:globalReview:table:view')" icon="el-icon-view"
+            @click="handleView(scope.row.VisitTaskId)" />
         </template>
       </el-table-column>
     </el-table>
@@ -320,7 +250,7 @@ export default {
       var isReadingTaskViewInOrder = this.rowData.IsReadingTaskViewInOrder
       var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0 || readingTool === 2 ) {
+      if (readingTool === 0 || readingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index becf5cee..2074b445 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -40,7 +40,7 @@
         <!-- 受试者中止状态 -->
         <el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:IsSubjectQuit')">
           <el-select v-model="searchData.IsSubjectQuit" clearable style="width: 120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.label" />
+            <el-option v-for="item of $d.Subject_Visit_Status" :value="item.value" :label="item.label" :key="item.label" />
           </el-select>
         </el-form-item>
         <!-- 审核状态 -->
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 2de0864b..fdc64d46 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -34,7 +34,8 @@
         <!-- 受试者中止状态 -->
         <el-form-item style="margin-bottom: 10px" :label="$t('trials:qcCheck:table:IsSubjectQuit')">
           <el-select v-model="searchData.IsSubjectQuit" clearable style="width: 120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.label" />
+            <el-option v-for="item of $d.Subject_Visit_Status" :value="item.value" :label="item.label"
+              :key="item.label" />
           </el-select>
         </el-form-item>
         <!-- 审核状态 -->

From d57c080916ff8282691cb7d973bccdff007f5178 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 2 Dec 2025 17:52:47 +0800
Subject: [PATCH 126/333] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/research.js                           |  7 +-
 .../research/components/ResearchForm.vue      | 73 +++++++++----------
 src/views/research/form.vue                   |  3 +-
 .../site-research/components/ImageManual.vue  | 18 ++++-
 .../attachments/site-research/index.vue       |  4 +-
 .../dicoms/components/PCWG/QuestionList.vue   |  2 +-
 .../reading/dicoms/components/ReportPage.vue  |  5 +-
 src/views/trials/trials-workbench/index.vue   |  6 +-
 8 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/src/api/research.js b/src/api/research.js
index 086c0294..66f1b54c 100644
--- a/src/api/research.js
+++ b/src/api/research.js
@@ -26,8 +26,11 @@ export function getTrialSurveyInitInfo(trialId) {
 
 export function getSiteSurveyInfo(trialId, id) {
   return request({
-    url: `/TrialSiteSurvey/getSiteSurveyInfo/${trialId}/${id}`,
-    method: 'get'
+    url: `/TrialSiteSurvey/getSiteSurveyInfo/${trialId}`,
+    method: 'get',
+    params: {
+      TrialsiteSurveyId: id
+    }
   })
 }
 
diff --git a/src/views/research/components/ResearchForm.vue b/src/views/research/components/ResearchForm.vue
index 1c8b0922..0c27b87d 100644
--- a/src/views/research/components/ResearchForm.vue
+++ b/src/views/research/components/ResearchForm.vue
@@ -21,14 +21,15 @@
         <!-- <h4>{{ $t('trials:staffResearch:title:staff') }}</h4>-->
         <!-- 历史人员 -->
         <h4>{{ $t('trials:staffResearch:title:historicalStaff') }}</h4>
-        <HistoricalParticipant ref="historicalParticipant" :is-history="true" @refreshPage="refreshPage" @getList="initPage" />
+        <HistoricalParticipant ref="historicalParticipant" :is-history="true" @refreshPage="refreshPage"
+          @getList="initPage" />
         <!-- 新增人员 -->
         <h4>{{ $t('trials:staffResearch:title:newStaff') }}</h4>
         <ParticipantList ref="researchParticipants" :is-history="true" @refreshPage="refreshPage" @getList="initPage" />
       </el-card>
- 
+
       <!-- 设备调研 -->
-      <el-card shadow="hover" class="mt10">
+      <el-card shadow="hover" class="mt10" v-if="siteSurveyNoteInfo.IsCloseEquipmentSurvey">
         <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
         <EquipmentList ref="researchEquipments" :is-history="true" />
       </el-card>
@@ -53,31 +54,17 @@
       </el-card>
     </div>
 
-    <el-dialog
-      v-if="rejectVisible"
-      :visible.sync="rejectVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:researchForm:dialogTitle:reject')"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-      :append-to-body="userTypeEnumInt !== 0"
-    >
+    <el-dialog v-if="rejectVisible" :visible.sync="rejectVisible" :close-on-click-modal="false"
+      :title="$t('trials:researchForm:dialogTitle:reject')" width="600px" custom-class="base-dialog-wrapper"
+      :append-to-body="userTypeEnumInt !== 0">
       <el-form ref="rejectForm" :model="rejectForm" label-width="100px">
         <div class="base-dialog-body">
           <!-- 驳回原因 -->
-          <el-form-item
-            :label="$t('trials:researchForm:form:rejectReson')"
-            prop="reason"
-            :rules="[
-              { required: true, message: $t('trials:researchForm:formRule:specify')}
-            ]"
-          >
-            <el-input
-              v-model="rejectForm.reason"
-              type="textarea"
-              :autosize="{ minRows: 2, maxRows: 4}"
-              style="width:100%;"
-            />
+          <el-form-item :label="$t('trials:researchForm:form:rejectReson')" prop="reason" :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:specify') }
+          ]">
+            <el-input v-model="rejectForm.reason" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+              style="width:100%;" />
           </el-form-item>
         </div>
         <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@@ -136,7 +123,7 @@ export default {
   props: {
     trialSiteSurveyId: {
       type: String,
-      required: true
+      default: ''
     }
   },
   data() {
@@ -152,7 +139,7 @@ export default {
       btnLoading: false,
       isFullscreen: false,
       historyVisible: false,
-      siteSurveyNoteInfo: null
+      siteSurveyNoteInfo: {}
     }
   },
   mounted() {
@@ -172,6 +159,7 @@ export default {
           if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
             this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
           }
+          this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey
           var historicalArr = []
           var newArr = []
           res.Result.TrialSiteUserSurveyList.map(i => {
@@ -241,7 +229,7 @@ export default {
             this.$message.success(this.$t('common:message:savedSuccessfully'))
           }
         }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 生成账号
     generateAccount() {
@@ -276,7 +264,7 @@ export default {
         }).catch(() => {
           this.loading = false
         })
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 驳回
     handleReject() {
@@ -324,37 +312,44 @@ export default {
   display: flex;
   flex-direction: column;
   height: 100%;
-  .mt10{
+
+  .mt10 {
     margin-top: 10px;
   }
-  .header-wrapper{
+
+  .header-wrapper {
     width: 70%;
     margin: 20px auto;
   }
-  .center-wrapper{
+
+  .center-wrapper {
     flex: 1;
     width: 70%;
     margin: 0px auto;
     padding-bottom: 20px;
     overflow-y: auto;
   }
-  ::v-deep .el-card__body{
+
+  ::v-deep .el-card__body {
     padding: 10px;
   }
+
   // >>>.el-dialog__body{
   //   padding: 10px 20px 20px 20px;
   // }
 
-  ::v-deep .full-dialog-container{
-   .el-dialog__body{
+  ::v-deep .full-dialog-container {
+    .el-dialog__body {
       height: calc(100% - 80px);
     }
   }
-  ::v-deep .dialog-container{
+
+  ::v-deep .dialog-container {
     // margin-top: 50px !important;
-    width:75%;
-    height:80%;
-    .el-dialog__body{
+    width: 75%;
+    height: 80%;
+
+    .el-dialog__body {
       padding: 10px;
       height: calc(100% - 80px);
     }
diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index afd5728e..7c4a1858 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -62,7 +62,7 @@
       </el-card>
 
       <!-- 设备调研 -->
-      <el-card shadow="hover" class="mt10">
+      <el-card shadow="hover" class="mt10" v-if="siteSurveyNoteInfo.IsCloseEquipmentSurvey">
         <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
         <EquipmentList ref="researchEquipments" :isPreview="isPreview" />
       </el-card>
@@ -193,6 +193,7 @@ export default {
           if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
             this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
           }
+          this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey
           this.state = res.Result.TrialSiteSurvey.State
           this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
           this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
index 14a84b6f..70f29157 100644
--- a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
@@ -28,6 +28,17 @@
                     </el-checkbox>
                 </el-form-item>
             </el-form>
+            <div style="margin-bottom: 20px;font-weight: bold;">
+                {{ $t("trials:researchRecord:ImageManual:TableConfiguration") }}
+            </div>
+            <el-form size="small" :model="form" style="width:80%">
+                <el-form-item :label="$t('trials:researchRecord:ImageManual:Equipment')">
+                    <el-radio-group v-model="form.IsCloseEquipmentSurvey">
+                        <el-radio :label="item.value" v-for="item in $d.YesOrNo" :key="item.id">{{ item.label
+                            }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
             <div style="margin-bottom: 20px;font-weight: bold;">
                 {{ $t("trials:researchRecord:ImageManual:Precautions") }}
             </div>
@@ -53,7 +64,7 @@ export default {
     props: {
         trialSiteSurveyId: {
             type: String,
-            required: true
+            default: ''
         }
     },
     data() {
@@ -68,7 +79,8 @@ export default {
                 ReplaceContent: '',
                 ReplaceContentCN: '',
                 IsOpenLostVistRead: false,
-                IsSupportQCDownloadImage: false
+                IsSupportQCDownloadImage: false,
+                IsCloseEquipmentSurvey: true
             },
             obj: {
                 AverageEngravingCycle: false,
@@ -105,6 +117,7 @@ export default {
                     })
                     this.form.IsOpenLostVistRead = res.Result.IsOpenLostVistRead
                     this.form.IsSupportQCDownloadImage = res.Result.IsSupportQCDownloadImage
+                    this.form.IsCloseEquipmentSurvey = res.Result.IsCloseEquipmentSurvey
                     if (Array.isArray(res.Result.NotShowFieldList) && res.Result.NotShowFieldList.length > 0) {
                         res.Result.NotShowFieldList.forEach(key => {
                             this.form[key] = false
@@ -151,6 +164,7 @@ export default {
                 let data = {
                     IsOpenLostVistRead: this.form.IsOpenLostVistRead,
                     IsSupportQCDownloadImage: this.form.IsSupportQCDownloadImage,
+                    IsCloseEquipmentSurvey: this.form.IsCloseEquipmentSurvey,
                     ModifyFiledList: [],
                     NotShowFieldList: []
                 }
diff --git a/src/views/trials/trials-panel/attachments/site-research/index.vue b/src/views/trials/trials-panel/attachments/site-research/index.vue
index 9507c564..07b03083 100644
--- a/src/views/trials/trials-panel/attachments/site-research/index.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/index.vue
@@ -288,7 +288,7 @@ export default {
   },
   methods: {
     openImageManual() {
-      if (!this.trialSiteSurveyId) return false
+      // if (!this.trialSiteSurveyId) return false
       this.ImageManualVisible = true
     },
     // 获取系统文件数据
@@ -418,7 +418,7 @@ export default {
       const trialId = this.trialId
       this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`
       this.share_model.visible = true
-      this.trialSiteSurveyId = this.list[0].Id
+      // this.trialSiteSurveyId = this.list[0].Id
       this.$nextTick(() => {
         this.creatQrCode()
       })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
index b04fc35e..cc814660 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
@@ -36,7 +36,7 @@
                     class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                       e,
                       data: {
-                        ReportChartTypeEnum: 0,
+                        ReportChartTypeEnum: 1,
                         QuestionName: item.QuestionName
                       },
                     })" />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 9e1b542e..59277565 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -49,7 +49,7 @@
                       QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
                       TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
                       RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
-                      ReportChartTypeEnum: (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) || (scope.row.LesionType === 4 && scope.row.ReportLayType === 1) ? 0 : null,
+                      ReportChartTypeEnum: (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) ? 0 : (scope.row.LesionType === 4 && scope.row.ReportLayType === 1) ? 1 : null,
                       QuestionName: scope.row.QuestionName
                     }
                   })" />
@@ -169,7 +169,8 @@
                   <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] === '-2' ? "NA" : scope.row.Answers[task.VisitTaskId] === '-1' ?
+                  {{ scope.row.Answers[task.VisitTaskId] === '-2' ? "NA" : scope.row.Answers[task.VisitTaskId] === '-1'
+                    ?
                     $t('trials:readingReport:title:unknow') :
                     scope.row.Answers[task.VisitTaskId] }}
                 </template>
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 9ed37dc4..8e6e0593 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -88,11 +88,11 @@
                   <span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 150px">{{
                     user.RealName }}</span>
                 </div>
-                <!-- <div style="font-size: .75rem;line-height: 18px;color:#999" v-if="NODE_ENV !== 'usa'">{{ new
+                <div style="font-size: .75rem;line-height: 18px;color:#999" v-if="NODE_ENV !== 'usa'">{{ new
                   Date().getFullYear() }}{{ $t('common:date:today') }}{{ new Date().getMonth() +
                     1 }}{{ $t('common:date:month') }}{{ new Date().getDate() }}{{ $t('common:date:day') }}，{{ dayOfWeek }}
-                </div> -->
-                <div style="font-size: .75rem;line-height: 18px;color:#999">{{ moment().format('DDMMMYYYY') }}，{{
+                </div>
+                <div style="font-size: .75rem;line-height: 18px;color:#999" v-else>{{ moment().format('DDMMMYYYY') }}，{{
                   dayOfWeek }}
                 </div>
               </div>

From 1b6f48a5a58058c8e5c71ec03ae76b1e34644e24 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 3 Dec 2025 11:13:02 +0800
Subject: [PATCH 127/333] 1

---
 .../trials-panel/reading/dicoms/components/ReportPage.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 59277565..06cd90e9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -577,7 +577,7 @@ export default {
               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 || item.QuestionType === 39) {
+            if (item.QuestionType === 13 || item.QuestionType === 42 || (item.QuestionType === 39 && this.CriterionType === 18)) {
               this.currentEvaluateResult = obj.Answers[this.visitTaskId]
               this.answerArr.push({ id: item.QuestionId, answer: obj.Answers[this.visitTaskId], questionType: item.QuestionType })
             }

From ae536a7fc43dbfa50404235522b40a9ff5dd0010 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 3 Dec 2025 16:52:52 +0800
Subject: [PATCH 128/333] =?UTF-8?q?mpr=E9=98=85=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue  | 111 ++++++++++++------
 .../dicoms3D/components/VolumeViewport.vue    |  33 +++---
 .../components/customize/QuestionFormItem.vue |   9 +-
 .../components/customize/QuestionList.vue     |   9 +-
 4 files changed, 107 insertions(+), 55 deletions(-)

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 b831618b..d5c07bdd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -161,7 +161,7 @@
               <svg-icon v-else icon-class="fitToImage" class="svg-icon" />
             </div>
             <!-- MPR -->
-            <div class="tool-item" :title="`${$t('trials:reading:button:mpr')}`" @click.prevent="openMPRViewport"
+            <div class="tool-item" :title="`${$t('trials:reading:button:mpr')}`" @click.prevent="openMPRViewport()"
               v-if="criterionType === 0 && readingTool === 0">
               <svg-icon icon-class="mpr" class="svg-icon" />
             </div>
@@ -308,7 +308,7 @@
               <div v-if="criterionType === 0 && readingTool === 0"
                 :class="['viewports-box', !isMPR ? 'viewports-box-down' : '']" :style="gridStyle">
                 <div v-for="(v, index) in 3" :key="`viewport-volume-${index}`" :style="cellStyle"
-                  :class="['grid-cell', isMPR && index === 2 ? 'grid-cell-3' : '', index === activeViewportIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
+                  :class="['grid-cell', isMPR && index === 0 ? 'grid-cell-3' : '', index === activeViewportIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
                   @dblclick="toggleFullScreen($event, index)" @click="activeViewport(index)">
                   <VolumeViewport :ref="`viewport-volume-${index}`" :data-viewport-uid="`viewport-volume-${index}`"
                     :rendering-engine-id="renderingEngineId" :viewport-id="`viewport-volume-${index}`"
@@ -672,8 +672,8 @@ export default {
     gridStyle() {
       return {
         display: 'grid',
-        gridTemplateRows: `repeat(${this.rows}, 1fr)`,
-        gridTemplateColumns: `repeat(${this.cols}, 1fr)`,
+        gridTemplateRows: `repeat(${this.isMPR ? 2 : this.rows}, 1fr)`,
+        gridTemplateColumns: `repeat(${this.isMPR ? 2 : this.cols}, 1fr)`,
         height: '100%',
         width: '100%'
       }
@@ -1510,6 +1510,7 @@ export default {
         annotation.visitTaskId = series.TaskInfo.VisitTaskId
         annotation.studyId = series.StudyId
         annotation.seriesId = series.Id
+        annotation.from = this.isMPR ? 'MPR' : this.isFusion ? "Fusion" : ''
         annotation.instanceId = params.instanceId
         annotation.sliceThickness = series.SliceThickness
         annotation.numberOfFrames = isNaN(parseInt(params.frame)) ? null : parseInt(params.frame)
@@ -2683,7 +2684,7 @@ export default {
       }
       return obj
     },
-    getMarkedSeries(studyList, annotation) {
+    getMarkedSeries(studyList, annotation, checkFrom = false) {
       let obj = {}
       const sIdx = studyList.findIndex(s => s.StudyId === annotation.studyId)
       if (sIdx > -1) {
@@ -2709,18 +2710,37 @@ export default {
             obj.IsMarked = true
             obj.MeasureData = annotation
           }
+          if (annotation.from === 'MPR' && checkFrom) {
+            obj = Object.assign({}, seriesList[seriesIdx])
+            obj.SliceIndex = annotation?.metadata?.sliceIndex
+            obj.IsMarked = true
+            obj.MeasureData = annotation
+          }
+
         }
       }
       return obj
     },
-    viewCustomAnnotationSeries(obj) {
+    async viewCustomAnnotationSeries(obj) {
       const i = this.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       if (i === -1) return
       const studyList = this.visitTaskList[i].StudyList
-      const series = this.getMarkedSeries(studyList, obj.annotation)
+      const series = this.getMarkedSeries(studyList, obj.annotation, true)
       if (series) {
-        this.$refs[`${this.viewportKey}-${this.cells.length - 1}`][0].setSeriesInfo(series, true)
-        this.activeViewportIndex = i
+        this.activeViewportIndex = this.cells.length - 1
+        if (obj.annotation.from === 'MPR') {
+          let res = await this.openMPRViewport(series)
+          let viewPlaneNormal = obj.annotation?.metadata?.viewPlaneNormal.map(i => i == 0 ? 0 : i).join(',')
+          if (viewPlaneNormal === '0,0,-1') {
+            this.activeViewportIndex = 0
+          } else if (viewPlaneNormal === '0,-1,0') {
+            this.activeViewportIndex = 1
+          } else if (viewPlaneNormal === '1,0,0') {
+            this.activeViewportIndex = 2
+          }
+          if (!res) return false
+        }
+        this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(series, true)
         this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
       }
     },
@@ -2728,17 +2748,29 @@ export default {
       const i = this.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       if (i === -1) return
       const studyList = this.visitTaskList[i].StudyList
-      const series = this.getMarkedSeries(studyList, obj.annotation)
+      const series = this.getMarkedSeries(studyList, obj.annotation, true)
       if (series) {
-        this.$refs[`${this.viewportKey}-${this.cells.length - 1}`][0].setSeriesInfo(series, true)
-        this.activeViewportIndex = i
+        this.activeViewportIndex = this.cells.length - 1
+        if (obj.annotation.from === 'MPR') {
+          let viewPlaneNormal = obj.annotation?.metadata?.viewPlaneNormal.map(i => i == 0 ? 0 : i).join(',')
+          if (viewPlaneNormal === '0,0,-1') {
+            this.activeViewportIndex = 0
+          } else if (viewPlaneNormal === '0,-1,0') {
+            this.activeViewportIndex = 1
+          } else if (viewPlaneNormal === '1,0,0') {
+            this.activeViewportIndex = 2
+          }
+        }
+        this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(series, true)
         this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
-        const divForDownloadViewport = document.querySelector(
-          `div[data-viewport-uid="${this.viewportKey}-${this.activeViewportIndex}"]`
-        )
-        const canvas = await html2canvas(divForDownloadViewport)
-        const base64Str = canvas.toDataURL('image/png', 1)
-        callback(base64Str)
+        setTimeout(async () => {
+          const divForDownloadViewport = document.querySelector(
+            `div[data-viewport-uid="${this.viewportKey}-${this.activeViewportIndex}"]`
+          )
+          const canvas = await html2canvas(divForDownloadViewport)
+          const base64Str = canvas.toDataURL('image/png', 1)
+          callback(base64Str)
+        }, 500)
       }
     },
     async getScreenshots(measureData, callback) {
@@ -3090,24 +3122,29 @@ export default {
         this.$refs[id][0].voiChange(v)
       })
     },
-    async openMPRViewport() {
-      this.isMPR = true
-      this.rows = 2
-      this.cols = 2
-      this.loading = true
-      this.loadingText = this.$t('trials:lugano:message:loadVolumes')
-      const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
-      this.activeViewportIndex = 0
-      this.$refs[`viewport-0`][0].setSeriesInfo(series)
-      this.$refs[`viewport-1`][0].setSeriesInfo(series)
-      this.$refs[`viewport-2`][0].setSeriesInfo(series)
-      this.$refs[`viewport-3`][0].setSeriesInfo(series)
-      await this.getVolume(series)
-      this.loading = false
-      this.loadingText = null
-      this.$refs[`viewport-volume-0`][0].setSeriesInfo(Object.assign({ orientation: 'AXIAL' }, series))
-      this.$refs[`viewport-volume-1`][0].setSeriesInfo(Object.assign({ orientation: 'CORONAL' }, series))
-      this.$refs[`viewport-volume-2`][0].setSeriesInfo(Object.assign({ orientation: 'SAGITTAL' }, series))
+    async openMPRViewport(data = null) {
+      return new Promise(async (resolve, reject) => {
+        if (this.isMPR) return resolve(true)
+        this.isMPR = true
+        this.rows = 3
+        this.cols = 1
+        this.loading = true
+        this.loadingText = this.$t('trials:lugano:message:loadVolumes')
+        const series = data ? data : this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+        this.activeViewportIndex = 0
+        // this.$refs[`viewport-0`][0].setSeriesInfo(series)
+        // this.$refs[`viewport-1`][0].setSeriesInfo(series)
+        // this.$refs[`viewport-2`][0].setSeriesInfo(series)
+        // this.$refs[`viewport-3`][0].setSeriesInfo(series)
+        await this.getVolume(series)
+        this.loading = false
+        this.loadingText = null
+        this.$refs[`viewport-volume-0`][0].setSeriesInfo(Object.assign({ orientation: 'AXIAL' }, series))
+        this.$refs[`viewport-volume-1`][0].setSeriesInfo(Object.assign({ orientation: 'CORONAL' }, series))
+        this.$refs[`viewport-volume-2`][0].setSeriesInfo(Object.assign({ orientation: 'SAGITTAL' }, series))
+        resolve(false)
+      })
+
     },
     async handleFusion(data) {
       try {
@@ -3570,7 +3607,7 @@ export default {
         }
 
         .grid-cell-3 {
-          grid-column: 2 / 3;
+          grid-column: 0 / 3;
           grid-row: 1 / 3;
         }
 
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
index e5145bf8..dfc02285 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
@@ -11,7 +11,7 @@
                 {{ `${series.TaskInfo.SubjectCode} ${series.TaskInfo.TaskBlindName} ` }}
             </h2>
             <div>Series: #{{ series.SeriesNumber }}</div>
-            <div v-if="series.Stack">Image: #{{ `${series.SliceIndex + 1}/${imageInfo.total}` }}</div>
+            <div v-if="imageInfo.total">Image: #{{ `${series.SliceIndex + 1}/${imageInfo.total}` }}</div>
             <div>{{ series.Modality }}</div>
         </div>
         <div v-if="series" class="right-top-text">
@@ -40,10 +40,10 @@
         <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>
+            <div v-show="imageInfo.sliceThickness">Slice Thickness: {{
+                `${Number(imageInfo.sliceThickness).toFixed(digitPlaces)} mm`
+                }}</div>
             <div v-show="imageInfo.wwwc">WW/WL: {{ imageInfo.wwwc }}</div>
         </div>
         <div class="orientation-top">
@@ -117,7 +117,8 @@ export default {
                 location: null,
                 sliceThickness: null,
                 wwwc: null,
-                total: 0
+                total: 0,
+                sliceThickness: 0
             },
             digitPlaces: 2,
             orientationMarkers: [],
@@ -194,21 +195,24 @@ export default {
             this.imageInfo.zoom = zoom.toFixed(4)
             let imageIds = viewport.getImageIds(this.volumeId)
             let imageId = imageIds[0]
-            if (this.series.orientation === 'AXIAL') imageId = viewport.getCurrentImageId()
+            // if (this.series.orientation === 'AXIAL') imageId = viewport.getCurrentImageId() 
             if (imageId) {
                 const imagePlaneModule = metaData.get('imagePlaneModule', imageId)
                 if (this.series.orientation === 'AXIAL') {
                     this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}`
                     this.imageInfo.location = imagePlaneModule.sliceLocation
                     this.imageInfo.total = imageIds.length
+                    this.imageInfo.sliceThickness = imagePlaneModule.sliceThickness
                 }
                 if (this.series.orientation === 'CORONAL') {
                     this.imageInfo.size = `${imagePlaneModule.columns}*${imageIds.length}`
                     this.imageInfo.total = imagePlaneModule.rows
+                    this.imageInfo.sliceThickness = imagePlaneModule.rowPixelSpacing
                 }
                 if (this.series.orientation === 'SAGITTAL') {
                     this.imageInfo.size = `${imagePlaneModule.rows}*${imageIds.length}`
                     this.imageInfo.total = imagePlaneModule.columns
+                    this.imageInfo.sliceThickness = imagePlaneModule.columnPixelSpacing
                 }
 
                 this.getOrientationMarker()
@@ -395,15 +399,16 @@ export default {
             })
             this.loading = false
         },
-        async setSeriesInfo(obj) {
+        async setSeriesInfo(obj, isLocate = false) {
             try {
                 let data = obj
-                if (this.series && data.Id === this.series.Id && data.Description === this.series.Description) {
+                if (this.series && data.Id === this.series.Id && data.Description === this.series.Description && !isLocate) {
                     data.SliceIndex = this.series.SliceIndex
                 }
-                this.series = {}
                 const renderingEngine = getRenderingEngine(this.renderingEngineId)
                 const viewport = renderingEngine.getViewport(this.viewportId)
+                if (isLocate) return csUtils.jumpToSlice(viewport.element, { imageIndex: data.SliceIndex });
+                this.series = {}
                 this.volumeId = data.SeriesInstanceUid
                 this.series = { ...data }
                 viewport
@@ -456,8 +461,8 @@ export default {
         clickSlider(e) {
             const height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
             this.sliderInfo.height = height
-            let sliceIdx = Math.trunc(this.series.Stack.length * height / 100)
-            sliceIdx = sliceIdx >= this.series.Stack.length ? this.series.Stack.length - 1 : sliceIdx < 0 ? 0 : sliceIdx
+            let sliceIdx = Math.trunc(this.imageInfo.total * height / 100)
+            sliceIdx = sliceIdx >= this.imageInfo.total ? this.imageInfo.total : sliceIdx < 0 ? 0 : sliceIdx
             const renderingEngine = getRenderingEngine(this.renderingEngineId)
             const viewport = renderingEngine.getViewport(
                 this.viewportId
@@ -486,8 +491,8 @@ export default {
             if (delta < 0) return
             if (delta > boxHeight) return
             const height = delta * 100 / boxHeight
-            let sliceIdx = Math.trunc(this.series.Stack.length * height / 100)
-            sliceIdx = sliceIdx >= this.series.Stack.length ? this.series.Stack.length - 1 : sliceIdx < 0 ? 0 : sliceIdx
+            let sliceIdx = Math.trunc(this.imageInfo.total * height / 100)
+            sliceIdx = sliceIdx >= this.imageInfo.total ? this.imageInfo.total - 1 : sliceIdx < 0 ? 0 : sliceIdx
             this.sliderInfo.height = height
             const renderingEngine = getRenderingEngine(this.renderingEngineId)
             const viewport = renderingEngine.getViewport(
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 35b368f1..a7102075 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -1244,9 +1244,14 @@ export default {
     },
     getAnnotationProp(annotation, prop) {
       if (!annotation) return
-      const referencedImageId = annotation?.metadata?.referencedImageId
+      let referencedImageId = null
+      if (annotation.from) {
+        referencedImageId = `${annotation?.metadata?.volumeId}?sliceIndex=${annotation?.metadata?.sliceIndex}&viewPlaneNormal=${annotation?.metadata?.viewPlaneNormal.map(i => i == 0 ? 0 : i).join(',')}`
+      } else {
+        referencedImageId = annotation?.metadata?.referencedImageId
+      }
       if (!referencedImageId) return null
-      const cacheKey = `imageId:${referencedImageId}`
+      const cacheKey = annotation.from ? `volumeId:${referencedImageId}` : `imageId:${referencedImageId}`
       const cachedStats = annotation.data?.cachedStats?.[cacheKey]
       const hasProp = cachedStats
         && Object.prototype.hasOwnProperty.call(cachedStats, prop)
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index fe18dbc1..775f3ae9 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -943,9 +943,14 @@ export default {
     },
     getAnnotationProp(annotation, prop) {
       if (!annotation || !prop) return
-      const referencedImageId = annotation?.metadata?.referencedImageId
+      let referencedImageId = null
+      if (annotation.from) {
+        referencedImageId = `${annotation?.metadata?.volumeId}?sliceIndex=${annotation?.metadata?.sliceIndex}&viewPlaneNormal=${annotation?.metadata?.viewPlaneNormal.map(i => i == 0 ? 0 : i).join(',')}`
+      } else {
+        referencedImageId = annotation?.metadata?.referencedImageId
+      }
       if (!referencedImageId) return null
-      const cacheKey = `imageId:${referencedImageId}`
+      const cacheKey = annotation.from ? `volumeId:${referencedImageId}` : `imageId:${referencedImageId}`
       const cachedStats = annotation.data?.cachedStats?.[cacheKey]
       const hasProp = cachedStats
         && Object.prototype.hasOwnProperty.call(cachedStats, prop)

From 09e5bcb3b7fdc6e444d44b92ce34798c813a236c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 4 Dec 2025 13:40:23 +0800
Subject: [PATCH 129/333] =?UTF-8?q?mpr=E6=9F=A5=E7=9C=8B=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E5=92=8C=E6=A0=87=E8=AE=B0=E6=88=AA=E5=9B=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue  | 82 +++++++++++++------
 .../dicoms3D/components/VolumeViewport.vue    | 12 ++-
 2 files changed, 67 insertions(+), 27 deletions(-)

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 d5c07bdd..a26fcc8d 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -703,7 +703,7 @@ export default {
       },
       immediate: true
     },
-    currentReadingTaskState() { console.log(this.currentReadingTaskState, 'currentReadingTaskState') },
+    // currentReadingTaskState() { console.log(this.currentReadingTaskState, 'currentReadingTaskState') },
     activeTaskId: {
       immediate: true,
       handler(id) {
@@ -722,7 +722,7 @@ export default {
           this.clipPlaying = false
           this.fps = 15
         }
-        if (index === this.cells.length - 1 && series) {
+        if (index === this.cells.length - 1 && series && series.TaskInfo) {
           this.lastViewportTaskId = series.TaskInfo.VisitTaskId
           this.currentVisitInfo = series.TaskInfo
         }
@@ -1047,7 +1047,6 @@ export default {
       const element2 = this.$refs['viewport-1'][0].$el
       const element3 = this.$refs['viewport-2'][0].$el
       const element4 = this.$refs['viewport-3'][0].$el
-      console.log(Enums.OrientationAxis)
       let viewportInputArray = [
         {
           viewportId: 'viewport-0',
@@ -1089,7 +1088,7 @@ export default {
             type: ViewportType.ORTHOGRAPHIC,
             element: volumeElement2,
             defaultOptions: {
-              orientation: Enums.OrientationAxis.CORONAL
+              orientation: Enums.OrientationAxis.SAGITTAL
             }
           },
           {
@@ -1097,7 +1096,7 @@ export default {
             type: ViewportType.ORTHOGRAPHIC,
             element: volumeElement3,
             defaultOptions: {
-              orientation: Enums.OrientationAxis.SAGITTAL
+              orientation: Enums.OrientationAxis.CORONAL
             }
           },
         ]
@@ -1506,7 +1505,6 @@ export default {
         const referencedImageId = annotation.metadata.referencedImageId
         console.log(annotation, 'annotation')
         const params = this.getInstanceInfo(referencedImageId)
-        console.log(params, 'params')
         annotation.visitTaskId = series.TaskInfo.VisitTaskId
         annotation.studyId = series.StudyId
         annotation.seriesId = series.Id
@@ -2725,20 +2723,31 @@ export default {
       const i = this.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       if (i === -1) return
       const studyList = this.visitTaskList[i].StudyList
-      const series = this.getMarkedSeries(studyList, obj.annotation, true)
+      let series = this.getMarkedSeries(studyList, obj.annotation, true)
       if (series) {
         this.activeViewportIndex = this.cells.length - 1
         if (obj.annotation.from === 'MPR') {
-          let res = await this.openMPRViewport(series)
           let viewPlaneNormal = obj.annotation?.metadata?.viewPlaneNormal.map(i => i == 0 ? 0 : i).join(',')
           if (viewPlaneNormal === '0,0,-1') {
             this.activeViewportIndex = 0
+            series = Object.assign({ orientation: 'AXIAL' }, series)
           } else if (viewPlaneNormal === '0,-1,0') {
-            this.activeViewportIndex = 1
-          } else if (viewPlaneNormal === '1,0,0') {
             this.activeViewportIndex = 2
+            series = Object.assign({ orientation: 'CORONAL' }, series)
+          } else if (viewPlaneNormal === '1,0,0') {
+            this.activeViewportIndex = 1
+            series = Object.assign({ orientation: 'SAGITTAL' }, series)
           }
+          let res = await this.openMPRViewport(series)
           if (!res) return false
+        } else {
+          if (this.isMPR) {
+            this.isMPR = false
+            this.rows = 1
+            this.cols = 1
+            this.activeViewportIndex = 0
+            // return this.activeSeries(series)
+          }
         }
         this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(series, true)
         this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
@@ -2748,17 +2757,41 @@ export default {
       const i = this.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       if (i === -1) return
       const studyList = this.visitTaskList[i].StudyList
-      const series = this.getMarkedSeries(studyList, obj.annotation, true)
+      let series = this.getMarkedSeries(studyList, obj.annotation, true)
       if (series) {
         this.activeViewportIndex = this.cells.length - 1
         if (obj.annotation.from === 'MPR') {
           let viewPlaneNormal = obj.annotation?.metadata?.viewPlaneNormal.map(i => i == 0 ? 0 : i).join(',')
           if (viewPlaneNormal === '0,0,-1') {
             this.activeViewportIndex = 0
+            series = Object.assign({ orientation: 'AXIAL' }, series)
           } else if (viewPlaneNormal === '0,-1,0') {
-            this.activeViewportIndex = 1
-          } else if (viewPlaneNormal === '1,0,0') {
             this.activeViewportIndex = 2
+            series = Object.assign({ orientation: 'CORONAL' }, series)
+          } else if (viewPlaneNormal === '1,0,0') {
+            this.activeViewportIndex = 1
+            series = Object.assign({ orientation: 'SAGITTAL' }, series)
+          }
+          let res = await this.openMPRViewport(series)
+          if (!res) {
+            this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
+            setTimeout(async () => {
+              const divForDownloadViewport = document.querySelector(
+                `div[data-viewport-uid="${this.viewportKey}-${this.activeViewportIndex}"]`
+              )
+              const canvas = await html2canvas(divForDownloadViewport)
+              const base64Str = canvas.toDataURL('image/png', 1)
+              callback(base64Str)
+            }, 200)
+            return false
+          }
+        } else {
+          if (this.isMPR) {
+            this.isMPR = false
+            this.rows = 1
+            this.cols = 1
+            this.activeViewportIndex = 0
+            // return this.activeSeries(series)
           }
         }
         this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(series, true)
@@ -2770,7 +2803,7 @@ export default {
           const canvas = await html2canvas(divForDownloadViewport)
           const base64Str = canvas.toDataURL('image/png', 1)
           callback(base64Str)
-        }, 500)
+        }, 200)
       }
     },
     async getScreenshots(measureData, callback) {
@@ -3124,24 +3157,27 @@ export default {
     },
     async openMPRViewport(data = null) {
       return new Promise(async (resolve, reject) => {
-        if (this.isMPR) return resolve(true)
+        if (this.isMPR) {
+          if (!data) return resolve(false)
+          let viewportSeries = this.$refs[`viewport-volume-0`][0].series
+          if (data && viewportSeries.SeriesInstanceUid === data.SeriesInstanceUid) return resolve(true)
+        }
+
         this.isMPR = true
         this.rows = 3
         this.cols = 1
         this.loading = true
         this.loadingText = this.$t('trials:lugano:message:loadVolumes')
         const series = data ? data : this.$refs[`viewport-${this.activeViewportIndex}`][0].series
-        this.activeViewportIndex = 0
-        // this.$refs[`viewport-0`][0].setSeriesInfo(series)
-        // this.$refs[`viewport-1`][0].setSeriesInfo(series)
-        // this.$refs[`viewport-2`][0].setSeriesInfo(series)
-        // this.$refs[`viewport-3`][0].setSeriesInfo(series)
+        if (!data) this.activeViewportIndex = 0
+        const visitTaskId = this.visitTaskList[this.activeTaskIndex].VisitTaskId
+        this.$refs[visitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
         await this.getVolume(series)
         this.loading = false
         this.loadingText = null
-        this.$refs[`viewport-volume-0`][0].setSeriesInfo(Object.assign({ orientation: 'AXIAL' }, series))
-        this.$refs[`viewport-volume-1`][0].setSeriesInfo(Object.assign({ orientation: 'CORONAL' }, series))
-        this.$refs[`viewport-volume-2`][0].setSeriesInfo(Object.assign({ orientation: 'SAGITTAL' }, series))
+        this.$refs[`viewport-volume-0`][0].setSeriesInfo(Object.assign({ orientation: 'AXIAL', isLocation: data && this.activeViewportIndex === 0 }, series))
+        this.$refs[`viewport-volume-1`][0].setSeriesInfo(Object.assign({ orientation: 'SAGITTAL', isLocation: data && this.activeViewportIndex === 1 }, series))
+        this.$refs[`viewport-volume-2`][0].setSeriesInfo(Object.assign({ orientation: 'CORONAL', isLocation: data && this.activeViewportIndex === 2 }, series))
         resolve(false)
       })
 
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
index dfc02285..c41845e1 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
@@ -40,10 +40,10 @@
         <div v-if="series" class="right-bottom-text">
             <div v-show="imageInfo.location">Location: {{
                 `${Number(imageInfo.location).toFixed(digitPlaces)} mm`
-                }}</div>
+            }}</div>
             <div v-show="imageInfo.sliceThickness">Slice Thickness: {{
                 `${Number(imageInfo.sliceThickness).toFixed(digitPlaces)} mm`
-                }}</div>
+            }}</div>
             <div v-show="imageInfo.wwwc">WW/WL: {{ imageInfo.wwwc }}</div>
         </div>
         <div class="orientation-top">
@@ -402,7 +402,7 @@ export default {
         async setSeriesInfo(obj, isLocate = false) {
             try {
                 let data = obj
-                if (this.series && data.Id === this.series.Id && data.Description === this.series.Description && !isLocate) {
+                if (this.series && data.Id === this.series.Id && data.Description === this.series.Description && !isLocate && !data.isLocation) {
                     data.SliceIndex = this.series.SliceIndex
                 }
                 const renderingEngine = getRenderingEngine(this.renderingEngineId)
@@ -421,7 +421,11 @@ export default {
                             }
                             console.log("渲染成功")
                         }
-                    }])
+                    }]).then(res => {
+                        if (data.isLocation) {
+                            setTimeout(() => { csUtils.jumpToSlice(viewport.element, { imageIndex: data.SliceIndex }); })
+                        }
+                    })
                 viewport.render()
             } catch (e) {
                 console.log(e)

From 9d601b4a4654259f698e1ade4acf53253e484453 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 4 Dec 2025 13:40:44 +0800
Subject: [PATCH 130/333] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 8e6e0593..d56ba505 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -88,7 +88,7 @@
                   <span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 150px">{{
                     user.RealName }}</span>
                 </div>
-                <div style="font-size: .75rem;line-height: 18px;color:#999" v-if="NODE_ENV !== 'usa'">{{ new
+                <div style="font-size: .75rem;line-height: 18px;color:#999" v-if="isEN">{{ new
                   Date().getFullYear() }}{{ $t('common:date:today') }}{{ new Date().getMonth() +
                     1 }}{{ $t('common:date:month') }}{{ new Date().getDate() }}{{ $t('common:date:day') }}，{{ dayOfWeek }}
                 </div>
@@ -644,7 +644,10 @@ export default {
   },
   computed: {
     ...mapGetters(['userId', 'name']),
-    ...mapState('user', ['isTestUser'])
+    ...mapState('user', ['isTestUser']),
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
   },
   mounted() {
     this.getUserTobeDoneRecord()

From dbc84b2f58d42aa61ed8e9db72a4d6ba101457bb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 4 Dec 2025 13:43:23 +0800
Subject: [PATCH 131/333] 1

---
 src/views/trials/trials-workbench/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index d56ba505..30777727 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -88,7 +88,7 @@
                   <span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 150px">{{
                     user.RealName }}</span>
                 </div>
-                <div style="font-size: .75rem;line-height: 18px;color:#999" v-if="isEN">{{ new
+                <div style="font-size: .75rem;line-height: 18px;color:#999" v-if="!isEN">{{ new
                   Date().getFullYear() }}{{ $t('common:date:today') }}{{ new Date().getMonth() +
                     1 }}{{ $t('common:date:month') }}{{ new Date().getDate() }}{{ $t('common:date:day') }}，{{ dayOfWeek }}
                 </div>

From 1b25f6538e53b311ca67a282f9bf9fdd7018efeb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 4 Dec 2025 14:43:35 +0800
Subject: [PATCH 132/333] =?UTF-8?q?MPR=E8=B0=83=E7=AA=97=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icons/svg/mpr.svg                         |  1 -
 src/icons/svg/mprLeft.svg                     |  1 +
 .../reading/dicoms3D/components/ReadPage.vue  | 32 +++++++++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)
 delete mode 100644 src/icons/svg/mpr.svg
 create mode 100644 src/icons/svg/mprLeft.svg

diff --git a/src/icons/svg/mpr.svg b/src/icons/svg/mpr.svg
deleted file mode 100644
index 1f23e360..00000000
--- a/src/icons/svg/mpr.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1764646377457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7057" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M192 170.666667a21.333333 21.333333 0 0 0-21.333333 21.333333v640a21.333333 21.333333 0 0 0 21.333333 21.333333h640a21.333333 21.333333 0 0 0 21.333333-21.333333v-640a21.333333 21.333333 0 0 0-21.333333-21.333333h-640zM85.333333 192A106.666667 106.666667 0 0 1 192 85.333333h640A106.666667 106.666667 0 0 1 938.666667 192v640a106.666667 106.666667 0 0 1-106.666667 106.666667h-640A106.666667 106.666667 0 0 1 85.333333 832v-640z" fill="#e6e6e6" p-id="7058"></path><path d="M173.653333 170.666667c-1.621333 5.034667-2.986667 12.373333-2.986666 21.333333v640c0 8.96 1.365333 16.298667 2.986666 21.333333h292.693334c1.621333-5.034667 2.986667-12.373333 2.986666-21.333333v-640c0-8.96-1.365333-16.298667-2.986666-21.333333H173.653333zM99.157333 127.658667C107.306667 111.530667 126.293333 85.333333 160 85.333333h320c33.706667 0 52.736 26.197333 60.8 42.325334 9.301333 18.688 13.866667 41.472 13.866667 64.341333v640c0 22.869333-4.565333 45.653333-13.866667 64.341333-8.106667 16.128-27.093333 42.325333-60.8 42.325334h-320c-33.706667 0-52.736-26.197333-60.8-42.325334C89.856 877.653333 85.333333 854.869333 85.333333 832v-640c0-22.869333 4.522667-45.653333 13.866667-64.341333z" fill="#e6e6e6" p-id="7059"></path><path d="M170.666667 170.666667v298.666666h298.666666V170.666667H170.666667z m-85.333334-10.666667C85.333333 118.784 118.784 85.333333 160 85.333333h320c41.216 0 74.666667 33.450667 74.666667 74.666667v320A74.666667 74.666667 0 0 1 480 554.666667h-320A74.666667 74.666667 0 0 1 85.333333 480v-320z" fill="#e6e6e6" p-id="7060"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/mprLeft.svg b/src/icons/svg/mprLeft.svg
new file mode 100644
index 00000000..9240986b
--- /dev/null
+++ b/src/icons/svg/mprLeft.svg
@@ -0,0 +1 @@
+<svg t="1764646377457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7057" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" transform="rotate(180)"><path d="M192 170.666667a21.333333 21.333333 0 0 0-21.333333 21.333333v640a21.333333 21.333333 0 0 0 21.333333 21.333333h640a21.333333 21.333333 0 0 0 21.333333-21.333333v-640a21.333333 21.333333 0 0 0-21.333333-21.333333h-640zM85.333333 192A106.666667 106.666667 0 0 1 192 85.333333h640A106.666667 106.666667 0 0 1 938.666667 192v640a106.666667 106.666667 0 0 1-106.666667 106.666667h-640A106.666667 106.666667 0 0 1 85.333333 832v-640z" fill="#e6e6e6" p-id="7058"></path><path d="M173.653333 170.666667c-1.621333 5.034667-2.986667 12.373333-2.986666 21.333333v640c0 8.96 1.365333 16.298667 2.986666 21.333333h292.693334c1.621333-5.034667 2.986667-12.373333 2.986666-21.333333v-640c0-8.96-1.365333-16.298667-2.986666-21.333333H173.653333zM99.157333 127.658667C107.306667 111.530667 126.293333 85.333333 160 85.333333h320c33.706667 0 52.736 26.197333 60.8 42.325334 9.301333 18.688 13.866667 41.472 13.866667 64.341333v640c0 22.869333-4.565333 45.653333-13.866667 64.341333-8.106667 16.128-27.093333 42.325333-60.8 42.325334h-320c-33.706667 0-52.736-26.197333-60.8-42.325334C89.856 877.653333 85.333333 854.869333 85.333333 832v-640c0-22.869333 4.522667-45.653333 13.866667-64.341333z" fill="#e6e6e6" p-id="7059"></path><path d="M170.666667 170.666667v298.666666h298.666666V170.666667H170.666667z m-85.333334-10.666667C85.333333 118.784 118.784 85.333333 160 85.333333h320c41.216 0 74.666667 33.450667 74.666667 74.666667v320A74.666667 74.666667 0 0 1 480 554.666667h-320A74.666667 74.666667 0 0 1 85.333333 480v-320z" fill="#e6e6e6" p-id="7060"></path></svg>
\ No newline at end of file
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 a26fcc8d..77d2a402 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -163,7 +163,7 @@
             <!-- MPR -->
             <div class="tool-item" :title="`${$t('trials:reading:button:mpr')}`" @click.prevent="openMPRViewport()"
               v-if="criterionType === 0 && readingTool === 0">
-              <svg-icon icon-class="mpr" class="svg-icon" />
+              <svg-icon icon-class="mprLeft" class="svg-icon" />
             </div>
             <!--融合-->
             <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')"
@@ -1043,6 +1043,7 @@ export default {
       }
       let viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
       const fusionViewportIds = ['viewport-fusion-0', 'viewport-fusion-1', 'viewport-fusion-2', 'viewport-fusion-3']
+      const volumeViewportIds = ['viewport-volume-0', 'viewport-volume-1', 'viewport-volume-2']
       const element1 = this.$refs['viewport-0'][0].$el
       const element2 = this.$refs['viewport-1'][0].$el
       const element3 = this.$refs['viewport-2'][0].$el
@@ -1070,7 +1071,6 @@ export default {
         }
       ]
       if (this.criterionType === 0 && this.readingTool === 0) {
-        let volumeViewportIds = ['viewport-volume-0', 'viewport-volume-1', 'viewport-volume-2']
         const volumeElement1 = this.$refs['viewport-volume-0'][0].$el
         const volumeElement2 = this.$refs['viewport-volume-1'][0].$el
         const volumeElement3 = this.$refs['viewport-volume-2'][0].$el
@@ -1180,6 +1180,13 @@ export default {
 
         toolGroup.addTool(PanTool.toolName)
         toolGroup.addTool(ZoomTool.toolName)
+        if (volumeViewportIds.includes(viewportId)) {
+          toolGroup.addTool(WindowLevelTool.toolName, {
+            targetViewportIds: volumeViewportIds
+          })
+        } else {
+          toolGroup.addTool(WindowLevelTool.toolName)
+        }
         toolGroup.addTool(WindowLevelTool.toolName)
         toolGroup.addTool(WindowLevelRegionTool.toolName)
         toolGroup.addTool(PlanarRotateTool.toolName)
@@ -1293,6 +1300,9 @@ export default {
       if (this.readingTool === 2) {
         this.setUpSynchronizers()
       }
+      if (this.criterionType === 0 && this.readingTool === 0) {
+        this.setUpSynchronizersMPR()
+      }
     },
     // 影像下载进度回调
     imageLoadProgress(e) {
@@ -3141,6 +3151,24 @@ export default {
         })
       })
     },
+    // mpr调窗同步设置
+    setUpSynchronizersMPR() {
+      const MPRVoiSynchronizer = createVOISynchronizer('MPR_VOI_SYNCHRONIZER_ID', {
+        syncInvertState: false,
+        syncColormap: false
+      })
+      let viewportIds = [
+        `viewport-volume-0`,
+        `viewport-volume-1`,
+        `viewport-volume-2`
+      ]
+      viewportIds.forEach((viewportId) => {
+        MPRVoiSynchronizer.add({
+          renderingEngineId: this.renderingEngineId,
+          viewportId
+        })
+      });
+    },
     setColorMap(rgbPresetName) {
       const fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
       fusionViewportIds.forEach(id => {

From 3a7eadb41c91705d66ecb987fa11c49b50248be4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 4 Dec 2025 14:57:44 +0800
Subject: [PATCH 133/333] =?UTF-8?q?mpr=E5=9B=BE=E6=A0=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icons/svg/mpr.svg                                           | 1 +
 src/icons/svg/mprLeft.svg                                       | 1 -
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue       | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 src/icons/svg/mpr.svg
 delete mode 100644 src/icons/svg/mprLeft.svg

diff --git a/src/icons/svg/mpr.svg b/src/icons/svg/mpr.svg
new file mode 100644
index 00000000..992638a6
--- /dev/null
+++ b/src/icons/svg/mpr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1764830990216" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5566" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M192 170.666667a21.333333 21.333333 0 0 0-21.333333 21.333333v640a21.333333 21.333333 0 0 0 21.333333 21.333333h640a21.333333 21.333333 0 0 0 21.333333-21.333333v-640a21.333333 21.333333 0 0 0-21.333333-21.333333h-640zM85.333333 192A106.666667 106.666667 0 0 1 192 85.333333h640A106.666667 106.666667 0 0 1 938.666667 192v640a106.666667 106.666667 0 0 1-106.666667 106.666667h-640A106.666667 106.666667 0 0 1 85.333333 832v-640z" fill="#ffffff" p-id="5567"></path><path d="M173.653333 170.666667c-1.621333 5.034667-2.986667 12.373333-2.986666 21.333333v640c0 8.96 1.365333 16.298667 2.986666 21.333333h292.693334c1.621333-5.034667 2.986667-12.373333 2.986666-21.333333v-640c0-8.96-1.365333-16.298667-2.986666-21.333333H173.653333zM99.157333 127.658667C107.306667 111.530667 126.293333 85.333333 160 85.333333h320c33.706667 0 52.736 26.197333 60.8 42.325334 9.301333 18.688 13.866667 41.472 13.866667 64.341333v640c0 22.869333-4.565333 45.653333-13.866667 64.341333-8.106667 16.128-27.093333 42.325333-60.8 42.325334h-320c-33.706667 0-52.736-26.197333-60.8-42.325334C89.856 877.653333 85.333333 854.869333 85.333333 832v-640c0-22.869333 4.522667-45.653333 13.866667-64.341333z" fill="#ffffff" p-id="5568"></path><path d="M170.666667 170.666667v298.666666h298.666666V170.666667H170.666667z m-85.333334-10.666667C85.333333 118.784 118.784 85.333333 160 85.333333h320c41.216 0 74.666667 33.450667 74.666667 74.666667v320A74.666667 74.666667 0 0 1 480 554.666667h-320A74.666667 74.666667 0 0 1 85.333333 480v-320z" fill="#ffffff" p-id="5569"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/mprLeft.svg b/src/icons/svg/mprLeft.svg
deleted file mode 100644
index 9240986b..00000000
--- a/src/icons/svg/mprLeft.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1764646377457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7057" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" transform="rotate(180)"><path d="M192 170.666667a21.333333 21.333333 0 0 0-21.333333 21.333333v640a21.333333 21.333333 0 0 0 21.333333 21.333333h640a21.333333 21.333333 0 0 0 21.333333-21.333333v-640a21.333333 21.333333 0 0 0-21.333333-21.333333h-640zM85.333333 192A106.666667 106.666667 0 0 1 192 85.333333h640A106.666667 106.666667 0 0 1 938.666667 192v640a106.666667 106.666667 0 0 1-106.666667 106.666667h-640A106.666667 106.666667 0 0 1 85.333333 832v-640z" fill="#e6e6e6" p-id="7058"></path><path d="M173.653333 170.666667c-1.621333 5.034667-2.986667 12.373333-2.986666 21.333333v640c0 8.96 1.365333 16.298667 2.986666 21.333333h292.693334c1.621333-5.034667 2.986667-12.373333 2.986666-21.333333v-640c0-8.96-1.365333-16.298667-2.986666-21.333333H173.653333zM99.157333 127.658667C107.306667 111.530667 126.293333 85.333333 160 85.333333h320c33.706667 0 52.736 26.197333 60.8 42.325334 9.301333 18.688 13.866667 41.472 13.866667 64.341333v640c0 22.869333-4.565333 45.653333-13.866667 64.341333-8.106667 16.128-27.093333 42.325333-60.8 42.325334h-320c-33.706667 0-52.736-26.197333-60.8-42.325334C89.856 877.653333 85.333333 854.869333 85.333333 832v-640c0-22.869333 4.522667-45.653333 13.866667-64.341333z" fill="#e6e6e6" p-id="7059"></path><path d="M170.666667 170.666667v298.666666h298.666666V170.666667H170.666667z m-85.333334-10.666667C85.333333 118.784 118.784 85.333333 160 85.333333h320c41.216 0 74.666667 33.450667 74.666667 74.666667v320A74.666667 74.666667 0 0 1 480 554.666667h-320A74.666667 74.666667 0 0 1 85.333333 480v-320z" fill="#e6e6e6" p-id="7060"></path></svg>
\ No newline at end of file
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 77d2a402..1d8abafd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -163,7 +163,7 @@
             <!-- MPR -->
             <div class="tool-item" :title="`${$t('trials:reading:button:mpr')}`" @click.prevent="openMPRViewport()"
               v-if="criterionType === 0 && readingTool === 0">
-              <svg-icon icon-class="mprLeft" class="svg-icon" />
+              <svg-icon icon-class="mpr" class="svg-icon" style="transform: rotate(180deg);"/>
             </div>
             <!--融合-->
             <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')"

From b4821ace59663af7c5fee2fad103c292afb560f0 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 4 Dec 2025 15:10:57 +0800
Subject: [PATCH 134/333] =?UTF-8?q?oct=E6=A0=87=E5=87=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/export.js                             |   8 +
 .../components/OCT/QuestionTableFormItem.vue  | 183 ++++++------------
 .../components/exportList.vue                 |  44 ++---
 3 files changed, 92 insertions(+), 143 deletions(-)

diff --git a/src/api/export.js b/src/api/export.js
index 801716e6..32c24d34 100644
--- a/src/api/export.js
+++ b/src/api/export.js
@@ -239,6 +239,14 @@ export function getPatientList_Export(data) {
     data
   })
 }
+export function getTumor_CDISC_Export(data) {
+  return requestDownload({
+    url: `/IVUS_OCTExport/getTumor_CDISC_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
 export function getCommonEvaluationList_Export(data) {
   return requestDownload({
     url: `/ExcelExport/getCommonEvaluationList_Export`,
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
index 8500284f..8e2a32b6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
@@ -1,119 +1,68 @@
 <template>
   <div>
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ 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']},
+        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' : '']"
-      >
+        :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-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-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'"
+        <el-select v-else-if="question.Type === 'select' || question.type === 'multipleSelect'"
           v-model="questionForm[question.Id]"
           :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode)"
-          clearable
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+          clearable :multiple="question.type === 'multipleSelect'"
+          @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]"
-            />
+            <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"
-            />
+            <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
+            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"
-            />
+            <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)})"
-        >
+        <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)"
-            >
+            <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"
-            >
+            <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"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
+        <el-checkbox-group v-else-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2" @change="((val) => { formItemChange(val, question) })">
+          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
             {{ val }}
           </el-checkbox>
         </el-checkbox-group>
@@ -144,24 +93,15 @@
           />
         </template> -->
         <!-- 数值类型 -->
-        <el-input
-          v-else-if="question.Type==='number'"
-          v-model="questionForm[question.Id]"
-          :disabled="readingTaskState>=2 "
-          type="number"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+        <el-input v-else-if="question.Type === 'number'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2" type="number" @change="((val) => { formItemChange(val, question) })">
           <template v-if="question.Unit" slot="append">
             {{ $fd('ValueUnit', parseInt(question.Unit)) }}
           </template>
         </el-input>
 
-        <el-input
-          v-else-if="question.Type==='calculation'"
-          v-model="questionForm[question.Id]"
-          disabled
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+        <el-input v-else-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled
+          @change="((val) => { formItemChange(val, question) })">
           <template v-if="question.Unit" slot="append">
             {{ $fd('ValueUnit', parseInt(question.Unit)) }}
           </template>
@@ -169,15 +109,9 @@
       </el-form-item>
     </template>
 
-    <QuestionTableFormItem
-      v-for="item in question.Childrens"
-      :key="item.Id"
-      :question="item"
-      :question-form="questionForm"
-      :reading-task-state="readingTaskState"
-      @setFormItemData="setFormItemData"
-      @resetFormItemData="resetFormItemData"
-    />
+    <QuestionTableFormItem v-for="item in question.Childrens" :key="item.Id" :question="item"
+      :question-form="questionForm" :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
+      @resetFormItemData="resetFormItemData" />
   </div>
 </template>
 <script>
@@ -269,29 +203,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.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;
-  }
+
+::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/reading-tracking/components/exportList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
index e49c8a8c..5e3a53b3 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
@@ -6,10 +6,7 @@
       </template>
     </el-table-column>
     <!-- 文件名称 -->
-    <el-table-column
-      :label="$t('trials:reviewTrack:title:fileName')"
-      :min-width="50"
-    >
+    <el-table-column :label="$t('trials:reviewTrack:title:fileName')" :min-width="50">
       <template slot-scope="scope">
         {{ scope.row.FileName }}
       </template>
@@ -17,13 +14,8 @@
     <el-table-column prop="" :label="$t('common:action:action')" min-width="80">
       <template slot-scope="scope">
         <!-- 下载 -->
-        <el-button
-          icon="el-icon-download"
-          circle
-          :title="$t('trials:reviewTrack:title:download')"
-          size="mini"
-          @click="handleExport(scope.row.ExportCatogory)"
-        />
+        <el-button icon="el-icon-download" circle :title="$t('trials:reviewTrack:title:download')" size="mini"
+          @click="handleExport(scope.row.ExportCatogory)" />
       </template>
     </el-table-column>
   </el-table>
@@ -35,6 +27,7 @@ import {
   getCommonJudgeRatioList_Export,
   getReadingTaskList_Export,
   getTrialReadingCriterionCanExportDocumentList,
+  getTumor_CDISC_Export,
   getOverallTumorEvaluationList_Export,
   getEvaluationOfTumorEfficacy_Export,
   getDetailedOfEvaluatedLesion_Export,
@@ -85,7 +78,7 @@ export default {
       switch (type) {
         case 0:
           getReadingTaskList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -93,7 +86,7 @@ export default {
         case 1:
           searchData.ReadingExportType = 1
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -101,7 +94,7 @@ export default {
         case 2:
           searchData.ReadingExportType = 2
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -109,7 +102,7 @@ export default {
         case 3:
           searchData.ReadingExportType = 3
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -117,7 +110,7 @@ export default {
         case 4:
           searchData.ReadingExportType = 4
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -125,7 +118,7 @@ export default {
         case 7:
           searchData.ReadingExportType = 7
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -133,7 +126,7 @@ export default {
         case 8:
           searchData.ReadingExportType = 8
           getCommonEvaluationList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -141,7 +134,7 @@ export default {
         case 17:
           searchData.ReadingExportType = 17
           getCommonJudgeRatioList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -149,7 +142,15 @@ export default {
         case 18:
           searchData.ReadingExportType = 18
           getCommonJudgeRatioList_Export(searchData)
-            .then((res) => {})
+            .then((res) => { })
+            .catch(() => {
+              this.loading = false
+            })
+          break
+        case 21:
+          searchData.ReadingExportType = 18
+          getTumor_CDISC_Export(searchData)
+            .then((res) => { })
             .catch(() => {
               this.loading = false
             })
@@ -160,5 +161,4 @@ export default {
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>

From 6ee3a06eb25d4a35ae7c91427eea847aa87be2e3 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 5 Dec 2025 09:07:56 +0800
Subject: [PATCH 135/333] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/crc-upload/components/studyInfo.vue          | 10 +++++++---
 .../visit/crc-upload/components/uploadDicomFiles2.vue  |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
index a24660aa..4886d9c3 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
@@ -5,8 +5,8 @@
       <el-button v-if="
         data.SubmitState * 1 < 2 ||
         (data.SubmitState === 2 && data.IsQCConfirmedReupload)
-      " v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']" :disabled="deleteArr.length === 0"
-        type="primary" size="small" icon="el-icon-delete" @click="handleBatchDelete">
+      " v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']" :disabled="deleteArr.length === 0" type="primary"
+        size="small" icon="el-icon-delete" @click="handleBatchDelete">
         {{ $t('trials:uploadedDicoms:action:delete') }}
       </el-button>
       <!-- 预览 -->
@@ -112,7 +112,7 @@
           <!-- 检查部位 -->
           <el-form-item :label="$t('trials:audit:table:bodyPart')" prop="BodyPartForEdit" :rules="[
             {
-              required: true,
+              required: studyForm.BodyPartForEditOther ? false : true,
               message: $t('common:ruleMessage:specify'),
               trigger: 'blur',
             },
@@ -121,6 +121,8 @@
               <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{
                 $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
               }}</el-checkbox>
+              <el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
+                v-model.trim="studyForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
             </el-checkbox-group>
           </el-form-item>
           <!-- 序列数量 -->
@@ -183,6 +185,7 @@ export default {
         BodyPartForEdit: [],
         SeriesCount: null,
         StudyTime: '',
+        BodyPartForEditOther: ''
       },
       deleteArr: [],
       studyLoading: false,
@@ -236,6 +239,7 @@ export default {
           type: 1,
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
+          BodyPartForEditOther: this.studyForm.BodyPartForEditOther
         }
         updateModality(this.data.TrialId, params)
           .then((res) => {
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index ebdef565..1984eda6 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -105,16 +105,16 @@
           <el-button icon="el-icon-upload2" v-if="
             ['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
             relationInfo.IsHaveStudyClinicalData
-          " :disabled="!isAfresh && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
+          " :disabled="!isAfresh && data.SubmitState === 2 && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
             :title="$t('trials:workbench:title:UploadClinicalData')" circle @click="handleUploadPetData(scope.row)" />
           <!-- 编辑 -->
           <el-button icon="el-icon-edit-outline" v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             :title="$t('common:button:edit')"
-            :disabled="!isAfresh && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
+            :disabled="!isAfresh && data.SubmitState === 2 && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
             circle @click="handleEditStudy(scope.row)" />
           <!-- 删除 :disabled="scope.row.IsDeleted"-->
           <el-button icon="el-icon-delete" :title="$t('trials:uploadedDicoms:action:delete')" circle
-            :disabled="!isAfresh && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
+            :disabled="!isAfresh && data.SubmitState === 2 && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
             @click="handleDeleteStudy(scope.row)" />
           <!--          <el-button-->
           <!--            icon="el-icon-toilet-paper"-->
@@ -1774,7 +1774,7 @@ export default {
       }
     },
     handleSelectable2(row) {
-      if (!this.isAfresh && this.data.SubmitTime && moment(this.data.SubmitTime).isAfter(moment(row.UploadedTime))) {
+      if (!this.isAfresh && this.data.SubmitState === 2 && this.data.SubmitTime && moment(this.data.SubmitTime).isAfter(moment(row.UploadedTime))) {
         return false
       } else {
         return true

From d64bea0d27f5381853f75ed4d6181bb10c72d973 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 5 Dec 2025 09:12:30 +0800
Subject: [PATCH 136/333] 1

---
 src/views/research/form.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 7c4a1858..2782cea4 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -8,7 +8,7 @@
       <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
       <div style="display: flex;justify-content: space-between;" v-if="!isPreview">
         <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state)
-        }}</el-tag></div>
+            }}</el-tag></div>
         <div>
           <!-- 提交 -->
           <el-button v-if="(state === 0 && userTypeEnumInt === 0)" type="primary" size="small"
@@ -172,7 +172,7 @@ export default {
       btnLoading: false,
       isFullscreen: false,
       historyVisible: false,
-      siteSurveyNoteInfo: null
+      siteSurveyNoteInfo: {}
     }
   },
   mounted() {

From 41eb97449662e1376c61a5e88e007510b3da74c5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 8 Dec 2025 15:13:35 +0800
Subject: [PATCH 137/333] =?UTF-8?q?OCT=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=A1=A8=E5=8D=95=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E5=A2=9E=E5=8A=A0=E5=A4=9A=E9=80=89=EF=BC=88OCT?=
 =?UTF-8?q?=E3=80=81=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/reading.js                  |   7 +
 .../components/CriterionQuestionForm.vue      | 786 ++++++------------
 .../template/components/TableQsForm.vue       | 562 ++++---------
 .../dicoms/components/OCT/QuestionList.vue    |  16 +-
 .../components/OCT/QuestionTableFormItem.vue  |   6 +-
 .../dicoms/components/QuestionItem.vue        | 325 +++-----
 .../components/Recist/QuestionFormItem.vue    | 229 ++---
 .../components/Recist/QuestionList.vue        |   2 +-
 .../components/customize/QuestionFormItem.vue |  78 +-
 .../components/customize/QuestionList.vue     |  27 +-
 .../customize/QuestionTableFormItem.vue       |  10 +-
 .../components/customize/ReportPage.vue       | 133 ++-
 .../reading/dicoms3D/components/toolConfig.js |   2 +-
 .../reading-unit/components/QuestionsForm.vue |  15 +-
 .../reading-unit/components/TableQsForm.vue   |  13 +
 .../trial-summary/image-summary/index.vue     |  42 +-
 16 files changed, 861 insertions(+), 1392 deletions(-)

diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index 053b9d0f..b61c175b 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -40,6 +40,13 @@ function getQuestions(questions) {
   const criterionType = parseInt(localStorage.getItem('CriterionType'))
   questions.forEach(item => {
     if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+      item.TableQuestions.Questions.forEach(question => {
+        if (question.Type === 'select' && question.OptionTypeEnum === 1) {
+          item.TableQuestions.Answers.forEach((answer) => {
+            answer[question.Id] = answer[question.Id] ? JSON.parse(answer[question.Id]) : []
+          })
+        }
+      })
       item.TableQuestions.Answers.forEach(answerObj => {
         answerObj.isDicomReading = answerObj.IsDicomReading === 'True'
 
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 52b5f545..425f1166 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -1,251 +1,143 @@
 <template>
-  <el-form
-    ref="clinicalDataForm"
-    v-loading="loading"
-    :model="form"
-    size="small"
-    :rules="rules"
-    :disabled="type === 'look'"
-    label-width="220px"
-  >
+  <el-form ref="clinicalDataForm" v-loading="loading" :model="form" size="small" :rules="rules"
+    :disabled="type === 'look'" label-width="220px">
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">
         <!-- 类型 -->
         <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
-          <el-select
-            v-model="form.Type"
-            clearable
-            @change="
-              (val) => {
-                typeChange(val, form)
-              }
-            "
-          >
-            <el-option
-              v-for="item of $d.Criterion_Question_Type"
-              v-show="item.value !== 'class'"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
+          <el-select v-model="form.Type" clearable @change="
+            (val) => {
+              typeChange(val, form)
+            }
+          ">
+            <el-option v-for="item of $d.Criterion_Question_Type" v-show="item.value !== 'class'" :key="item.value"
+              :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 分组名称 -->
-        <el-form-item
-          v-if="form.Type === 'group'"
-          :label="$t('trials:readingUnit:qsList:title:groupName')"
-          prop="GroupName"
-        >
+        <el-form-item v-if="form.Type === 'group'" :label="$t('trials:readingUnit:qsList:title:groupName')"
+          prop="GroupName">
           <el-input v-model="form.GroupName" />
         </el-form-item>
         <!-- 分组名称（EN） -->
-        <el-form-item
-          v-if="form.Type === 'group'"
-          :label="$t('dictionary:template:criterionConfig:title:groupNameEn')"
-          prop="GroupEnName"
-        >
+        <el-form-item v-if="form.Type === 'group'" :label="$t('dictionary:template:criterionConfig:title:groupNameEn')"
+          prop="GroupEnName">
           <el-input v-model="form.GroupEnName" />
         </el-form-item>
         <!-- 问题名称 -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:qsName')"
-          prop="QuestionName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsName')"
+          prop="QuestionName" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
+          ]">
           <el-input v-model="form.QuestionName" />
         </el-form-item>
         <!-- 问题名称（EN） -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('dictionary:template:criterionConfig:title:qsNameEn')"
-          prop="QuestionEnName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('dictionary:template:criterionConfig:title:qsNameEn')"
+          prop="QuestionEnName" :rules="[
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
+          ]">
           <el-input v-model="form.QuestionEnName" />
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
         <!-- 公有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:publicProperties') }}</el-divider>
         <!-- 问题分组 -->
-        <el-form-item 
-          v-if="form.Type !== 'group'" 
-          :label="$t('trials:readingUnit:qsList:title:qsGroupName')"
-          :rules="[
-            { required: form.ShowQuestion === 1 ? false : true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-select
-            v-model="form.GroupId"
-            clearable
-            :disabled="isParentExistGroup"
-          >
-            <el-option
-              v-for="group of groupOptions"
-              :key="group.GroupId"
-              :label="group.GroupName"
-              :value="group.GroupId"
-            />
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsGroupName')" :rules="[
+          { required: form.ShowQuestion === 1 ? false : true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-select v-model="form.GroupId" clearable :disabled="isParentExistGroup">
+            <el-option v-for="group of groupOptions" :key="group.GroupId" :label="group.GroupName"
+              :value="group.GroupId" />
           </el-select>
         </el-form-item>
         <!-- 是否显示 -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:isShow')"
-          prop="ShowQuestion"
-        >
-          <el-radio-group
-            v-model="form.ShowQuestion"
-            @change="
-              (val) => {
-                isShowQuestionChange(val, form)
-              }
-            "
-          >
-            <el-radio
-              v-for="item of $d.ShowQuestion"
-              :key="`ShowQuestion${item.value}`"
-              :label="item.value"
-            >
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')"
+          prop="ShowQuestion">
+          <el-radio-group v-model="form.ShowQuestion" @change="
+            (val) => {
+              isShowQuestionChange(val, form)
+            }
+          ">
+            <el-radio v-for="item of $d.ShowQuestion" :key="`ShowQuestion${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 显示时依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.ShowQuestion === 1"
-          :label="$t('trials:readingUnit:qsList:title:parentId')"
-          prop="ParentId"
-        >
-          <el-select
-            v-model="form.ParentId"
-            clearable
-            @change="
-              (val) => {
-                parentQuestionChange(val, form)
-              }
-            "
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`ParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentId')" prop="ParentId">
+          <el-select v-model="form.ParentId" clearable @change="
+            (val) => {
+              parentQuestionChange(val, form)
+            }
+          ">
+            <el-option v-for="item of parentOptions" :key="`ParentId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 显示时依赖父问题触发值 -->
-        <el-form-item
-          v-if="form.ParentId && form.ShowQuestion === 1"
-          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" 
-          prop="ParentTriggerValueList"
-        >
+        <el-form-item v-if="form.ParentId && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-            <el-option
-              v-for="item of parentTriggerValOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value + ''"
-            />
+            <el-option v-for="item of parentTriggerValOptions" :key="item.value" :label="item.label"
+              :value="item.value + ''" />
           </el-select>
         </el-form-item>
         <!-- 是否必填 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'"
-          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired"
-        >
-          <el-radio-group
-            v-model="form.IsRequired"
-            :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
+          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
+          <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
             @change="
               (val) => {
                 isRequiredChange(val, form)
               }
-            "
-          >
-            <el-radio
-              v-for="item of $d.QuestionRequired"
-              :key="`QuestionRequired${item.value}`"
-              :label="item.value"
-            >
+            ">
+            <el-radio v-for="item of $d.QuestionRequired" :key="`QuestionRequired${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 必填依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-          prop="RelevanceId"
-        >
-          <el-select
-            v-model="form.RelevanceId"
-            clearable
-            @change="
-              (val) => {
-                relevanceQuestionChange(val, form)
-              }
-            "
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`RelevanceId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')" prop="RelevanceId">
+          <el-select v-model="form.RelevanceId" clearable @change="
+            (val) => {
+              relevanceQuestionChange(val, form)
+            }
+          ">
+            <el-option v-for="item of parentOptions" :key="`RelevanceId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 必填触发值 -->
-        <el-form-item
-          v-if="form.RelevanceId && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-          prop="RelevanceValueList"
-        >
+        <el-form-item v-if="form.RelevanceId && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')" prop="RelevanceValueList">
           <el-select v-model="form.RelevanceValueList" clearable multiple>
-            <el-option
-              v-for="item of reParentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value + ''"
-            />
+            <el-option v-for="item of reParentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="item.value + ''" />
           </el-select>
         </el-form-item>
         <!-- 是否裁判问题 -->
-        <el-form-item
-          v-if="
-            form.Type === 'select' ||
-            form.Type === 'radio' ||
-            form.Type === 'calculation' ||
-            form.Type === 'number'
-          "
-          :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')"
-          prop="IsJudgeQuestion"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.IsJudgeQuestion"
-            @change="
-              (val) => {
-                isJudgeQuestionChange(val, form)
-              }
-            "
-          >
-            <el-radio
-              v-for="item of $d.YesOrNo"
-              :key="`YesOrNo${item.value}`"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+        <el-form-item v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation' ||
+          form.Type === 'number'
+        " :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')" prop="IsJudgeQuestion" :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-radio-group v-model="form.IsJudgeQuestion" @change="
+            (val) => {
+              isJudgeQuestionChange(val, form)
+            }
+          ">
+            <el-radio v-for="item of $d.YesOrNo" :key="`YesOrNo${item.value}`" :label="item.value">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- <el-form-item label="导出标识" 
@@ -269,471 +161,278 @@
           </el-radio-group>
         </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
-           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'">
           <el-select v-model="form.ExportResult" multiple>
-            <el-option
-              v-for="item in CriterionDictionaryList.ExportResult"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            >
+            <el-option v-for="item in CriterionDictionaryList.ExportResult" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value">
             </el-option>
           </el-select>
         </el-form-item>
         <!-- 限制编辑 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'upload' || form.Type === 'number' || form.Type === 'screenshot'"
-          prop="LimitEdit"
-          :rules="[
+          prop="LimitEdit" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-radio-group v-model="form.LimitEdit">
-            <el-radio
-              v-for="item of $d.LimitEdit"
-              :key="`LimitEdit${item.value}`"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item of $d.LimitEdit" :key="`LimitEdit${item.value}`" :label="item.value">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 全局阅片是否显示 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')"
-          prop="GlobalReadingShowType"
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')" prop="GlobalReadingShowType"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-radio-group v-model="form.GlobalReadingShowType">
-            <el-radio
-              v-for="item of $d.GlobalReadingShowType"
-              :key="item.id"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 问题标识 -->
-        <el-form-item
-          :label="$t('dictionary:template:criterionConfig:table:questionType')"
-          v-if="form.Type !== 'group' && form.Type !== 'summary'"
-          prop="QuestionType"
-        >
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionType')"
+          v-if="form.Type !== 'group' && form.Type !== 'summary'" prop="QuestionType">
           <el-select v-model="form.QuestionType" clearable>
-            <el-option
-              v-for="item of CriterionDictionaryList.QuestionType"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
+            <el-option v-for="item of CriterionDictionaryList.QuestionType" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
           </el-select>
         </el-form-item>
         <!-- 是否在阅片页面显示 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:isShowInDicom')"
-          prop="IsShowInDicom"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:isShowInDicom')" prop="IsShowInDicom" :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
           <el-radio-group v-model="form.IsShowInDicom">
-            <el-radio
-              v-for="item of $d.YesOrNo"
-              :key="`YesOrNo${item.value}`"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item of $d.YesOrNo" :key="`YesOrNo${item.value}`" :label="item.value">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 注释 -->
-        <el-form-item
-          :label="$t('trials:readingUnit:qsList:title:Remark')"
-          prop="Remark"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:Remark')" prop="Remark">
           <el-input v-model="form.Remark" />
         </el-form-item>
         <!-- 序号 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:order')" 
-          prop="ShowOrder"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-input-number
-            v-model="form.ShowOrder"
-            controls-position="right"
-            :min="0"
-          />
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder" :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
         </el-form-item>
         <!-- 适用于Lugano 2014标准 -->
         <!-- 问题分类 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="form.Type !== 'group' && criterionType === 2">
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')"
+          v-if="form.Type !== 'group' && criterionType === 2">
           <el-select v-model="form.QuestionClassify" clearable>
-            <el-option
-              v-for="item of $d.QuestionClassify"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.QuestionClassify" :key="item.id" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <!-- 适用于iRECST标准 -->
         <!-- 转化显示类型 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:convertType')" prop="ConvertShowType" v-if="criterionType === 3">
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:convertType')" prop="ConvertShowType"
+          v-if="criterionType === 3">
           <el-radio-group v-model="form.ConvertShowType">
-            <el-radio
-              v-for="item of $d.ConvertShowType"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio v-for="item of $d.ConvertShowType" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 私有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
+        <!-- 下拉框单选或多选 -->
+        <el-form-item v-if="form.Type === 'select'" :label="$t('trials:readingUnit:qsList:title:MultipleSelect')"
+          prop="OptionTypeEnum" :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify') }
+          ]">
+          <el-radio-group v-model="form.OptionTypeEnum">
+            <el-radio v-for="item of $d.OptionType" :key="item.id" :label="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 选项类型 -->
-        <el-form-item
-          v-if="
-            form.Type === 'select' ||
-            form.Type === 'radio' ||
-            form.Type === 'calculation'
-          "
-          :label="$t('trials:readingUnit:label:QuestionGenre')"
-          prop="QuestionGenre"
-          :rules="[{ required: form.Type !== 'calculation', message: this.$t('common:ruleMessage:select') }]"
-        >
-          <el-radio-group
-            v-model="form.QuestionGenre"
-            @change="
-              (val) => {
-                questionGenreChange(val, form)
-              }
-            "
-          >
+        <el-form-item v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation'
+        " :label="$t('trials:readingUnit:label:QuestionGenre')" prop="QuestionGenre"
+          :rules="[{ required: form.Type !== 'calculation', message: this.$t('common:ruleMessage:select') }]">
+          <el-radio-group v-model="form.QuestionGenre" @change="
+            (val) => {
+              questionGenreChange(val, form)
+            }
+          ">
             <el-radio :label="-1"> {{ this.$t('common:title:none') }} </el-radio>
-            <el-radio
-              v-for="item of $d.TableQuestionType"
-              v-show="item.value === 0 || item.value === 3"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio v-for="item of $d.TableQuestionType" v-show="item.value === 0 || item.value === 3" :key="item.id"
+              :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 选项 -->
-        <el-form-item
-          v-if="form.QuestionGenre === 0 || form.Type === 'class'"
-          :label="$t('trials:qcCfg:table:typeValue')"
-          prop="TypeValue"
-        >
-          <el-input
-            v-model="form.TypeValue"
-            :placeholder="$t('trials:qcCfg:message:typeValue')"
-            @change="typeValueChange"
-          />
+        <el-form-item v-if="form.QuestionGenre === 0 || form.Type === 'class'"
+          :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue">
+          <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')"
+            @change="typeValueChange" />
         </el-form-item>
-        
+
         <!-- 关联字典 -->
-        <el-form-item
-          v-if="form.QuestionGenre === 3"
-          :label="$t('trials:readingUnit:label:DictionaryCode')"
-          prop="DictionaryCode"
-        >
-          <el-select
-            v-model="form.DictionaryCode"
-            clearable
-            @change="
-              () => {
-                form.DefaultValue = null
-              }
-            "
-          >
-            <el-option
-              v-for="item of dicList"
-              :key="item.Id"
-              :label="item.Code"
-              :value="item.Code"
-            />
+        <el-form-item v-if="form.QuestionGenre === 3" :label="$t('trials:readingUnit:label:DictionaryCode')"
+          prop="DictionaryCode">
+          <el-select v-model="form.DictionaryCode" clearable @change="
+            () => {
+              form.DefaultValue = null
+            }
+          ">
+            <el-option v-for="item of dicList" :key="item.Id" :label="item.Code" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
         <el-form-item v-if="form.QuestionGenre === 3" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of highlightAnswers"
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
+            <el-option v-for="item of highlightAnswers" :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
         <el-form-item v-if="form.QuestionGenre === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
+            <el-option v-for="item of form.TypeValue ? form.TypeValue.split('|') : []" :key="item" :label="item"
+              :value="item" />
           </el-select>
         </el-form-item>
         <!-- 高亮标记值 -->
-        <el-form-item
-          v-if="form.Type === 'select' || form.Type === 'radio'"
-          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')"
-          prop="HighlightAnswerList"
-        >
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
+          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
-              <el-option
-                v-for="item of form.TypeValue.split('|')"
-                :key="item"
-                :label="item"
-                :value="item"
-              />
+              <el-option v-for="item of form.TypeValue.split('|')" :key="item" :label="item" :value="item" />
             </template>
             <template v-else-if="form.DictionaryCode">
-              <el-option
-                v-for="item of highlightAnswers"
-                :key="item.Id"
-                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-                :value="item.Code"
-              />
+              <el-option v-for="item of highlightAnswers" :key="item.Id"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
             </template>
           </el-select>
         </el-form-item>
         <!-- 分组标识 -->
-        <el-form-item
-          :label="$t('dictionary:template:criterionConfig:table:groupClassify')"
-          v-if="form.Type === 'group'"
-          prop="GroupClassify"
-        >
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:groupClassify')"
+          v-if="form.Type === 'group'" prop="GroupClassify">
           <el-select v-model="form.GroupClassify" clearable>
-            <el-option
-              v-for="item of groupClassifyList"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
+            <el-option v-for="item of groupClassifyList" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
           </el-select>
         </el-form-item>
         <!-- 最大长度 -->
-        <el-form-item 
-          v-if="form.Type === 'input' || form.Type === 'textarea'"
-          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
-          prop="MaxAnswerLength"
-          :rules="[
+        <el-form-item v-if="form.Type === 'input' || form.Type === 'textarea'"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')" prop="MaxAnswerLength" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
         </el-form-item>
         <!-- 最大行数 -->
-        <el-form-item 
-          v-if="form.Type === 'table' || form.Type === 'basicTable'" 
-          :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')"
-          prop="MaxQuestionCount"
-          :rules="[
+        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'"
+          :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')" prop="MaxQuestionCount" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-          ]"
-        >
-          <el-input-number
-            v-model="form.MaxQuestionCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+          ]">
+          <el-input-number v-model="form.MaxQuestionCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
-        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:orderMark')">
+        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'"
+          :label="$t('trials:readingUnit:qsList:title:orderMark')">
           <el-input v-model="form.OrderMark" />
         </el-form-item>
-        
+
         <!-- 数值类型 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:valueType')"
-          prop="ValueType"
-          :rules="[{ required: true, message: this.$t('common:ruleMessage:select') }]"
-        >
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:valueType')" prop="ValueType"
+          :rules="[{ required: true, message: this.$t('common:ruleMessage:select') }]">
           <el-radio-group v-model="form.ValueType">
-            <el-radio
-              v-for="item of $d.ValueType"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio v-for="item of $d.ValueType" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 单位 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:unit')"
-          prop="Unit"
-          :rules="[
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:unit')" prop="Unit" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-radio-group v-model="form.Unit">
-            <el-radio
-              v-for="item of $d.ValueUnit"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio v-for="item of $d.ValueUnit" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 表格类型标识 -->
-        <el-form-item
-          v-if="form.Type === 'table'"
-          :label="$t('dictionary:template:criterionConfig:table:tableType')"
-          prop="LesionType"
-        >
+        <el-form-item v-if="form.Type === 'table'" :label="$t('dictionary:template:criterionConfig:table:tableType')"
+          prop="LesionType">
           <el-select v-model="form.LesionType" clearable>
-            <el-option
-              v-for="item of lesionTypes"
-              :key="item.Code"
-              :value="parseInt(item.Code)"
-              :label="$fd('LesionType', parseInt(item.Code))"
-            />
+            <el-option v-for="item of lesionTypes" :key="item.Code" :value="parseInt(item.Code)"
+              :label="$fd('LesionType', parseInt(item.Code))" />
           </el-select>
         </el-form-item>
         <!-- 表格类型标识 -->
-        <el-form-item
-          v-if="form.Type === 'basicTable'"
-          :label="$t('dictionary:template:criterionConfig:table:tableType')"
-          prop="LesionType"
-        >
+        <el-form-item v-if="form.Type === 'basicTable'"
+          :label="$t('dictionary:template:criterionConfig:table:tableType')" prop="LesionType">
           <el-select v-model="form.LesionType" clearable>
-            <el-option
-              v-for="item of lesionTypeList"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
+            <el-option v-for="item of lesionTypeList" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
           </el-select>
         </el-form-item>
         <!-- 关联字典 -->
-        <el-form-item
-          v-if="form.Type === 'table' || form.Type === 'basicTable'"
-          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
-        >
-          <el-select
-            v-model="form.DictionaryCode"
-            clearable
-            @change="
-              () => {
-                form.DefaultValue = null
-              }
-            "
-          >
-            <el-option
-              v-for="item of dicList"
-              :key="item.Id"
-              :label="item.Code"
-              :value="item.Code"
-            />
+        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')">
+          <el-select v-model="form.DictionaryCode" clearable @change="
+            () => {
+              form.DefaultValue = null
+            }
+          ">
+            <el-option v-for="item of dicList" :key="item.Id" :label="item.Code" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 最大上传个数 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:imageCount')"
-        >
-          <el-input-number
-            v-model="form.ImageCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')">
+          <el-input-number v-model="form.ImageCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
         <!-- 文件类型 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:FileType')"
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
-          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
-        >
-          <el-checkbox-group
-            v-model="form.FileType"
-            @change="(v) => {
-              if (v && v.includes('-1')) {
-                form.FileType = ['-1']
-              }
-            }"
-          >
-            <el-checkbox
-              v-for="item of $d.fileType"
-              :key="`fileType${item.value}`"
-              :value="item.value + ''"
-              :label="item.value"
-              :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
-            >
+          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }]">
+          <el-checkbox-group v-model="form.FileType" @change="(v) => {
+            if (v && v.includes('-1')) {
+              form.FileType = ['-1']
+            }
+          }">
+            <el-checkbox v-for="item of $d.fileType" :key="`fileType${item.value}`" :value="item.value + ''"
+              :label="item.value" :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'">
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <!-- 分类数据来源 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
-          prop="ClassifyQuestionId"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')" prop="ClassifyQuestionId">
           <el-select v-model="form.ClassifyQuestionId" clearable>
-            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName"
-                      :value="item.Id"/>
+            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName" :value="item.Id" />
           </el-select>
         </el-form-item>
         <!-- 分类算法 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
-          prop="ClassifyAlgorithms"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')" prop="ClassifyAlgorithms">
           <div>
-            <el-table
-              ref="CalculateTable"
-              :data="ClassifyAlgorithmsList"
-              style="margin: 10px;width: 100%"
-              size="small"
-            >
+            <el-table ref="CalculateTable" :data="ClassifyAlgorithmsList" style="margin: 10px;width: 100%" size="small">
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:label')"
-                show-overflow-tooltip
-                min-width="70"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:label')" show-overflow-tooltip min-width="70">
                 <template slot-scope="scope">
                   {{ scope.row.label }}
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:gt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:gt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.gt"></el-input-number>
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:lt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:lt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.lt"></el-input-number>
                 </template>
@@ -747,21 +446,11 @@
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
-        <el-button
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="close"
-        >
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="close">
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
-        <el-button
-          size="small"
-          type="primary"
-          :loading="btnLoading"
-          @click="save"
-        >
+        <el-button size="small" type="primary" :loading="btnLoading" @click="save">
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -863,6 +552,7 @@ export default {
         FileType: [],
         ClassifyQuestionId: null,
         ClassifyAlgorithms: null,
+        OptionTypeEnum: 0
       },
       rules: {
         Type: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
@@ -941,7 +631,7 @@ export default {
   mounted() {
     this.initForm()
     this.getCalculateQuestions('number')
-    
+
   },
   methods: {
     typeValueChange(v) {
@@ -964,7 +654,7 @@ export default {
       }).then(res => {
         this.dicList = res.Result
       })
-    }, 
+    },
     getCalculateQuestions(type) {
       getSystemCalculateQuestions({
         systemCriterionId: this.criterionId,
@@ -1010,7 +700,7 @@ export default {
           if (this.data.hasOwnProperty(k)) {
             if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
               this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
-            } else if(k === 'FileType'){
+            } else if (k === 'FileType') {
               this.form[k] = this.data[k].split(',')
             } else {
               this.form[k] = this.data[k]
@@ -1033,10 +723,10 @@ export default {
               // this.parentTriggerValOptions =
               //   this.$d[this.parentOptions[index].DictionaryCode]
               let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId, DictionaryCode: dicCode })
+
+              this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
 
             } else {
@@ -1059,9 +749,9 @@ export default {
               // this.reParentTriggerValOptions =
               //   this.$d[this.parentOptions[index].DictionaryCode]
               let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId, DictionaryCode: dicCode })
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -1164,7 +854,7 @@ export default {
       if (val !== 'select' && val !== 'radio') {
         data.IsJudgeQuestion = false
       }
-      
+
       if (val === 'number' || val === 'calculation') {
         data.Unit = 0
       } else {
@@ -1192,6 +882,7 @@ export default {
       data.FileType = []
       data.ClassifyQuestionId = null
       data.ClassifyAlgorithms = null
+      data.OptionTypeEnum = 0
 
     },
     isShowQuestionChange(val, form) {
@@ -1263,11 +954,11 @@ export default {
             // this.reParentTriggerValOptions =
             //   this.$d[this.parentOptions[index].DictionaryCode]
             let dicCode = this.parentOptions[index].DictionaryCode
-            let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
-              
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId, DictionaryCode: dicCode })
+
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
+            })
           } else {
             var options = []
             this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1310,5 +1001,4 @@ export default {
   },
 }
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index 0e770227..61dd9686 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -1,155 +1,86 @@
 <template>
-  <el-form
-    ref="tableQsForm"
-    v-loading="loading"
-    :model="form"
-    size="small"
-    :disabled="type === 'look'"
-    :rules="rules"
-    label-width="130px"
-  >
+  <el-form ref="tableQsForm" v-loading="loading" :model="form" size="small" :disabled="type === 'look'" :rules="rules"
+    label-width="130px">
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">
         <!-- 类型 -->
         <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
-          <el-select
-            v-model="form.Type"
-            @change="((val)=>{qsTypeChange(val, form)})"
-          >
-            <el-option
-              v-for="item of $d.Criterion_Question_Type"
+          <el-select v-model="form.Type" @change="((val) => { qsTypeChange(val, form) })">
+            <el-option v-for="item of $d.Criterion_Question_Type"
               v-show="item.value !== 'class' && item.value !== 'group' && item.value !== 'table' && item.value !== 'basicTable'"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
+              :key="item.value" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 问题名称 -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          prop="QuestionName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
+          prop="QuestionName" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
-          <el-input
-            v-model="form.QuestionName"
-          />
+          ]">
+          <el-input v-model="form.QuestionName" />
         </el-form-item>
         <!-- 问题名称（EN） -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          prop="QuestionEnName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
+          prop="QuestionEnName" :rules="[
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
-          <el-input
-            v-model="form.QuestionEnName"
-          />
+          ]">
+          <el-input v-model="form.QuestionEnName" />
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
         <!-- 公有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:publicProperties') }}</el-divider>
         <!-- 是否显示 -->
-        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion">
-          <el-radio-group
-            v-model="form.ShowQuestion"
-            @change="((val)=>{isShowQuestionChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.ShowQuestion"
-              :key="`ShowQuestion${item.value}`"
-              :label="item.value"
-            >
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')"
+          prop="ShowQuestion">
+          <el-radio-group v-model="form.ShowQuestion" @change="((val) => { isShowQuestionChange(val, form) })">
+            <el-radio v-for="item of $d.ShowQuestion" :key="`ShowQuestion${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 显示时依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.ShowQuestion===1"
-          :label="$t('trials:readingUnit:qsList:title:parentId')"
-          prop="ParentId"
-        >
-          <el-select
-            v-model="form.ParentId"
-            clearable
-            @change="((val)=>{parentQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`ParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentId')" prop="ParentId">
+          <el-select v-model="form.ParentId" clearable @change="((val) => { parentQuestionChange(val, form) })">
+            <el-option v-for="item of parentOptions" :key="`ParentId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 显示时依赖父问题触发值 -->
-        <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')"  prop="ParentTriggerValueList">
+        <el-form-item v-if="form.ParentId && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-            <el-option
-              v-for="item of parentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
+            <el-option v-for="item of parentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="String(item.value)" />
           </el-select>
         </el-form-item>
         <!-- 是否必填 -->
-        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
-          <el-radio-group
-            v-model="form.IsRequired"
-            :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-            @change="((val)=>{isRequiredChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.QuestionRequired"
-              :key="`QuestionRequired${item.value}`"
-              :label="item.value"
-            >
+        <el-form-item
+          v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'"
+          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
+          <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
+            @change="((val) => { isRequiredChange(val, form) })">
+            <el-radio v-for="item of $d.QuestionRequired" :key="`QuestionRequired${item.value}`" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 必填依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-          prop="RelevanceId"
-        >
-          <el-select
-            v-model="form.RelevanceId"
-            clearable
-            @change="((val)=>{relevanceQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`RelevanceId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')" prop="RelevanceId">
+          <el-select v-model="form.RelevanceId" clearable @change="((val) => { relevanceQuestionChange(val, form) })">
+            <el-option v-for="item of parentOptions" :key="`RelevanceId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 必填触发值 -->
-        <el-form-item
-          v-if="form.RelevanceId && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-          prop="RelevanceValueList"
-        >
+        <el-form-item v-if="form.RelevanceId && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')" prop="RelevanceValueList">
           <el-select v-model="form.RelevanceValueList" clearable multiple>
-            <el-option
-              v-for="item of reParentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
+            <el-option v-for="item of reParentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="String(item.value)" />
           </el-select>
         </el-form-item>
         <!-- 导出标识 -->
@@ -174,175 +105,106 @@
           </el-radio-group>
         </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
-          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'">
           <el-select v-model="form.ExportResult" multiple>
-            <el-option
-              v-for="item in CriterionDictionaryList.ExportResult"
-              :key="`ExportResult${item.value}`"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            >
+            <el-option v-for="item in CriterionDictionaryList.ExportResult" :key="`ExportResult${item.value}`"
+              :value="parseInt(item.Code)" :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value">
             </el-option>
           </el-select>
         </el-form-item>
         <!-- 限制编辑 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
-          v-if="form.Type !== 'summary'"
-          prop="LimitEdit"
-          :rules="[
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="form.Type !== 'summary'"
+          prop="LimitEdit" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-radio-group v-model="form.LimitEdit">
             <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 问题标识 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.Type !== 'summary'"
-          :label="$t('dictionary:template:criterionConfig:table:questionMark')"
-          prop="QuestionMark"
-        >
-          <el-select
-            v-model="form.QuestionMark"
-            clearable
-          >
-            <el-option
-              v-for="item of CriterionDictionaryList.QuestionMark"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'summary'"
+          :label="$t('dictionary:template:criterionConfig:table:questionMark')" prop="QuestionMark">
+          <el-select v-model="form.QuestionMark" clearable>
+            <el-option v-for="item of CriterionDictionaryList.QuestionMark" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
           </el-select>
         </el-form-item>
         <!-- 注释 -->
-        <el-form-item
-          :label="$t('trials:readingUnit:qsList:title:Remark')"
-          prop="Remark"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:Remark')" prop="Remark">
           <el-input v-model="form.Remark" />
         </el-form-item>
         <!-- 序号 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:order')" 
-          prop="ShowOrder"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-input-number
-            v-model="form.ShowOrder"
-            controls-position="right"
-            :min="0"
-          />
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder" :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]">
+          <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
         </el-form-item>
         <!-- 重复出现最大次数 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
-          <el-input-number
-            v-model="form.MaxRowCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')"
+          v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+          <el-input-number v-model="form.MaxRowCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
         <!-- 问题分类 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="criterionType === 2">
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')"
+          v-if="criterionType === 2">
           <el-select v-model="form.QuestionClassify" clearable>
-            <el-option
-              v-for="item of $d.QuestionClassify"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.QuestionClassify" :key="item.id" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <!-- 私有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
+        <!-- 下拉框单选或多选 -->
+        <el-form-item v-if="form.Type === 'select'" :label="$t('trials:readingUnit:qsList:title:MultipleSelect')"
+          prop="OptionTypeEnum" :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify') }
+          ]">
+          <el-radio-group v-model="form.OptionTypeEnum">
+            <el-radio v-for="item of $d.OptionType" :key="item.id" :label="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 选项类型 -->
-        <el-form-item
-          v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
-          :label="$t('trials:readingUnit:label:QuestionGenre')"
-          prop="TableQuestionType"
-          :rules="[
-            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.TableQuestionType"
-            @change="((val)=>{tableQuestionTypeChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.TableQuestionType"
-              :key="item.id"
-              :label="item.value"
-              :disabled="(form.Type === 'radio' && (item.value===1 || item.value===2)) || (form.Type === 'input' && (item.value===0 || item.value===3))"
-            >
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
+          :label="$t('trials:readingUnit:label:QuestionGenre')" prop="TableQuestionType" :rules="[
+            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select') }
+          ]">
+          <el-radio-group v-model="form.TableQuestionType" @change="((val) => { tableQuestionTypeChange(val, form) })">
+            <el-radio v-for="item of $d.TableQuestionType" :key="item.id" :label="item.value"
+              :disabled="(form.Type === 'radio' && (item.value === 1 || item.value === 2)) || (form.Type === 'input' && (item.value === 0 || item.value === 3))">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 选项 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 0  || form.Type === 'class'"
-          :label="$t('trials:qcCfg:table:typeValue')"
-          prop="TypeValue"
-        >
-          <el-input
-            v-model="form.TypeValue"
-            :placeholder="$t('trials:qcCfg:message:typeValue')"
-            @change="typeValueChange"
-          />
+        <el-form-item v-if="form.TableQuestionType === 0 || form.Type === 'class'"
+          :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue">
+          <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')"
+            @change="typeValueChange" />
         </el-form-item>
         <!-- 关联问题 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 2"
-          :label="$t('dictionary:template:criterionConfig:table:dependParentId')"
-          prop="DependParentId"
-        >
-          <el-select
-            v-model="form.DependParentId"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`DependParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.TableQuestionType === 2"
+          :label="$t('dictionary:template:criterionConfig:table:dependParentId')" prop="DependParentId">
+          <el-select v-model="form.DependParentId">
+            <el-option v-for="item of parentOptions" :key="`DependParentId${item.QuestionId}`"
+              :label="item.QuestionName" :value="item.QuestionId" />
           </el-select>
         </el-form-item>
         <!-- 关联字段 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 1 || !!form.DependParentId"
-          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')"
-          prop="DataTableColumn"
-        >
+        <el-form-item v-if="form.TableQuestionType === 1 || !!form.DependParentId"
+          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')" prop="DataTableColumn">
           <el-select v-model="form.DataTableColumn">
-            <el-option
-              v-for="item of CriterionDictionaryList.OrganColumn"
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
+            <el-option v-for="item of CriterionDictionaryList.OrganColumn" :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 关联字典 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
-          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
-          prop="DictionaryCode"
-          :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
-        >
+        <el-form-item v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')" prop="DictionaryCode"
+          :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]">
           <el-select v-model="form.DictionaryCode">
-            <el-option
-              v-for="item of dicList"
-              :key="item.Id"
-              :label="item.Code"
-              :value="item.Code"
-            />
+            <el-option v-for="item of dicList" :key="item.Id" :label="item.Code" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
@@ -354,35 +216,23 @@
               :label="item.label"
               :value="item.value.toString()"
             /> -->
-            <el-option
-              v-for="item of highlightAnswers"
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
+            <el-option v-for="item of highlightAnswers" :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
         <el-form-item v-if="form.TableQuestionType === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
+            <el-option v-for="item of form.TypeValue ? form.TypeValue.split('|') : []" :key="item" :label="item"
+              :value="item" />
           </el-select>
         </el-form-item>
         <!-- 高亮标记值 -->
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
+          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
-              <el-option
-                v-for="item of form.TypeValue.split('|')"
-                :key="item"
-                :label="item"
-                :value="item"
-              />
+              <el-option v-for="item of form.TypeValue.split('|')" :key="item" :label="item" :value="item" />
             </template>
             <template v-else-if="form.DictionaryCode">
               <!-- <el-option
@@ -391,24 +241,16 @@
                 :label="item.label"
                 :value="item.value.toString()"
               /> -->
-              <el-option
-                v-for="item of highlightAnswers"
-                :key="item.Id"
-                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-                :value="item.Code"
-              />
+              <el-option v-for="item of highlightAnswers" :key="item.Id"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
             </template>
           </el-select>
         </el-form-item>
         <!-- 最大长度 -->
-        <el-form-item 
-          v-if="form.Type === 'input' || form.Type === 'textarea'"
-          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
-          prop="MaxAnswerLength"
-          :rules="[
+        <el-form-item v-if="form.Type === 'input' || form.Type === 'textarea'"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')" prop="MaxAnswerLength" :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-          ]"
-        >
+          ]">
           <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
         </el-form-item>
         <!-- 是否复制前值 -->
@@ -425,138 +267,75 @@
           />
         </el-form-item> -->
         <!-- 数值类型 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:valueType')"
-          prop="ValueType"
-          :rules="[
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:valueType')" prop="ValueType" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select') }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ValueType"
-          >
-            <el-radio
-              v-for="item of $d.ValueType"
-              :key="item.id"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.ValueType">
+            <el-radio v-for="item of $d.ValueType" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 单位 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:unit')"
-          prop="Unit"
-          :rules="[
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:unit')" prop="Unit" :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.Unit"
-          >
-            <el-radio
-              v-for="item of $d.ValueUnit"
-              :key="item.id"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.Unit">
+            <el-radio v-for="item of $d.ValueUnit" :key="item.id" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 最大上传个数 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:imageCount')"
-          prop="ImageCount"
-        >
-          <el-input-number
-            v-model="form.ImageCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')"
+          prop="ImageCount">
+          <el-input-number v-model="form.ImageCount" controls-position="right" :min="0" :max="10" />
         </el-form-item>
         <!-- 文件类型 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:FileType')"
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
-          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
-        >
-          <el-checkbox-group
-            v-model="form.FileType"
-            @change="(v) => {
-              if (v && v.includes('-1')) {
-                form.FileType = ['-1']
-              }
-            }"
-          >
-            <el-checkbox
-              v-for="item of $d.fileType"
-              :key="`fileType${item.value}`"
-              :value="item.value + ''"
-              :label="item.value"
-              :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
-            >
+          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }]">
+          <el-checkbox-group v-model="form.FileType" @change="(v) => {
+            if (v && v.includes('-1')) {
+              form.FileType = ['-1']
+            }
+          }">
+            <el-checkbox v-for="item of $d.fileType" :key="`fileType${item.value}`" :value="item.value + ''"
+              :label="item.value" :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'">
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <!-- 分类 -->
         <!-- 分类数据来源 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
-          prop="ClassifyTableQuestionId"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')" prop="ClassifyTableQuestionId">
           <el-select v-model="form.ClassifyTableQuestionId" clearable>
-            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName"
-                      :value="item.Id"/>
+            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName" :value="item.Id" />
           </el-select>
         </el-form-item>
         <!-- 分类算法 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
-          prop="ClassifyAlgorithms"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')" prop="ClassifyAlgorithms">
           <div>
-            <el-table
-              ref="CalculateTable"
-              :data="ClassifyAlgorithmsList"
-              style="margin: 10px;width: 100%"
-              size="small"
-            >
+            <el-table ref="CalculateTable" :data="ClassifyAlgorithmsList" style="margin: 10px;width: 100%" size="small">
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:label')"
-                show-overflow-tooltip
-                min-width="70"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:label')" show-overflow-tooltip min-width="70">
                 <template slot-scope="scope">
                   {{ scope.row.label }}
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:gt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:gt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.gt"></el-input-number>
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:lt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:lt')" show-overflow-tooltip min-width="128">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.lt"></el-input-number>
                 </template>
@@ -569,11 +348,7 @@
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item>
         <!-- 取消 -->
-        <el-button
-          size="small"
-          type="primary"
-          @click="close"
-        >
+        <el-button size="small" type="primary" @click="close">
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
@@ -666,7 +441,8 @@ export default {
         ClassifyAlgorithms: null,
         // ExportIdentification: 0,
         ExportResult: [],
-        DefaultValue:null
+        DefaultValue: null,
+        OptionTypeEnum: 0
         // IsEnable: true
       },
       rules: {
@@ -677,8 +453,8 @@ export default {
         //   { max: 300, message: '最大长度为 300' }],
 
         TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { validator: validateTypeVal, trigger: 'blur' },
-          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
+        { validator: validateTypeVal, trigger: 'blur' },
+        { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
         ShowQuestion: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
@@ -776,7 +552,7 @@ export default {
           if (this.data.hasOwnProperty(k)) {
             if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
               this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
-            } else if(k === 'FileType'){
+            } else if (k === 'FileType') {
               this.form[k] = this.data[k].split(',')
             } else {
               this.form[k] = this.data[k]
@@ -792,10 +568,10 @@ export default {
             if (this.parentOptions[index].QuestionGenre === 3) {
               // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
               let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+
+              this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -814,9 +590,9 @@ export default {
             if (this.parentOptions[i].QuestionGenre === 3) {
               // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
               let dicCode = this.parentOptions[i].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -903,12 +679,12 @@ export default {
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
             // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
-             let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
+            let dicCode = this.parentOptions[index].DictionaryCode
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+
+            this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
+            })
           } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -929,10 +705,10 @@ export default {
           if (this.parentOptions[index].QuestionGenre === 3) {
             // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
             let dicCode = this.parentOptions[index].DictionaryCode
-            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-            
-            this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
             })
           } else {
             const options = []
@@ -993,6 +769,7 @@ export default {
       // form.ExportIdentification = 0
       form.ExportResult = []
       form.DefaultValue = null
+      form.OptionTypeEnum = 0
     },
     close() {
       this.$emit('close')
@@ -1001,5 +778,4 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 10b7cf93..1dbb04dc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -37,7 +37,8 @@
                       <div class="add-icon" @click.prevent="downloadTpl(item.LesionType)">
                         <i class="el-icon-download" />
                       </div>
-                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
+                      <div class="add-icon" style="margin: 0 5px;"
+                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
                         <i class="el-icon-upload2" />
                       </div>
                       <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
@@ -64,7 +65,11 @@
                           {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
                         </span>
                         <span v-else-if="q.DictionaryCode">
-                          {{ `${$fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}` }}
+                          {{`${scope.row[q.Id] instanceof Array ? scope.row[q.Id].map(item => $fd(q.DictionaryCode,
+                            parseInt(item))).join(',') : $fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}`}}
+                        </span>
+                        <span v-else-if="q.OptionTypeEnum === 1">
+                          {{ `${scope.row[q.Id] instanceof Array ? scope.row[q.Id].join(',') : scope.row[q.Id]}` }}
                         </span>
                         <span v-else>
                           {{ `${scope.row[q.Id]}` }}
@@ -169,7 +174,8 @@
       <!-- 导入 -->
       <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
         :title="upload.title" width="500px">
-        <UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" :TableName="upload.TableName" @close="uploadDlgClose" />
+        <UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" :TableName="upload.TableName"
+          @close="uploadDlgClose" />
       </el-dialog>
     </div>
   </div>
@@ -319,7 +325,7 @@ export default {
       const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
       questions.forEach(item => {
         if (type.includes(item.Type)) {
-          const answer = item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
+          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
           this.$set(this.questionForm, item.Id, answer)
         }
         if (item.Childrens.length > 0) {
@@ -604,7 +610,7 @@ export default {
         for (const k in this.qsForm) {
           if (reg.test(k)) {
             if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
-              answers.push({ tableQuestionId: k, answer: this.qsForm[k] })
+              answers.push({ tableQuestionId: k, answer: Array.isArray(this.qsForm[k]) ? JSON.stringify(this.qsForm[k]) : this.qsForm[k] })
             }
           }
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
index 8e2a32b6..b349a9ff 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
@@ -23,11 +23,9 @@
           :autosize="{ minRows: 2, maxRows: 4 }" maxlength="500" :disabled="readingTaskState >= 2"
           @change="((val) => { formItemChange(val, question) })" />
         <!-- 下拉框 -->
-        <el-select v-else-if="question.Type === 'select' || question.type === 'multipleSelect'"
-          v-model="questionForm[question.Id]"
+        <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 :multiple="question.type === 'multipleSelect'"
-          @change="((val) => { formItemChange(val, question) })">
+          clearable :multiple="question.OptionTypeEnum === 1" @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]" />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index 571830b6..da4b4fb5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -6,47 +6,44 @@
     >
       {{ question.GroupName }}
     </div> -->
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ language === 'en' ? question.GroupEnName : question.GroupName }}
       </h4>
     </div>
     <template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" />
     <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']},
+        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' : '']"
-      >
+        :class="[question.Type === 'group' ? 'mb' : (question.Type === 'upload' || question.QuestionName.length > 15) ? 'uploadWrapper' : '']">
         <template v-if="question.QuestionType === 60 || question.QuestionType === 61">
           <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
 
-            <el-input
-              v-if="question.Type==='calculation'"
-              v-model="questionForm[question.Id]"
-              disabled
-              style="width: 130px;"
-            >
+            <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled
+              style="width: 130px;">
               <template v-if="question.Unit" slot="append">
                 {{ $fd('ValueUnit', parseInt(question.Unit)) }}
               </template>
             </el-input>
             <!-- 测量 -->
-            <el-button v-if="!questionForm[question.Id] && readingTaskState!== 2" size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
+            <el-button v-if="!questionForm[question.Id] && readingTaskState !== 2" size="mini" type="text"
+              @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
             <!-- 清除标记 -->
-            <el-button v-if="questionForm[question.Id]&& readingTaskState!== 2" size="mini" type="text" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
+            <el-button v-if="questionForm[question.Id] && readingTaskState !== 2" size="mini" type="text"
+              @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
             <!-- 定位 -->
-            <el-button v-if="questionForm[question.Id]" size="mini" type="text" @click="locateAnnotation(question)">{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
+            <el-button v-if="questionForm[question.Id]" size="mini" type="text" @click="locateAnnotation(question)">{{
+              $t('trials:lugano:button:locateAnnotation') }}</el-button>
             <!-- 保存 -->
-            <el-button v-if="readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" @click="saveAnnotation(question)">
+            <el-button v-if="readingTaskState !== 2 && question.SaveEnum === 1" size="mini" type="text"
+              @click="saveAnnotation(question)">
               <!-- 未保存 -->
               <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                 <i class="el-icon-warning" style="color:red" />
@@ -56,12 +53,9 @@
           </div>
         </template>
 
-        <template v-else-if="question.QuestionType === 48 || question.QuestionType === 51 || question.QuestionType === 52 || question.QuestionType === 53">
-          <el-input
-            v-if="question.Type==='calculation'"
-            v-model="questionForm[question.Id]"
-            disabled
-          >
+        <template
+          v-else-if="question.QuestionType === 48 || question.QuestionType === 51 || question.QuestionType === 52 || question.QuestionType === 53">
+          <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled>
             <template v-if="question.Unit" slot="append">
               {{ $fd('ValueUnit', parseInt(question.Unit)) }}
             </template>
@@ -69,144 +63,79 @@
         </template>
 
         <!-- 输入框 -->
-        <el-input
-          v-else-if="question.Type==='input'"
-          v-model="questionForm[question.Id]"
-          :disabled="readingTaskState >= 2 || isFirstChangeTask"
-          @change="((val)=>{formItemChange(val, question)})"
-        />
+        <el-input v-else-if="question.Type === 'input'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || isFirstChangeTask" @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 || isFirstChangeTask"
-          @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 || isFirstChangeTask"
+          @change="((val) => { formItemChange(val, question) })" />
         <!-- 下拉框 -->
-        <el-select
-          v-else-if="question.Type==='select'"
-          v-model="questionForm[question.Id]"
+        <el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
           :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode) || isFirstChangeTask || question.QuestionType === 50 || question.QuestionType === 55"
-          clearable
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+          clearable :multiple="question.OptionTypeEnum === 1" @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]"
-            />
+            <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]" />
           </template>
           <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 47 && question.IsBaseLineTask">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              v-show="item.value === 1 ||item.value === 2 || item.value === 5 "
-              :key="item.id"
-              :value="String(item.value)"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[question.DictionaryCode]"
+              v-show="item.value === 1 || item.value === 2 || item.value === 5" :key="item.id"
+              :value="String(item.value)" :label="item.label" />
           </template>
-          <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 47 && !question.IsBaseLineTask">
+          <template
+            v-else-if="question.QuestionGenre === 3 && question.QuestionType === 47 && !question.IsBaseLineTask">
             <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-            >
-              <el-option
-                v-for="item of $d[question.DictionaryCode]"
-                v-show="item.value === 1 ||item.value === 3|| item.value === 4 || item.value === 5"
-                :key="item.id"
-                :value="String(item.value)"
-                :label="item.label"
-              />
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
+              <el-option v-for="item of $d[question.DictionaryCode]"
+                v-show="item.value === 1 || item.value === 3 || item.value === 4 || item.value === 5" :key="item.id"
+                :value="String(item.value)" :label="item.label" />
             </el-option-group>
           </template>
           <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 49 && question.IsBaseLineTask">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              v-show="item.value === 1 ||item.value === 5 || item.value === 6 "
-              :key="item.id"
-              :value="String(item.value)"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[question.DictionaryCode]"
+              v-show="item.value === 1 || item.value === 5 || item.value === 6" :key="item.id"
+              :value="String(item.value)" :label="item.label" />
           </template>
-          <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 49 && !question.IsBaseLineTask">
+          <template
+            v-else-if="question.QuestionGenre === 3 && question.QuestionType === 49 && !question.IsBaseLineTask">
             <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-            >
-              <el-option
-                v-for="item of $d[question.DictionaryCode]"
-                v-show="item.value === 1 ||item.value === 2 || item.value === 3 || item.value === 4 || item.value === 5"
-                :key="item.id"
-                :value="String(item.value)"
-                :label="item.label"
-              />
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
+              <el-option v-for="item of $d[question.DictionaryCode]"
+                v-show="item.value === 1 || item.value === 2 || item.value === 3 || item.value === 4 || item.value === 5"
+                :key="item.id" :value="String(item.value)" :label="item.label" />
             </el-option-group>
           </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"
-            />
+            <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
+            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"
-            />
+            <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 || isFirstChangeTask"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+        <el-radio-group v-else-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || isFirstChangeTask" @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)"
-            >
+            <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"
-            >
+            <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 || isFirstChangeTask"
-        >
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
+        <el-checkbox-group v-else-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || isFirstChangeTask">
+          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
             {{ val }}
           </el-checkbox>
         </el-checkbox-group>
@@ -217,80 +146,41 @@
           :disabled="readingTaskState >= 2 || isFirstChangeTask"
           :precision="2"
         /> -->
-        <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 || isFirstChangeTask"
-          />
-          <el-input-number
-            v-else-if="question.ValueType === 3"
-            v-model="questionForm[question.Id]"
-            :disabled="readingTaskState >= 2 || isFirstChangeTask"
-          />
-          <el-input-number
-            v-else-if="question.ValueType === 1 || question.ValueType === 2"
-            v-model="questionForm[question.Id]"
-            :precision="digitPlaces"
-            :disabled="readingTaskState >= 2 || isFirstChangeTask"
-          />
+        <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 || isFirstChangeTask" />
+          <el-input-number v-else-if="question.ValueType === 3" v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2 || isFirstChangeTask" />
+          <el-input-number v-else-if="question.ValueType === 1 || question.ValueType === 2"
+            v-model="questionForm[question.Id]" :precision="digitPlaces"
+            :disabled="readingTaskState >= 2 || isFirstChangeTask" />
         </template>
-        <el-input
-          v-else-if="question.Type==='calculation'"
-          v-model="questionForm[question.Id]"
-          disabled
-        >
+        <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 || isFirstChangeTask"
-        >
+        <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 || isFirstChangeTask">
           <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=""
-            >
+            <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)"
-              >
+              <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)"
-              >
+              <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-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>
@@ -300,17 +190,9 @@
       </el-form-item>
     </template>
 
-    <QuestionItem
-      v-for="(item) in question.Childrens"
-      :key="item.Id"
-      :question="item"
-      :reading-task-state="readingTaskState"
-      :is-first-change-task="isFirstChangeTask"
-      :question-form="questionForm"
-      :visit-task-id="visitTaskId"
-      @setFormItemData="setFormItemData"
-      @resetFormItemData="resetFormItemData"
-    />
+    <QuestionItem v-for="(item) in question.Childrens" :key="item.Id" :question="item"
+      :reading-task-state="readingTaskState" :is-first-change-task="isFirstChangeTask" :question-form="questionForm"
+      :visit-task-id="visitTaskId" @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
   </div>
 </template>
 <script>
@@ -423,7 +305,7 @@ export default {
         .then(() => {
           DicomEvent.$emit('removeAnnotation', question)
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     locateAnnotation(question) {
       DicomEvent.$emit('locateAnnotation', question)
@@ -479,29 +361,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.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;
-  }
+
+::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/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
index ed44a6ba..8254172c 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
@@ -1,197 +1,104 @@
 <template>
   <div>
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ 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']},
+        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' : '']"
-      >
+        :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-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-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]"
+        <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)})"
-        >
+          clearable :multiple="question.OptionTypeEnum === 1" @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]"
-            />
+            <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"
-            />
+            <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
+            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"
-            />
+            <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)})"
-        >
+        <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)"
-            >
+            <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"
-            >
+            <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"
-          >
+        <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 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
-        >
+        <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"
-        >
+        <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=""
-            >
+            <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)"
-              >
+              <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)"
-              >
+              <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-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>
@@ -201,16 +108,9 @@
       </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"
-      @resetFormItemData="resetFormItemData"
-      @setFormItemData="setFormItemData"
-    />
+    <question-form-item v-for="(item) in question.Childrens" :key="item.Id" :question="item"
+      :question-form="questionForm" :reading-task-state="readingTaskState" :visitTaskId="visitTaskId"
+      @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData" />
   </div>
 </template>
 <script>
@@ -293,33 +193,40 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.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{
+
+::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{
+
+::v-deep .el-select.is-disabled .el-input__inner {
   background-color: #646464a1;
 }
+
 // ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
 //   background-color: #428bca;
 //   border-color: #428bca;
-// }
-</style>
+// }</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
index 88b8226d..20f42e9c 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -283,7 +283,7 @@ export default {
     getOuterFormData(childrens, formData = {}) {
       childrens.forEach(item => {
         if (item.Type !== 'group' && item.Type !== 'summary') {
-          formData[item.Id] = item.Answer || ''
+          formData[item.Id] = item.Answer ? item.OptionTypeEnum === 1 ? JSON.parse(item.Answer) : item.Answer : ''
           if (item.QuestionType === 44) {
             // 影像质量评估
             this.imageQualityId = item.Id
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 10d132ef..9c569c90 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -27,6 +27,10 @@
             <span v-else-if="item.Type === 'number'">
               {{ scope.row[item.Id] ? parseFloat(scope.row[item.Id]).toFixed(digitPlaces) : null }}
             </span>
+            <span v-else-if="item.Type === 'select' && item.OptionTypeEnum === 1">
+              {{ scope.row[item.Id] && Array.isArray(scope.row[item.Id]) ?
+                scope.row[item.Id].join(',') : scope.row[item.Id] }}
+            </span>
             <span v-else>
               {{ scope.row[item.Id] }}
             </span>
@@ -92,6 +96,7 @@
           :autosize="{ minRows: 2, maxRows: 4 }" :disabled="readingTaskState === 2" />
         <!-- 下拉框 -->
         <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
+          :multiple="question.OptionTypeEnum === 1"
           :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode || readingTaskState === 2"
           @change="((val) => { formItemChange(val, question) })">
           <template v-if="question.TableQuestionType === 1">
@@ -636,7 +641,7 @@ export default {
         for (const k in this.QuestionsForm) {
           if (reg.test(k)) {
             if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
-              answers.push({ tableQuestionId: k, answer: this.QuestionsForm[k] })
+              answers.push({ tableQuestionId: k, answer: Array.isArray(this.QuestionsForm[k]) ? JSON.stringify(this.QuestionsForm[k]) : this.QuestionsForm[k] })
             }
           }
         }
@@ -744,7 +749,7 @@ export default {
       }
     },
     logic(rules, num = 0) {
-      let isNE = false
+      let isNE = false, isNAN = false
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false
@@ -762,6 +767,8 @@ export default {
                       } else {
                         num *= parseFloat(q[o.TableQuestionId])
                       }
+                    } else {
+                      isNAN = true
                     }
 
                     if (q[o.TableQuestionId] === 'NE') {
@@ -777,6 +784,8 @@ export default {
                       } else {
                         num += parseFloat(q[o.TableQuestionId])
                       }
+                    } else {
+                      isNAN = true
                     }
 
                     if (q[o.TableQuestionId] === 'NE') {
@@ -792,6 +801,8 @@ export default {
                       } else {
                         num += parseFloat(q[o.TableQuestionId])
                       }
+                    } else {
+                      isNAN = true
                     }
 
                     if (q[o.TableQuestionId] === 'NE') {
@@ -805,6 +816,8 @@ export default {
                   this.questionForm[o.QuestionId].forEach(q => {
                     if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
                       arr.push(q[o.TableQuestionId])
+                    } else {
+                      isNAN = true
                     }
 
                     if (q[o.TableQuestionId] === 'NE') {
@@ -818,6 +831,8 @@ export default {
                   this.questionForm[o.QuestionId].forEach(q => {
                     if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
                       arr.push(q[o.TableQuestionId])
+                    } else {
+                      isNAN = true
                     }
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
@@ -832,6 +847,8 @@ export default {
               }
               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                 num = parseFloat(this.questionForm[o.TableQuestionId])
+              } else {
+                isNAN = true
               }
               if (!isNaN(num)) {
                 dataArr.push(num)
@@ -845,18 +862,24 @@ export default {
               case 1:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   num += parseFloat(this.questionForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
                 }
 
                 break;
               case 2:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   num -= parseFloat(this.questionForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
                 }
 
                 break;
               case 3:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   num *= parseFloat(this.questionForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
                 }
 
                 break;
@@ -867,12 +890,16 @@ export default {
                   } else {
                     num /= parseFloat(this.questionForm[o.TableQuestionId])
                   }
+                } else {
+                  isNAN = true
                 }
 
                 break;
               case 10:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
                   return acc + (typeof curr === "number" ? curr : 0);
@@ -881,27 +908,43 @@ export default {
               case 11:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = Math.max(...dataArr);
                 break;
               case 12:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = Math.min(...dataArr);
                 break;
               case 13:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
                 break;
               case 14:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc || curr, 0) ? 1 : 0;
                 break;
+              case 15:
+                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                  num = Math.abs(num)
+                }
+                else {
+                  isNAN = true
+                }
+                break;
             }
           }
         })
@@ -911,7 +954,7 @@ export default {
       if (isNE) {
         return 'NE'
       }
-      if (isNaN(num)) {
+      if (isNAN) {
         return null
       }
       if (rules.ValueType === 2) {
@@ -964,7 +1007,7 @@ export default {
           var CalculateQuestions = JSON.parse(v.CalculateQuestions);
           var num,
             arr = [];
-          let isNE = false
+          let isNE = false, isNAN = false
           CalculateQuestions.forEach((o, i) => {
             if (this.QuestionsForm[o.TableQuestionId] === 'NE') {
               isNE = true
@@ -973,6 +1016,8 @@ export default {
               if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
                 num = parseFloat(this.QuestionsForm[o.TableQuestionId]);
                 arr = [num];
+              } else {
+                isNAN = true
               }
 
             } else {
@@ -980,24 +1025,32 @@ export default {
                 case 1:
                   if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
                     num += parseFloat(this.QuestionsForm[o.TableQuestionId]);
+                  } else {
+                    isNAN = true
                   }
 
                   break;
                 case 2:
                   if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
                     num -= parseFloat(this.QuestionsForm[o.TableQuestionId]);
+                  } else {
+                    isNAN = true
                   }
 
                   break;
                 case 3:
                   if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
                     num *= parseFloat(this.QuestionsForm[o.TableQuestionId]);
+                  } else {
+                    isNAN = true
                   }
 
                   break;
                 case 4:
                   if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
                     num /= parseFloat(this.QuestionsForm[o.TableQuestionId]);
+                  } else {
+                    isNAN = true
                   }
 
                   break;
@@ -1006,6 +1059,9 @@ export default {
                     arr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]));
                   }
 
+                  else {
+                    isNAN = true
+                  }
                   num =
                     arr.length === 0
                       ? 0
@@ -1016,6 +1072,8 @@ export default {
                 case 8:
                   if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
                     arr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]));
+                  } else {
+                    isNAN = true
                   }
 
                   num = arr.length === 0 ? 0 : Math.max(...arr);
@@ -1023,6 +1081,8 @@ export default {
                 case 9:
                   if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
                     arr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]));
+                  } else {
+                    isNAN = true
                   }
 
                   num = arr.length === 0 ? 0 : Math.min(...arr);
@@ -1034,6 +1094,9 @@ export default {
           if (isNE) {
             num = 'NE'
           }
+          if (isNAN) {
+            num = ''
+          }
           this.$set(this.QuestionsForm, v.Id, num.toString());
         }
       });
@@ -1198,11 +1261,12 @@ export default {
       const referencedImageId = annotation?.metadata?.referencedImageId
       if (!referencedImageId) return null
       const cacheKey = `imageId:${referencedImageId}`
-      const cachedStats = annotation.data?.cachedStats?.[cacheKey]
+      const points = ['x', 'y', 'z'];
+      const cachedStats = annotation.markTool === "ArrowAnnotate" ? annotation.data?.handles?.points[0] : annotation.data?.cachedStats?.[cacheKey]
       const hasProp = cachedStats
-        && Object.prototype.hasOwnProperty.call(cachedStats, prop)
+        && (Object.prototype.hasOwnProperty.call(cachedStats, prop) || cachedStats[points.indexOf(prop)])
       if (!hasProp) return null
-      const value = cachedStats[prop]
+      const value = annotation.markTool === "ArrowAnnotate" ? cachedStats[points.indexOf(prop)] : cachedStats[prop]
       return value !== null
         ? parseFloat(value).toFixed(this.digitPlaces)
         : value
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 8c4ac9f0..5422189b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -181,6 +181,9 @@ export default {
         if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table' && i.Type !== 'basicTable') {
           this.$set(this.questionForm, i.Id, i.Answer)
         }
+        if (i.Type === 'select' && i.OptionTypeEnum === 1) {
+          this.$set(this.questionForm, i.Id, i.Answer ? JSON.parse(i.Answer) : [])
+        }
         if (i.Type === 'table' || i.Type === 'basicTable') {
           i.TableQuestions.Questions.forEach(o => {
             if (o.Type === 'number') {
@@ -188,6 +191,11 @@ export default {
                 this.$set(i.TableQuestions.Answers[index], o.Id, isNaN(parseFloat(i.TableQuestions.Answers[index][o.Id])) ? i.TableQuestions.Answers[index][o.Id] : parseFloat(i.TableQuestions.Answers[index][o.Id]).toFixed(this.digitPlaces))
               })
             }
+            if (o.Type === 'select' && o.OptionTypeEnum === 1) {
+              i.TableQuestions.Answers.forEach((ite, index) => {
+                this.$set(i.TableQuestions.Answers[index], o.Id, i.TableQuestions.Answers[index][o.Id] ? JSON.parse(i.TableQuestions.Answers[index][o.Id]) : [])
+              })
+            }
           })
           this.$set(this.questionForm, i.Id, i.TableQuestions.Answers)
         }
@@ -220,7 +228,11 @@ export default {
       try {
         var answers = []
         for (const k in this.questionForm) {
-          if (this.questionForm[k] instanceof Array) { } else {
+          if (this.questionForm[k] instanceof Array) {
+            if (this.questionForm[k].length > 0 && Object.prototype.toString.call(this.questionForm[k][0]) === '[object String]') {
+              answers.push({ id: k, answer: JSON.stringify(this.questionForm[k]) })
+            }
+          } else {
             answers.push({ id: k, answer: this.questionForm[k] })
           }
         }
@@ -261,7 +273,11 @@ export default {
       this.loading = true
       var answers = []
       for (const k in this.questionForm) {
-        if (this.questionForm[k] instanceof Array) { } else {
+        if (this.questionForm[k] instanceof Array) {
+          if (this.questionForm[k].length > 0 && Object.prototype.toString.call(this.questionForm[k][0]) === '[object String]') {
+            answers.push({ id: k, answer: JSON.stringify(this.questionForm[k]) })
+          }
+        } else {
           answers.push({ readingQuestionTrialId: k, answer: this.questionForm[k] })
         }
       }
@@ -952,11 +968,12 @@ export default {
       const referencedImageId = annotation?.metadata?.referencedImageId
       if (!referencedImageId) return null
       const cacheKey = `imageId:${referencedImageId}`
-      const cachedStats = annotation.data?.cachedStats?.[cacheKey]
+      const points = ['x', 'y', 'z']
+      const cachedStats = annotation.markTool === "ArrowAnnotate" ? annotation.data?.handles?.points[0] : annotation.data?.cachedStats?.[cacheKey]
       const hasProp = cachedStats
-        && Object.prototype.hasOwnProperty.call(cachedStats, prop)
+        && (Object.prototype.hasOwnProperty.call(cachedStats, prop) || cachedStats[points.indexOf(prop)])
       if (!hasProp) return null
-      const value = cachedStats[prop]
+      const value = annotation.markTool === "ArrowAnnotate" ? cachedStats[points.indexOf(prop)] : cachedStats[prop]
       return value !== null
         ? parseFloat(value).toFixed(this.digitPlaces)
         : value
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index cbb9bc2e..a3e61ce1 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -22,6 +22,7 @@
         :autosize="{ minRows: 2, maxRows: 4 }" />
       <!-- 下拉框 -->
       <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
+        :multiple="question.OptionTypeEnum === 1"
         :disabled="(question.TableQuestionType === 2 || question.IsPreinstall || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
         @change="((val) => { formItemChange(val, question) })">
         <template v-if="question.TableQuestionType === 1">
@@ -62,7 +63,8 @@
       <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
         v-model="questionForm[question.Id]" />
       <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType || question.IsPreinstall" @change="(val) => { formItemChange(val, question) }">
+        :disabled="!question.ClassifyEditType || question.IsPreinstall"
+        @change="(val) => { formItemChange(val, question) }">
         <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
       </el-select>
       <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
@@ -158,9 +160,9 @@
         </el-input>
       </template>
       <!-- 上传图像 -->
-      <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'" :disabled="readingTaskState === 2 || question.IsPreinstall"
-        action :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
-        :on-preview="handlePictureCardPreview"
+      <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'"
+        :disabled="readingTaskState === 2 || question.IsPreinstall" action :accept="question.FileType"
+        :limit="question.ImageCount === 0 ? 100 : question.ImageCount" :on-preview="handlePictureCardPreview"
         :before-upload="(file) => { return handleBeforeUpload(file, question.FileType, question.Type) }"
         :http-request="uploadScreenshot" :on-remove="handleRemove" :file-list="fileList"
         :class="{ disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount }">
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
index f5642050..bed7a11e 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
@@ -68,24 +68,35 @@
                   <el-select
                     v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'select' || scope.row.Type === 'radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
                     v-model="questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]"
-                    size="mini" clearable>
+                    size="mini" clearable :multiple="scope.row.OptionTypeEnum === 1">
                     <template>
                       <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
                     </template>
                   </el-select>
                   <span
-                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
-                    {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
+                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && questionForm[scope.row.QuestionId][scope.row.xfIndex] && questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
+                    {{
+
+                      Array.isArray(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId])
+                        ?
+                        questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId].join(',') :
+                        questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]
+                    }}
                   </span>
                   <el-select
                     v-else-if="(scope.row.Type === 'select' || scope.row.Type === 'radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
-                    v-model="questionForm[scope.row.QuestionId]" size="mini" clearable>
+                    v-model="questionForm[scope.row.QuestionId]" size="mini" clearable
+                    :multiple="scope.row.OptionTypeEnum === 1">
                     <template>
                       <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
                     </template>
                   </el-select>
                   <span v-else-if="scope.row.Type === 'select' || scope.row.Type === 'radio'">
-                    {{ questionForm[scope.row.QuestionId] }}
+                    {{
+                      questionForm[scope.row.QuestionId] && Array.isArray(questionForm[scope.row.QuestionId]) ?
+                        questionForm[scope.row.QuestionId].join(',') :
+                        questionForm[scope.row.QuestionId]
+                    }}
                   </span>
                   <el-input
                     v-else-if="scope.row.DataSource !== 1 && questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'number' && (scope.row.xfIndex || scope.row.xfIndex === 0) && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
@@ -160,7 +171,10 @@
                 </span>
               </template>
               <template v-else-if="scope.row.DictionaryCode">
-                {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}
+                {{scope.row.Answers[task.VisitTaskId] instanceof Array
+                  ? scope.row.Answers[task.VisitTaskId].map(item => $fd(scope.row.DictionaryCode,
+                    item)).join(",") : $fd(scope.row.DictionaryCode,
+                      scope.row.Answers[task.VisitTaskId])}}
               </template>
               <template v-else-if="criterionType === 10">
                 {{
@@ -430,7 +444,7 @@ export default {
       })
     },
     logic(rules, num = 0) {
-      let isNE = false
+      let isNE = false, isNAN = false
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false
@@ -451,6 +465,8 @@ export default {
                       } else {
                         num *= parseFloat(q[o.TableQuestionId])
                       }
+                    } else {
+                      isNAN = true
                     }
 
                     if (q[o.TableQuestionId] === 'NE') {
@@ -466,6 +482,8 @@ export default {
                       } else {
                         num += isNaN(parseFloat(q[o.TableQuestionId])) ? null : parseFloat(q[o.TableQuestionId])
                       }
+                    } else {
+                      isNAN = true
                     }
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
@@ -480,6 +498,8 @@ export default {
                       } else {
                         num += parseFloat(q[o.TableQuestionId])
                       }
+                    } else {
+                      isNAN = true
                     }
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
@@ -492,6 +512,8 @@ export default {
                   this.questionForm[o.QuestionId].forEach(q => {
                     if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
                       arr.push(q[o.TableQuestionId])
+                    } else {
+                      isNAN = true
                     }
 
                     if (q[o.TableQuestionId] === 'NE') {
@@ -505,6 +527,8 @@ export default {
                   this.questionForm[o.QuestionId].forEach(q => {
                     if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
                       arr.push(q[o.TableQuestionId])
+                    } else {
+                      isNAN = true
                     }
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
@@ -516,6 +540,8 @@ export default {
             } else {
               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                 num = parseFloat(this.questionForm[o.TableQuestionId])
+              } else {
+                isNAN = true
               }
 
             }
@@ -524,24 +550,32 @@ export default {
               case 1:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   num += parseFloat(this.questionForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
                 }
 
                 break
               case 2:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   num -= parseFloat(this.questionForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
                 }
 
                 break
               case 3:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   num *= parseFloat(this.questionForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
                 }
 
                 break
               case 4:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   num /= parseFloat(this.questionForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
                 }
 
                 // num /= parseFloat(this.questionForm[o.TableQuestionId])
@@ -549,6 +583,8 @@ export default {
               case 10:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
                   return acc + (typeof curr === "number" ? curr : 0);
@@ -557,27 +593,40 @@ export default {
               case 11:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = Math.max(...dataArr);
                 break;
               case 12:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = Math.min(...dataArr);
                 break;
               case 13:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
                 break;
               case 14:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc || curr, 0) ? 1 : 0;
                 break;
+              case 15:
+                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                  num = Math.abs(num)
+                }
+                break;
             }
           }
         })
@@ -587,6 +636,9 @@ export default {
       if (isNE) {
         return 'NE'
       }
+      if (isNAN) {
+        return null
+      }
       if (rules.ValueType === 2) {
         num = num * 100
       }
@@ -614,39 +666,54 @@ export default {
       }).catch(() => { this.loading = false })
     },
     getQuestions(questions) {
-      const arr = []
-      if (questions.length !== 0) {
-        questions.forEach((item) => {
-          const obj = item
-          this.$set(obj, 'Answers', {})
-          item.Answer.forEach(i => {
-            if (item.DictionaryCode) {
-              this.$set(obj.Answers, i.VisitTaskId, i.Answer ? parseInt(i.Answer) : null)
-              // obj.Answers[i.VisitTaskId] = i.Answer ? parseInt(i.Answer) : null
-            } else {
-              if (item.Type === 'number') {
-                let val = null
-                if (item.ValueType === 0) {
-                  val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseInt(i.Answer)
-                } else if (item.ValueType === 3) {
-                  val = i.Answer
+      try {
+        const arr = []
+        if (questions.length !== 0) {
+          questions.forEach((item) => {
+            const obj = item
+            this.$set(obj, 'Answers', {})
+            item.Answer.forEach(i => {
+              if (item.DictionaryCode) {
+                if (item.Type === 'select' && item.OptionTypeEnum === 1) {
+                  let val = i.Answer ? JSON.parse(i.Answer) : []
+                  this.$set(obj.Answers, i.VisitTaskId, val)
                 } else {
-                  val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseFloat(i.Answer).toFixed(this.digitPlaces)
+                  this.$set(obj.Answers, i.VisitTaskId, i.Answer ? parseInt(i.Answer) : null)
                 }
-                this.$set(obj.Answers, i.VisitTaskId, val)
+
+
+                // obj.Answers[i.VisitTaskId] = i.Answer ? parseInt(i.Answer) : null
               } else {
-                this.$set(obj.Answers, i.VisitTaskId, i.Answer)
+                if (item.Type === 'number') {
+                  let val = null
+                  if (item.ValueType === 0) {
+                    val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseInt(i.Answer)
+                  } else if (item.ValueType === 3) {
+                    val = i.Answer
+                  } else {
+                    val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseFloat(i.Answer).toFixed(this.digitPlaces)
+                  }
+                  this.$set(obj.Answers, i.VisitTaskId, val)
+                } else if (item.Type === 'select' && item.OptionTypeEnum === 1) {
+                  let val = i.Answer ? JSON.parse(i.Answer) : []
+                  this.$set(obj.Answers, i.VisitTaskId, val)
+                } else {
+                  this.$set(obj.Answers, i.VisitTaskId, i.Answer)
+                }
+                // obj.Answers[i.VisitTaskId] = i.Answer
               }
-              // obj.Answers[i.VisitTaskId] = i.Answer
+            })
+            if (item.Childrens.length >= 1) {
+              obj.Childrens = this.getQuestions(item.Childrens)
             }
+            arr.push(obj)
           })
-          if (item.Childrens.length >= 1) {
-            obj.Childrens = this.getQuestions(item.Childrens)
-          }
-          arr.push(obj)
-        })
+        }
+        return arr
+      } catch (err) {
+        console.log(err)
       }
-      return arr
+
     },
     handleShowDetail(val) {
       this.getReportInfo()
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 0c495672..18a581db 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
@@ -261,7 +261,7 @@ const config = {
       'name': '箭头工具',
       'icon': 'arrow',
       'toolName': 'ArrowAnnotate',
-      'props': [],
+      'props': ['x', 'y', 'z'],
       'i18nKey': 'trials:reading:button:arrowAnnotate',
       'isDisabled': false,
       'disabledReason': ''
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 15a8a1f8..6fafe986 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -225,6 +225,17 @@
         </el-form-item>
         <!-- 私有属性 -->
         <el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
+        <!-- 下拉框单选或多选 -->
+        <el-form-item v-if="form.Type === 'select'" :label="$t('trials:readingUnit:qsList:title:MultipleSelect')"
+          prop="OptionTypeEnum" :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify') }
+          ]">
+          <el-radio-group v-model="form.OptionTypeEnum">
+            <el-radio v-for="item of $d.OptionType" :key="item.id" :label="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 数值类型 -->
         <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:valueType')"
           prop="ValueType" :rules="[
@@ -737,7 +748,8 @@ export default {
         ImageMarkEnum: 0,
         ImageTool: '',
         ImageToolAttribute: '',
-        ExcludeShowVisitList: []
+        ExcludeShowVisitList: [],
+        OptionTypeEnum: 0
 
         // IsEnable: true
       },
@@ -1246,6 +1258,7 @@ export default {
       form.ImageMarkEnum = 0
       form.ImageTool = ''
       form.ImageToolAttribute = ''
+      form.OptionTypeEnum = 0
       this.imageToolAttributes = []
     },
     getLesionType() {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index 4797e4b8..c9c2fb1a 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -154,6 +154,17 @@
 
         <!-- 私有属性 -->
         <el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
+        <!-- 下拉框单选或多选 -->
+        <el-form-item v-if="form.Type === 'select'" :label="$t('trials:readingUnit:qsList:title:MultipleSelect')"
+          prop="OptionTypeEnum" :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify') }
+          ]">
+          <el-radio-group v-model="form.OptionTypeEnum">
+            <el-radio v-for="item of $d.OptionType" :key="item.id" :label="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 问题数据来源 -->
         <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
           prop="DataSource" :rules="[
@@ -600,6 +611,7 @@ export default {
         ImageMarkEnum: 0,
         ImageTool: '',
         ImageToolAttribute: '',
+        OptionTypeEnum: 0
         // IsEnable: true
       },
       imageToolAttributes: [],
@@ -1110,6 +1122,7 @@ export default {
       form.ImageMarkEnum = 0
       form.ImageTool = ''
       form.ImageToolAttribute = ''
+      form.OptionTypeEnum = 0
       this.imageToolAttributes = []
     },
     close() {
diff --git a/src/views/trials/trials-panel/trial-summary/image-summary/index.vue b/src/views/trials/trials-panel/trial-summary/image-summary/index.vue
index 813af93d..3dce0dbf 100644
--- a/src/views/trials/trials-panel/trial-summary/image-summary/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/image-summary/index.vue
@@ -70,10 +70,10 @@
                     <template slot-scope="scope">
                         <el-tag v-if="scope.row.IsHaveDicom" type="primary">{{
                             $fd('IsDicom', true)
-                        }}</el-tag>
+                            }}</el-tag>
                         <el-tag v-if="scope.row.IsHaveNoneDicom" type="primary">{{
                             $fd('IsDicom', false)
-                        }}</el-tag>
+                            }}</el-tag>
                     </template>
                 </el-table-column>
                 <!-- 影像数量 -->
@@ -204,16 +204,16 @@ export default {
                 }
                 let res = await getExportSubjectVisitImageList(data)
                 if (res.IsSuccess) {
-                    this.downLoad(IsKeyImage, res.Result)
+                    this.downLoad(IsKeyImage, res.Result, IsExportReading)
                 }
             } catch (err) {
                 console.log(err)
             }
         },
         // 下载
-        async downLoad(IsKeyImage = false, row) {
+        async downLoad(IsKeyImage = false, row, IsExportReading = false) {
             try {
-                let { files, name } = this.formatDownloadFile(IsKeyImage, row)
+                let { files, name } = this.formatDownloadFile(IsKeyImage, row, IsExportReading)
                 let res = await downLoadFile(files, name, 'zip')
                 // }
             } catch (err) {
@@ -221,24 +221,44 @@ export default {
             }
         },
         // 格式化下载文件路径
-        formatDownloadFile(IsKeyImage = false, row) {
+        formatDownloadFile(IsKeyImage = false, row, IsExportReading = false) {
             let files = [],
                 name = `${this.$route.query.researchProgramNo}_${this.$t('trials:imageSummary:downloadname:dicom')}_${Date.now()}.zip`;
+            if (IsExportReading) {
+                name = `${this.$route.query.researchProgramNo}_${this.$t('trials:imageSummary:downloadname:readingDicom')}_${Date.now()}.zip`;
+            }
             if (!IsKeyImage) {
                 //中心ID/受试者ID/访视名/Study ID_Study Date_Modality/文件  
                 row.VisitList.forEach(visit => {
                     if (visit.StudyList && visit.StudyList.length > 0) {
                         visit.StudyList.forEach(study => {
+                            let arr = []
+                            study.SeriesList.forEach(item => {
+                                if (!arr.includes(item.Modality)) {
+                                    arr.push(item.Modality)
+                                }
+                            })
+                            let str = arr.join('_')
+                            let time = study.StudyTime.split(' ')[0]
+                            if (study.StudyDIRPath && !study.dirHas) {
+                                study.dirHas = true
+                                let obj = {
+                                    name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${time}_${str}/DICOMDIR`,
+                                    url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+                                }
+                                files.push(obj)
+                            }
                             if (study.SeriesList && study.SeriesList.length > 0) {
                                 study.SeriesList.forEach(serie => {
-                                    if (serie.InstancePathList && serie.InstancePathList.length > 0) {
-                                        serie.InstancePathList.forEach(instance => {
+
+                                    if (serie.InstanceList && serie.InstanceList.length > 0) {
+                                        serie.InstanceList.forEach(instance => {
                                             let instanceArr = instance.Path.split("/")
-                                            let fileName = instanceArr[instanceArr.length - 1]
-                                            let time = study.StudyTime.split(' ')[0]
+                                            let fileName = instance.FileName || instanceArr[instanceArr.length - 1]
                                             let obj = {
-                                                name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${time}_${serie.Modality}/IMAGE/${fileName}`,
+                                                name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${time}_${str}/IMAGE/${fileName}`,
                                                 url: this.OSSclientConfig.basePath + instance.Path,
+                                                IsEncapsulated: instance.IsEncapsulated
                                             }
                                             files.push(obj)
                                         })

From f7af9999e42bd0032ca5ac48beed08af2a1093cc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 8 Dec 2025 15:39:03 +0800
Subject: [PATCH 138/333] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AEId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/email/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/system/email/index.vue b/src/views/system/email/index.vue
index 6c418b54..438e3a7b 100644
--- a/src/views/system/email/index.vue
+++ b/src/views/system/email/index.vue
@@ -156,7 +156,8 @@ export default {
         async view(row) {
             try {
                 let data = {
-                    Id: row.Id
+                    Id: row.Id,
+                    TrialId: this.$route.query.trialId
                     // Id: "EC660000-BA37-5C60-8680-08DE1CD6931B"
                 }
                 let res = await getEmailInfo(data)
@@ -195,7 +196,8 @@ export default {
         async resendEmail(row) {
             try {
                 let data = {
-                    Id: row.Id
+                    Id: row.Id,
+                    TrialId: this.$route.query.trialId
                 }
                 this.loading = true
                 let res = await resendEmail(data)

From fbb9899b5525297aa1e541c4310edc5823e82cbe Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 8 Dec 2025 15:39:26 +0800
Subject: [PATCH 139/333] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/ReportPage.vue  | 4 +++-
 .../reading/dicoms3D/components/ReportPage.vue             | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 06cd90e9..f0aac9dc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -78,7 +78,7 @@
             </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' }">
+                :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]}`) || scope.row.IsHighlightObj[task.VisitTaskId] ? '#f66' : '#fff' }">
                 <template
                   v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13, 14, 15, 39, 42].includes(scope.row.QuestionType)">
                   <!-- 是否存在疾病（基线时可修改） -->
@@ -477,6 +477,7 @@ export default {
           if (!(filterArr.includes(item.QuestionMark))) {
             const obj = item
             obj.Answers = {}
+            obj.IsHighlightObj = {}
             if (item.RowIndex > 0) {
               try {
                 var idx = item.Childrens.findIndex(i => i.QuestionMark === 8)
@@ -572,6 +573,7 @@ export default {
               } else {
                 obj.Answers[i.VisitTaskId] = i.Answer
               }
+              obj.IsHighlightObj[i.VisitTaskId] = i.IsHighlight
             })
             if (item.QuestionType === 15) {
               this.currentExistDisease = obj.Answers[this.visitTaskId]
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 4db9dbab..4df9c2e4 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -78,7 +78,7 @@
             </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' }">
+                :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]}`) || scope.row.IsHighlightObj[task.VisitTaskId] ? '#f66' : '#fff' }">
                 <template
                   v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13, 14, 15, 42].includes(scope.row.QuestionType)">
                   <!-- 是否存在疾病（基线时可修改） -->
@@ -168,7 +168,8 @@
                   <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] === '-2' ? "NA" : scope.row.Answers[task.VisitTaskId] === '-1' ?
+                  {{ scope.row.Answers[task.VisitTaskId] === '-2' ? "NA" : scope.row.Answers[task.VisitTaskId] === '-1'
+                    ?
                     $t('trials:readingReport:title:unknow') :
                     scope.row.Answers[task.VisitTaskId] }}
                 </template>
@@ -429,6 +430,7 @@ export default {
           if (!(filterArr.includes(item.QuestionMark))) {
             const obj = item
             obj.Answers = {}
+            obj.IsHighlightObj = {}
             if (item.RowIndex > 0) {
               try {
                 var idx = item.Childrens.findIndex(i => i.QuestionMark === 8)
@@ -524,6 +526,7 @@ export default {
               } else {
                 obj.Answers[i.VisitTaskId] = i.Answer
               }
+              obj.IsHighlightObj[i.VisitTaskId] = i.IsHighlight
             })
             if (item.QuestionType === 15) {
               this.currentExistDisease = obj.Answers[this.visitTaskId]

From f93274080a91c865de37dad8a0bd72146c3dfcda Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 8 Dec 2025 16:21:53 +0800
Subject: [PATCH 140/333] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=87=8D=E5=8F=91=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.js                              |   8 +
 .../system/email/components/resendList.vue    | 255 ++++++++++++++++++
 src/views/system/email/index.vue              |  17 +-
 3 files changed, 278 insertions(+), 2 deletions(-)
 create mode 100644 src/views/system/email/components/resendList.vue

diff --git a/src/api/admin.js b/src/api/admin.js
index f0cece3c..9ae710d7 100644
--- a/src/api/admin.js
+++ b/src/api/admin.js
@@ -382,3 +382,11 @@ export function synchronizationEmail(data) {
     data
   })
 }
+// 邮件日志-重发列表
+export function getReSendEmail(data) {
+  return request({
+    url: `/EmailLog/getReSendEmail`,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/views/system/email/components/resendList.vue b/src/views/system/email/components/resendList.vue
new file mode 100644
index 00000000..6ecfc1b7
--- /dev/null
+++ b/src/views/system/email/components/resendList.vue
@@ -0,0 +1,255 @@
+<template>
+    <div class="event">
+        <div ref="leftContainer" class="left">
+            <el-form :inline="true">
+                <el-form-item :label="$t('system:email:search:ToRecipientName')">
+                    <el-input v-model="searchData.ToRecipientName" clearable />
+                </el-form-item>
+                <el-form-item :label="$t('system:email:search:CcRecipientName')">
+                    <el-input v-model="searchData.CcRecipientName" clearable />
+                </el-form-item>
+                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
+                    <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
+                        <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
+                    <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
+                        <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="$t('system:email:search:emailDate')">
+                    <el-date-picker v-model="datetimerange" type="datetimerange"
+                        :default-time="['00:00:00', '23:59:59']" :start-placeholder="$t('feedBack:search:beginTime')"
+                        :end-placeholder="$t('feedBack:search:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
+                        @change="handleDatetimeChange" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="small" @click="getList">
+                        {{ $t('common:button:search') }}
+                    </el-button>
+                    <el-button icon="el-icon-refresh-left" size="small" @click="handleReset">
+                        {{ $t('common:button:reset') }}
+                    </el-button>
+                    <!-- <el-button type="primary" size="small" @click="synchronizationEmail">
+                        {{ $t('system:email:button:sync') }}
+                    </el-button> -->
+                </el-form-item>
+            </el-form>
+            <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" height="100" :data="list" class="table"
+                @sort-change="handleSortByColumn">
+                <el-table-column type="index" width="50" />
+                <el-table-column :label="$t('system:email:table:messageId')" prop="MessageId" show-overflow-tooltip
+                    sortable="custom" />
+                <el-table-column :label="$t('system:email:table:emailSubject')" prop="EmailSubject"
+                    show-overflow-tooltip />
+                <el-table-column :label="$t('system:email:table:ToRecipientName')" prop="ToRecipientName"
+                    show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
+                            ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
+                                item.RecipientAddress).join(", ") : ''
+                        }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="$t('system:email:table:CcRecipientName')" prop="CcRecipientName"
+                    show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
+                            ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
+                                item.RecipientAddress).join(", ") : ''
+                        }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="$t('system:email:table:emailDate')" prop="EmailDate" show-overflow-tooltip
+                    sortable="custom" />
+                <el-table-column :label="$t('system:email:table:emailStateEnum')" prop="EmailStateEnum"
+                    show-overflow-tooltip sortable="custom">
+                    <template slot-scope="scope">
+                        <el-tag :type="scope.row.EmailStateEnum === 1 ? 'danger' : ''">{{ $fd("EmailState",
+                            scope.row.EmailStateEnum) }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="$t('system:email:table:errorInfo')" prop="ErrorInfo" show-overflow-tooltip />
+                <el-table-column :label="$t('common:action:action')" fixed="right" prop="" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <el-button type="text" @click="view(scope.row)">
+                            {{ $t('common:button:view') }}
+                        </el-button>
+                        <!-- <el-button type="text" @click="resendEmail(scope.row)">
+                            {{ $t('system:email:button:resendEmail') }}
+                        </el-button> -->
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="pagination" style="text-align: right; margin-top: 5px">
+                <pagination :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+                    @pagination="getList" />
+            </div>
+        </div>
+        <base-model v-if="model_cfg.visible" :config="model_cfg">
+            <template slot="dialog-body">
+                <emailDetail :info="info" />
+            </template>
+        </base-model>
+    </div>
+</template>
+<script>
+import { getReSendEmail, getEmailInfo } from '@/api/admin'
+import Pagination from '@/components/Pagination'
+import BaseModel from '@/components/BaseModel'
+import emailDetail from "./detail"
+const searchDataDefault = () => {
+    return {
+        // TrialId: null,
+        // EmailStartDate: null,
+        // EmailEndDate: null,
+        // EmailStateEnum: null,
+        // ToRecipientName: null,
+        // CcRecipientName: null,
+        Id: null,
+        Asc: false,
+        SortField: 'CreateTime',
+        PageIndex: 1,
+        PageSize: 20,
+    }
+}
+export default {
+    name: 'emailLog',
+    components: { Pagination, BaseModel, emailDetail },
+    props: {
+        isSystem: {
+            type: Boolean,
+            default: true
+        },
+        rowData: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        }
+    },
+    data() {
+        return {
+            searchData: searchDataDefault(),
+            list: [],
+            total: 0,
+            loading: false,
+            datetimerange: [],
+            model_cfg: { visible: false, title: '', width: '500px', fullscreen: true, appendToBody: true },
+            info: null,
+        }
+    },
+    watch: {
+        "rowData.Id": {
+            handler() {
+                this.getList()
+            }
+        }
+    },
+    mounted() {
+        this.getList()
+    },
+    methods: {
+        getList() {
+            this.loading = true
+            if (!this.rowData.Id) return false
+            this.searchData.Id = this.rowData.Id
+            if (!this.isSystem) this.searchData.TrialId = this.$route.query.trialId
+            getReSendEmail(this.searchData)
+                .then((res) => {
+                    this.loading = false
+                    this.list = res.Result.CurrentPageData
+                    this.total = res.Result.TotalCount
+                })
+                .catch(() => {
+                    this.loading = false
+                })
+        },
+        // 查看详情
+        async view(row) {
+            try {
+                let data = {
+                    Id: row.Id,
+                    TrialId: this.$route.query.trialId
+                    // Id: "EC660000-BA37-5C60-8680-08DE1CD6931B"
+                }
+                let res = await getEmailInfo(data)
+                if (res.IsSuccess) {
+                    this.info = res.Result
+                    if (Array.isArray(this.info.AttachmentList) && this.info.AttachmentList.length > 0) {
+                        this.info.AttachmentList.forEach(item => {
+                            var type = item.AttachmentName
+                                .substring(item.AttachmentName.lastIndexOf('.'))
+                                .toLocaleLowerCase().split('.')[1];
+                            item.type = type
+                        })
+                    }
+                    this.model_cfg.visible = true
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        },
+        // 重置列表查询
+        handleReset() {
+            this.searchData = searchDataDefault()
+            this.getList()
+        },
+        // 排序
+        handleSortByColumn(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+        handleDatetimeChange(val) {
+            if (val) {
+                this.searchData.EmailStartDate = val[0]
+                this.searchData.EmailEndDate = val[1]
+            } else {
+                this.searchData.EmailStartDate = ''
+                this.searchData.EmailEndDate = ''
+            }
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.event {
+    height: 100%;
+    box-sizing: border-box;
+    display: flex;
+    padding: 10px;
+    border-radius: 5px;
+
+    .left {
+        display: flex;
+        flex-direction: column;
+        width: 0;
+        flex-grow: 4;
+
+        // border-right: 1px solid #ccc;
+        .filter-container {
+            display: flex;
+            align-items: center;
+            margin: 5px;
+        }
+
+        .data-table {
+            flex: 1;
+            padding: 5px 0px;
+        }
+
+        .pagination-container {
+            text-align: right;
+        }
+    }
+}
+</style>
diff --git a/src/views/system/email/index.vue b/src/views/system/email/index.vue
index 438e3a7b..79d1a69f 100644
--- a/src/views/system/email/index.vue
+++ b/src/views/system/email/index.vue
@@ -73,7 +73,8 @@
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('system:email:table:errorInfo')" prop="ErrorInfo" show-overflow-tooltip />
-                <el-table-column :label="$t('common:action:action')" fixed="right" prop="" show-overflow-tooltip>
+                <el-table-column :label="$t('common:action:action')" fixed="right" prop="" show-overflow-tooltip
+                    min-width="120px">
                     <template slot-scope="scope">
                         <el-button type="text" @click="view(scope.row)">
                             {{ $t('common:button:view') }}
@@ -81,6 +82,9 @@
                         <el-button type="text" @click="resendEmail(scope.row)">
                             {{ $t('system:email:button:resendEmail') }}
                         </el-button>
+                        <el-button type="text" @click="openResendEmailList(scope.row)">
+                            {{ $t('system:email:button:resendEmailList') }}
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -94,6 +98,9 @@
                 <emailDetail :info="info" />
             </template>
         </base-model>
+        <el-dialog title="" :visible.sync="resendVisible" width="30%" :fullscreen='true'>
+            <resendList :rowData="info" :isSystem="isSystem" />
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -101,6 +108,7 @@ import { getEmailLogList, resendEmail, getEmailInfo, synchronizationEmail } from
 import Pagination from '@/components/Pagination'
 import BaseModel from '@/components/BaseModel'
 import emailDetail from "./components/detail"
+import resendList from "./components/resendList"
 const searchDataDefault = () => {
     return {
         TrialId: null,
@@ -117,7 +125,7 @@ const searchDataDefault = () => {
 }
 export default {
     name: 'emailLog',
-    components: { Pagination, BaseModel, emailDetail },
+    components: { Pagination, BaseModel, emailDetail, resendList },
     props: {
         isSystem: {
             type: Boolean,
@@ -133,12 +141,17 @@ export default {
             datetimerange: [],
             model_cfg: { visible: false, title: '', width: '500px', fullscreen: true },
             info: null,
+            resendVisible: false
         }
     },
     mounted() {
         this.getList()
     },
     methods: {
+        openResendEmailList(row) {
+            this.info = row
+            this.resendVisible = true
+        },
         getList() {
             this.loading = true
             if (!this.isSystem) this.searchData.TrialId = this.$route.query.trialId

From 61a1b1b1c2c87611c30372b4995697efa6d771cb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 8 Dec 2025 16:26:25 +0800
Subject: [PATCH 141/333] =?UTF-8?q?=E3=80=90=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E4=B8=80=E8=87=B4=E6=80=A7=E6=A0=B8=E6=9F=A5=E5=92=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=AD=E5=BF=83=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=96=87=E5=AD=97=E7=9A=84=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E9=9C=80=E8=A6=81=E7=9B=B8=E4=BA=92=E7=8B=AC=E7=AB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/IVUS/UploadExcel.vue    |  2 +-
 .../dicoms/components/OCT/UploadExcel.vue     |  2 +-
 .../components/uploadExcel.vue                | 36 +++++++------------
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
index abf167de..f6e8237e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
@@ -4,7 +4,7 @@
     class="upload-excel-file"
   >
     <!-- 文件 -->
-    <el-form-item :label="$t('trials:consistencyCheck:label:file')">
+    <el-form-item :label="$t('trials:consistencyCheck:label:file2')">
       <div class="upload-container">
         <el-upload
           class="upload-demo"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue
index 8a7e5ef0..0898161e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue
@@ -4,7 +4,7 @@
     class="upload-excel-file"
   >
     <!-- 文件 -->
-    <el-form-item :label="$t('trials:consistencyCheck:label:file')">
+    <el-form-item :label="$t('trials:consistencyCheck:label:file3')">
       <div class="upload-container">
         <el-upload
           class="upload-demo"
diff --git a/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue b/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue
index ca2ad298..189e64a2 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue
@@ -1,30 +1,15 @@
 <template>
-  <el-form
-    ref="uploadExcel"
-    class="upload-excel-file"
-  >
+  <el-form ref="uploadExcel" class="upload-excel-file">
     <!-- 文件 -->
-    <el-form-item :label="$t('trials:consistencyCheck:label:file')">
+    <el-form-item :label="$t('trials:consistencyCheck:label:file1')">
       <div class="upload-container">
-        <el-upload
-          class="upload-demo"
-          action
-          accept=".xlsx,.xls"
-          :before-upload="beforeUpload"
-          :http-request="handleUploadFile"
-          :on-preview="handlePreview"
-          :show-file-list="true"
-          :limit="1"
-          :on-exceed="handleExceed"
-        >
+        <el-upload class="upload-demo" action accept=".xlsx,.xls" :before-upload="beforeUpload"
+          :http-request="handleUploadFile" :on-preview="handlePreview" :show-file-list="true" :limit="1"
+          :on-exceed="handleExceed">
           <el-button size="small" type="primary" :loading="btnLoading">
             {{ $t('trials:consistencyCheck:dialogButton:upload') }}
           </el-button>
-          <span
-            slot="tip"
-            style="margin-left:10px;"
-            class="el-upload__tip"
-          >
+          <span slot="tip" style="margin-left:10px;" class="el-upload__tip">
             ({{ $t('trials:consistencyCheck:message:excelFileOnly') }})
           </span>
         </el-upload>
@@ -85,21 +70,24 @@ export default {
 </script>
 
 <style lang="scss">
-.upload-excel-file{
+.upload-excel-file {
   .upload-container .el-upload--text {
     border: none;
     width: 80px;
     height: 40px;
   }
+
   .upload-container .el-input--small {
     margin-bottom: 5px;
   }
+
   .upload-container .el-icon-circle-check {
     color: #428bca;
     font-size: 13px;
   }
-  .account_item_clear{
-    .el-tag__close{
+
+  .account_item_clear {
+    .el-tag__close {
       display: none !important;
     }
   }

From 5ec5eda344a0bfc9bfa9ef3b222eab91db105d23 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 8 Dec 2025 16:43:25 +0800
Subject: [PATCH 142/333] =?UTF-8?q?=E3=80=90lugano2014=E3=80=91=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E7=8A=B6=E6=80=81=E5=8F=AF=E4=BD=BF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue     | 8 ++++----
 .../dicoms/components/LuganoWithoutPET/QuestionForm.vue   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index ce9b71e6..0d990f34 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -1212,8 +1212,8 @@ export default {
         // 靶病灶且状态为消失（3）
         if (this.lesionType === 0 && lesionState === 3) {
           if (lymphNodes === 1) {
-            // 淋巴结靶病灶 使用箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            // 淋巴结靶病灶 使用箭头工具 measureData.type === 'ArrowAnnotate' ||
+            if (!(measureData && (measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结靶病灶需使用箭头工具或长短径工具添加标记！
               this.$confirm(this.$t('trials:lugano:message:validState5'), {
                 type: 'warning',
@@ -1244,9 +1244,9 @@ export default {
             // }
           } else {
             // 非淋巴结靶病灶 箭头工具
-            if (!(measureData && measureData.type === 'ArrowAnnotate')) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg30'), {
+              this.$confirm(this.$t('trials:lugano:warnning:validState7'), {
                 type: 'warning',
                 showCancelButton: false,
                 callback: action => { }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index ce9b71e6..0d990f34 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -1212,8 +1212,8 @@ export default {
         // 靶病灶且状态为消失（3）
         if (this.lesionType === 0 && lesionState === 3) {
           if (lymphNodes === 1) {
-            // 淋巴结靶病灶 使用箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            // 淋巴结靶病灶 使用箭头工具 measureData.type === 'ArrowAnnotate' ||
+            if (!(measureData && (measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结靶病灶需使用箭头工具或长短径工具添加标记！
               this.$confirm(this.$t('trials:lugano:message:validState5'), {
                 type: 'warning',
@@ -1244,9 +1244,9 @@ export default {
             // }
           } else {
             // 非淋巴结靶病灶 箭头工具
-            if (!(measureData && measureData.type === 'ArrowAnnotate')) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg30'), {
+              this.$confirm(this.$t('trials:lugano:warnning:validState7'), {
                 type: 'warning',
                 showCancelButton: false,
                 callback: action => { }

From 74547d7bff26b8cd5f815a050305a98e3dbce062 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 11 Dec 2025 11:00:25 +0800
Subject: [PATCH 143/333] =?UTF-8?q?dicom=E5=A4=9A=E5=B8=A7=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=A7=A3=E6=9E=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dcmUpload/dcmjs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/dcmUpload/dcmjs.js b/src/utils/dcmUpload/dcmjs.js
index 9bcc9bc0..a70b1b42 100644
--- a/src/utils/dcmUpload/dcmjs.js
+++ b/src/utils/dcmUpload/dcmjs.js
@@ -8535,7 +8535,7 @@
 	        for (i = 0; i < frames; i++) {
 	          var _needsPadding = Boolean(value[i].byteLength & 1);
 
-	          startOffset.push(binaryStream.size);
+	        //   startOffset.push(binaryStream.size);
 	          var frameBuffer = value[i],
 	              frameStream = new ReadBufferStream(frameBuffer);
 	          var fragmentsLength = 1;

From d05ea6c28ddc6d81e558a1283f9e88e5e121e298 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 11 Dec 2025 11:01:02 +0800
Subject: [PATCH 144/333] =?UTF-8?q?oct=E8=A1=A8=E5=8D=95=E7=88=B6=E9=A1=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=90=E9=A1=B9=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/OCT/QuestionList.vue    |  4 ++--
 .../components/OCT/QuestionTableFormItem.vue  | 20 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 1dbb04dc..ec70327c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -157,8 +157,8 @@
       <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
         :title="addOrEdit.title" width="500px">
         <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
-          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
-            :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
+          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :questions="qsList"
+            :question-form="qsForm" :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
             @resetFormItemData="resetFormItemData" />
           <el-form-item style="text-align: right">
             <el-button size="small" @click="addOrEdit.visible = false">
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
index b349a9ff..e8bd5be1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
@@ -107,7 +107,7 @@
       </el-form-item>
     </template>
 
-    <QuestionTableFormItem v-for="item in question.Childrens" :key="item.Id" :question="item"
+    <QuestionTableFormItem v-for="item in question.Childrens" :key="item.Id" :question="item" :questions="questions"
       :question-form="questionForm" :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
       @resetFormItemData="resetFormItemData" />
   </div>
@@ -129,6 +129,12 @@ export default {
         return []
       }
     },
+    questions: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
     readingTaskState: {
       type: Number,
       required: true
@@ -155,6 +161,7 @@ export default {
         }
         this.$emit('setFormItemData', { key: question.Id, val: v })
       }
+      this.resetChildValue(question, this.questions)
     },
     resetChild(obj) {
       obj.forEach(i => {
@@ -164,6 +171,17 @@ export default {
         }
       })
     },
+    resetChildValue(obj, arr) {
+      arr.some(item => {
+        if (item.ParentId === obj.Id) {
+          this.$emit('resetFormItemData', item.Id)
+        }
+        if (item.Childrens && item.Childrens.length > 0) {
+          this.resetChildValue(obj, item.Childrens)
+        }
+        return item.ParentId === obj.Id
+      })
+    },
     limitBlur(valueType, value) {
       if (isNaN(parseInt(value))) {
         value = null

From d7a8112441994343010ffbea4213a6fb189788c9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 11 Dec 2025 11:01:30 +0800
Subject: [PATCH 145/333] =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/reading-tracking/components/exportList.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
index 5e3a53b3..f65401d2 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
@@ -148,7 +148,15 @@ export default {
             })
           break
         case 21:
-          searchData.ReadingExportType = 18
+          searchData.ReadingExportType = 21
+          getTumor_CDISC_Export(searchData)
+            .then((res) => { })
+            .catch(() => {
+              this.loading = false
+            })
+          break
+        case 22:
+          searchData.ReadingExportType = 22
           getTumor_CDISC_Export(searchData)
             .then((res) => { })
             .catch(() => {

From 365791624e05fa0abd58a773f64c315710b8380f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 11 Dec 2025 11:02:10 +0800
Subject: [PATCH 146/333] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99=E7=BB=9D=E5=AF=B9=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/customize/QuestionFormItem.vue | 42 +++++++++++++------
 .../components/customize/QuestionList.vue     |  2 +-
 .../components/customize/ReportPage.vue       | 14 +++++--
 .../reading-unit/components/QuestionsForm.vue |  9 ++--
 .../reading-unit/components/TableQsForm.vue   |  7 ++--
 5 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 9c569c90..39500471 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -486,8 +486,8 @@ export default {
       }
     })
     DicomEvent.$on('operateImageMarker', (data) => {
-      let { operateStateEnum, QuestionId, picturePath } = data
-      if (this.question.Id === QuestionId) {
+      let { operateStateEnum, QuestionId, picturePath, visitTaskId } = data
+      if (this.question.Id === QuestionId && visitTaskId === this.visitTaskId) {
         this.operateImageMarker({ operateStateEnum, question: this.question, picturePath })
       }
     })
@@ -842,17 +842,33 @@ export default {
                   break;
               }
             } else {
-              if (this.questionForm[o.TableQuestionId] === 'NE') {
-                isNE = true
-              }
-              if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                num = parseFloat(this.questionForm[o.TableQuestionId])
-              } else {
-                isNAN = true
-              }
-              if (!isNaN(num)) {
-                dataArr.push(num)
+              switch (rules.CustomCalculateMark) {
+                case 15:
+                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                    num = Math.abs(this.questionForm[o.TableQuestionId])
+                  }
+                  else {
+                    isNAN = true
+                  }
+                  if (this.questionForm[o.TableQuestionId] === 'NE') {
+                    isNE = true
+                  }
+                  break;
+                default:
+                  if (this.questionForm[o.TableQuestionId] === 'NE') {
+                    isNE = true
+                  }
+                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                    num = parseFloat(this.questionForm[o.TableQuestionId])
+                  } else {
+                    isNAN = true
+                  }
+                  if (!isNaN(num)) {
+                    dataArr.push(num)
+                  }
+                  break;
               }
+
             }
           } else {
             if (this.questionForm[o.TableQuestionId] === 'NE') {
@@ -939,7 +955,7 @@ export default {
                 break;
               case 15:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  num = Math.abs(num)
+                  num = Math.abs(this.questionForm[o.TableQuestionId])
                 }
                 else {
                   isNAN = true
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 5422189b..00b1ecdd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -643,7 +643,7 @@ export default {
             if (!item.MeasureData || item.MeasureData.annotationUID !== annotation.annotationUID) continue
             const isTableMode = item.TableQuestionId
             if (!isTableMode && this.questionsMarkStatus[item.QuestionId] && !this.questionsMarkStatus[item.QuestionId].isSaved && this.questionsMarkStatus[item.QuestionId].isMarked) {
-              DicomEvent.$emit('operateImageMarker', { QuestionId: item.QuestionId, operateStateEnum: 5, picturePath })
+              DicomEvent.$emit('operateImageMarker', { QuestionId: item.QuestionId, operateStateEnum: 5, picturePath, visitTaskId: this.visitTaskId })
               break
             }
           }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
index bed7a11e..f02ac930 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
@@ -535,7 +535,15 @@ export default {
                     }
                   })
                   num = arr1.length === 0 ? 0 : Math.min(...arr1)
-                  break
+                  break;
+                case 15:
+                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                    num = Math.abs(this.questionForm[o.TableQuestionId])
+                  }
+                  else {
+                    isNAN = true
+                  }
+                  break;
               }
             } else {
               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -624,7 +632,7 @@ export default {
                 break;
               case 15:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  num = Math.abs(num)
+                  num = Math.abs(this.questionForm[o.TableQuestionId])
                 }
                 break;
             }
@@ -637,7 +645,7 @@ export default {
         return 'NE'
       }
       if (isNAN) {
-        return null
+        return false
       }
       if (rules.ValueType === 2) {
         num = num * 100
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 6fafe986..d9792647 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -389,7 +389,7 @@
               @change="(v) => CustomCalculateMarkChange(v)">
               <div>
                 <el-radio v-for="item of $d.CustomCalculateMark"
-                  v-show="item.value <= 4 || item.value === 10 || item.value === 11 || item.value === 12 || item.value === 13 || item.value === 14"
+                  v-show="item.value <= 4 || item.value === 10 || item.value === 11 || item.value === 12 || item.value === 13 || item.value === 14 || item.value === 15"
                   :key="`CustomCalculateMark${item.value}`" :label="item.value">
                   {{ item.label }}
                 </el-radio>
@@ -451,9 +451,10 @@
               <template slot-scope="scope">
                 <!-- 添加 -->
                 <el-button icon="el-icon-plus" size="mini" circle :title="$t('trials:readingUnit:qsList:title:add')"
-                  @click="addCustomCalculateMark(scope.$index)" />
+                  @click="addCustomCalculateMark(scope.$index)" :disabled="form.CustomCalculateMark === 15" />
                 <!-- 删除 -->
-                <el-button icon="el-icon-minus" size="mini" circle :disabled="form.CalculateQuestions.length <= 2"
+                <el-button icon="el-icon-minus" size="mini" circle
+                  :disabled="(form.CustomCalculateMark !== 15 && form.CalculateQuestions.length <= 2) || (form.CustomCalculateMark === 15 && form.CalculateQuestions.length <= 1)"
                   :title="$t('trials:readingUnit:qsList:title:delete')"
                   @click="deleteCustomCalculateMark(scope.$index)" />
               </template>
@@ -894,7 +895,7 @@ export default {
     },
     CustomCalculateMarkChange() {
       this.isShow = false
-      if (this.form.CustomCalculateMark <= 4 || this.form.CustomCalculateMark >= 10) {
+      if ((this.form.CustomCalculateMark <= 4 || this.form.CustomCalculateMark >= 10) && this.form.CustomCalculateMark < 15) {
         this.form.CalculateQuestions = [
           {
             IsTable: false,
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index c9c2fb1a..7cc53ba9 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -221,7 +221,7 @@
             <el-radio-group v-model="form.CustomCalculateMark" style="line-height: 40px;"
               @change="(v) => CustomCalculateMarkChange(v)">
               <div>
-                <el-radio v-for="item of $d.CustomCalculateMark" v-show="item.value <= 4"
+                <el-radio v-for="item of $d.CustomCalculateMark" v-show="item.value <= 4 || item.value >= 15"
                   :key="`CustomCalculateMark${item.value}`" :label="item.value">
                   {{ item.label }}
                 </el-radio>
@@ -259,8 +259,9 @@
             <el-table-column :label="$t('common:action:action')" prop="TableQuestionId" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button icon="el-icon-plus" size="mini" circle :title="$t('common:button:add')"
-                  @click="addCustomCalculateMark(scope.$index)" />
-                <el-button icon="el-icon-minus" size="mini" circle :disabled="form.CalculateQuestions.length <= 2"
+                  @click="addCustomCalculateMark(scope.$index)" :disabled="form.CustomCalculateMark === 15" />
+                <el-button icon="el-icon-minus" size="mini" circle
+                  ::disabled="(form.CustomCalculateMark !== 15 && form.CalculateQuestions.length <= 2) || (form.CustomCalculateMark === 15 && form.CalculateQuestions.length <= 1)"
                   :title="$t('common:button:delete')" @click="deleteCustomCalculateMark(scope.$index)" />
               </template>
             </el-table-column>

From 7ca31d8a5e1fe0ff35a331b26e366cd762257dcf Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 11 Dec 2025 11:18:59 +0800
Subject: [PATCH 147/333] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=85=8D=E7=BD=AE=E9=AB=98=E4=BA=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dictionary/template/components/CriterionQuestionForm.vue    | 2 +-
 src/views/dictionary/template/components/TableQsForm.vue        | 2 +-
 .../setting/reading-unit/components/QuestionsForm.vue           | 2 +-
 .../setting/reading-unit/components/TableQsForm.vue             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 221038d8..4e2310fb 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -289,7 +289,7 @@
           </el-select>
         </el-form-item>
         <!-- 高亮标记值 -->
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation'"
           :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index 879f571c..97298ee1 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -217,7 +217,7 @@
           </el-select>
         </el-form-item>
         <!-- 高亮标记值 -->
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation'"
           :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 60bee424..f6f98305 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -287,7 +287,7 @@
           <el-input :disabled="form.DataSource === 1" v-model="form.DefaultValue" />
         </el-form-item>
         <!-- 高亮标记值 -->
-        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio')"
+        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio'|| form.Type === 'calculation')"
           :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index e32b8521..1671fd89 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -351,7 +351,7 @@
         </el-form-item>
 
         <!-- 高亮标记值 -->
-        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio')"
+        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation')"
           :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">

From edb03fef23229f67730f340db28722073297468f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 11 Dec 2025 11:36:54 +0800
Subject: [PATCH 148/333] =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E5=92=8C=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=92=8C=E7=94=9F=E6=95=88=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/agreement/TemplateForm.vue       | 12 +++++------
 .../dictionary/template/agreement/index.vue   | 20 +++++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/views/dictionary/template/agreement/TemplateForm.vue b/src/views/dictionary/template/agreement/TemplateForm.vue
index 7acfc29a..7d1ffacb 100644
--- a/src/views/dictionary/template/agreement/TemplateForm.vue
+++ b/src/views/dictionary/template/agreement/TemplateForm.vue
@@ -25,9 +25,9 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')" prop="UpdateDate" style="width: 48%">
-            <el-date-picker v-model="form.UpdateDate" type="datetime"
-              :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%;">
+            <el-date-picker v-model="form.UpdateDate" type="date"
+              :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd" clearable style="width: 100%;">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -35,9 +35,9 @@
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('dictionary:agreement:table:EffectiveDate')" prop="EffectiveDate" style="width: 48%">
-            <el-date-picker v-model="form.EffectiveDate" type="datetime"
-              :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%;">
+            <el-date-picker v-model="form.EffectiveDate" type="date"
+              :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd" clearable style="width: 100%;">
             </el-date-picker>
           </el-form-item>
         </el-col>
diff --git a/src/views/dictionary/template/agreement/index.vue b/src/views/dictionary/template/agreement/index.vue
index 90c93afb..84923565 100644
--- a/src/views/dictionary/template/agreement/index.vue
+++ b/src/views/dictionary/template/agreement/index.vue
@@ -18,14 +18,14 @@
         </el-form-item>
         <!--更新日期-->
         <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')">
-          <el-date-picker v-model="UpdateDate" @change="changeTimeList('UpdateDate')" value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']" type="datetimerange">
+          <el-date-picker v-model="UpdateDate" @change="changeTimeList('UpdateDate')" value-format="yyyy-MM-dd"
+            type="daterange">
           </el-date-picker>
         </el-form-item>
         <!--生效日期-->
         <el-form-item :label="$t('dictionary:agreement:table:EffectiveDate')">
-          <el-date-picker v-model="EffectiveDate" @change="changeTimeList('EffectiveDate')"
-            value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']" type="datetimerange">
+          <el-date-picker v-model="EffectiveDate" @change="changeTimeList('EffectiveDate')" value-format="yyyy-MM-dd"
+            type="daterange">
           </el-date-picker>
         </el-form-item>
         <!-- 当前版本 -->
@@ -80,10 +80,18 @@
         </el-table-column>
         <!-- 更新日期 -->
         <el-table-column prop="UpdateDate" :label="$t('dictionary:agreement:table:UpdateDate')" show-overflow-tooltip
-          sortable="custom" />
+          sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ scope.row.UpdateDate ? scope.row.UpdateDate.split(' ')[0] : '' }}</span>
+          </template>
+        </el-table-column>
         <!-- 生效日期 -->
         <el-table-column prop="EffectiveDate" :label="$t('dictionary:agreement:table:EffectiveDate')"
-          show-overflow-tooltip sortable="custom" />
+          show-overflow-tooltip sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ scope.row.EffectiveDate ? scope.row.EffectiveDate.split(' ')[0] : '' }}</span>
+          </template>
+        </el-table-column>
         <!-- 当前版本 -->
         <el-table-column prop="IsCurrentVersion" :label="$t('dictionary:agreement:table:IsCurrentVersion')"
           show-overflow-tooltip sortable="custom">

From b661a51ec2c09cc0bce26f1b2f2693698948a819 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 11 Dec 2025 16:24:37 +0800
Subject: [PATCH 149/333] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/IRecist/QuestionList.vue       | 282 ++++++++++++++----
 .../dicoms/components/Recist/QuestionList.vue | 249 +++++++++++++---
 .../components/RecistBM/QuestionList.vue      | 237 +++++++++++++--
 .../reading/dicoms3D/components/ReadPage.vue  |   6 +-
 .../components/Recist/QuestionList.vue        | 263 +++++++++++++---
 .../components/mRecist/QuestionList.vue       | 190 +++++++++++-
 6 files changed, 1068 insertions(+), 159 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index 6f9d65d7..ff0df539 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -80,60 +80,81 @@
                         placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div style="position: absolute;left: 62px;top: 2px;">
-                        <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
-                        <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                              <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
-                            </el-tooltip>
+                      <div
+                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
                           </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
-                            <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 2">
-                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 5">
-                              {{ $fd('NewTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 6">
-                              {{ $fd('NewNoTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 7">
-                              {{ $fd('OtherPreviousNewLesionState',
-                                parseInt(item.TableQuestions.Answers[i].lesionState))
-                              }}
-                            </span>
-                            <span v-else-if="item.LesionType === 8">
-                              {{
-                                $fd('NewLesionAfterTriggeringiRECSITState',
+                          <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+                          <div style="font-size: 11px;width:220px;height: 30px;">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
+                              </el-tooltip>
+                            </div>
+                            <div
+                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                              <span v-if="item.LesionType === 0">
+                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 1">
+                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 2">
+                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 5">
+                                {{ $fd('NewTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 6">
+                                {{ $fd('NewNoTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState))
+                                }}
+                              </span>
+                              <span v-else-if="item.LesionType === 7">
+                                {{ $fd('OtherPreviousNewLesionState',
                                   parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
-                              {{ item.TableQuestions.Answers[i].lesionShort }}mm
-                            </template>
-                            <template
-                              v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                              {{ item.TableQuestions.Answers[i].lesionLength }}mm
-                            </template>
+                                }}
+                              </span>
+                              <span v-else-if="item.LesionType === 8">
+                                {{
+                                  $fd('NewLesionAfterTriggeringiRECSITState',
+                                    parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
+                                {{ item.TableQuestions.Answers[i].lesionShort }}mm
+                              </template>
+                              <template
+                                v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                                {{ item.TableQuestions.Answers[i].lesionLength }}mm
+                              </template>
+                            </div>
                           </div>
                         </div>
+
                       </div>
                       <div
-                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1, 4, 5].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 5 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1) || (item.LesionType === 6 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 7 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 8 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1, 4, 5].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 5 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1) || (item.LesionType === 6 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 7 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 8 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                         style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
                         <el-tooltip
@@ -142,6 +163,13 @@
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -165,10 +193,35 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion } from '@/api/trials'
+import { splitLesion, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -224,7 +277,12 @@ export default {
       criterionType: null,
       subjectCode: '',
       isConvertedTask: null,
-      isFirstChangeTask: null
+      isFirstChangeTask: null,
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -280,6 +338,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          DicomEvent.$emit('readingPageUpdate', {})
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          this.getReadingQuestionAndAnswer()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -1181,6 +1299,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .measurement-wrapper {
   height: 100%;
   overflow-y: auto;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index 39730027..5680e32c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -68,43 +68,63 @@
                         placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div style="position: absolute;left: 50px;top: 2px;">
-                        <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
-                        <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                              <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
-                            </el-tooltip>
+                      <div
+                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
                           </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
-                            <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else>
-                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
-                              {{ item.TableQuestions.Answers[i].lesionShort }}mm
-                            </template>
-                            <template
-                              v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                              {{ item.TableQuestions.Answers[i].lesionLength }}mm
-                            </template>
+                          <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+                          <div style="font-size: 11px;width:220px;height: 30px;">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
+                              </el-tooltip>
+                            </div>
+                            <div
+                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                              <span v-if="item.LesionType === 0">
+                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 1">
+                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else>
+                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
+                                {{ item.TableQuestions.Answers[i].lesionShort }}mm
+                              </template>
+                              <template
+                                v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                                {{ item.TableQuestions.Answers[i].lesionLength }}mm
+                              </template>
+                            </div>
                           </div>
                         </div>
+
                       </div>
                       <div
-                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                         style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
                         <el-tooltip
@@ -113,6 +133,13 @@
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -134,10 +161,35 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion } from '@/api/trials'
+import { splitLesion, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -191,7 +243,12 @@ export default {
       tableQuestions: [],
       isFirstRender: false,
       CriterionType: null,
-      subjectCode: ''
+      subjectCode: '',
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -248,6 +305,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          DicomEvent.$emit('readingPageUpdate', {})
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          this.getReadingQuestionAndAnswer()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -1066,6 +1183,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .measurement-wrapper {
   height: 100%;
   overflow-y: auto;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index b3ef5be3..96829b4e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -66,38 +66,58 @@
                         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="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                              <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
-                            </el-tooltip>
+                      <div
+                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
                           </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
-                            <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else>
-                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                          </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                          <div style="font-size: 11px;width:220px;height: 30px;">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
+                              </el-tooltip>
+                            </div>
+                            <div
+                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                              <span v-if="item.LesionType === 0">
+                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 1">
+                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else>
+                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                              {{ item.TableQuestions.Answers[i].lesionLength }}mm
-                            </template>
+                              <template v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                                {{ item.TableQuestions.Answers[i].lesionLength }}mm
+                              </template>
+                            </div>
                           </div>
                         </div>
+
                       </div>
                       <div
-                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                         style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
                         <el-tooltip
@@ -106,6 +126,13 @@
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -127,10 +154,35 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion } from '@/api/trials'
+import { splitLesion, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 
@@ -185,7 +237,12 @@ export default {
       tableQuestions: [],
       isFirstRender: false,
       CriterionType: null,
-      subjectCode: ''
+      subjectCode: '',
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -243,6 +300,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          DicomEvent.$emit('readingPageUpdate', {})
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          this.getReadingQuestionAndAnswer()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -993,6 +1110,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .measurement-wrapper {
   height: 100%;
   overflow-y: auto;
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 1d8abafd..8bbc24bd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -163,7 +163,7 @@
             <!-- MPR -->
             <div class="tool-item" :title="`${$t('trials:reading:button:mpr')}`" @click.prevent="openMPRViewport()"
               v-if="criterionType === 0 && readingTool === 0">
-              <svg-icon icon-class="mpr" class="svg-icon" style="transform: rotate(180deg);"/>
+              <svg-icon icon-class="mpr" class="svg-icon" style="transform: rotate(180deg);" />
             </div>
             <!--融合-->
             <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')"
@@ -343,7 +343,7 @@
                 :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
                 @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
                 @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations" @setToolToTarget="setToolToTarget"
-                @handleReadingChart="handleReadingChart" />
+                @handleReadingChart="handleReadingChart" @setReadingToolPassive="setReadingToolPassive" />
               <recisit
                 v-else-if="lastViewportTaskId && criterionType === 1 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
@@ -351,7 +351,7 @@
                 :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
                 @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
                 @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations" @setToolToTarget="setToolToTarget"
-                @handleReadingChart="handleReadingChart" />
+                @handleReadingChart="handleReadingChart" @setReadingToolPassive="setReadingToolPassive" />
               <customize-question-list
                 v-else-if="lastViewportTaskId && criterionType === 0 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
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
index 13bf30bf..723c4ad7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -77,49 +77,70 @@
                         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
+                        :style="{ position: 'absolute', left: table.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)}`" />
                           </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}`].IsLymphNodes && !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}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
-                              {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
-                            </template>
+                          <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}`].IsLymphNodes && !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}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                                {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
+                              </template>
+                            </div>
                           </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'"
+                        v-if="((table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (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"
@@ -127,6 +148,13 @@
                           <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>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -164,6 +192,31 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -174,7 +227,9 @@ import {
   saveTaskQuestion,
   submitTableQuestion,
   deleteReadingRowAnswer,
-  splitLesion
+  splitLesion,
+  getCanMergeLesion,
+  mergeLesion
 } from '@/api/trials'
 import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
@@ -221,7 +276,13 @@ export default {
       deleteTargetInfo: null,
       digitPlaces: 2,
       imageQualityId: '',
-      imageQualityIssuesId: ''
+      imageQualityIssuesId: '',
+
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -258,6 +319,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          // DicomEvent.$emit('readingPageUpdate', {})
+          // DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setReadingToolPassive')
+          this.getTableQuestions()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     // 获取器官信息
     async getOrganList() {
       try {
@@ -1841,6 +1962,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .questionList-wrapper {
   height: 100%;
   overflow-y: auto;
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
index 5bcaab84..0154ec63 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -80,8 +80,25 @@
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
                       <div
-                        :style="{ position: 'absolute', left: '50px', top: '2px', color: innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? '#5fb4ff' : '#fff' }">
-                        <div style="font-size: 11px;width:220px;height: 30px;">
+                        :style="{ position: 'absolute', left: table.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px', color: innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? '#5fb4ff' : '#fff' }">
+
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)}`" />
+                          </div>
                           <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">
@@ -122,7 +139,7 @@
                       </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'"
+                        v-if="((table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)))) || ((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"
@@ -130,6 +147,13 @@
                           <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>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -167,6 +191,31 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -177,7 +226,9 @@ import {
   saveTaskQuestion,
   submitTableQuestion,
   deleteReadingRowAnswer,
-  splitLesion
+  splitLesion,
+  getCanMergeLesion,
+  mergeLesion
 } from '@/api/trials'
 import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
@@ -223,7 +274,12 @@ export default {
       deleteTargetInfo: null,
       digitPlaces: 2,
       imageQualityId: '',
-      imageQualityIssuesId: ''
+      imageQualityIssuesId: '',
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -259,6 +315,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          // DicomEvent.$emit('readingPageUpdate', {})
+          // DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setReadingToolPassive')
+          this.getTableQuestions()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     // 获取器官信息
     async getOrganList() {
       try {
@@ -1930,6 +2046,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .questionList-wrapper {
   height: 100%;
   overflow-y: auto;

From aab9c4576c4e7bede1187aae13a8382ae6e40859 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 11 Dec 2025 16:30:31 +0800
Subject: [PATCH 150/333] =?UTF-8?q?=E7=97=85=E7=81=B6=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/IRecist/QuestionList.vue       | 282 ++++--------------
 .../dicoms/components/Recist/QuestionList.vue | 249 +++-------------
 .../components/RecistBM/QuestionList.vue      | 237 ++-------------
 .../reading/dicoms3D/components/ReadPage.vue  |   6 +-
 .../components/Recist/QuestionList.vue        | 263 +++-------------
 .../components/mRecist/QuestionList.vue       | 190 +-----------
 6 files changed, 159 insertions(+), 1068 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index ff0df539..6f9d65d7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -80,81 +80,60 @@
                         placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div
-                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
-                        <div
-                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip
-                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
-                            class="item" effect="dark"
-                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
-                            placement="bottom">
-                            <div
-                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
-                              <span class="login-cycle"
-                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
-                            </div>
-                          </el-tooltip>
-                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
-                            <span class="login-cycle"
-                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
+                      <div style="position: absolute;left: 62px;top: 2px;">
+                        <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+                        <div style="font-size: 11px;width:220px;height: 30px;">
+                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                              <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
+                            </el-tooltip>
                           </div>
-                          <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
-                          <div style="font-size: 11px;width:220px;height: 30px;">
-                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
-                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
-                              </el-tooltip>
-                            </div>
-                            <div
-                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
-                              <span v-if="item.LesionType === 0">
-                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                              </span>
-                              <span v-else-if="item.LesionType === 1">
-                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                              </span>
-                              <span v-else-if="item.LesionType === 2">
-                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                              </span>
-                              <span v-else-if="item.LesionType === 5">
-                                {{ $fd('NewTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                              </span>
-                              <span v-else-if="item.LesionType === 6">
-                                {{ $fd('NewNoTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState))
-                                }}
-                              </span>
-                              <span v-else-if="item.LesionType === 7">
-                                {{ $fd('OtherPreviousNewLesionState',
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                            <span v-if="item.LesionType === 0">
+                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else-if="item.LesionType === 1">
+                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else-if="item.LesionType === 2">
+                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else-if="item.LesionType === 5">
+                              {{ $fd('NewTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else-if="item.LesionType === 6">
+                              {{ $fd('NewNoTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else-if="item.LesionType === 7">
+                              {{ $fd('OtherPreviousNewLesionState',
+                                parseInt(item.TableQuestions.Answers[i].lesionState))
+                              }}
+                            </span>
+                            <span v-else-if="item.LesionType === 8">
+                              {{
+                                $fd('NewLesionAfterTriggeringiRECSITState',
                                   parseInt(item.TableQuestions.Answers[i].lesionState))
-                                }}
-                              </span>
-                              <span v-else-if="item.LesionType === 8">
-                                {{
-                                  $fd('NewLesionAfterTriggeringiRECSITState',
-                                    parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
-                                {{ item.TableQuestions.Answers[i].lesionShort }}mm
-                              </template>
-                              <template
-                                v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                                {{ item.TableQuestions.Answers[i].lesionLength }}mm
-                              </template>
-                            </div>
+                              }}
+                            </span>
+                          </div>
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                            <template
+                              v-if="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
+                              {{ item.TableQuestions.Answers[i].lesionShort }}mm
+                            </template>
+                            <template
+                              v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                              {{ item.TableQuestions.Answers[i].lesionLength }}mm
+                            </template>
                           </div>
                         </div>
-
                       </div>
                       <div
-                        v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1, 4, 5].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 5 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1) || (item.LesionType === 6 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 7 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 8 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1, 4, 5].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 5 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1) || (item.LesionType === 6 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 7 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 8 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                         style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
                         <el-tooltip
@@ -163,13 +142,6 @@
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
-                        <!-- 融合 -->
-                        <el-tooltip
-                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
-                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
-                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
-                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
-                        </el-tooltip>
                       </div>
 
                     </div>
@@ -193,35 +165,10 @@
         </div>
       </template>
     </div>
-    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
-      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
-      <div class="merge-table">
-        <div class="merge-label">
-          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
-          <span>{{ mergeInfo.lesionName }}</span>
-          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
-        </div>
-        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
-        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
-          @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="45" />
-          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
-          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
-            show-overflow-tooltip />
-        </el-table>
-      </div>
-      <div slot="footer" style="text-align:right;">
-        <!-- 取消 -->
-        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
-        <!-- 确认 -->
-        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
-          {{ $t('common:button:confirm') }}</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion, getCanMergeLesion, mergeLesion } from '@/api/trials'
+import { splitLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -277,12 +224,7 @@ export default {
       criterionType: null,
       subjectCode: '',
       isConvertedTask: null,
-      isFirstChangeTask: null,
-
-      merge: { visible: false, loading: false },
-      lesionData: [],
-      mergeInfo: {},
-      mergeList: []
+      isFirstChangeTask: null
     }
   },
   computed: {
@@ -338,66 +280,6 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    // 融合
-    async handleMerge(answers, questionId, orderMark) {
-      this.lesionData = []
-      this.mergeList = []
-      this.merge.visible = true
-      this.mergeInfo.questionId = questionId
-      this.mergeInfo.mergeRowId = answers.RowId
-      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
-      this.mergeInfo.lesionPart = answers.lesionPart
-      this.merge.loading = true
-      try {
-        const res = await getCanMergeLesion({ rowId: answers.RowId })
-        if (res.IsSuccess) {
-          this.lesionData = res.Result
-        }
-        this.merge.loading = false
-      } catch (e) {
-        console.log(e)
-        this.merge.loading = false
-      }
-    },
-    handleSelectionChange(val) {
-      this.mergeList = []
-      val.map(i => {
-        this.mergeList.push(i.RowId)
-      })
-    },
-    confirmMerge() {
-      // '融合后将无法撤销, 是否继续?'
-      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
-        type: 'warning'
-      }).then(() => {
-        this.lesionMerge()
-      }).catch(() => {
-
-      })
-    },
-    async lesionMerge() {
-      this.merge.loading = true
-      try {
-        var params = {
-          visitTaskId: this.visitTaskId,
-          questionId: this.mergeInfo.questionId,
-          mergeMainRowId: this.mergeInfo.mergeRowId,
-          mergeRowIdList: this.mergeList
-        }
-        const res = await mergeLesion(params)
-        if (res.IsSuccess) {
-          this.merge.visible = false
-          DicomEvent.$emit('readingPageUpdate', {})
-          DicomEvent.$emit('getReportInfo', true)
-          DicomEvent.$emit('setMeasuredToolsPassive')
-          this.getReadingQuestionAndAnswer()
-        }
-        this.merge.loading = false
-      } catch (e) {
-        this.merge.loading = false
-        console.log(e)
-      }
-    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -1299,70 +1181,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.login-cycle {
-  width: 5px;
-  height: 5px;
-  display: inline-block;
-  background-color: #428bca;
-  border-radius: 50%;
-  margin-right: 2px;
-  margin-bottom: 2px;
-}
-
-.merge-table {
-  padding: 0 10px;
-
-  ::v-deep.el-table {
-    background-color: #1e1e1e !important;
-    color: #383838;
-  }
-
-  ::v-deep.el-table td.el-table__cell,
-  .el-table th.el-table__cell.is-leaf {
-    border-bottom: 1px solid #383838;
-  }
-
-  .el-table--border::after,
-  .el-table--group::after,
-  .el-table::before {
-    background-color: #1e1e1e;
-  }
-
-  ::v-deep.el-table__header-wrapper {
-    th {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-      border-bottom: 1px solid #383838;
-    }
-  }
-
-  ::v-deep.el-table__body-wrapper {
-    tr {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-    }
-
-    tr:hover>td {
-      background-color: #1e1e1e !important;
-    }
-  }
-
-  ::v-deep.el-table__empty-block {
-    background-color: #1e1e1e !important;
-  }
-
-  .merge-label {
-    color: #ddd;
-    font-size: 13px;
-    margin-bottom: 10px;
-
-    span {
-      font-size: 15px;
-      color: red;
-    }
-  }
-}
-
 .measurement-wrapper {
   height: 100%;
   overflow-y: auto;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index 5680e32c..39730027 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -68,63 +68,43 @@
                         placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div
-                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
-                        <div
-                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip
-                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
-                            class="item" effect="dark"
-                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
-                            placement="bottom">
-                            <div
-                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
-                              <span class="login-cycle"
-                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
-                            </div>
-                          </el-tooltip>
-                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
-                            <span class="login-cycle"
-                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
+                      <div style="position: absolute;left: 50px;top: 2px;">
+                        <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+                        <div style="font-size: 11px;width:220px;height: 30px;">
+                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                              <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
+                            </el-tooltip>
                           </div>
-                          <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
-                          <div style="font-size: 11px;width:220px;height: 30px;">
-                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
-                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
-                              </el-tooltip>
-                            </div>
-                            <div
-                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
-                              <span v-if="item.LesionType === 0">
-                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                              </span>
-                              <span v-else-if="item.LesionType === 1">
-                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                              </span>
-                              <span v-else>
-                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
-                                {{ item.TableQuestions.Answers[i].lesionShort }}mm
-                              </template>
-                              <template
-                                v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                                {{ item.TableQuestions.Answers[i].lesionLength }}mm
-                              </template>
-                            </div>
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                            <span v-if="item.LesionType === 0">
+                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else-if="item.LesionType === 1">
+                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else>
+                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
+                              {{ item.TableQuestions.Answers[i].lesionShort }}mm
+                            </template>
+                            <template
+                              v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                              {{ item.TableQuestions.Answers[i].lesionLength }}mm
+                            </template>
                           </div>
                         </div>
-
                       </div>
                       <div
-                        v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                         style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
                         <el-tooltip
@@ -133,13 +113,6 @@
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
-                        <!-- 融合 -->
-                        <el-tooltip
-                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
-                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
-                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
-                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
-                        </el-tooltip>
                       </div>
 
                     </div>
@@ -161,35 +134,10 @@
         </div>
       </template>
     </div>
-    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
-      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
-      <div class="merge-table">
-        <div class="merge-label">
-          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
-          <span>{{ mergeInfo.lesionName }}</span>
-          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
-        </div>
-        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
-        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
-          @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="45" />
-          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
-          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
-            show-overflow-tooltip />
-        </el-table>
-      </div>
-      <div slot="footer" style="text-align:right;">
-        <!-- 取消 -->
-        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
-        <!-- 确认 -->
-        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
-          {{ $t('common:button:confirm') }}</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion, getCanMergeLesion, mergeLesion } from '@/api/trials'
+import { splitLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -243,12 +191,7 @@ export default {
       tableQuestions: [],
       isFirstRender: false,
       CriterionType: null,
-      subjectCode: '',
-
-      merge: { visible: false, loading: false },
-      lesionData: [],
-      mergeInfo: {},
-      mergeList: []
+      subjectCode: ''
     }
   },
   computed: {
@@ -305,66 +248,6 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    // 融合
-    async handleMerge(answers, questionId, orderMark) {
-      this.lesionData = []
-      this.mergeList = []
-      this.merge.visible = true
-      this.mergeInfo.questionId = questionId
-      this.mergeInfo.mergeRowId = answers.RowId
-      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
-      this.mergeInfo.lesionPart = answers.lesionPart
-      this.merge.loading = true
-      try {
-        const res = await getCanMergeLesion({ rowId: answers.RowId })
-        if (res.IsSuccess) {
-          this.lesionData = res.Result
-        }
-        this.merge.loading = false
-      } catch (e) {
-        console.log(e)
-        this.merge.loading = false
-      }
-    },
-    handleSelectionChange(val) {
-      this.mergeList = []
-      val.map(i => {
-        this.mergeList.push(i.RowId)
-      })
-    },
-    confirmMerge() {
-      // '融合后将无法撤销, 是否继续?'
-      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
-        type: 'warning'
-      }).then(() => {
-        this.lesionMerge()
-      }).catch(() => {
-
-      })
-    },
-    async lesionMerge() {
-      this.merge.loading = true
-      try {
-        var params = {
-          visitTaskId: this.visitTaskId,
-          questionId: this.mergeInfo.questionId,
-          mergeMainRowId: this.mergeInfo.mergeRowId,
-          mergeRowIdList: this.mergeList
-        }
-        const res = await mergeLesion(params)
-        if (res.IsSuccess) {
-          this.merge.visible = false
-          DicomEvent.$emit('readingPageUpdate', {})
-          DicomEvent.$emit('getReportInfo', true)
-          DicomEvent.$emit('setMeasuredToolsPassive')
-          this.getReadingQuestionAndAnswer()
-        }
-        this.merge.loading = false
-      } catch (e) {
-        this.merge.loading = false
-        console.log(e)
-      }
-    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -1183,70 +1066,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.login-cycle {
-  width: 5px;
-  height: 5px;
-  display: inline-block;
-  background-color: #428bca;
-  border-radius: 50%;
-  margin-right: 2px;
-  margin-bottom: 2px;
-}
-
-.merge-table {
-  padding: 0 10px;
-
-  ::v-deep.el-table {
-    background-color: #1e1e1e !important;
-    color: #383838;
-  }
-
-  ::v-deep.el-table td.el-table__cell,
-  .el-table th.el-table__cell.is-leaf {
-    border-bottom: 1px solid #383838;
-  }
-
-  .el-table--border::after,
-  .el-table--group::after,
-  .el-table::before {
-    background-color: #1e1e1e;
-  }
-
-  ::v-deep.el-table__header-wrapper {
-    th {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-      border-bottom: 1px solid #383838;
-    }
-  }
-
-  ::v-deep.el-table__body-wrapper {
-    tr {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-    }
-
-    tr:hover>td {
-      background-color: #1e1e1e !important;
-    }
-  }
-
-  ::v-deep.el-table__empty-block {
-    background-color: #1e1e1e !important;
-  }
-
-  .merge-label {
-    color: #ddd;
-    font-size: 13px;
-    margin-bottom: 10px;
-
-    span {
-      font-size: 15px;
-      color: red;
-    }
-  }
-}
-
 .measurement-wrapper {
   height: 100%;
   overflow-y: auto;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index 96829b4e..b3ef5be3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -66,58 +66,38 @@
                         placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div
-                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
-                        <div
-                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip
-                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
-                            class="item" effect="dark"
-                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
-                            placement="bottom">
-                            <div
-                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
-                              <span class="login-cycle"
-                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
-                            </div>
-                          </el-tooltip>
-                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
-                            <span class="login-cycle"
-                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
+                      <div style="position: absolute;left: 50px;top: 2px;">
+                        <div style="font-size: 11px;width:220px;height: 30px;">
+                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                              <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
+                            </el-tooltip>
                           </div>
-                          <div style="font-size: 11px;width:220px;height: 30px;">
-                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
-                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
-                              </el-tooltip>
-                            </div>
-                            <div
-                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
-                              <span v-if="item.LesionType === 0">
-                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                              </span>
-                              <span v-else-if="item.LesionType === 1">
-                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                              </span>
-                              <span v-else>
-                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                              </span>
-                            </div>
-                            <div
-                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                            <span v-if="item.LesionType === 0">
+                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else-if="item.LesionType === 1">
+                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else>
+                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                                {{ item.TableQuestions.Answers[i].lesionLength }}mm
-                              </template>
-                            </div>
+                            <template v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                              {{ item.TableQuestions.Answers[i].lesionLength }}mm
+                            </template>
                           </div>
                         </div>
-
                       </div>
                       <div
-                        v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                         style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
                         <el-tooltip
@@ -126,13 +106,6 @@
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
-                        <!-- 融合 -->
-                        <el-tooltip
-                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
-                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
-                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
-                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
-                        </el-tooltip>
                       </div>
 
                     </div>
@@ -154,35 +127,10 @@
         </div>
       </template>
     </div>
-    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
-      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
-      <div class="merge-table">
-        <div class="merge-label">
-          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
-          <span>{{ mergeInfo.lesionName }}</span>
-          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
-        </div>
-        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
-        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
-          @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="45" />
-          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
-          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
-            show-overflow-tooltip />
-        </el-table>
-      </div>
-      <div slot="footer" style="text-align:right;">
-        <!-- 取消 -->
-        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
-        <!-- 确认 -->
-        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
-          {{ $t('common:button:confirm') }}</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion, getCanMergeLesion, mergeLesion } from '@/api/trials'
+import { splitLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 
@@ -237,12 +185,7 @@ export default {
       tableQuestions: [],
       isFirstRender: false,
       CriterionType: null,
-      subjectCode: '',
-
-      merge: { visible: false, loading: false },
-      lesionData: [],
-      mergeInfo: {},
-      mergeList: []
+      subjectCode: ''
     }
   },
   computed: {
@@ -300,66 +243,6 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    // 融合
-    async handleMerge(answers, questionId, orderMark) {
-      this.lesionData = []
-      this.mergeList = []
-      this.merge.visible = true
-      this.mergeInfo.questionId = questionId
-      this.mergeInfo.mergeRowId = answers.RowId
-      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
-      this.mergeInfo.lesionPart = answers.lesionPart
-      this.merge.loading = true
-      try {
-        const res = await getCanMergeLesion({ rowId: answers.RowId })
-        if (res.IsSuccess) {
-          this.lesionData = res.Result
-        }
-        this.merge.loading = false
-      } catch (e) {
-        console.log(e)
-        this.merge.loading = false
-      }
-    },
-    handleSelectionChange(val) {
-      this.mergeList = []
-      val.map(i => {
-        this.mergeList.push(i.RowId)
-      })
-    },
-    confirmMerge() {
-      // '融合后将无法撤销, 是否继续?'
-      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
-        type: 'warning'
-      }).then(() => {
-        this.lesionMerge()
-      }).catch(() => {
-
-      })
-    },
-    async lesionMerge() {
-      this.merge.loading = true
-      try {
-        var params = {
-          visitTaskId: this.visitTaskId,
-          questionId: this.mergeInfo.questionId,
-          mergeMainRowId: this.mergeInfo.mergeRowId,
-          mergeRowIdList: this.mergeList
-        }
-        const res = await mergeLesion(params)
-        if (res.IsSuccess) {
-          this.merge.visible = false
-          DicomEvent.$emit('readingPageUpdate', {})
-          DicomEvent.$emit('getReportInfo', true)
-          DicomEvent.$emit('setMeasuredToolsPassive')
-          this.getReadingQuestionAndAnswer()
-        }
-        this.merge.loading = false
-      } catch (e) {
-        this.merge.loading = false
-        console.log(e)
-      }
-    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -1110,70 +993,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.login-cycle {
-  width: 5px;
-  height: 5px;
-  display: inline-block;
-  background-color: #428bca;
-  border-radius: 50%;
-  margin-right: 2px;
-  margin-bottom: 2px;
-}
-
-.merge-table {
-  padding: 0 10px;
-
-  ::v-deep.el-table {
-    background-color: #1e1e1e !important;
-    color: #383838;
-  }
-
-  ::v-deep.el-table td.el-table__cell,
-  .el-table th.el-table__cell.is-leaf {
-    border-bottom: 1px solid #383838;
-  }
-
-  .el-table--border::after,
-  .el-table--group::after,
-  .el-table::before {
-    background-color: #1e1e1e;
-  }
-
-  ::v-deep.el-table__header-wrapper {
-    th {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-      border-bottom: 1px solid #383838;
-    }
-  }
-
-  ::v-deep.el-table__body-wrapper {
-    tr {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-    }
-
-    tr:hover>td {
-      background-color: #1e1e1e !important;
-    }
-  }
-
-  ::v-deep.el-table__empty-block {
-    background-color: #1e1e1e !important;
-  }
-
-  .merge-label {
-    color: #ddd;
-    font-size: 13px;
-    margin-bottom: 10px;
-
-    span {
-      font-size: 15px;
-      color: red;
-    }
-  }
-}
-
 .measurement-wrapper {
   height: 100%;
   overflow-y: auto;
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 8bbc24bd..1d8abafd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -163,7 +163,7 @@
             <!-- MPR -->
             <div class="tool-item" :title="`${$t('trials:reading:button:mpr')}`" @click.prevent="openMPRViewport()"
               v-if="criterionType === 0 && readingTool === 0">
-              <svg-icon icon-class="mpr" class="svg-icon" style="transform: rotate(180deg);" />
+              <svg-icon icon-class="mpr" class="svg-icon" style="transform: rotate(180deg);"/>
             </div>
             <!--融合-->
             <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')"
@@ -343,7 +343,7 @@
                 :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
                 @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
                 @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations" @setToolToTarget="setToolToTarget"
-                @handleReadingChart="handleReadingChart" @setReadingToolPassive="setReadingToolPassive" />
+                @handleReadingChart="handleReadingChart" />
               <recisit
                 v-else-if="lastViewportTaskId && criterionType === 1 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
@@ -351,7 +351,7 @@
                 :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
                 @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
                 @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations" @setToolToTarget="setToolToTarget"
-                @handleReadingChart="handleReadingChart" @setReadingToolPassive="setReadingToolPassive" />
+                @handleReadingChart="handleReadingChart" />
               <customize-question-list
                 v-else-if="lastViewportTaskId && criterionType === 0 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
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
index 723c4ad7..13bf30bf 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -77,70 +77,49 @@
                         placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div
-                        :style="{ position: 'absolute', left: table.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
-                        <div
-                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip
-                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'"
-                            class="item" effect="dark"
-                            :content="`${$t('trials:reading:message:fused')}${innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeLesionName}`"
-                            placement="bottom">
-                            <div
-                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'">
-                              <span class="login-cycle"
-                                :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].MergeRowId)}`" />
-                            </div>
-                          </el-tooltip>
-                          <div v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '4'">
-                            <span class="login-cycle"
-                              :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)}`" />
+                      <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="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}`].IsLymphNodes && !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}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
-                                {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
-                              </template>
-                            </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}`].IsLymphNodes && !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}`].IsLymphNodes && !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 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (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'"
+                        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"
@@ -148,13 +127,6 @@
                           <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>
-                        <!-- 融合 -->
-                        <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
-                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
-                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
-                            @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
-                        </el-tooltip>
                       </div>
 
                     </div>
@@ -192,31 +164,6 @@
         </div>
       </template>
     </div>
-    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
-      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
-      <div class="merge-table">
-        <div class="merge-label">
-          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
-          <span>{{ mergeInfo.lesionName }}</span>
-          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
-        </div>
-        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
-        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
-          @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="45" />
-          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
-          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
-            show-overflow-tooltip />
-        </el-table>
-      </div>
-      <div slot="footer" style="text-align:right;">
-        <!-- 取消 -->
-        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
-        <!-- 确认 -->
-        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
-          {{ $t('common:button:confirm') }}</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -227,9 +174,7 @@ import {
   saveTaskQuestion,
   submitTableQuestion,
   deleteReadingRowAnswer,
-  splitLesion,
-  getCanMergeLesion,
-  mergeLesion
+  splitLesion
 } from '@/api/trials'
 import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
@@ -276,13 +221,7 @@ export default {
       deleteTargetInfo: null,
       digitPlaces: 2,
       imageQualityId: '',
-      imageQualityIssuesId: '',
-
-
-      merge: { visible: false, loading: false },
-      lesionData: [],
-      mergeInfo: {},
-      mergeList: []
+      imageQualityIssuesId: ''
     }
   },
   computed: {
@@ -319,66 +258,6 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    // 融合
-    async handleMerge(answers, questionId, orderMark) {
-      this.lesionData = []
-      this.mergeList = []
-      this.merge.visible = true
-      this.mergeInfo.questionId = questionId
-      this.mergeInfo.mergeRowId = answers.RowId
-      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
-      this.mergeInfo.lesionPart = answers.lesionPart
-      this.merge.loading = true
-      try {
-        const res = await getCanMergeLesion({ rowId: answers.RowId })
-        if (res.IsSuccess) {
-          this.lesionData = res.Result
-        }
-        this.merge.loading = false
-      } catch (e) {
-        console.log(e)
-        this.merge.loading = false
-      }
-    },
-    handleSelectionChange(val) {
-      this.mergeList = []
-      val.map(i => {
-        this.mergeList.push(i.RowId)
-      })
-    },
-    confirmMerge() {
-      // '融合后将无法撤销, 是否继续?'
-      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
-        type: 'warning'
-      }).then(() => {
-        this.lesionMerge()
-      }).catch(() => {
-
-      })
-    },
-    async lesionMerge() {
-      this.merge.loading = true
-      try {
-        var params = {
-          visitTaskId: this.visitTaskId,
-          questionId: this.mergeInfo.questionId,
-          mergeMainRowId: this.mergeInfo.mergeRowId,
-          mergeRowIdList: this.mergeList
-        }
-        const res = await mergeLesion(params)
-        if (res.IsSuccess) {
-          this.merge.visible = false
-          // DicomEvent.$emit('readingPageUpdate', {})
-          // DicomEvent.$emit('getReportInfo', true)
-          DicomEvent.$emit('setReadingToolPassive')
-          this.getTableQuestions()
-        }
-        this.merge.loading = false
-      } catch (e) {
-        this.merge.loading = false
-        console.log(e)
-      }
-    },
     // 获取器官信息
     async getOrganList() {
       try {
@@ -1962,70 +1841,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.login-cycle {
-  width: 5px;
-  height: 5px;
-  display: inline-block;
-  background-color: #428bca;
-  border-radius: 50%;
-  margin-right: 2px;
-  margin-bottom: 2px;
-}
-
-.merge-table {
-  padding: 0 10px;
-
-  ::v-deep.el-table {
-    background-color: #1e1e1e !important;
-    color: #383838;
-  }
-
-  ::v-deep.el-table td.el-table__cell,
-  .el-table th.el-table__cell.is-leaf {
-    border-bottom: 1px solid #383838;
-  }
-
-  .el-table--border::after,
-  .el-table--group::after,
-  .el-table::before {
-    background-color: #1e1e1e;
-  }
-
-  ::v-deep.el-table__header-wrapper {
-    th {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-      border-bottom: 1px solid #383838;
-    }
-  }
-
-  ::v-deep.el-table__body-wrapper {
-    tr {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-    }
-
-    tr:hover>td {
-      background-color: #1e1e1e !important;
-    }
-  }
-
-  ::v-deep.el-table__empty-block {
-    background-color: #1e1e1e !important;
-  }
-
-  .merge-label {
-    color: #ddd;
-    font-size: 13px;
-    margin-bottom: 10px;
-
-    span {
-      font-size: 15px;
-      color: red;
-    }
-  }
-}
-
 .questionList-wrapper {
   height: 100%;
   overflow-y: auto;
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
index 0154ec63..5bcaab84 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -80,25 +80,8 @@
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
                       <div
-                        :style="{ position: 'absolute', left: table.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px', color: innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? '#5fb4ff' : '#fff' }">
-
-                        <div
-                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip
-                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'"
-                            class="item" effect="dark"
-                            :content="`${$t('trials:reading:message:fused')}${innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeLesionName}`"
-                            placement="bottom">
-                            <div
-                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'">
-                              <span class="login-cycle"
-                                :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].MergeRowId)}`" />
-                            </div>
-                          </el-tooltip>
-                          <div v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '4'">
-                            <span class="login-cycle"
-                              :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)}`" />
-                          </div>
+                        :style="{ position: 'absolute', left: '50px', top: '2px', color: innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? '#5fb4ff' : '#fff' }">
+                        <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">
@@ -139,7 +122,7 @@
                       </div>
                       <!-- 分裂 -->
                       <div
-                        v-if="((table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)))) || ((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'"
+                        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"
@@ -147,13 +130,6 @@
                           <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>
-                        <!-- 融合 -->
-                        <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
-                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
-                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
-                            @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
-                        </el-tooltip>
                       </div>
 
                     </div>
@@ -191,31 +167,6 @@
         </div>
       </template>
     </div>
-    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
-      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
-      <div class="merge-table">
-        <div class="merge-label">
-          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
-          <span>{{ mergeInfo.lesionName }}</span>
-          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
-        </div>
-        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
-        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
-          @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="45" />
-          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
-          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
-            show-overflow-tooltip />
-        </el-table>
-      </div>
-      <div slot="footer" style="text-align:right;">
-        <!-- 取消 -->
-        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
-        <!-- 确认 -->
-        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
-          {{ $t('common:button:confirm') }}</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -226,9 +177,7 @@ import {
   saveTaskQuestion,
   submitTableQuestion,
   deleteReadingRowAnswer,
-  splitLesion,
-  getCanMergeLesion,
-  mergeLesion
+  splitLesion
 } from '@/api/trials'
 import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
@@ -274,12 +223,7 @@ export default {
       deleteTargetInfo: null,
       digitPlaces: 2,
       imageQualityId: '',
-      imageQualityIssuesId: '',
-
-      merge: { visible: false, loading: false },
-      lesionData: [],
-      mergeInfo: {},
-      mergeList: []
+      imageQualityIssuesId: ''
     }
   },
   computed: {
@@ -315,66 +259,6 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    // 融合
-    async handleMerge(answers, questionId, orderMark) {
-      this.lesionData = []
-      this.mergeList = []
-      this.merge.visible = true
-      this.mergeInfo.questionId = questionId
-      this.mergeInfo.mergeRowId = answers.RowId
-      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
-      this.mergeInfo.lesionPart = answers.lesionPart
-      this.merge.loading = true
-      try {
-        const res = await getCanMergeLesion({ rowId: answers.RowId })
-        if (res.IsSuccess) {
-          this.lesionData = res.Result
-        }
-        this.merge.loading = false
-      } catch (e) {
-        console.log(e)
-        this.merge.loading = false
-      }
-    },
-    handleSelectionChange(val) {
-      this.mergeList = []
-      val.map(i => {
-        this.mergeList.push(i.RowId)
-      })
-    },
-    confirmMerge() {
-      // '融合后将无法撤销, 是否继续?'
-      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
-        type: 'warning'
-      }).then(() => {
-        this.lesionMerge()
-      }).catch(() => {
-
-      })
-    },
-    async lesionMerge() {
-      this.merge.loading = true
-      try {
-        var params = {
-          visitTaskId: this.visitTaskId,
-          questionId: this.mergeInfo.questionId,
-          mergeMainRowId: this.mergeInfo.mergeRowId,
-          mergeRowIdList: this.mergeList
-        }
-        const res = await mergeLesion(params)
-        if (res.IsSuccess) {
-          this.merge.visible = false
-          // DicomEvent.$emit('readingPageUpdate', {})
-          // DicomEvent.$emit('getReportInfo', true)
-          DicomEvent.$emit('setReadingToolPassive')
-          this.getTableQuestions()
-        }
-        this.merge.loading = false
-      } catch (e) {
-        this.merge.loading = false
-        console.log(e)
-      }
-    },
     // 获取器官信息
     async getOrganList() {
       try {
@@ -2046,70 +1930,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.login-cycle {
-  width: 5px;
-  height: 5px;
-  display: inline-block;
-  background-color: #428bca;
-  border-radius: 50%;
-  margin-right: 2px;
-  margin-bottom: 2px;
-}
-
-.merge-table {
-  padding: 0 10px;
-
-  ::v-deep.el-table {
-    background-color: #1e1e1e !important;
-    color: #383838;
-  }
-
-  ::v-deep.el-table td.el-table__cell,
-  .el-table th.el-table__cell.is-leaf {
-    border-bottom: 1px solid #383838;
-  }
-
-  .el-table--border::after,
-  .el-table--group::after,
-  .el-table::before {
-    background-color: #1e1e1e;
-  }
-
-  ::v-deep.el-table__header-wrapper {
-    th {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-      border-bottom: 1px solid #383838;
-    }
-  }
-
-  ::v-deep.el-table__body-wrapper {
-    tr {
-      background-color: #1e1e1e !important;
-      color: #dfdfdf;
-    }
-
-    tr:hover>td {
-      background-color: #1e1e1e !important;
-    }
-  }
-
-  ::v-deep.el-table__empty-block {
-    background-color: #1e1e1e !important;
-  }
-
-  .merge-label {
-    color: #ddd;
-    font-size: 13px;
-    margin-bottom: 10px;
-
-    span {
-      font-size: 15px;
-      color: red;
-    }
-  }
-}
-
 .questionList-wrapper {
   height: 100%;
   overflow-y: auto;

From 726f6499f9912ddaf239d14c45b492b03f930a37 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 12 Dec 2025 16:58:50 +0800
Subject: [PATCH 151/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  24 ++
 .../trial-summary/report-forms/index.vue      | 350 ++++++++++++++++++
 2 files changed, 374 insertions(+)
 create mode 100644 src/views/trials/trials-panel/trial-summary/report-forms/index.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index c8e8d53b..ad52e1e7 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -4382,4 +4382,28 @@ export function setReadKeyFile(data) {
     method: 'post',
     data
   })
+}
+// 项目报表-访视完成度
+export function getTrialVisitFinishedStatList(data) {
+  return request({
+    url: `/TrialStat/getTrialVisitFinishedStatList`,
+    method: 'post',
+    data
+  })
+}
+// 项目报表-质疑统计表
+export function getTrialQuestionStatList(data) {
+  return request({
+    url: `/TrialStat/getTrialQuestionStatList`,
+    method: 'post',
+    data
+  })
+}
+// 项目报表-疗效统计表
+export function getTrialEfficacyEvaluationStatList(data) {
+  return request({
+    url: `/TrialStat/getTrialEfficacyEvaluationStatList`,
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
new file mode 100644
index 00000000..7601aa22
--- /dev/null
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -0,0 +1,350 @@
+<template>
+    <div class="reportForms">
+        <div class="search">
+            <el-form :inline="true">
+                <!-- 阅片标准 -->
+                <el-form-item :label="$t('trials:reportForms:table:Criterion')">
+                    <el-select v-model="searchData.TrialReadingCriterionId" clearable filterable>
+                        <el-option v-for="(item, index) of trialCriterionList" :key="index"
+                            :label="item.TrialReadingCriterionName" :value="item.TrialReadingCriterionId" />
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="contentBox">
+            <div class="chartBox">
+                <div ref="chartContainer_left" style="width: 100%; height: 100%;" v-loading="loading_left"></div>
+            </div>
+            <div class="chartBox">
+                <div ref="chartContainer_right" style="width: 100%; height: 100%;" v-loading="loading_right"></div>
+            </div>
+            <div class="chartBox">
+                <div ref="chartContainer_bottom" style="width: 100%; height: 100%;" v-loading="loading_bottom"></div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import BaseContainer from '@/components/BaseContainer'
+let echarts = require('echarts/lib/echarts');
+
+// require('echarts/lib/chart/line');
+require('echarts/lib/chart/funnel');
+require('echarts/lib/chart/bar');
+// 按需引入组件
+require('echarts/lib/component/tooltip');
+require('echarts/lib/component/title');
+require('echarts/lib/component/legend');
+require('echarts/lib/component/grid');
+require('echarts/lib/component/dataZoom');
+import {
+    getTrialCriterionList,
+    getTrialVisitFinishedStatList,
+    getTrialQuestionStatList,
+    getTrialEfficacyEvaluationStatList
+} from '@/api/trials'
+export default {
+    name: 'reportForms',
+    components: { BaseContainer },
+    data() {
+        return {
+            searchData: {
+                TrialReadingCriterionId: null
+            },
+            trialCriterionList: [],
+            loading_left: false,
+            chart_left: null,
+            loading_right: false,
+            chart_right: null,
+            loading_bottom: false,
+            chart_bottom: null,
+        }
+    },
+    created() {
+        this.getTrialCriterionList()
+    },
+    watch: {
+        'searchData.TrialReadingCriterionId': {
+            handler() {
+                if (this.searchData.TrialReadingCriterionId) {
+                    this.getTrialVisitFinishedStatList()
+                    this.getTrialQuestionStatList()
+                    this.getTrialEfficacyEvaluationStatList()
+                }
+            }
+        }
+    },
+    methods: {
+        getTrialCriterionList() {
+            getTrialCriterionList(this.$route.query.trialId, false).then(res => {
+                this.trialCriterionList = res.Result
+                if (this.trialCriterionList.length > 0) {
+                    this.searchData.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+                }
+            }).catch(() => { })
+        },
+        // 获取访视完成度
+        async getTrialVisitFinishedStatList() {
+            try {
+                let data = {
+                    TrialId: this.$route.query.trialId,
+                    TrialReadingCriterionId: this.searchData.TrialReadingCriterionId
+                }
+                this.loading_left = true
+                let res = await getTrialVisitFinishedStatList(data)
+                this.loading_left = false
+                if (res.IsSuccess) {
+                    let obj = {
+                        titleText: this.$t("trials:reportForms:cjart:title:VisitFinishedStat"),
+                        seriesData: [],
+                        legendData: [
+                            this.$t("trials:reportForms:cjart:title:UploadedCount"),
+                            this.$t("trials:reportForms:cjart:title:QCFinishedCount"),
+                            this.$t("trials:reportForms:cjart:title:CheckFinishedCount"),
+                            this.$t("trials:reportForms:cjart:title:ReadingFinishedCount")
+                        ]
+                    }
+                    res.Result.ReadingFinishedCount = res.Result.CriterionList[0].ReadingFinishedCount
+                    let keys = ['UploadedCount', 'QCFinishedCount', 'CheckFinishedCount', 'ReadingFinishedCount']
+                    obj.legendData.forEach((item, index) => {
+                        let o = {
+                            name: item,
+                            value: res.Result[keys[index]]
+                        }
+                        obj.seriesData.push(o)
+                    })
+                    this.initChart_left(obj)
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        },
+        initChart_left(obj) {
+            this.chart_left = echarts.init(this.$refs.chartContainer_left);
+            // ...图表配置
+            const option = {
+                title: {
+                    text: obj.titleText
+                },
+                tooltip: {
+                    trigger: 'item',
+                    formatter: '{a} <br/>{b} : {c}'
+                },
+                toolbox: {
+                    feature: {
+                        dataView: { readOnly: false },
+                        restore: {},
+                        saveAsImage: {}
+                    }
+                },
+                legend: {
+                    data: obj.legendData
+                },
+                series: [
+                    {
+                        name: 'Funnel',
+                        type: 'funnel',
+                        left: '10%',
+                        top: 60,
+                        bottom: 60,
+                        width: '80%',
+                        min: 0,
+                        max: 100,
+                        minSize: '0%',
+                        maxSize: '100%',
+                        sort: 'descending',
+                        gap: 2,
+                        label: {
+                            show: true,
+                            position: 'inside'
+                        },
+                        labelLine: {
+                            length: 10,
+                            lineStyle: {
+                                width: 1,
+                                type: 'solid'
+                            }
+                        },
+                        itemStyle: {
+                            borderColor: '#fff',
+                            borderWidth: 1
+                        },
+                        emphasis: {
+                            label: {
+                                fontSize: 20
+                            }
+                        },
+                        data: obj.seriesData
+                    }
+                ]
+            };
+            // 4. 使用配置项渲染图表
+            this.chart_left.setOption(option);
+        },
+        // 获取质疑统计列表
+        async getTrialQuestionStatList() {
+            try {
+                let data = {
+                    TrialId: this.$route.query.trialId,
+                }
+                this.loading_right = true
+                let res = await getTrialQuestionStatList(data)
+                this.loading_right = false
+                if (res.IsSuccess) {
+                    let obj = {
+                        titleText: this.$t("trials:reportForms:cjart:title:QuestionStat"),
+                        seriesData: [
+                            {
+                                name: this.$t("trials:reportForms:cjart:data:IngCount"),
+                                type: 'bar',
+                                stack: 'Ad',
+                                emphasis: {
+                                    focus: 'series'
+                                },
+                                data: [res.Result.QCQuestion_IngCount, res.Result.CheckQuestion_IngCount, res.Result.MedicalReviewQuestion_IngCount]
+                            },
+                            {
+                                name: this.$t("trials:reportForms:cjart:data:ClosedCount"),
+                                type: 'bar',
+                                stack: 'Ad',
+                                emphasis: {
+                                    focus: 'series'
+                                },
+                                data: [res.Result.QCQuestion_ClosedCount, res.Result.CheckQuestion_ClosedCount, res.Result.MedicalReviewQuestion_ClosedCount]
+                            }
+                        ],
+                        xAxisData: [
+                            this.$t("trials:reportForms:cjart:title:QCQuestion"),
+                            this.$t("trials:reportForms:cjart:title:CheckQuestion"),
+                            this.$t("trials:reportForms:cjart:title:MedicalReviewQuestion"),
+                        ],
+                        unit: this.$t("trials:reportForms:cjart:unit:count")
+                    }
+                    this.initChart_right(obj)
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        },
+        initChart_right(obj) {
+            this.chart_right = echarts.init(this.$refs.chartContainer_right);
+            // ...图表配置
+            const option = {
+                title: {
+                    text: obj.titleText
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    }
+                },
+                legend: {},
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: obj.xAxisData
+                    }
+                ],
+                yAxis: [
+                    {
+                        name: obj.unit,
+                        type: 'value'
+                    }
+                ],
+                series: obj.seriesData
+            };
+            // 4. 使用配置项渲染图表
+            this.chart_right.setOption(option);
+        },
+        // 获取疗效统计表
+        async getTrialEfficacyEvaluationStatList() {
+            try {
+                let data = {
+                    TrialId: this.$route.query.trialId,
+                    TrialReadingCriterionId: this.searchData.TrialReadingCriterionId
+                }
+                this.loading_bottom = true
+                let res = await getTrialEfficacyEvaluationStatList(data)
+                this.loading_bottom = false
+                if (res.IsSuccess) {
+                    let obj = {
+                        xAxisData: [],
+                        seriesData: [],
+                        unit: this.$t("trials:reportForms:cjart:unit:subjectCount"),
+                        titleText: this.$t("trials:reportForms:cjart:title:EfficacyEvaluationStat"),
+                    }
+                    res.Result.forEach(item => {
+                        obj.xAxisData.push(this.$fd(item.DictionaryCode, Number(item.OverallTumorEvaluation)))
+                        obj.seriesData.push(item.SubjectCount)
+                    })
+                    this.initChart_bottom(obj)
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        },
+        initChart_bottom(obj) {
+            this.chart_bottom = echarts.init(this.$refs.chartContainer_bottom);
+            // ...图表配置
+            const option = {
+                title: {
+                    text: obj.titleText
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    }
+                },
+                xAxis: {
+                    type: 'category',
+                    data: obj.xAxisData
+                },
+                yAxis: {
+                    name: obj.unit,
+                    type: 'value'
+                },
+                series: [
+                    {
+                        data: obj.seriesData,
+                        type: 'bar'
+                    }
+                ]
+            };
+            // 4. 使用配置项渲染图表
+            this.chart_bottom.setOption(option);
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.reportForms {
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+
+    .search {
+        padding: 5px;
+    }
+
+    .contentBox {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-around;
+        align-items: center;
+        width: 100%;
+        height: calc(100% - 70px);
+
+        .chartBox {
+            box-sizing: border-box;
+            width: 50%;
+            height: 50%;
+
+            &:last-child {
+                width: 100%;
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file

From f3d9b31313637af8cdcdcfaf21fe6d00645f1f6b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 12 Dec 2025 17:24:39 +0800
Subject: [PATCH 152/333] =?UTF-8?q?=E7=97=85=E7=81=B6=E8=9E=8D=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/IRecist/QuestionList.vue       | 282 ++++++++++++++----
 .../dicoms/components/Recist/QuestionList.vue | 249 +++++++++++++---
 .../components/RecistBM/QuestionList.vue      | 237 +++++++++++++--
 .../reading/dicoms3D/components/ReadPage.vue  |   6 +-
 .../components/Recist/QuestionList.vue        | 263 +++++++++++++---
 .../components/mRecist/QuestionList.vue       | 190 +++++++++++-
 6 files changed, 1068 insertions(+), 159 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index 6f9d65d7..ff0df539 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -80,60 +80,81 @@
                         placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div style="position: absolute;left: 62px;top: 2px;">
-                        <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
-                        <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                              <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
-                            </el-tooltip>
+                      <div
+                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
                           </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
-                            <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 2">
-                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 5">
-                              {{ $fd('NewTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 6">
-                              {{ $fd('NewNoTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 7">
-                              {{ $fd('OtherPreviousNewLesionState',
-                                parseInt(item.TableQuestions.Answers[i].lesionState))
-                              }}
-                            </span>
-                            <span v-else-if="item.LesionType === 8">
-                              {{
-                                $fd('NewLesionAfterTriggeringiRECSITState',
+                          <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+                          <div style="font-size: 11px;width:220px;height: 30px;">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
+                              </el-tooltip>
+                            </div>
+                            <div
+                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                              <span v-if="item.LesionType === 0">
+                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 1">
+                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 2">
+                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 5">
+                                {{ $fd('NewTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 6">
+                                {{ $fd('NewNoTargetLesionState', parseInt(item.TableQuestions.Answers[i].lesionState))
+                                }}
+                              </span>
+                              <span v-else-if="item.LesionType === 7">
+                                {{ $fd('OtherPreviousNewLesionState',
                                   parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
-                              {{ item.TableQuestions.Answers[i].lesionShort }}mm
-                            </template>
-                            <template
-                              v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                              {{ item.TableQuestions.Answers[i].lesionLength }}mm
-                            </template>
+                                }}
+                              </span>
+                              <span v-else-if="item.LesionType === 8">
+                                {{
+                                  $fd('NewLesionAfterTriggeringiRECSITState',
+                                    parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
+                                {{ item.TableQuestions.Answers[i].lesionShort }}mm
+                              </template>
+                              <template
+                                v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                                {{ item.TableQuestions.Answers[i].lesionLength }}mm
+                              </template>
+                            </div>
                           </div>
                         </div>
+
                       </div>
                       <div
-                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1, 4, 5].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 5 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1) || (item.LesionType === 6 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 7 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 8 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1, 4, 5].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 5 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1) || (item.LesionType === 6 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 7 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 8 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                         style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
                         <el-tooltip
@@ -142,6 +163,13 @@
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -165,10 +193,35 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion } from '@/api/trials'
+import { splitLesion, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -224,7 +277,12 @@ export default {
       criterionType: null,
       subjectCode: '',
       isConvertedTask: null,
-      isFirstChangeTask: null
+      isFirstChangeTask: null,
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -280,6 +338,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          DicomEvent.$emit('readingPageUpdate', {})
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          this.getReadingQuestionAndAnswer()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -1181,6 +1299,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .measurement-wrapper {
   height: 100%;
   overflow-y: auto;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index 39730027..5680e32c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -68,43 +68,63 @@
                         placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div style="position: absolute;left: 50px;top: 2px;">
-                        <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
-                        <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div v-if="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                              <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
-                            </el-tooltip>
+                      <div
+                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
                           </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
-                            <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else>
-                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
-                              {{ item.TableQuestions.Answers[i].lesionShort }}mm
-                            </template>
-                            <template
-                              v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                              {{ item.TableQuestions.Answers[i].lesionLength }}mm
-                            </template>
+                          <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+                          <div style="font-size: 11px;width:220px;height: 30px;">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
+                              </el-tooltip>
+                            </div>
+                            <div
+                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                              <span v-if="item.LesionType === 0">
+                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 1">
+                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else>
+                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
+                                {{ item.TableQuestions.Answers[i].lesionShort }}mm
+                              </template>
+                              <template
+                                v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                                {{ item.TableQuestions.Answers[i].lesionLength }}mm
+                              </template>
+                            </div>
                           </div>
                         </div>
+
                       </div>
                       <div
-                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                         style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
                         <el-tooltip
@@ -113,6 +133,13 @@
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -134,10 +161,35 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion } from '@/api/trials'
+import { splitLesion, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -191,7 +243,12 @@ export default {
       tableQuestions: [],
       isFirstRender: false,
       CriterionType: null,
-      subjectCode: ''
+      subjectCode: '',
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -248,6 +305,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          DicomEvent.$emit('readingPageUpdate', {})
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          this.getReadingQuestionAndAnswer()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -1066,6 +1183,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .measurement-wrapper {
   height: 100%;
   overflow-y: auto;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index b3ef5be3..96829b4e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -66,38 +66,58 @@
                         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="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
-                              <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
-                            </el-tooltip>
+                      <div
+                        :style="{ position: 'absolute', left: item.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
                           </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
-                            <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                            <span v-else>
-                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
-                            </span>
-                          </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                          <div style="font-size: 11px;width:220px;height: 30px;">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
+                              </el-tooltip>
+                            </div>
+                            <div
+                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                              <span v-if="item.LesionType === 0">
+                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else-if="item.LesionType === 1">
+                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              </span>
+                              <span v-else>
+                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].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="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
-                              {{ item.TableQuestions.Answers[i].lesionLength }}mm
-                            </template>
+                              <template v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                                {{ item.TableQuestions.Answers[i].lesionLength }}mm
+                              </template>
+                            </div>
                           </div>
                         </div>
+
                       </div>
                       <div
-                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                         style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
                         <el-tooltip
@@ -106,6 +126,13 @@
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
                         </el-tooltip>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -127,10 +154,35 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion } from '@/api/trials'
+import { splitLesion, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 
@@ -185,7 +237,12 @@ export default {
       tableQuestions: [],
       isFirstRender: false,
       CriterionType: null,
-      subjectCode: ''
+      subjectCode: '',
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -243,6 +300,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          DicomEvent.$emit('readingPageUpdate', {})
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          this.getReadingQuestionAndAnswer()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
@@ -993,6 +1110,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .measurement-wrapper {
   height: 100%;
   overflow-y: auto;
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 1d8abafd..8bbc24bd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -163,7 +163,7 @@
             <!-- MPR -->
             <div class="tool-item" :title="`${$t('trials:reading:button:mpr')}`" @click.prevent="openMPRViewport()"
               v-if="criterionType === 0 && readingTool === 0">
-              <svg-icon icon-class="mpr" class="svg-icon" style="transform: rotate(180deg);"/>
+              <svg-icon icon-class="mpr" class="svg-icon" style="transform: rotate(180deg);" />
             </div>
             <!--融合-->
             <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')"
@@ -343,7 +343,7 @@
                 :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
                 @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
                 @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations" @setToolToTarget="setToolToTarget"
-                @handleReadingChart="handleReadingChart" />
+                @handleReadingChart="handleReadingChart" @setReadingToolPassive="setReadingToolPassive" />
               <recisit
                 v-else-if="lastViewportTaskId && criterionType === 1 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
@@ -351,7 +351,7 @@
                 :last-viewport-task-id="lastViewportTaskId" :visit-info="s" @removeAnnotation="removeAnnotation"
                 @getScreenshots="getScreenshots" @setMarkName="setMarkName" @imageLocation="imageLocation"
                 @resetAnnotations="resetAnnotations" @getAnnotations="getAnnotations" @setToolToTarget="setToolToTarget"
-                @handleReadingChart="handleReadingChart" />
+                @handleReadingChart="handleReadingChart" @setReadingToolPassive="setReadingToolPassive" />
               <customize-question-list
                 v-else-if="lastViewportTaskId && criterionType === 0 && lastViewportTaskIds.includes(s.VisitTaskId)"
                 :ref="`ecrf_${s.VisitTaskId}`"
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
index 13bf30bf..723c4ad7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -77,49 +77,70 @@
                         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
+                        :style="{ position: 'absolute', left: table.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px' }">
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)}`" />
                           </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}`].IsLymphNodes && !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}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
-                              {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
-                            </template>
+                          <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}`].IsLymphNodes && !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}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                                {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
+                              </template>
+                            </div>
                           </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'"
+                        v-if="((table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (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"
@@ -127,6 +148,13 @@
                           <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>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -164,6 +192,31 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -174,7 +227,9 @@ import {
   saveTaskQuestion,
   submitTableQuestion,
   deleteReadingRowAnswer,
-  splitLesion
+  splitLesion,
+  getCanMergeLesion,
+  mergeLesion
 } from '@/api/trials'
 import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
@@ -221,7 +276,13 @@ export default {
       deleteTargetInfo: null,
       digitPlaces: 2,
       imageQualityId: '',
-      imageQualityIssuesId: ''
+      imageQualityIssuesId: '',
+
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -258,6 +319,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          // DicomEvent.$emit('readingPageUpdate', {})
+          // DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setReadingToolPassive')
+          this.getTableQuestions()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     // 获取器官信息
     async getOrganList() {
       try {
@@ -1841,6 +1962,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .questionList-wrapper {
   height: 100%;
   overflow-y: auto;
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
index 5bcaab84..0154ec63 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -80,8 +80,25 @@
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
                       <div
-                        :style="{ position: 'absolute', left: '50px', top: '2px', color: innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? '#5fb4ff' : '#fff' }">
-                        <div style="font-size: 11px;width:220px;height: 30px;">
+                        :style="{ position: 'absolute', left: table.LesionType === 1 && readingTaskState < 2 ? '58px' : '50px', top: '2px', color: innerFormData[`${table.Id}_${answer.RowIndex}`].IntrahepaticLesion ? '#5fb4ff' : '#fff' }">
+
+                        <div
+                          style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip
+                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'"
+                            class="item" effect="dark"
+                            :content="`${$t('trials:reading:message:fused')}${innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeLesionName}`"
+                            placement="bottom">
+                            <div
+                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '1' || innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '3'">
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].MergeRowId)}`" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType === '4'">
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)}`" />
+                          </div>
                           <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">
@@ -122,7 +139,7 @@
                       </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'"
+                        v-if="((table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)))) || ((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"
@@ -130,6 +147,13 @@
                           <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>
+                        <!-- 融合 -->
+                        <el-tooltip
+                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
+                          class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
+                            @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -167,6 +191,31 @@
         </div>
       </template>
     </div>
+    <el-dialog v-if="merge.visible" v-loading="merge.loading" :visible.sync="merge.visible"
+      :close-on-click-modal="false" :title="$t('trials:reading:lugano:message:merge')" width="500px">
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table :data="lesionData" style="width: 450px" size="small" height="200"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="45" />
+          <el-table-column prop="OrderMarkName" :label="$t('trials:reading:lugano:label:lesionNumber')" width="100" />
+          <el-table-column prop="Part" :label="$t('trials:reading:lugano:label:lesionLocation')" min-width="120"
+            show-overflow-tooltip />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button type="primary" size="mini" :disabled="mergeList.length === 0" @click="confirmMerge">
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -177,7 +226,9 @@ import {
   saveTaskQuestion,
   submitTableQuestion,
   deleteReadingRowAnswer,
-  splitLesion
+  splitLesion,
+  getCanMergeLesion,
+  mergeLesion
 } from '@/api/trials'
 import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
@@ -223,7 +274,12 @@ export default {
       deleteTargetInfo: null,
       digitPlaces: 2,
       imageQualityId: '',
-      imageQualityIssuesId: ''
+      imageQualityIssuesId: '',
+
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -259,6 +315,66 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          // DicomEvent.$emit('readingPageUpdate', {})
+          // DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setReadingToolPassive')
+          this.getTableQuestions()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
     // 获取器官信息
     async getOrganList() {
       try {
@@ -1930,6 +2046,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.login-cycle {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background-color: #428bca;
+  border-radius: 50%;
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+
+.merge-table {
+  padding: 0 10px;
+
+  ::v-deep.el-table {
+    background-color: #1e1e1e !important;
+    color: #383838;
+  }
+
+  ::v-deep.el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #383838;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #1e1e1e;
+  }
+
+  ::v-deep.el-table__header-wrapper {
+    th {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+      border-bottom: 1px solid #383838;
+    }
+  }
+
+  ::v-deep.el-table__body-wrapper {
+    tr {
+      background-color: #1e1e1e !important;
+      color: #dfdfdf;
+    }
+
+    tr:hover>td {
+      background-color: #1e1e1e !important;
+    }
+  }
+
+  ::v-deep.el-table__empty-block {
+    background-color: #1e1e1e !important;
+  }
+
+  .merge-label {
+    color: #ddd;
+    font-size: 13px;
+    margin-bottom: 10px;
+
+    span {
+      font-size: 15px;
+      color: red;
+    }
+  }
+}
+
 .questionList-wrapper {
   height: 100%;
   overflow-y: auto;

From 9da598862a1fa3a4a5cb48262fb084a5ecfd1cae Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 15 Dec 2025 14:07:59 +0800
Subject: [PATCH 153/333] =?UTF-8?q?trcist1.1=E6=96=B0=E5=A2=9E=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js                            |   9 +
 src/components/readingChart/index.vue         | 240 ++++++++++++++++++
 src/styles/index.scss                         |  14 +
 .../components/CriterionQuestionForm.vue      |   9 +
 .../template/components/TableQsForm.vue       |   9 +
 .../reading/dicoms/components/DicomViewer.vue |   4 +
 .../dicoms/components/QuestionItem.vue        |  81 ++++--
 .../reading/dicoms/components/Questions.vue   |   4 +
 .../reading/dicoms/components/ReadPage.vue    |  24 +-
 .../dicoms/components/Recist/QuestionForm.vue |  34 ++-
 .../dicoms/components/Recist/QuestionList.vue |  17 +-
 .../reading/dicoms/components/ReportPage.vue  |  36 ++-
 .../reading/dicoms3D/components/ReadPage.vue  |  20 ++
 .../components/Recist/QuestionFormItem.vue    |  40 ++-
 .../components/Recist/QuestionList.vue        |  18 +-
 .../Recist/TableQuestionFormItem.vue          |  36 ++-
 .../dicoms3D/components/ReportPage.vue        |  21 +-
 .../reading-unit/components/QuestionsForm.vue |   9 +
 .../reading-unit/components/TableQsForm.vue   |   9 +
 19 files changed, 565 insertions(+), 69 deletions(-)
 create mode 100644 src/components/readingChart/index.vue

diff --git a/src/api/reading.js b/src/api/reading.js
index 7a672889..4fff9530 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -294,3 +294,12 @@ export function readingImport(param) {
     data: param
   })
 }
+
+// 阅片获取图表数据
+export function getReportsChartData(param) {
+  return request({
+    url: `/ReadingImageTask/getReportsChartData`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/components/readingChart/index.vue b/src/components/readingChart/index.vue
new file mode 100644
index 00000000..4d51866d
--- /dev/null
+++ b/src/components/readingChart/index.vue
@@ -0,0 +1,240 @@
+<template>
+    <div :id="key" class="readingChart" v-show="visible" :style="{
+        'z-index': zIndex
+    }">
+        <div ref="chartContainer" style="width: 490px; height: 290px;" v-loading="loading"></div>
+    </div>
+</template>
+
+<script>
+import { getReportsChartData } from "@/api/reading"
+import moment from "moment"
+let echarts = require('echarts/lib/echarts');
+
+// 按需引入图表
+// require('echarts/lib/chart/bar');
+require('echarts/lib/chart/line');
+// require('echarts/lib/chart/pie');
+// require('echarts/lib/chart/scatter');
+
+// 按需引入组件
+require('echarts/lib/component/tooltip');
+require('echarts/lib/component/title');
+require('echarts/lib/component/legend');
+require('echarts/lib/component/grid');
+require('echarts/lib/component/dataZoom');
+export default {
+    name: "readingChart",
+    props: {
+
+    },
+    data() {
+        return {
+            visible: false,
+            zIndex: 9,
+            chart: null,
+            loading: false,
+            key: 'readingChart'
+        };
+    },
+    methods: {
+        init(event, obj, zIndex = 9) {
+            this.loading = true
+            this.zIndex = zIndex
+            let { key } = obj
+            if (key) {
+                this.key = key
+            }
+            this.$nextTick(() => {
+                this.visible = true
+                let readingChart = document.querySelector(`#${this.key}`);
+                let chaY = document.body.clientHeight - event.clientY;
+                let chaX = document.body.clientWidth - event.clientX;
+                if (chaY < 250) {
+                    readingChart.style.top = event.clientY - 220 + "px";
+                } else {
+                    readingChart.style.top = event.clientY + "px";
+                }
+                if (chaX < 500) {
+                    readingChart.style.left = event.clientX - 520 + "px";
+                } else {
+                    readingChart.style.left = event.clientX + 15 + "px";
+                }
+                this.getInfo(obj)
+            })
+        },
+        async getInfo(data) {
+            try {
+                let { VisitTaskId = null, TrialId = null, QuestionId = null, QuestionName = null, TableQuestionId = null, RowIndex = null, ReportChartTypeEnum = null } = data
+                let params = {
+                    VisitTaskId, TrialId, QuestionId, TableQuestionId, RowIndex, ReportChartTypeEnum
+                }
+                this.loading = true
+                let res = await getReportsChartData(params)
+                this.loading = false
+                if (res.IsSuccess) {
+                    let LatestScanDateList = res.Result.LatestScanDateList.map(item => item.split(" ")[0])
+                    let obj = {
+                        title: QuestionName,
+                        xAxisData: LatestScanDateList || [],
+                        series: [],
+                        unit: this.$fd("ValueUnit", res.Result.Unit),
+                        visitName: res.Result.VisitTaskNameList,
+                        min: null,
+                        max: null
+                    }
+                    res.Result.ChartDataList.forEach((item) => {
+                        let arr = []
+                        item.Value.forEach((d, index) => {
+                            // arr.push([LatestScanDateList[index], d])
+                            arr.push(d)
+                        })
+                        obj.series.push({
+                            name: item.Name,
+                            data: arr,
+                            type: 'line'
+                        })
+                    });
+                    // if (Array.isArray(res.Result.LatestScanDateList) && res.Result.LatestScanDateList.length >= 2) {
+                    //     let hours = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'hours');
+                    //     let days = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'days');
+                    //     let months = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'months');
+                    //     console.log(hours, 'hours')
+                    //     console.log(days, 'days')
+                    //     console.log(months, 'months')
+                    //     if (hours < 24) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (days >= 1 && days <= 7) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'days').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (days > 7 && days < 30) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months >= 1 && months <= 3) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(4, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 3 && months <= 6) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 6 && months <= 12) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(13, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 12) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).add(1, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    // }
+                    // console.log(obj)
+                    this.initChart(obj)
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        foo() {
+            this.visible = false
+            this.$emit("foo");
+            this.dispose()
+        },
+        initChart(obj) {
+            this.chart = echarts.init(this.$refs.chartContainer);
+            // ...图表配置
+            const option = {
+                title: {
+                    text: obj.title,
+                    textStyle: {
+                        color: "#fff"
+                    }
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    // formatter: function (params) {
+                    //     let index = obj.xAxisData.findIndex(item => item === params[0].value[0])
+                    //     let result = obj.visitName[index] + ' ' + params[0].value[0] + '<br>'; // 显示类目名（如日期）
+                    //     params.forEach(function (item) {
+                    //         result += item.marker + ' ' + item.seriesName + ': ' + item.value[1] + '<br>'; // 显示每个系列的图例、系列名和值
+                    //     });
+                    //     return result;
+                    // }
+                },
+                xAxis: {
+                    // type: 'time',
+                    // data: obj.xAxisData,
+                    data: obj.visitName,
+                    axisLine: { // 设置 x 轴线颜色
+                        lineStyle: {
+                            color: '#fff',
+                        }
+                    },
+                    axisLabel: { // 设置 x 轴文字颜色
+                        textStyle: {
+                            color: '#fff'
+                        }
+                    },
+                    // splitLine: {
+                    //     show: false // 隐藏网格线
+                    // },
+                    // min: obj.min,
+                    // max: obj.max
+                },
+                yAxis: {
+                    name: obj.unit,
+                    type: 'value',
+                    axisLabel: {
+                        textStyle: {
+                            color: '#fff',
+                        }
+                    },
+                    axisLine: {
+                        lineStyle: {
+                            color: '#fff',
+                        }
+                    },
+                },
+                series: obj.series
+            };
+            // 4. 使用配置项渲染图表
+            this.chart.setOption(option);
+        },
+        resize() {
+            if (this.chart) {
+                this.chart.resize()
+            }
+        },
+        dispose() {
+            if (this.chart) {
+                this.chart.dispose()
+                this.chart = null
+            }
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.readingChart {
+    min-width: 500px;
+    max-width: 500px;
+    font-size: 14px;
+    display: inline-block;
+    background: #000;
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+    position: fixed;
+    padding: 10px 6px;
+    list-style-type: none;
+    min-height: 300px;
+    max-height: 80vh;
+    // overflow: hidden;
+    // overflow-y: auto;
+    box-sizing: border-box;
+}
+</style>
\ No newline at end of file
diff --git a/src/styles/index.scss b/src/styles/index.scss
index d95173e6..13ba518a 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -357,4 +357,18 @@ body .el-table th.gutter {
 
 .el-message-box__wrapper {
   z-index: 9999 !important;
+}
+
+.svg-readingChart {
+  width: 28px !important;
+  height: 30px !important;
+  margin-left: 10px;
+  cursor: pointer;
+}
+
+.svg-readingChart-mini {
+  width: 18px !important;
+  height: 20px !important;
+  vertical-align: -0.4em !important;
+  cursor: pointer;
 }
\ No newline at end of file
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 425f1166..87fd02d6 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -361,6 +361,13 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 表格类型标识 -->
         <el-form-item v-if="form.Type === 'table'" :label="$t('dictionary:template:criterionConfig:table:tableType')"
           prop="LesionType">
@@ -552,6 +559,7 @@ export default {
         FileType: [],
         ClassifyQuestionId: null,
         ClassifyAlgorithms: null,
+        ShowChartTypeEnum: 0,
         OptionTypeEnum: 0
       },
       rules: {
@@ -879,6 +887,7 @@ export default {
       data.HighlightAnswerList = []
       // data.ExportIdentification = 0
       data.ExportResult = []
+      data.ShowChartTypeEnum = 0
       data.FileType = []
       data.ClassifyQuestionId = null
       data.ClassifyAlgorithms = null
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index 61dd9686..a6690f13 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -289,6 +289,13 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 最大上传个数 -->
         <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')"
           prop="ImageCount">
@@ -442,6 +449,7 @@ export default {
         // ExportIdentification: 0,
         ExportResult: [],
         DefaultValue: null,
+        ShowChartTypeEnum: 0,
         OptionTypeEnum: 0
         // IsEnable: true
       },
@@ -769,6 +777,7 @@ export default {
       // form.ExportIdentification = 0
       form.ExportResult = []
       form.DefaultValue = null
+      form.ShowChartTypeEnum = 0
       form.OptionTypeEnum = 0
     },
     close() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 0e7571f7..45ecb24b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -475,6 +475,7 @@
               :question-form-change-num="questionFormChangeNum"
               :is-show="isShow"
               :is-reading-show-subject-info="isReadingShowSubjectInfo"
+              @handleReadingChart="handleReadingChart"
             />
 
             <IVUSList
@@ -1229,6 +1230,9 @@ export default {
     })
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     getTrialCriterion() {
       getCriterionReadingInfo({
         TrialId: this.trialId || this.$route.query.trialId,
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index da4b4fb5..7f24f925 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -25,13 +25,22 @@
         :class="[question.Type === 'group' ? 'mb' : (question.Type === 'upload' || question.QuestionName.length > 15) ? 'uploadWrapper' : '']">
         <template v-if="question.QuestionType === 60 || question.QuestionType === 61">
           <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
-
-            <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled
-              style="width: 130px;">
-              <template v-if="question.Unit" slot="append">
-                {{ $fd('ValueUnit', parseInt(question.Unit)) }}
-              </template>
-            </el-input>
+            <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
+              <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled
+                            style="width: 130px;">
+                <template v-if="question.Unit" slot="append">
+                  {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+                </template>
+              </el-input>
+              <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart"
+                class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
+                  e,
+                  data: {
+                    QuestionId: question.Id,
+                    QuestionName: question.QuestionName
+                  }
+                })" />
+            </div>
             <!-- 测量 -->
             <el-button v-if="!questionForm[question.Id] && readingTaskState !== 2" size="mini" type="text"
               @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
@@ -55,11 +64,22 @@
 
         <template
           v-else-if="question.QuestionType === 48 || question.QuestionType === 51 || question.QuestionType === 52 || question.QuestionType === 53">
-          <el-input v-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>
+          <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
+            <el-input v-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>
+            <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  QuestionId: question.Id,
+                  QuestionName: question.QuestionName
+                }
+              })" />
+          </div>
+          
         </template>
 
         <!-- 输入框 -->
@@ -146,20 +166,31 @@
           :disabled="readingTaskState >= 2 || isFirstChangeTask"
           :precision="2"
         /> -->
-        <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 || isFirstChangeTask" />
-          <el-input-number v-else-if="question.ValueType === 3" v-model="questionForm[question.Id]"
-            :disabled="readingTaskState >= 2 || isFirstChangeTask" />
-          <el-input-number v-else-if="question.ValueType === 1 || question.ValueType === 2"
-            v-model="questionForm[question.Id]" :precision="digitPlaces"
-            :disabled="readingTaskState >= 2 || isFirstChangeTask" />
-        </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)) }}
+        <div style="display: flex;justify-content: space-between;"
+          v-else-if="question.Type === 'number' || question.Type === 'calculation'">
+          <template v-if="question.Type === 'number'">
+            <el-input-number v-if="question.ValueType === 0" v-model="questionForm[question.Id]" :precision="0"
+              :disabled="readingTaskState >= 2 || isFirstChangeTask" />
+            <el-input-number v-else-if="question.ValueType === 3" v-model="questionForm[question.Id]"
+              :disabled="readingTaskState >= 2 || isFirstChangeTask" />
+            <el-input-number v-else-if="question.ValueType === 1 || question.ValueType === 2"
+              v-model="questionForm[question.Id]" :precision="digitPlaces"
+              :disabled="readingTaskState >= 2 || isFirstChangeTask" />
           </template>
-        </el-input>
+          <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>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                QuestionId: question.Id,
+                QuestionName: question.QuestionName
+              }
+            })" />
+        </div>
         <!-- 上传图像 -->
         <el-upload v-else-if="question.Type === 'upload'" action :accept="accept" :limit="question.ImageCount"
           :on-preview="handlePictureCardPreview" :before-upload="handleBeforeUpload" :http-request="uploadScreenshot"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 765505d2..e88475b7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -16,6 +16,7 @@
         :visit-task-id="visitTaskId"
         @setFormItemData="setFormItemData"
         @resetFormItemData="resetFormItemData"
+        @handleReadingChart="handleReadingChart"
       />
 
       <el-form-item v-if="readingTaskState < 2 && !isFirstChangeTask">
@@ -150,6 +151,9 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async getQuestions(visitTaskId, isRefresh = false) {
       var isChangeVisitTask = this.visitTaskId !== visitTaskId
       this.visitTaskId = visitTaskId
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 5016e2ea..fbb359be 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -36,10 +36,12 @@
           :is-exists-clinical-data="isExistsClinicalData" :is-exists-no-dicom-file="isExistsNoDicomFile"
           :is-reading-show-subject-info="isReadingShowSubjectInfo"
           :is-reading-task-view-in-order="isReadingTaskViewInOrder" :is-exists-manual="isExistsManual"
-          :iseCRFShowInDicomReading="iseCRFShowInDicomReading" @previewCD="previewCD" />
+          :iseCRFShowInDicomReading="iseCRFShowInDicomReading" @previewCD="previewCD"
+          @handleReadingChart="handleReadingChart" />
       </div>
 
     </div>
+    <readingChart ref="readingChart" />
   </div>
 </template>
 <script>
@@ -54,6 +56,7 @@ import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import { workSpeedclose } from "@/utils"
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+import readingChart from '@/components/readingChart'
 // import metaDataProvider from '@/utils/metaDataProvider'
 // cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 var config = {
@@ -74,7 +77,8 @@ export default {
   name: 'ReadPage',
   components: {
     DicomViewer,
-    StudyList
+    StudyList,
+    readingChart
   },
   props: {
     trialId: {
@@ -216,6 +220,7 @@ export default {
     window.addEventListener('beforeunload', e => {
       cornerstone.imageCache.purgeCache()
     })
+    document.addEventListener("click", this.foo);
   },
   beforeDestroy() {
     cornerstone.imageCache.purgeCache()
@@ -229,6 +234,21 @@ export default {
     workSpeedclose(true)
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.visitTaskId
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart) return false
+      this.$refs.readingChart.foo()
+    },
     async getVisitInfo() {
       const loading = this.$loading({ fullscreen: true })
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index e1ae2648..58d3d9bd 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -64,17 +64,28 @@
 
         <!-- 输入框 -->
         <template v-if="qs.Type==='input' || qs.Type==='number'">
+          <div style="display: flex;justify-content: space-between;">
+            <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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.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>
+            <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+              @click.stop="(e) => handleReadingChart({
+                e,
+                data: {
+                  TableQuestionId: qs.Id,
+                  RowIndex: questionForm.RowIndex,
+                  QuestionName: qs.QuestionName
+                }
+              })" />
+          </div>
           <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
-          <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) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.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
@@ -307,6 +318,9 @@ export default {
     DicomEvent.$off('handleImageQualityAbnormal')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initForm() {
       const loading = this.$loading({ fullscreen: true })
       this.questions.forEach(item => {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index d3483c22..57aa2fe0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -19,7 +19,7 @@
 
       <!-- 非测量问题 -->
       <div class="lesions">
-        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum" />
+        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum" @handleReadingChart="handleReadingChart"/>
       </div>
       <!-- 测量问题 -->
       <template v-if="questions.length > 0 && CriterionType !== 10">
@@ -30,7 +30,16 @@
           <div class="lesion_list">
             <div v-for="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
-                <div class="title">{{ item.QuestionName }}</div>
+                <div class="title">{{ item.QuestionName }}
+                  <svg-icon v-if="item.LesionType === 0" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0,
+                        QuestionName: item.QuestionName
+                      },
+                    })" />
+                </div>
                 <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
                   <i class="el-icon-plus" />
                 </div>
@@ -120,6 +129,7 @@
                     @determineExistsUnsavedLession="determineExistsUnsavedLession"
                     @resetQuestions="resetQuestions"
                     @close="close"
+                    @handleReadingChart="handleReadingChart"
                   />
                 </el-collapse-item>
 
@@ -240,6 +250,9 @@ export default {
     DicomEvent.$off('getUnSaveTarget')
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     async initList() {
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index c5cb3365..dcef00f8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -69,7 +69,20 @@
             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-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 }}
+                <svg-icon
+                  v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) || (scope.row.LesionType === 4 && scope.row.ReportLayType === 1)"
+                  icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
+                      TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
+                      RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
+                      ReportChartTypeEnum: (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) ? 0 : (scope.row.LesionType === 4 && scope.row.ReportLayType === 1) ? 1 : null,
+                      QuestionName: scope.row.QuestionName
+                    }
+                  })" />
+              </span>
               <span
                 v-else
                 style="font-weight: bold;font-size: 16px;color: #f44336;"
@@ -266,6 +279,7 @@
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
+    <readingChart ref="readingChart_report" />
   </div>
 </template>
 <script>
@@ -280,9 +294,10 @@ import store from '@/store'
 import { mapGetters } from 'vuex'
 import { changeURLStatic } from '@/utils/history.js'
 import AdditionalAssessment from './AdditionalAssessment'
+import readingChart from '@/components/readingChart'
 export default {
   name: 'ReportPage',
-  components: { SignForm, AdditionalAssessment },
+  components: { SignForm, AdditionalAssessment, readingChart },
   props: {
     visitTaskId: {
       type: String,
@@ -352,6 +367,7 @@ export default {
       }
     })
     this.getReportInfo()
+    document.addEventListener("click", this.foo);
   },
   beforeDestroy() {
     DicomEvent.$off('getReportInfo')
@@ -361,6 +377,22 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.visitTaskId
+      obj.key = 'readingChart_report'
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart_report.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart_report) return false
+      this.$refs.readingChart_report.foo()
+    },
     myConfirm(msg) {
       return new Promise(resolve => {
         this.$confirm(msg, {
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 454dc17f..747ef8a3 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -461,6 +461,7 @@
                 @resetAnnotations="resetAnnotations"
                 @getAnnotations="getAnnotations"
                 @setToolToTarget="setToolToTarget"
+                @handleReadingChart="handleReadingChart"
               />
               <customize-question-list
                 v-else-if="lastViewportTaskId && criterionType === 0 && lastViewportTaskIds.includes(s.VisitTaskId)"
@@ -590,6 +591,7 @@
       :task-id="taskId"
       :visible.sync="downloadImageVisible"
     />
+    <readingChart ref="readingChart" />
   </div>
 </template>
 <script>
@@ -634,6 +636,7 @@ import RectangleROITool from './tools/RectangleROITool'
 import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import { getNetWorkSpeed, setNetWorkSpeedSizeAll, workSpeedclose } from "@/utils"
+import readingChart from '@/components/readingChart'
 const { visibility } = annotation
 const { ViewportType, Events } = Enums
 const renderingEngineId = 'myRenderingEngine'
@@ -706,6 +709,7 @@ export default {
     colorMap,
     downloadDicomAndNonedicom,
     uploadDicomAndNonedicom,
+    readingChart
   },
   props: {
     readingTool: {
@@ -912,8 +916,24 @@ export default {
     DicomEvent.$on('addNoneDicomMeasureData', data => {
       this.open.postMessage({ type: 'addNoneDicomMeasureData', data: data }, window.location)
     })
+    document.addEventListener("click", this.foo);
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart) return false
+      this.$refs.readingChart.foo()
+    },
     // 加载当前任务关联的任务信息
     async loadRelatedTasks() {
       this.loading = true
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
index 8254172c..257e6e19 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
@@ -65,20 +65,31 @@
             {{ 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)) }}
+         <div style="display: flex;justify-content: space-between;"
+          v-else-if="question.Type === 'number' || question.Type === 'calculation'">
+           <!-- 数值 -->
+          <template v-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>
+          <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>
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                QuestionId: question.Id,
+                QuestionName: question.QuestionName
+              }
+            })" />
+        </div>
         <!-- 上传图像 -->
         <el-upload v-else-if="question.Type === 'upload'" action :accept="accept" :limit="question.ImageCount"
           :on-preview="handlePictureCardPreview" :before-upload="handleBeforeUpload" :http-request="uploadScreenshot"
@@ -167,6 +178,9 @@ export default {
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
   },
   methods: {
+    handleReadingChart(row) {
+      this.$emit('handleReadingChart', row)
+    },
     formItemChange(v, question) {
       console.log('formItemChange')
       if (question.Childrens.length > 0) {
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
index 20f42e9c..ee8a0bfa 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -20,7 +20,7 @@
         <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"
-            @resetFormItemData="resetOuterFormItemData" @setFormItemData="setOuterFormItemData" />
+            @resetFormItemData="resetOuterFormItemData" @setFormItemData="setOuterFormItemData" @handleReadingChart="handleReadingChart"/>
           <el-form-item v-if="readingTaskState < 2">
             <div class="outer_form-footer">
               <i class="el-icon-warning feedback-icon"
@@ -40,7 +40,16 @@
           <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 class="title">{{ table.QuestionName }}
+                  <svg-icon v-if="table.LesionType === 0" icon-class="readingChart"
+                    class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                      e,
+                      data: {
+                        ReportChartTypeEnum: 0,
+                        QuestionName: table.QuestionName
+                      },
+                    })" />
+                </div>
                 <div v-if="readingTaskState < 2 && (isBaseLineTask || table.LesionType === 2)" class="add-icon"
                   @click.prevent="addTarget(table)">
                   <i class="el-icon-plus" />
@@ -129,7 +138,7 @@
                       :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" />
+                      @lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart"/>
                     <div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;">
                       <!-- 清除标记 -->
                       <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
@@ -246,6 +255,9 @@ export default {
     window.addEventListener('message', this.receiveMsg)
   },
   methods: {
+    handleReadingChart(e) {
+      this.$emit('handleReadingChart', e)
+    },
     // 获取器官信息
     async getOrganList() {
       try {
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
index fbb49226..90ea4e1a 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -47,17 +47,28 @@
     >
       <!-- 输入框 -->
       <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>
+        <div style="display: flex;justify-content: space-between;">
+          <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>
+          <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
+            @click.stop="(e) => handleReadingChart({
+              e,
+              data: {
+                TableQuestionId: qs.Id,
+                RowIndex: qsForm.RowIndex,
+                QuestionName: question.QuestionName
+              }
+            })" />
+        </div>
+        
       </template>
       <!-- 多行文本输入框 -->
       <el-input
@@ -254,6 +265,9 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(row) {
+      this.$emit('handleReadingChart', row)
+    },
     lesionTypeChange(v) {
       this.$emit('lesionTypeChange', { tableId: this.tableInfo.Id, rowIndex: this.answer.RowIndex, newLesionType: v })
     },
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 ea6cb647..0a7bf5d3 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -266,6 +266,7 @@
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
+    <readingChart ref="readingChart_report" />
   </div>
 </template>
 <script>
@@ -279,9 +280,10 @@ import { getToken } from '@/utils/auth'
 import { mapGetters } from 'vuex'
 import { changeURLStatic } from '@/utils/history.js'
 import AdditionalAssessment from '@/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment'
+import readingChart from '@/components/readingChart'
 export default {
   name: 'ReportPage',
-  components: { SignForm, AdditionalAssessment },
+  components: { SignForm, AdditionalAssessment, readingChart },
   data() {
     return {
       currentUser: zzSessionStorage.getItem('userName'),
@@ -336,6 +338,7 @@ export default {
       this.setScrollTop()
     })
     this.getReportInfo()
+    document.addEventListener("click", this.foo);
   },
   beforeDestroy() {
     if (this.openWindow) {
@@ -343,6 +346,22 @@ export default {
     }
   },
   methods: {
+    handleReadingChart(row) {
+      let { e, data } = row
+      let obj = Object.assign({}, data)
+      obj.TrialId = this.$route.query.trialId
+      obj.VisitTaskId = this.taskInfo.VisitTaskId
+      obj.key = 'readingChart_report'
+      let zIndex = 9
+      if (obj.RowIndex) {
+        zIndex = 9999
+      }
+      this.$refs.readingChart_report.init(e, obj, zIndex)
+    },
+    foo() {
+      if (!this.$refs.readingChart_report) return false
+      this.$refs.readingChart_report.foo()
+    },
     myConfirm(msg) {
       return new Promise(resolve => {
         this.$confirm(msg, {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index d9792647..10e4b239 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -469,6 +469,13 @@
             }}
           </div>
         </div>
+        <!-- 图表展示-->
+        <el-form-item v-if="(form.Type === 'number' || form.Type === 'calculation') && !isFromSystem"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 影像标记:disabled="form.IsRequired === 0" -->
         <el-form-item v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
           :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')" prop="ImageMarkEnum">
@@ -747,6 +754,7 @@ export default {
         ClassifyEditType: null,
         ClassifyShowType: null,
         ImageMarkEnum: 0,
+        ShowChartTypeEnum: 0,
         ImageTool: '',
         ImageToolAttribute: '',
         ExcludeShowVisitList: [],
@@ -1257,6 +1265,7 @@ export default {
       form.ClassifyType = null
       form.ClassifyShowType = null
       form.ImageMarkEnum = 0
+      form.ShowChartTypeEnum = 0
       form.ImageTool = ''
       form.ImageToolAttribute = ''
       form.OptionTypeEnum = 0
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index 7cc53ba9..d6f2c9f5 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -271,6 +271,13 @@
               $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2') }}
           </div>
         </div>
+        <!-- 图表展示-->
+        <el-form-item v-if="(form.Type === 'number' || form.Type === 'calculation') && !isFromSystem"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 影像标记:disabled="form.IsRequired === 0" -->
         <el-form-item v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
           :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')" prop="ImageMarkEnum">
@@ -610,6 +617,7 @@ export default {
         ClassifyEditType: null,
         ClassifyShowType: null,
         ImageMarkEnum: 0,
+        ShowChartTypeEnum: 0,
         ImageTool: '',
         ImageToolAttribute: '',
         OptionTypeEnum: 0
@@ -1121,6 +1129,7 @@ export default {
       form.ClassifyType = null
       form.ClassifyShowType = null
       form.ImageMarkEnum = 0
+      form.ShowChartTypeEnum = 0
       form.ImageTool = ''
       form.ImageToolAttribute = ''
       form.OptionTypeEnum = 0

From 4143eb627919d6dc0ffd7bcafe4a28e5e965ce76 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 15 Dec 2025 14:34:42 +0800
Subject: [PATCH 154/333] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/Recist/QuestionList.vue    | 5 +++--
 .../trials-panel/trial-summary/report-forms/index.vue      | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

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
index 723c4ad7..2b2c5e03 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -20,7 +20,8 @@
         <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"
-            @resetFormItemData="resetOuterFormItemData" @setFormItemData="setOuterFormItemData" />
+            @resetFormItemData="resetOuterFormItemData" @setFormItemData="setOuterFormItemData"
+            @handleReadingChart="handleReadingChart" />
           <el-form-item v-if="readingTaskState < 2">
             <div class="outer_form-footer">
               <i class="el-icon-warning feedback-icon"
@@ -166,7 +167,7 @@
                       :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" />
+                      @lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart" />
                     <div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;">
                       <!-- 清除标记 -->
                       <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index 7601aa22..0ca37ab9 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -128,7 +128,7 @@ export default {
                 },
                 tooltip: {
                     trigger: 'item',
-                    formatter: '{a} <br/>{b} : {c}'
+                    formatter: `${obj.titleText} <br/>{b} : {c}`
                 },
                 toolbox: {
                     feature: {
@@ -198,6 +198,7 @@ export default {
                                 name: this.$t("trials:reportForms:cjart:data:IngCount"),
                                 type: 'bar',
                                 stack: 'Ad',
+                                barWidth: 20,
                                 emphasis: {
                                     focus: 'series'
                                 },
@@ -207,6 +208,7 @@ export default {
                                 name: this.$t("trials:reportForms:cjart:data:ClosedCount"),
                                 type: 'bar',
                                 stack: 'Ad',
+                                barWidth: 20,
                                 emphasis: {
                                     focus: 'series'
                                 },
@@ -308,7 +310,8 @@ export default {
                 series: [
                     {
                         data: obj.seriesData,
-                        type: 'bar'
+                        type: 'bar',
+                        barWidth: 20,
                     }
                 ]
             };

From e5233c889438164aaeb0f28cf2db0c82a68b4037 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 15 Dec 2025 17:13:34 +0800
Subject: [PATCH 155/333] =?UTF-8?q?PET-CT=E8=9E=8D=E5=90=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B5=8B=E9=87=8F=E5=80=BC=E5=92=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=B2=A1=E6=9C=89=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue  | 39 ++++++++++++++++++-
 .../components/customize/QuestionList.vue     | 32 +++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

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 8bbc24bd..6f99003e 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2561,8 +2561,14 @@ export default {
     },
     async activeSeries(obj) {
       if (this.isFusion || this.isMPR) {
-        const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
-        if (!confirm) return false
+        if (this.isFusion && this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].verifyAnnotationIsSave()) {
+          const confirm = await this.$confirm(this.$t('trials:reading:confirm:clearnAnnotation'))
+          if (!confirm) return false
+          this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].removeAllNoSaveAnnotation()
+        } else {
+          const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
+          if (!confirm) return false
+        }
         this.isFusion = false
         this.setToolsPassive()
         this.rows = 1
@@ -2758,6 +2764,18 @@ export default {
             this.activeViewportIndex = 0
             // return this.activeSeries(series)
           }
+          if (this.isFusion) {
+            this.activeViewportIndex = 0
+            if (series.Modality === 'PT') {
+              this.activeViewportIndex = 1
+            }
+            series = {
+              data: series,
+              StudyIndex: series.StudyIndex,
+              SeriesIndex: series.SeriesIndex,
+              TaskInfo: series.TaskInfo
+            }
+          }
         }
         this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(series, true)
         this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
@@ -2803,6 +2821,18 @@ export default {
             this.activeViewportIndex = 0
             // return this.activeSeries(series)
           }
+          if (this.isFusion) {
+            this.activeViewportIndex = 0
+            if (series.Modality === 'PT') {
+              this.activeViewportIndex = 1
+            }
+            series = {
+              data: series,
+              StudyIndex: series.StudyIndex,
+              SeriesIndex: series.SeriesIndex,
+              TaskInfo: series.TaskInfo
+            }
+          }
         }
         this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(series, true)
         this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
@@ -3212,6 +3242,11 @@ export default {
     },
     async handleFusion(data) {
       try {
+        if (!this.isFusion && this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].verifyAnnotationIsSave()) {
+          const confirm = await this.$confirm(this.$t('trials:reading:confirm:clearnAnnotation'))
+          if (!confirm) return false
+          this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].removeAllNoSaveAnnotation()
+        }
         this.fusionVisible = false
         this.isFusion = true
         this.rows = 2
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 775f3ae9..11323f3f 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -703,6 +703,38 @@ export default {
         loading.close()
       }
     },
+    verifyAnnotationIsSave() {
+      return Object.keys(this.questionsMarkStatus).some(key => !this.questionsMarkStatus[key].isSaved)
+    },
+    removeAllNoSaveAnnotation() {
+      Object.keys(this.questionsMarkStatus).forEach(key => {
+        if (!this.questionsMarkStatus[key].isSaved) {
+          if (key.includes("_")) {
+            let QuestionId = key.split("_")[1]
+            DicomEvent.$emit('operateImageMarkerTable', { QuestionId, operateStateEnum: 4 })
+          } else {
+            let QuestionId = key
+            let res = this.findQuestion(QuestionId, this.questions)
+            if (res) {
+              DicomEvent.$emit('operateImageMarker', { QuestionId, operateStateEnum: 4 })
+            } else {
+              DicomEvent.$emit('operateImageMarkerTable', { QuestionId, operateStateEnum: 4 })
+            }
+          }
+        }
+      })
+    },
+    findQuestion(id, arr) {
+      for (let i = 0; i < arr.length; i++) {
+        let item = arr[i]
+        if (item.Id === id) return true
+        if (item.Childrens) {
+          let res = this.findQuestion(id, item.Childrens)
+          if (res) return true
+        }
+        if (i === arr.length - 1) return false
+      }
+    },
     findMarkIndex(question) {
       const { Id, RowId } = question
       if (this.isTableQuestion) {

From 903faf405e3f668d05c134123005f95f68417e02 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 16 Dec 2025 09:40:36 +0800
Subject: [PATCH 156/333] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Preview/fun.js                 |  4 +--
 src/components/Preview/index.vue              | 17 ++++-------
 src/components/PreviewFile/index.vue          | 16 ++++++----
 .../email-manage/components/EmailList.vue     | 29 +++++++++++++++----
 4 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/components/Preview/fun.js b/src/components/Preview/fun.js
index 370657d7..4a76f522 100644
--- a/src/components/Preview/fun.js
+++ b/src/components/Preview/fun.js
@@ -4,7 +4,7 @@ import Preview from "./index.vue";
 const PreviewConstructor = Vue.extend(Preview);
 
 const preview = options => {
-    const { path, type, title } = options;
+    const { path, type, title, isLocal = false } = options;
     if (!path) throw `path is requred.but ${path}`
     const id = `Preview_${new Date().getTime()}`;
     const instance = new PreviewConstructor();
@@ -12,7 +12,7 @@ const preview = options => {
     instance.vm = instance.$mount();
     if (instance.vm.visible) return;
     document.body.appendChild(instance.vm.$el);
-    instance.vm.open(path, type, title);
+    instance.vm.open(path, type, title, isLocal);
     instance.vm.$on("closed", () => {
         document.body.removeChild(instance.vm.$el);
         instance.vm.$destroy();
diff --git a/src/components/Preview/index.vue b/src/components/Preview/index.vue
index c44b0194..5b22ac8a 100644
--- a/src/components/Preview/index.vue
+++ b/src/components/Preview/index.vue
@@ -1,15 +1,8 @@
 <template>
-  <el-dialog
-    v-if="visible"
-    :visible.sync="visible"
-    :title="title"
-    :fullscreen="true"
-    append-to-body
-    custom-class="base-dialog-wrapper"
-    @close="handleClose"
-  >
+  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
+    custom-class="base-dialog-wrapper" @close="handleClose">
     <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-      <PreviewFile v-if="visible" :file-path="path" :file-type="type" />
+      <PreviewFile v-if="visible" :file-path="path" :file-type="type" :is-local="isLocal" />
     </div>
   </el-dialog>
 </template>
@@ -24,13 +17,15 @@ export default {
       path: null,
       type: null,
       title: null,
+      isLocal: false
     };
   },
   methods: {
-    open(path, type, title) {
+    open(path, type, title, isLocal) {
       this.path = path;
       this.type = type;
       this.title = title;
+      this.isLocal = isLocal;
       this.visible = true;
     },
     handleClose() {
diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue
index 53112407..7ee0ddc0 100644
--- a/src/components/PreviewFile/index.vue
+++ b/src/components/PreviewFile/index.vue
@@ -5,16 +5,17 @@
     <!-- <embed v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" style="width: 100%; height: 100%"> -->
     <!-- <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" width="100%" height="100%" frameborder="0" /> -->
     <iframe v-else-if="fileType.indexOf('pdf') !== -1"
-      :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
+      :src="`/static/pdfjs/web/viewer.html?file=${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
       width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <!--    <pdf-->
     <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
     <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
     <!--    </pdf>-->
-    <video :src="`${OSSclientConfig.basePath}${filePath}`" style="width: 100%;height: 99%;" autoplay controls
-      controlsList="nodownload" v-else-if="fileType.indexOf('mp4') !== -1"></video>
+    <video :src="`${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}`"
+      style="width: 100%;height: 99%;" autoplay controls controlsList="nodownload"
+      v-else-if="fileType.indexOf('mp4') !== -1"></video>
     <iframe v-else
-      :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
+      :src="`/static/onlyOffice/viewer.html?url=${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
       width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <!-- <div v-else>
       {{ $t('common:message:downloadFile') }}
@@ -43,12 +44,17 @@ export default {
       type: String,
       default: ''
     },
+    isLocal: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
       currentUser: zzSessionStorage.getItem('userName'),
       COMPANY: process.env.VUE_APP_COMPANY_NAME,
-      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL,
+      window
     }
   },
   computed: {
diff --git a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
index e32974ed..cdb7256f 100644
--- a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
@@ -125,14 +125,14 @@
         <el-table-column v-if="$i18n.locale === 'zh' && isDistinguishCriteria" prop="AttachNameCN"
           :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
           <template slot-scope="scope">
-            <span v-if="scope.row.AttachCNPath" @click="handlePreview(scope.row.AttachCNPath)"
+            <span v-if="scope.row.AttachCNPath" @click="handlePreview(scope.row)"
               style="cursor: pointer; color: #428bca">{{ scope.row.AttachNameCN }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="$i18n.locale === 'en' && isDistinguishCriteria" prop="AttachName"
           :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
           <template slot-scope="scope">
-            <span v-if="scope.row.AttachPath" @click="handlePreview(scope.row.AttachPath)"
+            <span v-if="scope.row.AttachPath" @click="handlePreview(scope.row)"
               style="cursor: pointer; color: #428bca">{{ scope.row.AttachName }}</span>
           </template>
         </el-table-column>
@@ -276,6 +276,9 @@ export default {
         (item) => ![4, 7, 8, 31, 32, 21, 26, 27].includes(item.value)
       )
     },
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
   },
   mounted() {
     this.trialId = this.$route.query.trialId
@@ -362,10 +365,26 @@ export default {
       this.currentRow = { ...row }
       this.editDialog.visible = true
     },
-    handlePreview(filePath) {
-      if (filePath) {
-        window.open(this.OSSclientConfig.basePath + filePath, '_blank')
+    handlePreview(row) {
+      let name = null, FilePath = null
+      if (this.isEN) {
+        name = row.AttachName;
+        FilePath = row.AttachPath;
+      } else {
+        name = row.AttachNameCN;
+        FilePath = row.AttachCNPath;
       }
+      this.$preview({
+        path: FilePath,
+        type: 'docx',
+        title: name,
+        isLocal: true
+      })
+      // if (filePath) {
+      //   let path = row.Path || row.FullPath || row.FilePath
+
+      //   window.open(this.OSSclientConfig.basePath + filePath, '_blank')
+      // }
     },
     handleSearch() {
       this.searchData.PageIndex = 1

From 4efcaa915c9c1deed2859b8838a3277618a5cd6e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 16 Dec 2025 10:21:22 +0800
Subject: [PATCH 157/333] 1

---
 src/components/uploadDicomAndNonedicom/nonedicomFile.vue     | 2 +-
 src/icons/svg/readingChart.svg                               | 1 +
 src/views/dictionary/template/email/components/EmailList.vue | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 src/icons/svg/readingChart.svg

diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index c8e6455c..6bcb388f 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -110,7 +110,7 @@
             :title="$t('upload:nonedicom:button:preview')" @click.stop="handlePreviewNoneDicomFiles(scope.row)" />
           <!--上传--->
           <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')"
-            @click.native.prevent="handleUpload(scope.row)" v-if="scope.row.Modality !== 'IVUS'" />
+            @click.native.prevent="handleUpload(scope.row)" />
           <!--删除--->
           <el-button :disabled="scope.row.UploadedFileCount <= 0 ||
             scope.row.ReadingTaskState === 2
diff --git a/src/icons/svg/readingChart.svg b/src/icons/svg/readingChart.svg
new file mode 100644
index 00000000..db700743
--- /dev/null
+++ b/src/icons/svg/readingChart.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1763446648844" class="icon" viewBox="0 0 1321 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3570" xmlns:xlink="http://www.w3.org/1999/xlink" width="258.0078125" height="200"><path d="M1187.981 845.871H200.885V120.065C200.885 91.032 177.659 62 142.82 62s-58.064 23.226-58.064 58.065v783.87c0 29.033 23.225 58.065 58.064 58.065h1045.161c29.033 0 58.065-23.226 58.065-58.065s-29.032-58.064-58.065-58.064z" fill="#1296db" p-id="3571"></path><path d="M287.981 317.484L555.078 485.87c11.613 5.806 17.42 5.806 29.032 5.806 17.42 0 34.84-5.806 46.452-23.225l185.806-255.484 191.613 145.161c23.226 17.42 58.065 11.613 75.484-11.613 17.42-23.226 11.613-58.064-11.613-75.484L839.594 96.84c-23.226-17.42-58.064-11.613-75.484 11.613L572.497 363.935 346.046 224.581c-23.226-17.42-58.065-5.807-75.484 17.419s-5.806 58.065 17.42 75.484z m29.033 505.161c29.032 0 58.064-23.226 58.064-58.064V532.323c0-29.033-23.226-58.065-58.064-58.065s-58.065 23.226-58.065 58.065v238.064c5.807 29.032 29.032 52.258 58.065 52.258zM502.82 619.42v150.968c0 29.032 23.226 58.065 58.065 58.065s58.064-23.226 58.064-58.065V619.42c0-29.032-23.226-58.064-58.064-58.064s-58.065 29.032-58.065 58.064z" fill="#1296db" p-id="3572"></path><path d="M740.885 416.194v354.193c0 29.032 23.225 58.065 58.064 58.065s58.065-23.226 58.065-58.065V416.194c0-29.033-23.226-58.065-58.065-58.065s-58.064 29.032-58.064 58.065z m296.129 92.903c-29.033 0-58.065 23.226-58.065 58.064v203.226c0 29.032 23.226 58.065 58.065 58.065s58.064-23.226 58.064-58.065V567.161c0-29.032-29.032-58.064-58.064-58.064z" fill="#1296db" p-id="3573"></path></svg>
\ No newline at end of file
diff --git a/src/views/dictionary/template/email/components/EmailList.vue b/src/views/dictionary/template/email/components/EmailList.vue
index 627dafcf..fea070e9 100644
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@@ -11,7 +11,7 @@
         <!-- 是否加急 -->
         <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
           <el-select v-model="searchData.IsUrgent" clearable style="width: 100px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id" />
+            <el-option v-for="item of $d.EmailUrgent" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
         <!-- 是否启用 -->

From 691a3721a0d1a40e97f292edc9174218235164db Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 17 Dec 2025 13:46:10 +0800
Subject: [PATCH 158/333] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/nonedicomFile.vue | 38 +++++++++----------
 .../template/email/components/EmailList.vue   | 10 ++---
 .../dicoms/components/IVUS/QuestionList.vue   | 20 +++++++---
 .../dicoms/components/IVUS/UploadExcel.vue    | 38 ++++++++-----------
 .../Recist/TableQuestionFormItem.vue          |  2 +-
 .../dicoms3D/components/ReportPage.vue        | 15 +++++++-
 .../reading-task/components/TargetSection.vue | 14 ++++---
 7 files changed, 77 insertions(+), 60 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 6bcb388f..5715210b 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -10,21 +10,21 @@
         )"></div>
       </div>
     </div>
-    <!--检查列表-->
+    <!--检查列表 @sort-change="handleSortByColumn"-->
     <el-table :data="list" style="width: 100%" v-adaptive="{ bottomOffset: 60 }" :loading="loading"
-      @sort-change="handleSortByColumn" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
-      <!--受试者-->
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
+      <!--受试者 sortable="custom"-->
       <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
       <!--访视名称-->
-      <el-table-column prop="VisitName" :label="$t('upload:nonedicom:table:VisitName')" sortable="custom"
+      <el-table-column prop="VisitName" :label="$t('upload:nonedicom:table:VisitName')" sortable
         v-if="IsImageSegment" />
       <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable="custom" v-else />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable v-else />
       <!--检查类型-->
-      <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable="custom">
+      <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable>
       </el-table-column>
       <!--检查部位-->
-      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom">
+      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable>
         <template slot-scope="scope">
           <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
         </template>
@@ -228,8 +228,8 @@ let defaultSearchData = () => {
     SubjectId: null,
     TrialReadingCriterionId: null,
     SubjectCode: null,
-    Asc: false,
-    SortField: 'TaskBlindName',
+    // Asc: false,
+    // SortField: 'TaskBlindName',
   }
 }
 export default {
@@ -506,16 +506,16 @@ export default {
       }
     },
     // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
+    // handleSortByColumn(column) {
+    //   if (column.order === 'ascending') {
+    //     this.searchData.Asc = true
+    //   } else {
+    //     this.searchData.Asc = false
+    //   }
+    //   this.searchData.SortField = column.prop
+    //   this.searchData.PageIndex = 1
+    //   this.getList()
+    // },
     // 获取待上传文件信息
     handleSelectionChange(selection) {
       this.selectArr = selection
diff --git a/src/views/dictionary/template/email/components/EmailList.vue b/src/views/dictionary/template/email/components/EmailList.vue
index fea070e9..82c3393d 100644
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@@ -9,11 +9,11 @@
           </el-select>
         </el-form-item>
         <!-- 是否加急 -->
-        <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
+        <!-- <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
           <el-select v-model="searchData.IsUrgent" clearable style="width: 100px">
-            <el-option v-for="item of $d.EmailUrgent" :value="item.value" :label="item.label" :key="item.id" />
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <!-- 是否启用 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" v-if="!systemLevel">
           <el-select v-model="searchData.IsEnable" clearable style="width: 100px">
@@ -41,7 +41,7 @@
             <el-option v-for="item of UserTypeList" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:form:EmailUrgent')" v-if="systemLevel === 1">
+        <el-form-item :label="$t('trials:emailManageCfg:form:EmailUrgent')">
           <el-select v-model="searchData.EmailUrgentEnum" clearable style="width: 100px">
             <el-option v-for="item of $d.EmailUrgent" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
@@ -86,7 +86,7 @@
         :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
         <template slot-scope="scope">
           {{scope.row.CriterionTypeList ? scope.row.CriterionTypeList.map(item => $fd('CriterionType', item)).join(', ')
-          : ''}}
+            : ''}}
         </template>
       </el-table-column>
       <!-- 邮件主题（中文） -->
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 1c3857d4..6302e20a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -37,7 +37,8 @@
                       <div class="add-icon" @click.prevent="downloadTpl">
                         <i class="el-icon-download" />
                       </div>
-                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
+                      <div class="add-icon" style="margin: 0 5px;"
+                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
                         <i class="el-icon-upload2" />
                       </div>
                       <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
@@ -71,13 +72,14 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column v-if="readingTaskState < 2 && item.LesionType === 102"
+                    <el-table-column v-if="readingTaskState < 2 && (item.LesionType === 102 || item.LesionType === 103)"
                       :label="$t('common:action:action')" width="90px" fixed="right">
                       <template slot-scope="scope">
                         <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
-                        <el-button type="text" size="mini" @click="handleDelete(item, scope.$index)">
+                        <el-button type="text" size="mini" @click="handleDelete(item, scope.$index)"
+                          v-if="item.LesionType === 102">
                           {{ $t('common:button:delete') }}
                         </el-button>
                       </template>
@@ -174,7 +176,8 @@
       <!-- 导入 -->
       <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
         :title="upload.title" width="500px">
-        <UploadExcel :visit-task-id="visitTaskId" :TableName="upload.TableName" @close="uploadDlgClose" />
+        <UploadExcel :visit-task-id="visitTaskId" :TableName="upload.TableName" :lesion-type="upload.lesionType"
+          @close="uploadDlgClose" />
       </el-dialog>
     </div>
   </div>
@@ -232,8 +235,8 @@ export default {
       questionForm: {},
       formChanged: false,
       digitPlaces: 2,
-      addOrEdit: { visible: false, title: '' },
-      upload: { visible: false, title: '', TableName: '' },
+      addOrEdit: { visible: false, title: '', lesionType: null },
+      upload: { visible: false, title: '', TableName: '', lesionType: null },
       qsList: [],
       answersList: [],
       qsForm: {},
@@ -595,6 +598,7 @@ export default {
         this.$set(this.qsForm, i.Id, v)
       })
       this.addOrEdit.visible = true
+      this.addOrEdit.lesionType = row.LesionType
     },
     async saveFormData() {
       const valid = await this.$refs.tableQsForm.validate()
@@ -619,6 +623,9 @@ export default {
           trialId: this.trialId,
           answerList: answers
         }
+        if (this.addOrEdit.lesionType === 103) {
+          params.computationTrigger = 9
+        }
         const res = await submitTableQuestion(params)
         if (res.IsSuccess) {
           // this.refreshQuestions()
@@ -669,6 +676,7 @@ export default {
       }
     },
     uploadTpl(lesionType, TableName) {
+      this.upload.lesionType = lesionType
       this.upload.TableName = TableName
       this.upload.title = `导入（ ${this.$fd('LesionType', lesionType)} ）`
       this.upload.visible = true
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
index abf167de..bce2d363 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
@@ -1,30 +1,15 @@
 <template>
-  <el-form
-    ref="uploadExcel"
-    class="upload-excel-file"
-  >
+  <el-form ref="uploadExcel" class="upload-excel-file">
     <!-- 文件 -->
     <el-form-item :label="$t('trials:consistencyCheck:label:file')">
       <div class="upload-container">
-        <el-upload
-          class="upload-demo"
-          action
-          accept=".xlsx,.xls,.csv"
-          :before-upload="beforeUpload"
-          :http-request="handleUploadFile"
-          :on-preview="handlePreview"
-          :show-file-list="true"
-          :limit="1"
-          :on-exceed="handleExceed"
-        >
+        <el-upload class="upload-demo" action accept=".xlsx,.xls,.csv" :before-upload="beforeUpload"
+          :http-request="handleUploadFile" :on-preview="handlePreview" :show-file-list="true" :limit="1"
+          :on-exceed="handleExceed">
           <el-button size="small" type="primary">
             {{ $t('trials:consistencyCheck:dialogButton:upload') }}
           </el-button>
-          <span
-            slot="tip"
-            style="margin-left:10px;"
-            class="el-upload__tip"
-          >
+          <span slot="tip" style="margin-left:10px;" class="el-upload__tip">
             ({{ $t('trials:consistencyCheck:message:excelFileOnly') }})
           </span>
         </el-upload>
@@ -40,6 +25,10 @@ export default {
       type: String,
       required: true
     },
+    lesionType: {
+      type: Number,
+      required: true
+    },
     TableName: {
       type: String,
       default: ''
@@ -101,21 +90,24 @@ export default {
 </script>
 
 <style lang="scss">
-.upload-excel-file{
+.upload-excel-file {
   .upload-container .el-upload--text {
     border: none;
     width: 80px;
     height: 40px;
   }
+
   .upload-container .el-input--small {
     margin-bottom: 5px;
   }
+
   .upload-container .el-icon-circle-check {
     color: #428bca;
     font-size: 13px;
   }
-  .account_item_clear{
-    .el-tag__close{
+
+  .account_item_clear {
+    .el-tag__close {
       display: none !important;
     }
   }
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
index 90ea4e1a..4ad1aa14 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -64,7 +64,7 @@
               data: {
                 TableQuestionId: qs.Id,
                 RowIndex: qsForm.RowIndex,
-                QuestionName: question.QuestionName
+                QuestionName: qs.QuestionName
               }
             })" />
         </div>
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 0a7bf5d3..7f611b89 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -69,7 +69,20 @@
             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-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 }}
+                <svg-icon
+                  v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) || (scope.row.LesionType === 4 && scope.row.ReportLayType === 1)"
+                  icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
+                      TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
+                      RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
+                      ReportChartTypeEnum: (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) ? 0 : (scope.row.LesionType === 4 && scope.row.ReportLayType === 1) ? 1 : null,
+                      QuestionName: scope.row.QuestionName
+                    }
+                  })" />
+              </span>
               <span
                 v-else
                 style="font-weight: bold;font-size: 16px;color: #f44336;"
diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
index 969152e0..091c2d21 100644
--- a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -46,15 +46,19 @@
                     sortable="custom" /> -->
                 <!-- 标记访视数量 -->
                 <el-table-column prop="MarkVisitCount" :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')"
-                    show-overflow-tooltip sortable="custom" />
+                    show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span>{{ `${scope.row.MarkIVUSVisitCount || 0}/${scope.row.MarkOCTVisitCount || 0}` }}</span>
+                    </template>
+                </el-table-column>
                 <!-- 标记dicom检查数量 -->
-                <el-table-column prop="MarkDicomStudyCount"
+                <!-- <el-table-column prop="MarkDicomStudyCount"
                     :label="$t('trials:pendingReadingTasks:table:MarkDicomStudyCount')" show-overflow-tooltip
-                    sortable="custom" />
+                    sortable="custom" /> -->
                 <!-- 标记非dicom检查数量 -->
-                <el-table-column prop="MarkNoneDicomStudyCount"
+                <!-- <el-table-column prop="MarkNoneDicomStudyCount"
                     :label="$t('trials:pendingReadingTasks:table:MarkNoneDicomStudyCount')" show-overflow-tooltip
-                    sortable="custom" />
+                    sortable="custom" /> -->
                 <el-table-column :label="$t('common:action:action')" width="100" fixed="right">
                     <template slot-scope="scope">
                         <!-- 阅片 -->

From fb8135d985eb0199b19ecb3b3c83201a197e8e18 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Dec 2025 11:28:54 +0800
Subject: [PATCH 159/333] =?UTF-8?q?=E3=80=90LiLi=E3=80=91=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E4=BA=BA=E5=91=98=E5=AE=9A=E6=9C=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/site/index.vue | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue
index 76365c7f..6a3fa3f0 100644
--- a/src/views/trials/trials-panel/site/index.vue
+++ b/src/views/trials/trials-panel/site/index.vue
@@ -173,14 +173,21 @@
           <el-form-item :label="$t('trials:site:form:UserName')">
             <el-input v-model="siteEmail_form.UserName" disabled />
           </el-form-item>
-          <el-form-item :label="$t('trials:site:form:email')" prop="EMail">
-            <el-input v-model="siteEmail_form.EMail" />
+          <el-form-item :label="$t('trials:site:form:email')">
+            <el-input v-model="siteEmail_form.OldEMail" disabled />
           </el-form-item>
           <el-form-item :label="$t('trials:site:form:phone')">
             <el-input v-model="siteEmail_form.Phone" disabled />
           </el-form-item>
+          <div class="tip">{{ $t('trials:site:siteEmail_form:tip:bottom') }}</div>
+          <el-form-item :label="$t('trials:site:form:FullName')">
+            <el-input v-model="siteEmail_form.FullName" />
+          </el-form-item>
+          <el-form-item :label="$t('trials:site:form:email')">
+            <el-input v-model="siteEmail_form.EMail" />
+          </el-form-item>
         </el-form>
-        <div class="tip">{{ $t('trials:site:siteEmail_form:tip:bottom') }}</div>
+
       </template>
       <template slot="dialog-footer">
         <el-button type="primary" @click="sendEMailTable" :loading="loading">
@@ -260,7 +267,7 @@ export default {
         title: this.$t('trials:site:dialogTitle:siteEmail'),
         width: '30%',
       },
-      siteEmail_form: { TrialSiteId: null, UserId: null, UserName: null, Role: null, EMail: null, OldEMail: null, Phone: null },
+      siteEmail_form: { TrialSiteId: null, UserId: null, UserName: null, Role: null, EMail: null, OldEMail: null, Phone: null, FullName: null },
       siteEmail_tip: null
     }
   },
@@ -301,8 +308,8 @@ export default {
         if (!validate) return false
         let data = {
           url: `${location.protocol}//${location.host}/researchLogin?trialId=${this.trialId}&lang=${this.$i18n.locale}&isUpload=1&email=${this.siteEmail_form.EMail}&oldEMail=${this.siteEmail_form.OldEMail}&trialSiteId=${this.siteEmail_form.TrialSiteId}`,
-          Email: this.siteEmail_form.EMail,
-          FullName: this.siteEmail_form.UserName,
+          Email: this.siteEmail_form.EMail || this.siteEmail_form.OldEMail,
+          FullName: this.siteEmail_form.FullName || this.siteEmail_form.UserName,
           TrialSiteId: this.siteEmail_form.TrialSiteId
 
         }
@@ -352,7 +359,7 @@ export default {
         if (res.IsSuccess) {
           this.siteEmail_form.UserName = res.Result.UserName
           this.siteEmail_form.OldEMail = res.Result.Email
-          this.siteEmail_form.EMail = res.Result.Email
+          // this.siteEmail_form.EMail = res.Result.Email
           this.siteEmail_form.Phone = res.Result.Phone
         }
       } catch (err) {

From 4e46bbac8454107182c17eef16839349240ffc35 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Dec 2025 11:36:50 +0800
Subject: [PATCH 160/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=A0=87=E5=87=86-NM=20DICOM=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=E6=B5=8B=E9=87=8F=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=EF=BC=8C=E5=BD=B1=E5=83=8F=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8ECRF=E9=97=AE=E9=A2=98=E5=85=B3?=
 =?UTF-8?q?=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue      | 3 +++
 1 file changed, 3 insertions(+)

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 6f99003e..88689e51 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2741,6 +2741,9 @@ export default {
       const studyList = this.visitTaskList[i].StudyList
       let series = this.getMarkedSeries(studyList, obj.annotation, true)
       if (series) {
+        if (this.isFusion && series.SeriesInstanceUid !== this.fusionSerieId.ct && series.SeriesInstanceUid !== this.fusionSerieId.pt) {
+          return await this.$confirm(this.$t('trials:reading:confirm:fusionPTOrCTInconsistent'))
+        }
         this.activeViewportIndex = this.cells.length - 1
         if (obj.annotation.from === 'MPR') {
           let viewPlaneNormal = obj.annotation?.metadata?.viewPlaneNormal.map(i => i == 0 ? 0 : i).join(',')

From 363ffa58b3fcb09fba3c55c9e0d8e362ee13b99e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Dec 2025 13:38:02 +0800
Subject: [PATCH 161/333] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-study.vue          | 42 +++++++++--------
 src/views/dicom-show/dicom-visit.vue          | 45 ++++++++++---------
 .../qc-check/components/qualityAssurance.vue  |  6 +++
 .../trials-panel/visit/qc-check/index.vue     |  1 +
 4 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index c84b0fc8..7a8f85e8 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -83,33 +83,36 @@
                             {{ item.description }}
                           </div>
                           <div v-if="!item.keySeries" style="padding: 1px;">
-                            {{ series.imageloadedArr.length <= series.instanceCount ? series.imageloadedArr.length : series.instanceCount }}/{{ item.instanceCount }}
+                            {{ series.imageloadedArr.length <= series.instanceCount ? series.imageloadedArr.length :
+                              series.instanceCount }}/{{ item.instanceCount }} </div>
+
                           </div>
-
                         </div>
-                      </div>
-                      <div v-if="showDelete" style="display: flex;flex-direction: row;justify-content: space-between;"
-                        @click.stop="">
+                        <div v-if="showDelete" style="display: flex;flex-direction: row;justify-content: space-between;"
+                          @click.stop="">
 
-                        <div>
-                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading')
-                          }}</span>
-                          <el-switch v-model="item.isReading" size="mini" @change="changeReadingStatus($event, item)" />
+                          <div>
+                            <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading')
+                            }}</span>
+                            <el-switch v-model="item.isReading" size="mini"
+                              @change="changeReadingStatus($event, item)" />
+                          </div>
+                          <div>
+                            <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isDelete')
+                            }}</span>
+                            <el-switch v-model="item.isDeleted" size="mini"
+                              @change="changeDeleteStatus($event, item)" />
+                          </div>
                         </div>
-                        <div>
-                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isDelete') }}</span>
-                          <el-switch v-model="item.isDeleted" size="mini" @change="changeDeleteStatus($event, item)" />
+                        <div
+                          v-if="item.prefetchInstanceCount > 0 && item.prefetchInstanceCount < item.instanceCount * 100">
+                          <el-progress
+                            :percentage="parseInt((item.prefetchInstanceCount / item.instanceCount).toFixed(2))" />
                         </div>
-                      </div>
-                      <div
-                        v-if="item.prefetchInstanceCount > 0 && item.prefetchInstanceCount < item.instanceCount * 100">
-                        <el-progress
-                          :percentage="parseInt((item.prefetchInstanceCount / item.instanceCount).toFixed(2))" />
-                      </div>
 
+                      </div>
                     </div>
                   </div>
-                </div>
               </el-tab-pane>
             </el-tabs>
           </div>
@@ -891,6 +894,7 @@ export default {
           // 设置当前序列状态为已下载完成
           this.seriesList[seriesIndex].loadStatus = true
           workSpeedclose()
+          localStorage.setItem("QCRiskControl", 1)
           if (!this.isFromCRCUpload) {
             this.loadAllImages()
           }
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 914c1c2f..24d8e5c5 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -113,35 +113,35 @@
                                 </div>
                               </el-tooltip>
                               <div style="padding: 1px;">
-                                {{ series.imageloadedArr.length <= series.instanceCount ? series.imageloadedArr.length : series.instanceCount }}/{{ series.instanceCount }}
+                                {{ series.imageloadedArr.length <= series.instanceCount ? series.imageloadedArr.length :
+                                  series.instanceCount }}/{{ series.instanceCount }} </div>
+                                  <div />
                               </div>
-                              <div />
                             </div>
-                          </div>
-                          <div v-if="showDelete"
-                            style="display: flex;flex-direction: row;justify-content: space-between;" @click.stop="">
+                            <div v-if="showDelete"
+                              style="display: flex;flex-direction: row;justify-content: space-between;" @click.stop="">
 
-                            <div>
-                              <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
-                              <el-switch v-model="series.isReading" size="mini"
-                                @change="changeReadingStatus($event, series)" />
+                              <div>
+                                <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
+                                <el-switch v-model="series.isReading" size="mini"
+                                  @change="changeReadingStatus($event, series)" />
+                              </div>
+                              <div>
+                                <span style="font-size: 12px;">{{ $t('trials:audit:table:isDelete') }}</span>
+                                <el-switch v-model="series.isDeleted" size="mini"
+                                  @change="changeDeleteStatus($event, series)" />
+                              </div>
                             </div>
-                            <div>
-                              <span style="font-size: 12px;">{{ $t('trials:audit:table:isDelete') }}</span>
-                              <el-switch v-model="series.isDeleted" size="mini"
-                                @change="changeDeleteStatus($event, series)" />
-                            </div>
-                          </div>
-                          <!-- <div style="position: absolute;bottom: -10px;left: 0;width: 100%;">
+                            <!-- <div style="position: absolute;bottom: -10px;left: 0;width: 100%;">
                           <el-progress v-if="series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount" :percentage="Number(series.prefetchInstanceCount/series.instanceCount)*100" />
                         </div> -->
-                          <div
-                            v-if="series.prefetchInstanceCount > 0 && series.prefetchInstanceCount < series.instanceCount * 100">
-                            <el-progress
-                              :percentage="parseInt((series.prefetchInstanceCount / series.instanceCount).toFixed(2))" />
-                          </div>
+                            <div
+                              v-if="series.prefetchInstanceCount > 0 && series.prefetchInstanceCount < series.instanceCount * 100">
+                              <el-progress
+                                :percentage="parseInt((series.prefetchInstanceCount / series.instanceCount).toFixed(2))" />
+                            </div>
 
-                        </div>
+                          </div>
                       </el-collapse-item>
 
                     </el-collapse>
@@ -937,6 +937,7 @@ export default {
           this.loadAllImages()
         }
         workSpeedclose()
+        localStorage.setItem("QCRiskControl", 1)
       }
     }
   }
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index b772a12f..e1210cd5 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1100,6 +1100,8 @@ export default {
       SecondReviewTime: '',
       IsSecondPass: false,
       userId: zzSessionStorage.getItem('userId'),
+
+      QCRiskControl: false
     }
   },
   async mounted() {
@@ -1314,6 +1316,7 @@ export default {
               this.SecondReviewTime = this.secondReviewList[0].SecondReviewTime
             }
           }
+          this.QCRiskControl = res.Result.QCRiskControl
           this.existsManual = res.Result.ExistsManual
           this.qCQuestionAnswerList = res.Result.QCQuestionAnswerList
           this.IsHaveStudyClinicalData = res.Result.IsHaveStudyClinicalData
@@ -1929,6 +1932,7 @@ export default {
         this.auditState = auditState
         return
       }
+      if (localStorage.getItem('QCRiskControl') <= 0 && this.QCRiskControl) return this.$confirm(this.$t('trials:qcQuality:title:noViewImage'))
       if (auditState === 8) {
         var isgo = true
         var hasStudyName = true,
@@ -2421,6 +2425,7 @@ export default {
       if (this.open) {
         this.open.close()
       }
+      localStorage.setItem("QCRiskControl", 1)
       // this.previewAllNoneDicomVisible = true
       let trialId = this.$route.query.trialId
       var token = getToken()
@@ -2438,6 +2443,7 @@ export default {
       if (this.open) {
         this.open.close()
       }
+      localStorage.setItem("QCRiskControl", 1)
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index fdc64d46..b98a82ee 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -880,6 +880,7 @@ export default {
     // 初审
     handlePrimaryQC(row) {
       if (!this.OtherInfo.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
+      localStorage.setItem("QCRiskControl", 0)
       this.loading = true
       isQCCanOpt(row.Id)
         .then((res) => {

From f5143fe11c7efee996ad4c3c8d021a4bd541e172 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Dec 2025 14:35:20 +0800
Subject: [PATCH 162/333] =?UTF-8?q?PET-CT=E8=9E=8D=E5=90=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B5=8B=E9=87=8F=E5=80=BC=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BASUV?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 156123e4..9cdb0864 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -1494,6 +1494,10 @@ export default {
       await setVolumesForViewports(
         renderingEngine,
         [
+          {
+            volumeId: ptVolumeId,
+            callback: setPetColorMapTransferFunctionForVolumeActor
+          },
           {
             volumeId: ctVolumeId,
             callback: setCtTransferFunctionForVolumeActor

From 4b5fee573967e07211047621067422d8a08de5ef Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Dec 2025 17:13:13 +0800
Subject: [PATCH 163/333] =?UTF-8?q?mpr=E6=B7=BB=E5=8A=A0=E5=8D=81=E5=AD=97?=
 =?UTF-8?q?=E5=87=86=E6=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icons/svg/crosshairs.svg                  |  1 +
 .../reading/dicoms3D/components/ReadPage.vue  | 97 +++++++++++++++----
 .../dicoms3D/components/VolumeViewport.vue    |  7 +-
 .../trials-panel/setting/attachment/index.vue | 10 +-
 4 files changed, 87 insertions(+), 28 deletions(-)
 create mode 100644 src/icons/svg/crosshairs.svg

diff --git a/src/icons/svg/crosshairs.svg b/src/icons/svg/crosshairs.svg
new file mode 100644
index 00000000..9a86eda3
--- /dev/null
+++ b/src/icons/svg/crosshairs.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1766048712120" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6026" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M924.520311 484.074997c7.439436 0 13.884218 2.726088 19.336394 8.16496 5.437849 5.452175 8.16496 11.897981 8.16496 19.336394 0 7.452739-2.726088 13.898545-8.16496 19.336394-5.452175 5.452175-11.897981 8.16496-19.336394 8.16496l-83.363639 0c-3.437286 40.110533-13.617136 77.777411-30.508851 113.012913-16.906042 35.236526-38.673811 66.175165-65.315588 92.816942s-57.58144 48.422849-92.816942 65.315588c-35.236526 16.906042-72.915683 26.790156-113.012913 29.650297l0 84.223217c0 7.439436-2.726088 13.884218-8.16496 19.336394-5.451152 5.437849-11.896958 8.16496-19.336394 8.16496-7.452739 0-13.898545-2.726088-19.336394-8.16496-5.452175-5.452175-8.16496-11.897981-8.16496-19.336394l0-84.223217c-40.110533-2.860141-77.777411-12.743232-113.012913-29.650297-35.236526-16.892739-66.175165-38.673811-92.816942-65.315588s-48.422849-57.58144-65.315588-92.816942c-16.906042-35.236526-27.071565-72.90238-30.508851-113.012913L99.479689 539.077705c-7.452739 0-13.898545-2.711761-19.336394-8.16496-5.452175-5.437849-8.16496-11.883655-8.16496-19.336394 0-7.439436 2.712785-13.884218 8.16496-19.336394 5.437849-5.437849 11.883655-8.16496 19.336394-8.16496l83.363639 0c3.437286-40.09723 13.602809-77.777411 30.508851-113.012913 16.892739-35.236526 38.673811-66.175165 65.315588-92.816942s57.58144-48.409546 92.816942-65.315588c35.236526-16.892739 72.90238-26.77583 113.012913-29.650297L484.497623 99.05604c0-7.439436 2.712785-13.885242 8.16496-19.336394 5.437849-5.437849 11.883655-8.16496 19.336394-8.16496 7.440459 0 13.885242 2.726088 19.336394 8.16496 5.437849 5.452175 8.16496 11.896958 8.16496 19.336394l0 84.223217c40.098253 2.874467 77.777411 12.757558 113.012913 29.650297 35.236526 16.906042 66.175165 38.673811 92.816942 65.315588s48.409546 57.58144 65.315588 92.816942c16.892739 35.236526 27.071565 72.916706 30.508851 113.012913L924.520311 484.074997zM484.498646 238.281965c-32.657794 2.874467-63.167668 11.320836-91.527576 25.352411-28.360931 14.046924-53.431933 31.946596-75.198679 53.713342-21.781072 21.781072-39.680744 46.837748-53.713342 75.198679-14.045901 28.360931-22.49227 58.869782-25.352411 91.527576L484.498646 484.073974 484.498646 238.281965zM238.70459 539.077705c2.860141 32.657794 11.30651 63.166645 25.352411 91.527576 14.032598 28.360931 31.933293 53.431933 53.713342 75.198679 21.766746 21.781072 46.837748 39.680744 75.198679 53.713342 28.360931 14.046924 58.869782 22.49227 91.527576 25.352411L484.496599 539.077705 238.70459 539.077705zM539.501354 484.074997l245.793032 0c-2.874467-32.657794-11.320836-63.167668-25.352411-91.527576-14.046924-28.360931-31.946596-53.417607-53.713342-75.198679-21.780049-21.766746-46.837748-39.667441-75.198679-53.713342-28.360931-14.032598-58.869782-22.478967-91.527576-25.352411L539.502377 484.074997zM539.501354 784.870738c32.657794-2.860141 63.167668-11.30651 91.527576-25.352411 28.360931-14.032598 53.41863-31.93227 75.198679-53.713342 21.766746-21.766746 39.667441-46.837748 53.713342-75.198679 14.032598-28.360931 22.478967-58.869782 25.352411-91.527576L539.501354 539.078729 539.501354 784.870738z" p-id="6027" fill="#ffffff"></path></svg>
\ No newline at end of file
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 88689e51..faeab3f5 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -165,6 +165,11 @@
               v-if="criterionType === 0 && readingTool === 0">
               <svg-icon icon-class="mpr" class="svg-icon" style="transform: rotate(180deg);" />
             </div>
+            <!-- 十字准星 -->
+            <div :class="['tool-item', activeTool === 'Crosshairs' ? 'tool-item-active' : '']" v-if="isMPR"
+              :title="$t('trials:reading:button:crosshairs')" @click.prevent="setToolActive('Crosshairs')">
+              <svg-icon icon-class="crosshairs" class="svg-icon" />
+            </div>
             <!--融合-->
             <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')"
               @click.prevent="openFusion">
@@ -517,10 +522,11 @@ const {
   EraserTool,
   MIPJumpToClickTool,
   VolumeRotateTool,
+  CrosshairsTool,
   synchronizers
   // cursors
 } = cornerstoneTools
-const { createCameraPositionSynchronizer, createVOISynchronizer } = synchronizers
+const { createCameraPositionSynchronizer, createVOISynchronizer, createSlabThicknessSynchronizer } = synchronizers
 const newStyles = {
   global: {
     color: 'rgb(255, 0, 0)',
@@ -665,7 +671,8 @@ export default {
 
       ManualsClose: false,
 
-      isMPR: false
+      isMPR: false,
+      volumeToolGroupId: "share-viewport-volume"
     }
   },
   computed: {
@@ -1167,11 +1174,16 @@ export default {
       cornerstoneTools.addTool(CobbAngleTool)
       cornerstoneTools.addTool(MIPJumpToClickTool)
       cornerstoneTools.addTool(VolumeRotateTool)
+      cornerstoneTools.addTool(CrosshairsTool)
 
       viewportIds.forEach((viewportId, i) => {
         // const toolGroupId = `viewport-${i}`
-        const toolGroupId = viewportId
-        const toolGroup = ToolGroupManager.createToolGroup(toolGroupId)
+        let toolGroupId = viewportId
+        if (volumeViewportIds.includes(viewportId)) {
+          toolGroupId = this.volumeToolGroupId
+        }
+
+        const toolGroup = ToolGroupManager.getToolGroup(toolGroupId) ? ToolGroupManager.getToolGroup(toolGroupId) : ToolGroupManager.createToolGroup(toolGroupId)
         toolGroup.addViewport(viewportId, renderingEngineId)
         toolGroup.addTool(StackScrollTool.toolName, {
           loop: true,        // 启用循环滚动
@@ -1184,6 +1196,7 @@ export default {
           toolGroup.addTool(WindowLevelTool.toolName, {
             targetViewportIds: volumeViewportIds
           })
+          toolGroup.addTool(CrosshairsTool.toolName);
         } else {
           toolGroup.addTool(WindowLevelTool.toolName)
         }
@@ -1296,7 +1309,7 @@ export default {
       })
 
       eventTarget.addEventListener('cornerstoneimageloadprogress', this.imageLoadProgress)
-      console.log(Events, toolsEvents)
+      // console.log(Events, toolsEvents)
       if (this.readingTool === 2) {
         this.setUpSynchronizers()
       }
@@ -2014,14 +2027,22 @@ export default {
     },
     // 激活工具
     setToolActive(toolName) {
-      const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
+      const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
       const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
       if (this.activeTool === toolName) {
-        toolGroup.setToolPassive(this.activeTool)
+        if (toolName === CrosshairsTool.toolName) {
+          toolGroup.setToolDisabled(this.activeTool)
+        } else {
+          toolGroup.setToolPassive(this.activeTool)
+        }
         this.activeTool = ''
       } else {
         if (this.activeTool) {
-          toolGroup.setToolPassive(this.activeTool)
+          if (toolName === CrosshairsTool.toolName) {
+            toolGroup.setToolDisabled(this.activeTool)
+          } else {
+            toolGroup.setToolPassive(this.activeTool)
+          }
         }
         toolGroup.setToolActive(toolName, {
           bindings: [{ mouseButton: MouseBindings.Primary }]
@@ -2036,14 +2057,22 @@ export default {
       if (!toolObj || toolObj.isDisabled) return
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
-        const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
+        const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
         if (this.activeTool === toolName) {
-          toolGroup.setToolPassive(this.activeTool)
+          if (toolName === CrosshairsTool.toolName) {
+            toolGroup.setToolDisabled(this.activeTool)
+          } else {
+            toolGroup.setToolPassive(this.activeTool)
+          }
           this.activeTool = ''
         } else {
           if (this.activeTool) {
-            toolGroup.setToolPassive(this.activeTool)
+            if (toolName === CrosshairsTool.toolName) {
+              toolGroup.setToolDisabled(this.activeTool)
+            } else {
+              toolGroup.setToolPassive(this.activeTool)
+            }
           }
           toolGroup.setToolActive(toolName, {
             bindings: [{ mouseButton: MouseBindings.Primary }]
@@ -2060,10 +2089,14 @@ export default {
       if (this.activeTool === toolName) return
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
-        const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
+        const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
         if (this.activeTool) {
-          toolGroup.setToolPassive(this.activeTool)
+          if (toolName === CrosshairsTool.toolName) {
+            toolGroup.setToolDisabled(this.activeTool)
+          } else {
+            toolGroup.setToolPassive(this.activeTool)
+          }
         }
         toolGroup.setToolActive(toolName, {
           bindings: [{ mouseButton: MouseBindings.Primary }]
@@ -2076,9 +2109,13 @@ export default {
       if (this.activeTool && this.toolNames.includes(this.activeTool)) {
         const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
         if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
-          const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
+          const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
           const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
-          toolGroup.setToolPassive(this.activeTool)
+          if (this.activeTool === CrosshairsTool.toolName) {
+            toolGroup.setToolDisabled(this.activeTool)
+          } else {
+            toolGroup.setToolPassive(this.activeTool)
+          }
           this.activeTool = ''
         }
       }
@@ -2088,7 +2125,7 @@ export default {
       this.setToolsPassive()
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
-        const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
+        const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
         toolGroup.setToolActive(toolName, {
           bindings: [{ mouseButton: MouseBindings.Primary }]
@@ -2100,11 +2137,16 @@ export default {
       if (!this.activeTool) return
       let toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`, `${this.viewportKey}-3`]
       if (this.isMPR) {
-        toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
+        // toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
+        toolGroupIds = [this.volumeToolGroupId]
       }
       toolGroupIds.forEach(toolGroupId => {
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
-        toolGroup.setToolPassive(this.activeTool)
+        if (this.activeTool === CrosshairsTool.toolName) {
+          toolGroup.setToolDisabled(this.activeTool)
+        } else {
+          toolGroup.setToolPassive(this.activeTool)
+        }
       })
       this.activeTool = ''
     },
@@ -2112,7 +2154,8 @@ export default {
       if (!this.activeTool) return
       let toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`, `${this.viewportKey}-3`]
       if (this.isMPR) {
-        toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
+        // toolGroupIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
+        toolGroupIds = [this.volumeToolGroupId]
       }
       toolGroupIds.forEach(toolGroupId => {
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
@@ -2972,7 +3015,7 @@ export default {
         if (this.activeTool) {
           this.setToolsPassive()
         }
-        const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
+        const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
         toolGroup.setToolActive(toolName, {
           bindings: [{ mouseButton: MouseBindings.Primary }]
@@ -3201,6 +3244,20 @@ export default {
           viewportId
         })
       });
+      const synchronizer = createSlabThicknessSynchronizer('SLAB_THICKNESS_SYNCHRONIZER_ID');
+
+      // Add viewports to VOI synchronizers
+      [
+        `viewport-volume-0`,
+        `viewport-volume-1`,
+        `viewport-volume-2`
+      ].forEach((viewportId) => {
+        synchronizer.add({
+          renderingEngineId: this.renderingEngineId,
+          viewportId,
+        });
+      });
+      synchronizer.setEnabled(false);
     },
     setColorMap(rgbPresetName) {
       const fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
index c41845e1..dd44c9c7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
@@ -40,10 +40,10 @@
         <div v-if="series" class="right-bottom-text">
             <div v-show="imageInfo.location">Location: {{
                 `${Number(imageInfo.location).toFixed(digitPlaces)} mm`
-            }}</div>
+                }}</div>
             <div v-show="imageInfo.sliceThickness">Slice Thickness: {{
                 `${Number(imageInfo.sliceThickness).toFixed(digitPlaces)} mm`
-            }}</div>
+                }}</div>
             <div v-show="imageInfo.wwwc">WW/WL: {{ imageInfo.wwwc }}</div>
         </div>
         <div class="orientation-top">
@@ -226,7 +226,8 @@ export default {
                     this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
                 }
             }
-            const toolGroupId = this.viewportId
+            // const toolGroupId = this.viewportId
+            const toolGroupId = 'share-viewport-volume'
             const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId)
             toolGroup.setToolEnabled('ScaleOverlay')
 
diff --git a/src/views/trials/trials-panel/setting/attachment/index.vue b/src/views/trials/trials-panel/setting/attachment/index.vue
index 1e1643e5..3c2c3a2c 100644
--- a/src/views/trials/trials-panel/setting/attachment/index.vue
+++ b/src/views/trials/trials-panel/setting/attachment/index.vue
@@ -141,14 +141,14 @@
           <!-- 编辑 -->
           <el-button v-hasPermi="['trials:trials-panel:setting:attachment:edit']" circle
             :title="$t('trials:attachment:action:edit')" icon="el-icon-edit-outline"
-            :disabled="scope.row.IsSomeUserSigned || scope.row.IsDeleted" @click="handleEdit(scope.row)" />
-          <el-button :disabled="scope.row.IsPublish || scope.row.IsDeleted" circle icon="el-icon-position"
+            :disabled="scope.row.IsSomeUserSigned || scope.row.IsPublish" @click="handleEdit(scope.row)" />
+          <el-button :disabled="scope.row.IsPublish || !scope.row.IsDeleted" circle icon="el-icon-position"
             :title="$t('dictionary:signature:button:publish')" @click="publishTrialDocument([scope.row])">
           </el-button>
           <!-- 废除 -->
-          <el-button v-hasPermi="['trials:trials-panel:setting:attachment:abolish']" :disabled="scope.row.IsDeleted"
-            circle :title="$t('trials:attachment:action:apolish')" icon="el-icon-delete"
-            @click="handleRepeal(scope.row)" />
+          <el-button v-hasPermi="['trials:trials-panel:setting:attachment:abolish']"
+            :disabled="!scope.row.IsPublish || scope.row.IsDeleted" circle
+            :title="$t('trials:attachment:action:apolish')" icon="el-icon-delete" @click="handleRepeal(scope.row)" />
         </template>
       </el-table-column>
     </el-table>

From 9f5fc1dc9d21d98f5ea184687913aed9de9f899d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Dec 2025 17:15:46 +0800
Subject: [PATCH 164/333] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/email/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/system/email/index.vue b/src/views/system/email/index.vue
index 79d1a69f..43b3b14f 100644
--- a/src/views/system/email/index.vue
+++ b/src/views/system/email/index.vue
@@ -193,8 +193,11 @@ export default {
         // 同步邮件
         async synchronizationEmail() {
             try {
+                let data = {
+                    TrialId: this.$route.query.trialId
+                }
                 this.loading = true
-                let res = await synchronizationEmail()
+                let res = await synchronizationEmail(data)
                 this.loading = false
                 if (res.IsSuccess) {
                     this.getList()

From 56bc2bc5cd4f237f2e6bd31bb80898609ee5b640 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 19 Dec 2025 16:27:32 +0800
Subject: [PATCH 165/333] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E3=80=81=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dcmUpload/dcmjs.js | 4 +++-
 src/utils/stream.js          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/utils/dcmUpload/dcmjs.js b/src/utils/dcmUpload/dcmjs.js
index a70b1b42..e889d053 100644
--- a/src/utils/dcmUpload/dcmjs.js
+++ b/src/utils/dcmUpload/dcmjs.js
@@ -8508,6 +8508,8 @@
 	      var binaryStream;
 	      var _writeOptions$fragmen = writeOptions.fragmentMultiframe,
 	          fragmentMultiframe = _writeOptions$fragmen === void 0 ? true : _writeOptions$fragmen;
+		  var _writeOptions$offset = writeOptions.startOffset,
+	          startOffset = _writeOptions$offset === void 0 ? true : _writeOptions$offset;
 	      value = value === null || value === undefined ? [] : value;
 
 	      if (isEncapsulated) {
@@ -8535,7 +8537,7 @@
 	        for (i = 0; i < frames; i++) {
 	          var _needsPadding = Boolean(value[i].byteLength & 1);
 
-	        //   startOffset.push(binaryStream.size);
+	          if (startOffset) startOffset.push(binaryStream.size);
 	          var frameBuffer = value[i],
 	              frameStream = new ReadBufferStream(frameBuffer);
 	          var fragmentsLength = 1;
diff --git a/src/utils/stream.js b/src/utils/stream.js
index 8f1b1d02..4b139653 100644
--- a/src/utils/stream.js
+++ b/src/utils/stream.js
@@ -112,7 +112,7 @@ function downloadFileToUrl(url) {
         xhr.onload = function () {
             const arraybuffer = xhr.response;
             let dataset = dcmjs.data.DicomMessage.readFile(arraybuffer)
-            let newDicomFile = dataset.write({ fragmentMultiframe: false }) // fragmentMultiframe 原始数据是否进行分割
+            let newDicomFile = dataset.write({ fragmentMultiframe: false, startOffset: false }) // fragmentMultiframe 原始数据是否进行分割
             const bufferArray = new Uint8Array(newDicomFile)
             const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
             const href = URL.createObjectURL(blob)

From 8122464fbb375442fce288c8b04e51419a60b5c5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 19 Dec 2025 16:27:43 +0800
Subject: [PATCH 166/333] =?UTF-8?q?=E3=80=90=E9=A1=B5=E9=9D=A2=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E3=80=91=E9=9D=B6=E6=AE=B5=E6=A0=87=E8=AE=B0=E7=AD=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=B3=E9=97=AD=E6=97=B6=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=88=B7=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-task/components/TargetSection.vue        | 12 ++++++++++++
 .../trials-panel/reading/reading-task/index.vue      |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
index 091c2d21..442c57e5 100644
--- a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -139,6 +139,18 @@ export default {
             uploadStatus: 'upload',
         }
     },
+    watch: {
+        downloadImageVisible(v) {
+            if (!v) {
+                this.getList()
+            }
+        },
+        uploadImageVisible(v) {
+            if (!v) {
+                this.getList()
+            }
+        }
+    },
     mounted() {
         this.getList()
     },
diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index 8b844be0..aa9ff4e0 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -235,6 +235,11 @@ export default {
         this.getList()
       }
     },
+    TargetSection_visible(v) {
+      if (!v) {
+        this.getList()
+      }
+    }
   },
   mounted() {
     window.addEventListener('message', this.receiveMsg)

From 6cd5e7b9575107780c8aa4b205b1d89af6a8f2bd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 22 Dec 2025 13:58:23 +0800
Subject: [PATCH 167/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E3=80=81=E9=A2=84=E8=A7=88=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dcmUpload/dcmjs.js                  |   6 +-
 .../components/image-viewer.vue               |  77 ++---
 .../none-dicom-show/components/preview.vue    | 112 +++----
 src/views/none-dicom-show/index.vue           |  39 ++-
 .../dicoms/components/NoneDicomsCanvas.vue    | 305 +++++++++---------
 .../dicoms/components/NoneDicomsViewer.vue    | 113 +++----
 .../trials-panel/reading/dicoms/index.vue     |   2 +-
 .../reading/dicoms/none-dicoms.vue            |  45 ++-
 .../none-dicoms/components/VisitReview.vue    |  31 +-
 9 files changed, 391 insertions(+), 339 deletions(-)

diff --git a/src/utils/dcmUpload/dcmjs.js b/src/utils/dcmUpload/dcmjs.js
index e889d053..14b7abe8 100644
--- a/src/utils/dcmUpload/dcmjs.js
+++ b/src/utils/dcmUpload/dcmjs.js
@@ -8509,7 +8509,7 @@
 	      var _writeOptions$fragmen = writeOptions.fragmentMultiframe,
 	          fragmentMultiframe = _writeOptions$fragmen === void 0 ? true : _writeOptions$fragmen;
 		  var _writeOptions$offset = writeOptions.startOffset,
-	          startOffset = _writeOptions$offset === void 0 ? true : _writeOptions$offset;
+	          isNeedStartOffset = _writeOptions$offset === void 0 ? true : _writeOptions$offset;
 	      value = value === null || value === undefined ? [] : value;
 
 	      if (isEncapsulated) {
@@ -8537,7 +8537,9 @@
 	        for (i = 0; i < frames; i++) {
 	          var _needsPadding = Boolean(value[i].byteLength & 1);
 
-	          if (startOffset) startOffset.push(binaryStream.size);
+	          if (isNeedStartOffset) {
+				 startOffset.push(binaryStream.size);
+			  }
 	          var frameBuffer = value[i],
 	              frameStream = new ReadBufferStream(frameBuffer);
 	          var fragmentsLength = 1;
diff --git a/src/views/none-dicom-show/components/image-viewer.vue b/src/views/none-dicom-show/components/image-viewer.vue
index 92ec89b6..c92144ae 100644
--- a/src/views/none-dicom-show/components/image-viewer.vue
+++ b/src/views/none-dicom-show/components/image-viewer.vue
@@ -2,13 +2,8 @@
 <template>
   <div style="width: 100%; height: 100%">
     <transition name="viewer-fade">
-      <div
-        v-show="urlList.length > 0"
-        ref="image-viewer__wrapper"
-        tabindex="-1"
-        class="image-viewer__wrapper"
-        :style="{ 'z-index': 5 }"
-      >
+      <div v-show="urlList.length > 0" ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper"
+        :style="{ 'z-index': 5 }">
         <span class="image-viewer_desc">
           <!-- <span v-if="studyCode">NST00006</span>
           <span v-if="modality">CT</span>
@@ -21,18 +16,12 @@
         </span>
         <!-- Arrow -->
         <template v-if="!isSingle">
-          <span
-            class="image-viewer__btn image-viewer__prev"
-            :class="{ 'is-disabled': !infinite && isFirst }"
-            @click="prev"
-          >
+          <span class="image-viewer__btn image-viewer__prev" :class="{ 'is-disabled': !infinite && isFirst }"
+            @click="prev">
             <i class="el-icon-arrow-left" />
           </span>
-          <span
-            class="el-image-viewer__btn el-image-viewer__next"
-            :class="{ 'is-disabled': !infinite && isLast }"
-            @click="next"
-          >
+          <span class="el-image-viewer__btn el-image-viewer__next" :class="{ 'is-disabled': !infinite && isLast }"
+            @click="next">
             <i class="el-icon-arrow-right" />
           </span>
         </template>
@@ -44,36 +33,19 @@
             <i class="el-image-viewer__actions__divider" />
             <i class="el-icon-c-scale-to-original" @click="toggleMode" />
             <i class="el-image-viewer__actions__divider" />
-            <i
-              class="el-icon-refresh-left"
-              @click="handleActions('anticlocelise')"
-            />
-            <i
-              class="el-icon-refresh-right"
-              @click="handleActions('clocelise')"
-            />
+            <i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
+            <i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
           </div>
         </div>
         <!-- 图片 -->
         <div id="image-viewer__canvas" class="image-viewer__canvas">
           <template v-for="(item, i) in urlList">
-            <img
-              v-if="!~item.FileType.indexOf('pdf')"
-              v-show="i === index"
-              :ref="`img${i}`"
-              :key="item.Id"
-              crossorigin="anonymous"
-              :src="
-                item.FileType && item.FileType.indexOf('zip') >= 0
-                  ? zipImg
-                  : `${OSSclientConfig.basePath}${item.Path}`
-              "
-              :style="imgStyle"
-              style="max-width: 100%; max-height: 100%"
-              @load="handleImgLoad"
-              @error="handleImgError"
-              @mousedown="handleMouseDown"
-            />
+            <img v-if="!~item.FileType.indexOf('pdf')" v-show="i === index" :ref="`img${i}`" :key="item.Id"
+              crossorigin="anonymous" :src="item.FileType && item.FileType.indexOf('zip') >= 0
+                ? zipImg
+                : `${OSSclientConfig.basePath}${item.Path}`
+                " :style="imgStyle" style="max-width: 100%; max-height: 100%" @load="handleImgLoad"
+              @error="handleImgError" @mousedown="handleMouseDown" />
           </template>
         </div>
       </div>
@@ -108,11 +80,11 @@ export default {
     },
     onSwitch: {
       type: Function,
-      default: () => {},
+      default: () => { },
     },
     onClose: {
       type: Function,
-      default: () => {},
+      default: () => { },
     },
     initialIndex: {
       type: Number,
@@ -172,7 +144,9 @@ export default {
       immediate: true,
       handler(val) {
         this.reset()
-        this.onSwitch(val)
+        if (val >= 0) {
+          this.onSwitch(this.urlList[val].Id)
+        }
       },
     },
   },
@@ -349,6 +323,7 @@ export default {
   width: 100%;
   height: 100%;
 }
+
 .image-viewer__btn {
   position: absolute;
   z-index: 1;
@@ -370,6 +345,7 @@ export default {
   height: 40px;
   font-size: 40px;
 }
+
 .image-viewer_desc {
   position: absolute;
   top: 40px;
@@ -387,6 +363,7 @@ export default {
   border-radius: 17px;
   // border-radius: 2%;
 }
+
 .image-viewer__canvas {
   position: absolute;
   top: 50%;
@@ -397,6 +374,7 @@ export default {
   justify-content: center;
   align-items: center;
 }
+
 .image-viewer__actions {
   left: 50%;
   bottom: 30px;
@@ -408,6 +386,7 @@ export default {
   border-color: #fff;
   border-radius: 22px;
 }
+
 .image-viewer__actions__inner {
   width: 100%;
   height: 100%;
@@ -419,6 +398,7 @@ export default {
   align-items: center;
   justify-content: space-around;
 }
+
 .image-viewer__next,
 .image-viewer__prev {
   top: 50%;
@@ -429,15 +409,18 @@ export default {
   background-color: #606266;
   border-color: #fff;
 }
+
 .image-viewer__prev {
   transform: translateY(-50%);
   left: 40px;
 }
+
 .image-viewer__next {
   transform: translateY(-50%);
   right: 40px;
   text-indent: 2px;
 }
+
 .image-viewer__mask {
   position: absolute;
   width: 100%;
@@ -447,9 +430,11 @@ export default {
   opacity: 0.5;
   // background:#000
 }
+
 .viewer-fade-enter-active {
   animation: viewer-fade-in 0.3s;
 }
+
 .viewer-fade-leave-active {
   animation: viewer-fade-out 0.3s;
 }
@@ -459,6 +444,7 @@ export default {
     transform: translate3d(0, -20px, 0);
     opacity: 0;
   }
+
   100% {
     transform: translate3d(0, 0, 0);
     opacity: 1;
@@ -470,6 +456,7 @@ export default {
     transform: translate3d(0, 0, 0);
     opacity: 1;
   }
+
   100% {
     transform: translate3d(0, -20px, 0);
     opacity: 0;
diff --git a/src/views/none-dicom-show/components/preview.vue b/src/views/none-dicom-show/components/preview.vue
index 7eedf98e..98aab393 100644
--- a/src/views/none-dicom-show/components/preview.vue
+++ b/src/views/none-dicom-show/components/preview.vue
@@ -2,56 +2,29 @@
   <div class="none-dicom_preview-wrapper">
     <div class="image-viewer-wrapper">
       <!-- 预览图像 -->
-      <ImageViewer
-        v-if="previewVisible"
-        :on-switch="
-          (index) => {
-            selected(index)
-          }
-        "
-        :initial-index="previewImage.index"
-        :url-list="previewImage.imgList"
-        :study-code="previewImage.studyCode"
-        :body-part="previewImage.bodyPart"
-        :modality="previewImage.modality"
-        :zip-img="zipImg"
-      />
+      <ImageViewer v-if="previewVisible" :on-switch="(index) => {
+        selected(index)
+      }
+        " :initial-index="previewImage.index" :url-list="previewImage.imgList" :study-code="previewImage.studyCode"
+        :body-part="previewImage.bodyPart" :modality="previewImage.modality" :zip-img="zipImg" />
     </div>
     <div class="thumbnail-wrapper" style="z-index: 999; background-color: #fff">
       <div class="">
         <div class="img-wrapper">
-          <el-button
-            icon="el-icon-d-arrow-left"
-            plain
-            class="left to"
-            :disabled="disabledPrev"
-            @click="toRight"
-          />
+          <el-button icon="el-icon-d-arrow-left" plain class="left to" :disabled="disabledPrev" @click="toRight" />
           <div ref="imagesWrapper" class="images">
             <div v-if="noData" class="empty-text">
               <slot name="empty">暂无数据</slot>
             </div>
             <div v-show="!noData" class="items" :style="itemsStyle">
               <template v-for="(item, index) in previewImage.imgList">
-                <div
-                  v-if="!~item.FileType.indexOf('pdf')"
-                  :key="index"
-                  class="item-img"
-                  :style="imgSize"
-                  :class="{
-                    'is-active': index === currentIndex,
-                  }"
-                  @click="selected(index)"
-                >
-                  <img
-                    :title="item.FileName"
-                    crossorigin="anonymous"
-                    :src="
-                      item.FileType && item.FileType.indexOf('zip') >= 0
-                        ? zipImg
-                        : `${OSSclientConfig.basePath}${item.Path}`
-                    "
-                  />
+                <div v-if="!~item.FileType.indexOf('pdf')" :key="index" class="item-img" :style="imgSize" :class="{
+                  'is-active': item.Id === currentFileId,
+                }" @click="selected(item.Id)">
+                  <img :title="item.FileName" crossorigin="anonymous" :src="item.FileType && item.FileType.indexOf('zip') >= 0
+                    ? zipImg
+                    : `${OSSclientConfig.basePath}${item.Path}`
+                    " />
                   <p v-if="item.FileName" class="item-date">
                     {{ `${index + 1}` }}
                   </p>
@@ -59,13 +32,7 @@
               </template>
             </div>
           </div>
-          <el-button
-            icon="el-icon-d-arrow-right"
-            :disabled="disabledNext"
-            plain
-            class="right to"
-            @click="Left"
-          />
+          <el-button icon="el-icon-d-arrow-right" :disabled="disabledNext" plain class="right to" @click="Left" />
         </div>
       </div>
     </div>
@@ -93,6 +60,10 @@ export default {
       type: Number,
       default: null,
     },
+    currentFileId: {
+      type: String,
+      default: ''
+    },
     previewImage: {
       type: Object,
       default: () => {
@@ -167,7 +138,7 @@ export default {
     const scope = this
     window.onresize = function () {
       scope.pageSize = scope.wrapperWidth() / scope.itemWidth
-      scope.selected(scope.currentIndex)
+      scope.selected(scope.currentFileId)
     }
   },
   methods: {
@@ -185,7 +156,8 @@ export default {
         this.translateX = maxTrans
       }
     },
-    selected(index) {
+    selected(id) {
+      let index = this.previewImage.imgList.findIndex(item => item.Id === id)
       const center = this.pageSize >> 1
       // 最后一页的中间位置
       const lastCenter = this.dataLength - center
@@ -202,7 +174,7 @@ export default {
       if (this.currentIndex !== index) {
         this.currentIndex = index
       }
-      this.$emit('selectedImg', index)
+      this.$emit('selectedImg', id)
     },
     wrapperWidth() {
       if (this.$refs.imagesWrapper) {
@@ -224,25 +196,30 @@ export default {
   .image-viewer-wrapper {
     flex: 1;
   }
+
   .thumbnail-wrapper {
     height: 130px;
   }
+
   .img-content {
     position: absolute;
     left: 0;
     bottom: 10px;
     width: 100%;
   }
+
   .img-wrapper {
     display: flex;
     position: relative;
     margin: 0 20px;
     height: 120px;
+
     .to {
       width: 32px;
       height: 100%;
       padding: 0;
     }
+
     .images::before {
       position: absolute;
       z-index: 5;
@@ -251,16 +228,15 @@ export default {
       width: 84px;
       content: '';
       pointer-events: none;
-      background: -webkit-gradient(
-        linear,
-        left top,
-        right top,
-        from(#fff),
-        color-stop(50%, rgba(0, 0, 0, 0))
-      );
+      background: -webkit-gradient(linear,
+          left top,
+          right top,
+          from(#fff),
+          color-stop(50%, rgba(0, 0, 0, 0)));
       background: -o-linear-gradient(left, #fff, rgba(0, 0, 0, 0) 50%);
       background: linear-gradient(90deg, #fff, rgba(0, 0, 0, 0) 50%);
     }
+
     .images::after {
       position: absolute;
       z-index: 5;
@@ -270,22 +246,22 @@ export default {
       width: 84px;
       content: '';
       pointer-events: none;
-      background: -webkit-gradient(
-        linear,
-        right top,
-        left top,
-        from(#fff),
-        color-stop(50%, rgba(0, 0, 0, 0))
-      );
+      background: -webkit-gradient(linear,
+          right top,
+          left top,
+          from(#fff),
+          color-stop(50%, rgba(0, 0, 0, 0)));
       background: -o-linear-gradient(right, #fff, rgba(0, 0, 0, 0) 50%);
       background: linear-gradient(270deg, #fff, rgba(0, 0, 0, 0) 50%);
     }
+
     .images {
       position: relative;
       overflow: hidden;
       width: 100%;
       height: 100%;
       margin: 0 2px;
+
       .empty-text {
         color: rgb(158, 158, 158);
         height: 100%;
@@ -293,6 +269,7 @@ export default {
         align-items: center;
         justify-content: center;
       }
+
       .items {
         position: absolute;
         top: 0;
@@ -302,6 +279,7 @@ export default {
         height: 100%;
         align-items: center;
         transition: transform 0.25s ease;
+
         .item-img {
           display: inline-block;
           box-sizing: border-box;
@@ -309,6 +287,7 @@ export default {
           margin-right: 8px;
           border: 2px solid rgba(0, 0, 0, 0);
           cursor: pointer;
+
           .item-date {
             bottom: 0px;
             position: absolute;
@@ -319,15 +298,18 @@ export default {
             line-height: 24px;
             color: white;
           }
+
           img {
             width: 100%;
             height: 100%;
           }
         }
+
         .item-img:hover::after {
           // border-color: #409EFF;
           opacity: 0;
         }
+
         .item-img::after {
           position: absolute;
           top: 0;
@@ -342,9 +324,11 @@ export default {
           transition: opacity 0.3s ease;
           background-color: #fff;
         }
+
         .is-active {
           border-color: #409eff;
         }
+
         .is-active:after {
           opacity: 0;
         }
diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index df9d1834..4b6a63f8 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -1,7 +1,11 @@
 <template>
   <div v-loading="loading" class="img-container">
     <el-card class="box-card left">
-      <div class="title">
+      <div class="title" style="display: flex;align-items: center;">
+        <div style="margin-right: 5px;cursor: pointer;" @click.stop="sortFile">
+          <i :class="['el-icon-caret-top', Asc ? '' : 'icon_check']" style="display: block;margin-bottom: -5px;"></i>
+          <i :class="['el-icon-caret-bottom', !Asc ? '' : 'icon_check']" style="display: block; margin-top: -5px;"></i>
+        </div>
         {{ $t('trials:none-dicom-show:fileList') }}
       </div>
       <div class="left-content">
@@ -77,7 +81,8 @@
     <el-card class="box-card right">
       <div style="width: 100%; height: 100%" v-if="!showPDF">
         <Preview v-if="previewImage.imgList.length > 0" ref="previewImage" style="width: 100%"
-          :preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg" />
+          :preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg"
+          :currentFileId="currentFileId" />
       </div>
       <div style="width: 100%; height: 100%" v-else>
         <PreviewFile :file-path="pdfFile.path" :file-type="pdfFile.type" />
@@ -140,6 +145,7 @@ export default {
       isAudit: false,
 
       activeNames: [],
+      Asc: false
     }
   },
   async created() {
@@ -157,6 +163,26 @@ export default {
     // 默认选择第一个文件
   },
   methods: {
+    sortFile() {
+      if (this.Asc) {
+        this.Asc = false
+      } else {
+        this.Asc = true
+      }
+      console.log(this.Asc, 'Asc')
+      this.studyList.forEach(study => {
+        if (study.NoneDicomStudyFileList.length > 0) {
+          if (this.Asc) {
+            study.NoneDicomStudyFileList.sort((a, b) => b.FileName.localeCompare(a.FileName))
+          } else {
+            study.NoneDicomStudyFileList.sort((a, b) => a.FileName.localeCompare(b.FileName))
+          }
+
+        }
+      })
+      this.previewImage.imgList = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList
+      this.previewImage.index = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === this.currentFileId)
+    },
     handleChange() { },
     changeReadingStatus(callback, row, file) {
       let statusStr = ''
@@ -321,12 +347,13 @@ export default {
       this.previewImage.modality = this.studyList[studyIndex].Modality
       this.$nextTick(() => {
         if (isChangeSub) {
-          this.$refs['previewImage'].selected(fileIndex)
+          this.$refs['previewImage'].selected(this.currentFileId)
         }
       })
     },
-    selectedImg(fileIndex) {
+    selectedImg(id) {
       if (this.studyList.length > 0) {
+        let fileIndex = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === id)
         this.currentStudyFileIndex = fileIndex
         this.currentFileId =
           this.studyList[this.currentStudyIndex].NoneDicomStudyFileList[
@@ -354,6 +381,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.icon_check {
+  color: #409EFF;
+}
+
 .img-container {
   position: relative;
   width: 100%;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue
index 2fe1ebfe..01508b8f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue
@@ -2,12 +2,13 @@
 <template>
   <div v-loading="loading" style="width:100%;height:100%;">
     <transition name="viewer-fade">
-      <div v-show="urlList.length > 0" ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper" :style="{ 'z-index':5 }">
+      <div v-show="urlList.length > 0" ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper"
+        :style="{ 'z-index': 5 }">
         <span class="image-viewer_desc">
           <!-- <span v-if="studyCode">NST00006</span>
           <span v-if="modality">CT</span>
           <span v-if="bodyPart">上/下腹部</span><br> -->
-          {{ `${index+1} / ${urlList.length}` }}
+          {{ `${index + 1} / ${urlList.length}` }}
         </span>
         <!-- 关闭 -->
         <span class="image-viewer__btn image-viewer__close" @click="hide">
@@ -15,18 +16,12 @@
         </span>
         <!-- Arrow -->
         <template v-if="!isSingle">
-          <span
-            class="image-viewer__btn image-viewer__prev"
-            :class="{ 'is-disabled': !infinite && isFirst }"
-            @click="prev"
-          >
+          <span class="image-viewer__btn image-viewer__prev" :class="{ 'is-disabled': !infinite && isFirst }"
+            @click="prev">
             <i class="el-icon-arrow-left" />
           </span>
-          <span
-            class="el-image-viewer__btn el-image-viewer__next"
-            :class="{ 'is-disabled': !infinite && isLast }"
-            @click="next"
-          >
+          <span class="el-image-viewer__btn el-image-viewer__next" :class="{ 'is-disabled': !infinite && isLast }"
+            @click="next">
             <i class="el-icon-arrow-right" />
           </span>
         </template>
@@ -40,34 +35,25 @@
             <i class="el-image-viewer__actions__divider" />
             <i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
             <i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
-            <i
-              v-if="readingTaskState < 2"
-              class="el-icon-bottom-right"
-              :style="{cursor:isToolDisabled || readingTaskState >=2 ?'not-allowed':'pointer'}"
-              @click="handleDrawArrow"
-            />
+            <i v-if="readingTaskState < 2" class="el-icon-bottom-right"
+              :style="{ cursor: isToolDisabled || readingTaskState >= 2 ? 'not-allowed' : 'pointer' }"
+              @click="handleDrawArrow" />
 
             <!-- <i
               class="rectangle"
               :style="{cursor:isToolDisabled || readingTaskState >=2 ?'not-allowed':'pointer'}"
               @click="handleDrawRectangle"
             /> -->
-            <svg-icon v-if="readingTaskState < 2" icon-class="rectangle" class="svg-icon" :style="{cursor:isToolDisabled || readingTaskState >=2 ?'not-allowed':'pointer'}" @click="handleDrawRectangle" />
+            <svg-icon v-if="readingTaskState < 2" icon-class="rectangle" class="svg-icon"
+              :style="{ cursor: isToolDisabled || readingTaskState >= 2 ? 'not-allowed' : 'pointer' }"
+              @click="handleDrawRectangle" />
           </div>
         </div>
         <!-- 图片 -->
         <div id="image-viewer__canvas" class="image-viewer__canvas">
-          <canvas
-            v-if="canvasSize.width && canvasPosition.y"
-            id="canvas"
-            :height="canvasSize.height"
-            :width="canvasSize.width"
-            :style="imgStyle"
-            @mousedown="handleMouseDown"
-            @mousemove="handleMouseMove"
-            @mouseup="handleMouseUp"
-            @contextmenu="handleContextmenu"
-          />
+          <canvas v-if="canvasSize.width && canvasPosition.y" id="canvas" :height="canvasSize.height"
+            :width="canvasSize.width" :style="imgStyle" @mousedown="handleMouseDown" @mousemove="handleMouseMove"
+            @mouseup="handleMouseUp" @contextmenu="handleContextmenu" />
 
         </div>
       </div>
@@ -111,11 +97,11 @@ export default {
     },
     onSwitch: {
       type: Function,
-      default: () => {}
+      default: () => { }
     },
     onClose: {
       type: Function,
-      default: () => {}
+      default: () => { }
     },
     initialIndex: {
       type: Number,
@@ -191,11 +177,15 @@ export default {
       immediate: true,
       handler(val) {
         this.reset()
-        this.onSwitch(val)
+        if (val >= 0) {
+          this.imgId = this.urlList[val].Id
+          this.onSwitch(this.imgId)
+
+          this.imgUrl = this.urlList[val].Path
+
+          this.loadImage()
+        }
 
-        this.imgUrl = this.urlList[val].Path
-        this.imgId = this.urlList[val].Id
-        this.loadImage()
       }
     }
   },
@@ -359,7 +349,7 @@ export default {
         y: canvasDiv.offsetHeight / 2 - img.height / 2 - 25
       } // 背景居中
 
-      this.$nextTick(async() => {
+      this.$nextTick(async () => {
         ctx = document.getElementById('canvas').getContext('2d') // 获取上下文
         await ctx.drawImage(img, 0, 0, img.width, img.height) // 在canvas中绘制图片(图片、起始位置、绘图尺寸)
         this.drawToArr()
@@ -779,42 +769,43 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-
-.image-viewer__wrapper{
-    position: relative;
-    top:0;
-    right:0;
-    bottom:0;
-    left:0;
-    width: 100%;
-    height: 100%;
-}
-.image-viewer__btn{
-    position:absolute;
-    z-index:1;
-    display:flex;
-    align-items:center;
-    justify-content:center;
-    border-radius:50%;
-    opacity:.8;
-    cursor:pointer;
-    box-sizing:border-box;
-    user-select:none
+.image-viewer__wrapper {
+  position: relative;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
 }
 
-.image-viewer__close{
+.image-viewer__btn {
+  position: absolute;
+  z-index: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  opacity: .8;
+  cursor: pointer;
+  box-sizing: border-box;
+  user-select: none
+}
+
+.image-viewer__close {
   display: none;
-    top:40px;
-    right:40px;
-    width:40px;
-    height:40px;
-    font-size:40px
+  top: 40px;
+  right: 40px;
+  width: 40px;
+  height: 40px;
+  font-size: 40px
 }
-.image-viewer_desc{
-  position:absolute;
-  top:40px;
-  left:40px;
-  font-size:15px;
+
+.image-viewer_desc {
+  position: absolute;
+  top: 40px;
+  left: 40px;
+  font-size: 15px;
   padding: 5px;
   height: 30px;
   width: 70px;
@@ -827,92 +818,104 @@ export default {
   border-radius: 17px;
   // border-radius: 2%;
 }
-.image-viewer__canvas{
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-    width:100%;
-    height:100%;
-    display:flex;
-    justify-content:center;
-    align-items:center
-}
-.image-viewer__actions{
-    left:50%;
-    bottom:30px;
-    transform:translateX(-50%);
-    width:282px;
-    height:44px;
-    padding:0 23px;
-    background-color:#606266;
-    border-color:#fff;
-    border-radius:22px
-}
-.image-viewer__actions__inner{
-    width:100%;
-    height:100%;
-    text-align:justify;
-    cursor:default;
-    font-size:23px;
-    color:#fff;
-    display:flex;
-    align-items:center;
-    justify-content:space-around
-}
-.image-viewer__next,.image-viewer__prev{
-    top:50%;
-    width:44px;
-    height:44px;
-    font-size:24px;
-    color:#fff;
-    background-color:#606266;
-    border-color:#fff
-}
-.image-viewer__prev{
-    transform:translateY(-50%);
-    left:40px
-}
-.image-viewer__next{
-    transform:translateY(-50%);
-    right:40px;
-    text-indent:2px
-}
-.image-viewer__mask{
-    position:absolute;
-    width:100%;
-    height:100%;
-    top:0;
-    left:0;
-    opacity:.5;
-    // background:#000
 
-}
-.viewer-fade-enter-active{
-    animation:viewer-fade-in .3s
-}
-.viewer-fade-leave-active{
-    animation:viewer-fade-out .3s
+.image-viewer__canvas {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center
 }
 
-@keyframes viewer-fade-in{
-    0%{
-        transform:translate3d(0,-20px,0);
-        opacity:0
-    }
-    100%{
-        transform:translate3d(0,0,0);
-        opacity:1
-    }
+.image-viewer__actions {
+  left: 50%;
+  bottom: 30px;
+  transform: translateX(-50%);
+  width: 282px;
+  height: 44px;
+  padding: 0 23px;
+  background-color: #606266;
+  border-color: #fff;
+  border-radius: 22px
 }
 
-@keyframes viewer-fade-out{
-    0%{
-        transform:translate3d(0,0,0);
-        opacity:1
-    }
-    100%{
-        transform:translate3d(0,-20px,0);
-        opacity:0
-    }
+.image-viewer__actions__inner {
+  width: 100%;
+  height: 100%;
+  text-align: justify;
+  cursor: default;
+  font-size: 23px;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: space-around
+}
+
+.image-viewer__next,
+.image-viewer__prev {
+  top: 50%;
+  width: 44px;
+  height: 44px;
+  font-size: 24px;
+  color: #fff;
+  background-color: #606266;
+  border-color: #fff
+}
+
+.image-viewer__prev {
+  transform: translateY(-50%);
+  left: 40px
+}
+
+.image-viewer__next {
+  transform: translateY(-50%);
+  right: 40px;
+  text-indent: 2px
+}
+
+.image-viewer__mask {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  opacity: .5;
+  // background:#000
+
+}
+
+.viewer-fade-enter-active {
+  animation: viewer-fade-in .3s
+}
+
+.viewer-fade-leave-active {
+  animation: viewer-fade-out .3s
+}
+
+@keyframes viewer-fade-in {
+  0% {
+    transform: translate3d(0, -20px, 0);
+    opacity: 0
+  }
+
+  100% {
+    transform: translate3d(0, 0, 0);
+    opacity: 1
+  }
+}
+
+@keyframes viewer-fade-out {
+  0% {
+    transform: translate3d(0, 0, 0);
+    opacity: 1
+  }
+
+  100% {
+    transform: translate3d(0, -20px, 0);
+    opacity: 0
+  }
 }
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsViewer.vue
index 94a7316d..6495dd67 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsViewer.vue
@@ -3,61 +3,33 @@
 
     <div class="image-viewer-wrapper">
       <!-- 预览图像 -->
-      <NoneDicomsCanvas
-        v-if="previewVisible"
-        :on-switch="
-          (index) => {
-            selected(index)
-          }
-        "
-        :initial-index="previewImage.index"
-        :url-list="previewImage.imgList"
-        :study-code="previewImage.studyCode"
-        :body-part="previewImage.bodyPart"
-        :modality="previewImage.modality"
-        :study-id="previewImage.studyId"
-        :reading-task-state="readingTaskState"
-      />
+      <NoneDicomsCanvas v-if="previewVisible" :on-switch="(index) => {
+        selected(index)
+      }
+        " :initial-index="previewImage.index" :url-list="previewImage.imgList" :study-code="previewImage.studyCode"
+        :body-part="previewImage.bodyPart" :modality="previewImage.modality" :study-id="previewImage.studyId"
+        :reading-task-state="readingTaskState" />
     </div>
     <div class="thumbnail-wrapper" style="z-index:999;background-color:#fff;">
       <div class="">
         <div class="img-wrapper">
-          <el-button
-            icon="el-icon-d-arrow-left"
-            plain
-            class="left to"
-            :disabled="disabledPrev"
-            @click="toRight"
-          />
+          <el-button icon="el-icon-d-arrow-left" plain class="left to" :disabled="disabledPrev" @click="toRight" />
           <div ref="imagesWrapper" class="images">
             <div v-if="noData" class="empty-text">
               <slot name="empty">{{ $t('trial:reading:noneDicoms:noData') }}</slot>
             </div>
             <div v-show="!noData" class="items" :style="itemsStyle">
-              <div
-                v-for="(item, index) in previewImage.imgList"
-                :key="index"
-                class="item-img"
-                :style="imgSize"
-                :class="{
-                  'is-active': index === currentIndex
-                }"
-                @click="selected(index)"
-              >
+              <div v-for="(item, index) in previewImage.imgList" :key="index" class="item-img" :style="imgSize" :class="{
+                'is-active': item.Id === currentFileId
+              }" @click="selected(item.Id)">
                 <img :title="item.FileName" :src="`${OSSclientConfig.basePath + item.Path}`" crossorigin="anonymous">
                 <p v-if="item.FileName" class="item-date">
-                  {{ `${index+1}` }}
+                  {{ `${index + 1}` }}
                 </p>
               </div>
             </div>
           </div>
-          <el-button
-            icon="el-icon-d-arrow-right"
-            :disabled="disabledNext"
-            plain
-            class="right to"
-            @click="Left"
-          />
+          <el-button icon="el-icon-d-arrow-right" :disabled="disabledNext" plain class="right to" @click="Left" />
         </div>
       </div>
     </div>
@@ -88,6 +60,10 @@ export default {
       type: Number,
       default: null
     },
+    currentFileId: {
+      type: String,
+      default: ''
+    },
     previewImage: {
       type: Object,
       default: () => {
@@ -161,9 +137,9 @@ export default {
     this.pageSize = this.wrapperWidth() / this.itemWidth
     this.urlList = this.previewImage
     const scope = this
-    window.onresize = function() {
+    window.onresize = function () {
       scope.pageSize = scope.wrapperWidth() / scope.itemWidth
-      scope.selected(scope.currentIndex)
+      scope.selected(scope.currentFileId)
     }
   },
   methods: {
@@ -181,7 +157,8 @@ export default {
         this.translateX = maxTrans
       }
     },
-    selected(index) {
+    selected(id) {
+      let index = this.previewImage.imgList.findIndex(item => item.Id === id)
       const center = this.pageSize >> 1
       // 最后一页的中间位置
       const lastCenter = this.dataLength - center
@@ -198,7 +175,7 @@ export default {
       if (this.currentIndex !== index) {
         this.currentIndex = index
       }
-      this.$emit('selectedImg', index)
+      this.$emit('selectedImg', id)
     },
     wrapperWidth() {
       if (this.$refs.imagesWrapper) {
@@ -212,35 +189,40 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.preview-wrapper{
+.preview-wrapper {
   width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
 }
 
-.image-viewer-wrapper{
+.image-viewer-wrapper {
   flex: 1;
 }
-.thumbnail-wrapper{
+
+.thumbnail-wrapper {
   height: 130px;
 }
-.img-content{
+
+.img-content {
   position: absolute;
   left: 0;
   bottom: 10px;
   width: 100%;
 }
+
 .img-wrapper {
   display: flex;
   position: relative;
   margin: 0 20px;
   height: 120px;
+
   .to {
     width: 32px;
     height: 100%;
     padding: 0;
   }
+
   .images::before {
     position: absolute;
     z-index: 5;
@@ -249,16 +231,15 @@ export default {
     width: 84px;
     content: '';
     pointer-events: none;
-    background: -webkit-gradient(
-      linear,
-      left top,
-      right top,
-      from(#fff),
-      color-stop(50%, rgba(0, 0, 0, 0))
-    );
+    background: -webkit-gradient(linear,
+        left top,
+        right top,
+        from(#fff),
+        color-stop(50%, rgba(0, 0, 0, 0)));
     background: -o-linear-gradient(left, #fff, rgba(0, 0, 0, 0) 50%);
     background: linear-gradient(90deg, #fff, rgba(0, 0, 0, 0) 50%);
   }
+
   .images::after {
     position: absolute;
     z-index: 5;
@@ -268,22 +249,22 @@ export default {
     width: 84px;
     content: '';
     pointer-events: none;
-    background: -webkit-gradient(
-      linear,
-      right top,
-      left top,
-      from(#fff),
-      color-stop(50%, rgba(0, 0, 0, 0))
-    );
+    background: -webkit-gradient(linear,
+        right top,
+        left top,
+        from(#fff),
+        color-stop(50%, rgba(0, 0, 0, 0)));
     background: -o-linear-gradient(right, #fff, rgba(0, 0, 0, 0) 50%);
     background: linear-gradient(270deg, #fff, rgba(0, 0, 0, 0) 50%);
   }
+
   .images {
     position: relative;
     overflow: hidden;
     width: 100%;
     height: 100%;
     margin: 0 2px;
+
     .empty-text {
       color: rgb(158, 158, 158);
       height: 100%;
@@ -291,6 +272,7 @@ export default {
       align-items: center;
       justify-content: center;
     }
+
     .items {
       position: absolute;
       top: 0;
@@ -300,6 +282,7 @@ export default {
       height: 100%;
       align-items: center;
       transition: transform 0.25s ease;
+
       .item-img {
         display: inline-block;
         box-sizing: border-box;
@@ -307,6 +290,7 @@ export default {
         margin-right: 8px;
         border: 2px solid rgba(0, 0, 0, 0);
         cursor: pointer;
+
         .item-date {
           bottom: 0px;
           position: absolute;
@@ -317,15 +301,18 @@ export default {
           line-height: 24px;
           color: white;
         }
+
         img {
           width: 100%;
           height: 100%;
         }
       }
+
       .item-img:hover::after {
         // border-color: #409EFF;
         opacity: 0;
       }
+
       .item-img::after {
         position: absolute;
         top: 0;
@@ -340,9 +327,11 @@ export default {
         transition: opacity 0.3s ease;
         background-color: #fff;
       }
+
       .is-active {
         border-color: #409eff;
       }
+
       .is-active:after {
         opacity: 0;
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index 1c930608..c9782c62 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -349,7 +349,7 @@ export default {
           this.dialogVisible = true
           this.cdVisitTaskId = this.visitTaskId
         }
-        if ((this.CriterionType === 19 || this.CriterionType === 20) && !this.IsViewStudyPart) {
+        if ((this.CriterionType === 19 || this.CriterionType === 20) && !this.IsViewStudyPart && this.readingCategory !== 4) {
           this.isFullscreen = false
           this.dialogBodyPartVisible = true
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
index a0273280..d971c2ca 100644
--- a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
@@ -1,7 +1,12 @@
 <template>
   <div v-loading="loading" class="img-container">
     <el-card class="box-card left">
-      <div v-if="otherInfo && otherInfo.IsReadingShowSubjectInfo" class="title" style="text-align:center">
+      <div v-if="otherInfo && otherInfo.IsReadingShowSubjectInfo" class="title"
+        style="display: flex;align-items: center;flex-wrap: wrap;">
+        <div style="margin-right: 5px;cursor: pointer;display: inline-block" @click.stop="sortFile">
+          <i :class="['el-icon-caret-top', Asc ? '' : 'icon_check']" style="display: block;margin-bottom: -5px;"></i>
+          <i :class="['el-icon-caret-bottom', !Asc ? '' : 'icon_check']" style="display: block; margin-top: -5px;"></i>
+        </div>
         <span>{{ otherInfo.SubjectCode }} </span>
         <span>({{ otherInfo.TaskBlindName }})</span>
       </div>
@@ -40,8 +45,8 @@
     <el-card class="box-card right">
       <div style="width:100%;height: 100%;">
         <NoneDicomsViewer v-if="previewImage.imgList.length > 0" ref="previewImage" style="width:100%;"
-          :preview-image="previewImage" :value="currentStudyFileIndex" :reading-task-state="readingTaskState"
-          @selectedImg="selectedImg" />
+          :preview-image="previewImage" :value="currentStudyFileIndex" :currentFileId="currentFileId"
+          :reading-task-state="readingTaskState" @selectedImg="selectedImg" />
       </div>
 
     </el-card>
@@ -90,7 +95,8 @@ export default {
       visistTaskId: '',
       taskBlindName: '',
       readingTaskState: 2,
-      BodyPart: {}
+      BodyPart: {},
+      Asc: null
     }
   },
   async mounted() {
@@ -113,6 +119,25 @@ export default {
     this.getNoneDicomList()
   },
   methods: {
+    sortFile() {
+      if (this.Asc) {
+        this.Asc = false
+      } else {
+        this.Asc = true
+      }
+      this.studyList.forEach(study => {
+        if (study.NoneDicomStudyFileList.length > 0) {
+          if (this.Asc) {
+            study.NoneDicomStudyFileList.sort((a, b) => b.FileName.localeCompare(a.FileName))
+          } else {
+            study.NoneDicomStudyFileList.sort((a, b) => a.FileName.localeCompare(b.FileName))
+          }
+
+        }
+      })
+      this.previewImage.imgList = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList
+      this.previewImage.index = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === this.currentFileId)
+    },
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
@@ -148,12 +173,14 @@ export default {
       this.previewImage.studyId = this.studyList[studyIndex].Id
       this.$nextTick(() => {
         if (isChangeSub) {
-          this.$refs['previewImage'].selected(fileIndex)
+          this.$refs['previewImage'].selected(this.currentFileId)
         }
       })
     },
-    selectedImg(fileIndex) {
+    selectedImg(id) {
       if (this.studyList.length > 0) {
+        let fileIndex = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === id)
+        console.log(fileIndex, id)
         this.currentStudyFileIndex = fileIndex
         this.currentFileId = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList[fileIndex].Id
         this.previewImage.index = fileIndex
@@ -195,6 +222,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.icon_check {
+  color: #409EFF;
+}
+
 .img-container {
   flex: 1;
   width: 100%;
@@ -236,7 +267,7 @@ export default {
   }
 
   .title {
-    height: 40px;
+    // height: 40px; 
     line-height: 40px;
     border: 1ppx solid;
     border: 1px solid #ebe7e7;
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
index 5146bfe9..1c08b481 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="img-container">
     <el-card v-loading="loading" class="box-card left">
-      <div v-if="isReadingShowSubjectInfo" class="title">
+      <div v-if="isReadingShowSubjectInfo" class="title" style="display: flex;align-items: center;">
+        <div style="margin-right: 5px;cursor: pointer;" @click.stop="sortFile">
+          <i :class="['el-icon-caret-top', Asc ? '' : 'icon_check']" style="display: block;margin-bottom: -5px;"></i>
+          <i :class="['el-icon-caret-bottom', !Asc ? '' : 'icon_check']" style="display: block; margin-top: -5px;"></i>
+        </div>
         <h4>{{ subjectCode }} </h4>
         <h4>{{ taskBlindName }}</h4>
       </div>
@@ -179,7 +183,8 @@ export default {
       otherInfo: null,
       isReadingShowPreviousResults: false,
       BodyPart: {},
-      openWindow: null
+      openWindow: null,
+      Asc: null
     }
   },
   computed: {
@@ -190,7 +195,6 @@ export default {
   async mounted() {
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.isReadingShowPreviousResults = this.$router.currentRoute.query.isReadingShowPreviousResults !== undefined ? this.$router.currentRoute.query.isReadingShowPreviousResults : true
-
     this.getNoneDicomList(this.isReadingShowPreviousResults)
   },
   beforeDestroy() {
@@ -199,6 +203,23 @@ export default {
     }
   },
   methods: {
+    sortFile() {
+      if (this.Asc) {
+        this.Asc = false
+      } else {
+        this.Asc = true
+      }
+      this.studyList.forEach(study => {
+        if (study.NoneDicomStudyFileList.length > 0) {
+          if (this.Asc) {
+            study.NoneDicomStudyFileList.sort((a, b) => b.FileName.localeCompare(a.FileName))
+          } else {
+            study.NoneDicomStudyFileList.sort((a, b) => a.FileName.localeCompare(b.FileName))
+          }
+
+        }
+      })
+    },
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
@@ -327,6 +348,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.icon_check {
+  color: #409EFF;
+}
+
 .img-container {
   flex: 1;
   width: 100%;

From 7892b8cf01f032a30545529923cfcfe8d327b6a4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 22 Dec 2025 14:15:45 +0800
Subject: [PATCH 168/333] =?UTF-8?q?=E5=8F=91=E4=BB=B6=E4=BA=BA=E5=9C=A8?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/email-manage/config.vue           | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/email-manage/config.vue b/src/views/trials/trials-panel/setting/email-manage/config.vue
index e0d74985..4d24e11e 100644
--- a/src/views/trials/trials-panel/setting/email-manage/config.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/config.vue
@@ -116,28 +116,28 @@ export default {
     //     console.log(v)
     //   }
     // },
-    created() {
-        if (this.VUE_APP_OSS_PATH === '/uat/dist') {
-            this.form = {
-                EmailFromEmail: 'uat@extimaging.com',
-                EmailFromName: 'Uat IRC Imaging System',
-                EmailAuthorizationCode: 'SHzyyl2021',
-                EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
-                EmailSMTPServerPort: 465,
-                IsConfigureEmail: true
-            };
-        }
-        if (this.VUE_APP_OSS_PATH === '/test/dist') {
-            this.form = {
-                EmailFromEmail: 'test@extimaging.com',
-                EmailFromName: 'Test IRC Imaging System',
-                EmailAuthorizationCode: 'SHzyyl2021',
-                EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
-                EmailSMTPServerPort: 465,
-                IsConfigureEmail: true
-            };
-        }
-    },
+    // created() {
+    //     if (this.VUE_APP_OSS_PATH === '/uat/dist') {
+    //         this.form = {
+    //             EmailFromEmail: 'uat@extimaging.com',
+    //             EmailFromName: 'Uat IRC Imaging System',
+    //             EmailAuthorizationCode: 'SHzyyl2021',
+    //             EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
+    //             EmailSMTPServerPort: 465,
+    //             IsConfigureEmail: true
+    //         };
+    //     }
+    //     if (this.VUE_APP_OSS_PATH === '/test/dist') {
+    //         this.form = {
+    //             EmailFromEmail: 'test@extimaging.com',
+    //             EmailFromName: 'Test IRC Imaging System',
+    //             EmailAuthorizationCode: 'SHzyyl2021',
+    //             EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
+    //             EmailSMTPServerPort: 465,
+    //             IsConfigureEmail: true
+    //         };
+    //     }
+    // },
     mounted() {
         this.trialId = this.$route.query.trialId
         this.getTrialEmail()

From 3eb28d2baa1b652a07dbe080c24021bbc38b4a81 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 22 Dec 2025 15:52:50 +0800
Subject: [PATCH 169/333] =?UTF-8?q?dicom=E9=A2=84=E8=A7=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-study.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 7a8f85e8..11529201 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -83,8 +83,8 @@
                             {{ item.description }}
                           </div>
                           <div v-if="!item.keySeries" style="padding: 1px;">
-                            {{ series.imageloadedArr.length <= series.instanceCount ? series.imageloadedArr.length :
-                              series.instanceCount }}/{{ item.instanceCount }} </div>
+                            {{ item.imageloadedArr.length <= item.instanceCount ? item.imageloadedArr.length :
+                              item.instanceCount }}/{{ item.instanceCount }} </div>
 
                           </div>
                         </div>

From fc72e141bfd90145db672c245670ecec838284dc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 22 Dec 2025 16:29:54 +0800
Subject: [PATCH 170/333] 1

---
 src/views/trials/trials-panel/visit/qc-check/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index b98a82ee..2ddb19fa 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -900,6 +900,7 @@ export default {
     // 复审
     handleSecondaryQC(row) {
       if (!this.OtherInfo.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
+      localStorage.setItem("QCRiskControl", 0)
       this.loading = true
       isQCCanOpt(row.Id)
         .then((res) => {

From 7bebb8900ea6fb01e7911a85f8a2067acd4e652d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 22 Dec 2025 17:10:52 +0800
Subject: [PATCH 171/333] 1

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 0d990f34..f263ae25 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -1244,7 +1244,7 @@ export default {
             // }
           } else {
             // 非淋巴结靶病灶 箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
               this.$confirm(this.$t('trials:lugano:warnning:validState7'), {
                 type: 'warning',

From 17ad103c34f0fc20c08b520e767aeb22538c02ce Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 23 Dec 2025 14:55:12 +0800
Subject: [PATCH 172/333] =?UTF-8?q?=E3=80=90=E9=82=AE=E4=BB=B6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E3=80=91=E9=82=AE=E4=BB=B6=E6=97=A5=E5=BF=97=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/email/components/resendList.vue | 11 ++++++-----
 src/views/system/email/index.vue                 |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/system/email/components/resendList.vue b/src/views/system/email/components/resendList.vue
index 6ecfc1b7..87ee91f4 100644
--- a/src/views/system/email/components/resendList.vue
+++ b/src/views/system/email/components/resendList.vue
@@ -14,12 +14,12 @@
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
+                <!-- <el-form-item :label="$t('system:email:search:EmailStateEnum')">
                     <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
                         <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
                             :value="item.value" />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item :label="$t('system:email:search:emailDate')">
                     <el-date-picker v-model="datetimerange" type="datetimerange"
                         :default-time="['00:00:00', '23:59:59']" :start-placeholder="$t('feedBack:search:beginTime')"
@@ -50,7 +50,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
-                                item.RecipientAddress).join(", ") : ''
+                                item.RecipientName).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>
@@ -59,7 +59,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
-                                item.RecipientAddress).join(", ") : ''
+                                item.RecipientName).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>
@@ -73,7 +73,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('system:email:table:errorInfo')" prop="ErrorInfo" show-overflow-tooltip />
-                <el-table-column :label="$t('common:action:action')" fixed="right" prop="" show-overflow-tooltip>
+                <el-table-column :label="$t('common:action:action')" prop="" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <el-button type="text" @click="view(scope.row)">
                             {{ $t('common:button:view') }}
@@ -196,6 +196,7 @@ export default {
         // 重置列表查询
         handleReset() {
             this.searchData = searchDataDefault()
+            this.datetimerange = []
             this.getList()
         },
         // 排序
diff --git a/src/views/system/email/index.vue b/src/views/system/email/index.vue
index 43b3b14f..c6118ee0 100644
--- a/src/views/system/email/index.vue
+++ b/src/views/system/email/index.vue
@@ -14,12 +14,12 @@
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
+                <!-- <el-form-item :label="$t('system:email:search:EmailStateEnum')">
                     <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
                         <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
                             :value="item.value" />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item :label="$t('system:email:search:emailDate')">
                     <el-date-picker v-model="datetimerange" type="datetimerange"
                         :default-time="['00:00:00', '23:59:59']" :start-placeholder="$t('feedBack:search:beginTime')"
@@ -50,7 +50,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
-                                item.RecipientAddress).join(", ") : ''
+                                item.RecipientName).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>
@@ -59,7 +59,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
-                                item.RecipientAddress).join(", ") : ''
+                                item.RecipientName).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>
@@ -230,6 +230,7 @@ export default {
         // 重置列表查询
         handleReset() {
             this.searchData = searchDataDefault()
+            this.datetimerange = []
             this.getList()
         },
         // 排序

From 68fa0edfe54e6beb9f2868dfac419eba7b1eed13 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 23 Dec 2025 16:19:54 +0800
Subject: [PATCH 173/333] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=87=8D=E9=98=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E7=95=99=E5=90=8E=E7=BB=AD=E8=AE=BF?=
 =?UTF-8?q?=E8=A7=86=E6=95=B0=E6=8D=AE=E7=9A=84=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/read-task/index.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 9806866a..6a65101d 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -206,6 +206,15 @@
               item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 是否复制阅片表单 -->
+        <el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')" prop="IsCopyLesionAnswer" :rules="[
+          { required: true, message: $t('common:ruleMessage:select') },
+        ]">
+          <el-radio-group v-model="ApplyforReasonForm.IsCopyLesionAnswer">
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsCopyOrigenalForms${item.raw.Id}`" :label="item.value">{{
+              item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <!-- 影响的任务列表 -->
       <el-divider content-position="left">{{ $t('trials:readTask:title:influenceList') }}</el-divider>
@@ -344,12 +353,14 @@ export default {
         Type: null,
         RequestReReadingReason: null,
         IsCopyOrigenalForms: null,
-        IsCopyFollowForms: null
+        IsCopyFollowForms: null,
+        IsCopyLesionAnswer: null
       },
       InfluenceTaskList: [],
       rules: {
         Type: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
         IsCopyOrigenalForms: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        IsCopyLesionAnswer: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
         RequestReReadingReason: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       trialCriterionList: [],

From bdca45a505d9191e6a71da028f514fb4b256bd9e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 23 Dec 2025 16:36:22 +0800
Subject: [PATCH 174/333] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/image-summary/index.vue     | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/image-summary/index.vue b/src/views/trials/trials-panel/trial-summary/image-summary/index.vue
index 813af93d..fb63744d 100644
--- a/src/views/trials/trials-panel/trial-summary/image-summary/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/image-summary/index.vue
@@ -204,16 +204,16 @@ export default {
                 }
                 let res = await getExportSubjectVisitImageList(data)
                 if (res.IsSuccess) {
-                    this.downLoad(IsKeyImage, res.Result)
+                    this.downLoad(IsKeyImage, res.Result, IsExportReading)
                 }
             } catch (err) {
                 console.log(err)
             }
         },
         // 下载
-        async downLoad(IsKeyImage = false, row) {
+        async downLoad(IsKeyImage = false, row, IsExportReading = false) {
             try {
-                let { files, name } = this.formatDownloadFile(IsKeyImage, row)
+                let { files, name } = this.formatDownloadFile(IsKeyImage, row, IsExportReading)
                 let res = await downLoadFile(files, name, 'zip')
                 // }
             } catch (err) {
@@ -221,24 +221,44 @@ export default {
             }
         },
         // 格式化下载文件路径
-        formatDownloadFile(IsKeyImage = false, row) {
+        formatDownloadFile(IsKeyImage = false, row, IsExportReading = false) {
             let files = [],
                 name = `${this.$route.query.researchProgramNo}_${this.$t('trials:imageSummary:downloadname:dicom')}_${Date.now()}.zip`;
+            if (IsExportReading) {
+                name = `${this.$route.query.researchProgramNo}_${this.$t('trials:imageSummary:downloadname:readingDicom')}_${Date.now()}.zip`;
+            }
             if (!IsKeyImage) {
                 //中心ID/受试者ID/访视名/Study ID_Study Date_Modality/文件  
                 row.VisitList.forEach(visit => {
                     if (visit.StudyList && visit.StudyList.length > 0) {
                         visit.StudyList.forEach(study => {
+                            let arr = []
+                            study.SeriesList.forEach(item => {
+                                if (!arr.includes(item.Modality)) {
+                                    arr.push(item.Modality)
+                                }
+                            })
+                            let str = arr.join('_')
+                            let time = study.StudyTime.split(' ')[0]
+                            if (study.StudyDIRPath && !study.dirHas) {
+                                study.dirHas = true
+                                let obj = {
+                                    name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${time}_${str}/DICOMDIR`,
+                                    url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+                                }
+                                files.push(obj)
+                            }
                             if (study.SeriesList && study.SeriesList.length > 0) {
                                 study.SeriesList.forEach(serie => {
-                                    if (serie.InstancePathList && serie.InstancePathList.length > 0) {
-                                        serie.InstancePathList.forEach(instance => {
+
+                                    if (serie.InstanceList && serie.InstanceList.length > 0) {
+                                        serie.InstanceList.forEach(instance => {
                                             let instanceArr = instance.Path.split("/")
-                                            let fileName = instanceArr[instanceArr.length - 1]
-                                            let time = study.StudyTime.split(' ')[0]
+                                            let fileName = instance.FileName || instanceArr[instanceArr.length - 1]
                                             let obj = {
-                                                name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${time}_${serie.Modality}/IMAGE/${fileName}`,
+                                                name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${time}_${str}/IMAGE/${fileName}`,
                                                 url: this.OSSclientConfig.basePath + instance.Path,
+                                                IsEncapsulated: instance.IsEncapsulated
                                             }
                                             files.push(obj)
                                         })

From 72d9872b207511f36d49af8acebee72fbb55dc62 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 23 Dec 2025 17:13:15 +0800
Subject: [PATCH 175/333] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=87=8D=E9=98=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E7=95=99=E5=90=8E=E7=BB=AD=E8=AE=BF?=
 =?UTF-8?q?=E8=A7=86=E6=95=B0=E6=8D=AE=E7=9A=84=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/reading/read-task/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 6a65101d..cc7d5c57 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -478,6 +478,7 @@ export default {
           IsCopyOrigenalForms: this.ApplyforReasonForm.IsCopyOrigenalForms,
           IsCopyFollowForms: this.ApplyforReasonForm.IsCopyFollowForms,
           RequestReReadingType: 1,
+          IsCopyLesionAnswer: this.ApplyforReasonForm.IsCopyLesionAnswer,
           RequestReReadingReason: this.ApplyforReasonForm.Type === 2 ? this.ApplyforReasonForm.RequestReReadingReason : this.$t('trials:readTask:option:errorRecords') // '阅片记录错误'
         }
         applyReReading(params).then(res => {

From bed842ec88a8b37c4df478675e1525796ff31e50 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 23 Dec 2025 17:28:27 +0800
Subject: [PATCH 176/333] 1

---
 src/views/trials/trials-panel/reading/read-task/index.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index cc7d5c57..6c3b778c 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -207,14 +207,14 @@
           </el-radio-group>
         </el-form-item>
         <!-- 是否复制阅片表单 -->
-        <el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')" prop="IsCopyLesionAnswer" :rules="[
+        <!-- <el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')" prop="IsCopyLesionAnswer" :rules="[
           { required: true, message: $t('common:ruleMessage:select') },
         ]">
           <el-radio-group v-model="ApplyforReasonForm.IsCopyLesionAnswer">
             <el-radio v-for="item of $d.YesOrNo" :key="`IsCopyOrigenalForms${item.raw.Id}`" :label="item.value">{{
               item.label }}</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item>  -->
       </el-form>
       <!-- 影响的任务列表 -->
       <el-divider content-position="left">{{ $t('trials:readTask:title:influenceList') }}</el-divider>
@@ -354,13 +354,11 @@ export default {
         RequestReReadingReason: null,
         IsCopyOrigenalForms: null,
         IsCopyFollowForms: null,
-        IsCopyLesionAnswer: null
       },
       InfluenceTaskList: [],
       rules: {
         Type: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
         IsCopyOrigenalForms: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        IsCopyLesionAnswer: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
         RequestReReadingReason: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       trialCriterionList: [],
@@ -478,7 +476,7 @@ export default {
           IsCopyOrigenalForms: this.ApplyforReasonForm.IsCopyOrigenalForms,
           IsCopyFollowForms: this.ApplyforReasonForm.IsCopyFollowForms,
           RequestReReadingType: 1,
-          IsCopyLesionAnswer: this.ApplyforReasonForm.IsCopyLesionAnswer,
+          IsCopyLesionAnswer: this.ApplyforReasonForm.IsCopyOrigenalForms,
           RequestReReadingReason: this.ApplyforReasonForm.Type === 2 ? this.ApplyforReasonForm.RequestReReadingReason : this.$t('trials:readTask:option:errorRecords') // '阅片记录错误'
         }
         applyReReading(params).then(res => {

From 2f8b88b51f57610c2932c2d31d0c96fa369ea579 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 23 Dec 2025 17:43:53 +0800
Subject: [PATCH 177/333] 1

---
 src/views/trials/trials-panel/reading/read-task/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 6c3b778c..583a23d5 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -474,9 +474,9 @@ export default {
           ],
           TrialId: this.$route.query.trialId,
           IsCopyOrigenalForms: this.ApplyforReasonForm.IsCopyOrigenalForms,
-          IsCopyFollowForms: this.ApplyforReasonForm.IsCopyFollowForms,
+          IsCopyFollowForms: this.ApplyforReasonForm.IsCopyOrigenalForms,
           RequestReReadingType: 1,
-          IsCopyLesionAnswer: this.ApplyforReasonForm.IsCopyOrigenalForms,
+          // IsCopyLesionAnswer: this.ApplyforReasonForm.IsCopyOrigenalForms,
           RequestReReadingReason: this.ApplyforReasonForm.Type === 2 ? this.ApplyforReasonForm.RequestReReadingReason : this.$t('trials:readTask:option:errorRecords') // '阅片记录错误'
         }
         applyReReading(params).then(res => {

From 3901ceec45f1ed17eff4ae24fb017140ec296e72 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 10:06:09 +0800
Subject: [PATCH 178/333] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=AE=BE=E5=A4=87=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/site-research/components/ImageManual.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
index 70f29157..970ee285 100644
--- a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
@@ -117,7 +117,7 @@ export default {
                     })
                     this.form.IsOpenLostVistRead = res.Result.IsOpenLostVistRead
                     this.form.IsSupportQCDownloadImage = res.Result.IsSupportQCDownloadImage
-                    this.form.IsCloseEquipmentSurvey = res.Result.IsCloseEquipmentSurvey
+                    this.form.IsCloseEquipmentSurvey = !res.Result.IsCloseEquipmentSurvey
                     if (Array.isArray(res.Result.NotShowFieldList) && res.Result.NotShowFieldList.length > 0) {
                         res.Result.NotShowFieldList.forEach(key => {
                             this.form[key] = false
@@ -164,7 +164,7 @@ export default {
                 let data = {
                     IsOpenLostVistRead: this.form.IsOpenLostVistRead,
                     IsSupportQCDownloadImage: this.form.IsSupportQCDownloadImage,
-                    IsCloseEquipmentSurvey: this.form.IsCloseEquipmentSurvey,
+                    IsCloseEquipmentSurvey: !this.form.IsCloseEquipmentSurvey,
                     ModifyFiledList: [],
                     NotShowFieldList: []
                 }

From bdbca2155068085a55bbab13067c0a90e69ff323 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 10:17:45 +0800
Subject: [PATCH 179/333] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=94=B6=E4=BB=B6=E4=BA=BA=E3=80=81=E6=8A=84=E9=80=81=E4=BA=BA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/email/components/resendList.vue    | 24 ++++++++++++-------
 src/views/system/email/index.vue              | 24 ++++++++++++-------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/views/system/email/components/resendList.vue b/src/views/system/email/components/resendList.vue
index 87ee91f4..f7286763 100644
--- a/src/views/system/email/components/resendList.vue
+++ b/src/views/system/email/components/resendList.vue
@@ -48,19 +48,27 @@
                 <el-table-column :label="$t('system:email:table:ToRecipientName')" prop="ToRecipientName"
                     show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
-                            ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
-                                item.RecipientName).join(", ") : ''
-                        }}</span>
+                        <el-tooltip class="item" effect="dark" :content="scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
+                            `${item.RecipientName}: ${item.RecipientAddress}`).join('<br/>')" placement="top-start"
+                            v-if="Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0">
+                            <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
+                                ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
+                                    item.RecipientName).join(", ") : ''
+                            }}</span>
+                        </el-tooltip>
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('system:email:table:CcRecipientName')" prop="CcRecipientName"
                     show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
-                            ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
-                                item.RecipientName).join(", ") : ''
-                        }}</span>
+                        <el-tooltip class="item" effect="dark" :content="scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
+                            `${item.RecipientName}: ${item.RecipientAddress}`).join('<br/>')" placement="top-start"
+                            v-if="Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0">
+                            <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
+                                ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
+                                    item.RecipientName).join(", ") : ''
+                            }}</span>
+                        </el-tooltip>
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('system:email:table:emailDate')" prop="EmailDate" show-overflow-tooltip
diff --git a/src/views/system/email/index.vue b/src/views/system/email/index.vue
index c6118ee0..a2c69f09 100644
--- a/src/views/system/email/index.vue
+++ b/src/views/system/email/index.vue
@@ -48,19 +48,27 @@
                 <el-table-column :label="$t('system:email:table:ToRecipientName')" prop="ToRecipientName"
                     show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
-                            ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
-                                item.RecipientName).join(", ") : ''
-                        }}</span>
+                        <el-tooltip class="item" effect="dark" :content="scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
+                            `${item.RecipientName}: ${item.RecipientAddress}`).join('<br/>')" placement="top-start"
+                            v-if="Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0">
+                            <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
+                                ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
+                                    item.RecipientName).join(", ") : ''
+                            }}</span>
+                        </el-tooltip>
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('system:email:table:CcRecipientName')" prop="CcRecipientName"
                     show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
-                            ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
-                                item.RecipientName).join(", ") : ''
-                        }}</span>
+                        <el-tooltip class="item" effect="dark" :content="scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
+                            `${item.RecipientName}: ${item.RecipientAddress}`).join('<br/>')" placement="top-start"
+                            v-if="Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0">
+                            <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
+                                ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
+                                    item.RecipientName).join(", ") : ''
+                            }}</span>
+                        </el-tooltip>
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('system:email:table:emailDate')" prop="EmailDate" show-overflow-tooltip

From 80fe969fe1160066cc8aa2d4ae74f874bfde59e2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 10:36:32 +0800
Subject: [PATCH 180/333] 1

---
 src/views/research/components/ResearchForm.vue | 2 +-
 src/views/research/form.vue                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/research/components/ResearchForm.vue b/src/views/research/components/ResearchForm.vue
index 0c27b87d..b790b142 100644
--- a/src/views/research/components/ResearchForm.vue
+++ b/src/views/research/components/ResearchForm.vue
@@ -29,7 +29,7 @@
       </el-card>
 
       <!-- 设备调研 -->
-      <el-card shadow="hover" class="mt10" v-if="siteSurveyNoteInfo.IsCloseEquipmentSurvey">
+      <el-card shadow="hover" class="mt10" v-if="!siteSurveyNoteInfo.IsCloseEquipmentSurvey">
         <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
         <EquipmentList ref="researchEquipments" :is-history="true" />
       </el-card>
diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 2782cea4..29c1d695 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -62,7 +62,7 @@
       </el-card>
 
       <!-- 设备调研 -->
-      <el-card shadow="hover" class="mt10" v-if="siteSurveyNoteInfo.IsCloseEquipmentSurvey">
+      <el-card shadow="hover" class="mt10" v-if="!siteSurveyNoteInfo.IsCloseEquipmentSurvey">
         <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
         <EquipmentList ref="researchEquipments" :isPreview="isPreview" />
       </el-card>

From a663f6fa4ed1a3cf662df10510c88635419fab95 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 10:54:57 +0800
Subject: [PATCH 181/333] 1

---
 .../trials-panel/reading/read-task/index.vue  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 583a23d5..5ec5b099 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -201,20 +201,22 @@
         <el-form-item :label="$t('trials:readTask:title:copyForm')" prop="IsCopyOrigenalForms" :rules="[
           { required: true, message: $t('common:ruleMessage:select') },
         ]">
-          <el-radio-group v-model="ApplyforReasonForm.IsCopyOrigenalForms">
+          <el-radio-group v-model="ApplyforReasonForm.IsCopyOrigenalForms"
+            @input="() => ApplyforReasonForm.IsCopyFollowForms = false">
             <el-radio v-for="item of $d.YesOrNo" :key="`IsCopyOrigenalForms${item.raw.Id}`" :label="item.value">{{
               item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 是否复制阅片表单 -->
-        <!-- <el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')" prop="IsCopyLesionAnswer" :rules="[
-          { required: true, message: $t('common:ruleMessage:select') },
-        ]">
-          <el-radio-group v-model="ApplyforReasonForm.IsCopyLesionAnswer">
-            <el-radio v-for="item of $d.YesOrNo" :key="`IsCopyOrigenalForms${item.raw.Id}`" :label="item.value">{{
+        <el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')"
+          v-if="ApplyforReasonForm.IsCopyOrigenalForms" prop="IsCopyLesionAnswer" :rules="[
+            { required: true, message: $t('common:ruleMessage:select') },
+          ]">
+          <el-radio-group v-model="ApplyforReasonForm.IsCopyFollowForms">
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsCopyFollowForms${item.raw.Id}`" :label="item.value">{{
               item.label }}</el-radio>
           </el-radio-group>
-        </el-form-item>  -->
+        </el-form-item>
       </el-form>
       <!-- 影响的任务列表 -->
       <el-divider content-position="left">{{ $t('trials:readTask:title:influenceList') }}</el-divider>
@@ -353,7 +355,7 @@ export default {
         Type: null,
         RequestReReadingReason: null,
         IsCopyOrigenalForms: null,
-        IsCopyFollowForms: null,
+        IsCopyFollowForms: false,
       },
       InfluenceTaskList: [],
       rules: {
@@ -474,7 +476,7 @@ export default {
           ],
           TrialId: this.$route.query.trialId,
           IsCopyOrigenalForms: this.ApplyforReasonForm.IsCopyOrigenalForms,
-          IsCopyFollowForms: this.ApplyforReasonForm.IsCopyOrigenalForms,
+          IsCopyFollowForms: this.ApplyforReasonForm.IsCopyFollowForms,
           RequestReReadingType: 1,
           // IsCopyLesionAnswer: this.ApplyforReasonForm.IsCopyOrigenalForms,
           RequestReReadingReason: this.ApplyforReasonForm.Type === 2 ? this.ApplyforReasonForm.RequestReReadingReason : this.$t('trials:readTask:option:errorRecords') // '阅片记录错误'

From e6e9ab03a3ca3cdd13ad8b26b65a561062393ebd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 11:10:08 +0800
Subject: [PATCH 182/333] 1

---
 src/views/trials/trials-panel/reading/read-task/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 5ec5b099..f93bf46c 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -209,7 +209,7 @@
         </el-form-item>
         <!-- 是否复制阅片表单 -->
         <el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')"
-          v-if="ApplyforReasonForm.IsCopyOrigenalForms" prop="IsCopyLesionAnswer" :rules="[
+          v-if="ApplyforReasonForm.IsCopyOrigenalForms" prop="IsCopyFollowForms" :rules="[
             { required: true, message: $t('common:ruleMessage:select') },
           ]">
           <el-radio-group v-model="ApplyforReasonForm.IsCopyFollowForms">
@@ -361,6 +361,7 @@ export default {
       rules: {
         Type: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
         IsCopyOrigenalForms: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        IsCopyFollowForms: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
         RequestReReadingReason: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       trialCriterionList: [],

From 5773a93df3b2a1056c0fd3fb4ae6ce9e4ae5833d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 11:18:17 +0800
Subject: [PATCH 183/333] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/reading/read-task/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index f93bf46c..47bdfb0b 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -201,8 +201,7 @@
         <el-form-item :label="$t('trials:readTask:title:copyForm')" prop="IsCopyOrigenalForms" :rules="[
           { required: true, message: $t('common:ruleMessage:select') },
         ]">
-          <el-radio-group v-model="ApplyforReasonForm.IsCopyOrigenalForms"
-            @input="() => ApplyforReasonForm.IsCopyFollowForms = false">
+          <el-radio-group v-model="ApplyforReasonForm.IsCopyOrigenalForms">
             <el-radio v-for="item of $d.YesOrNo" :key="`IsCopyOrigenalForms${item.raw.Id}`" :label="item.value">{{
               item.label }}</el-radio>
           </el-radio-group>
@@ -471,6 +470,9 @@ export default {
         if (!valid) return
         this.loading = true
         this.btnLoading = true
+        if (!this.ApplyforReasonForm.IsCopyOrigenalForms) {
+          this.ApplyforReasonForm.IsCopyFollowForms = null
+        }
         var params = {
           TaskIdList: [
             this.rowData.Id

From 7328ea55dff96d931e6c20c8466b7ffea9271c9a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 11:47:23 +0800
Subject: [PATCH 184/333] =?UTF-8?q?=E9=98=85=E7=89=87=E4=B8=B4=E5=BA=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 faeab3f5..37356433 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -386,7 +386,7 @@
         <!-- 手册 -->
         <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute;right: 20px;font-size: 20px;">
-          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+          <svg-icon :icon-class="manualsDialog.isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
             style="margin-right:10px;cursor: pointer;"
             @click="manualsDialog.isFullscreen = !manualsDialog.isFullscreen" />
           <svg-icon icon-class="close" style="cursor: pointer;" @click="manualsDialog.visible = false" />
@@ -394,9 +394,9 @@
       </span>
       <div style="height: 100%;margin:0;">
         <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
-        <div slot="footer" style="text-align:right;" v-if="openManuals">
+        <div slot="footer" style="text-align:right;" v-if="openManuals && !ManualsClose">
           <!-- 确认 -->
-          <el-button type="primary" size="mini" @click="handleSubmitKeyDoc && !ManualsClose">
+          <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
             {{ $t('common:button:confirm') }}</el-button>
         </div>
       </div>

From f59b205324b9302b1cebea31d9b95ecc39e44dff Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 13:35:26 +0800
Subject: [PATCH 185/333] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88=E9=98=85=E7=89=87=E6=A0=87=E8=AE=B0=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/PetCtViewport.vue        | 9 +++++----
 .../reading/dicoms3D/components/ReadPage.vue             | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
index 168c452b..268b39fb 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
@@ -475,20 +475,21 @@ export default {
       })
       this.loading = false
     },
-    async setSeriesInfo(obj, option = {}) {
+    async setSeriesInfo(obj, isLocate = false, option = {}) {
       try {
         let { data } = obj
         if (this.series && data.Id === this.series.Id && data.Description === this.series.Description) {
           data.SliceIndex = this.series.SliceIndex
         }
+        const renderingEngine = getRenderingEngine(this.renderingEngineId)
+        const viewport = renderingEngine.getViewport(this.viewportId)
+        if (isLocate) return csUtils.jumpToSlice(viewport.element, { imageIndex: data.SliceIndex });
+        this.volumeId = data.SeriesInstanceUid
         this.ptVolumeId = null
         this.series = {}
         let { isFusion, isMip, colorMap } = option
         this.isFusion = isFusion;
         this.isMip = isMip;
-        const renderingEngine = getRenderingEngine(this.renderingEngineId)
-        const viewport = renderingEngine.getViewport(this.viewportId)
-        this.volumeId = data.SeriesInstanceUid
         if (this.isFusion) {
           this.$nextTick(() => {
             this.renderColorBar(this.presetName)
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 37356433..f9b95a0b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -3352,9 +3352,9 @@ export default {
         this.$refs[`viewport-3`][0].setSeriesInfo(pt)
 
         this.$refs[`viewport-fusion-0`][0].setSeriesInfo(ctData)
-        this.$refs[`viewport-fusion-1`][0].setSeriesInfo(ptData, { colorMap: true })
-        this.$refs[`viewport-fusion-2`][0].setSeriesInfo(fusionData, { isFusion: true, colorMap: true })
-        this.$refs[`viewport-fusion-3`][0].setSeriesInfo(ptData, { isMip: true, colorMap: true })
+        this.$refs[`viewport-fusion-1`][0].setSeriesInfo(ptData, false, { colorMap: true })
+        this.$refs[`viewport-fusion-2`][0].setSeriesInfo(fusionData, false, { isFusion: true, colorMap: true })
+        this.$refs[`viewport-fusion-3`][0].setSeriesInfo(ptData, false, { isMip: true, colorMap: true })
         // this.resetAnnotation = false
         this.$nextTick(() => {
           this.$refs[`colorMap`].init()

From 97dda302e1cb9f07c01f2b535d1db19dacb29ad8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 14:22:30 +0800
Subject: [PATCH 186/333] =?UTF-8?q?=E8=9E=8D=E5=90=88=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E5=B7=A5=E5=85=B7=E5=AD=98=E5=9C=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/PetCtViewport.vue   | 13 +++++++++----
 .../reading/dicoms3D/components/ReadPage.vue        |  4 ++--
 .../components/customize/QuestionTableFormItem.vue  |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
index 268b39fb..28eb5452 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
@@ -454,7 +454,8 @@ export default {
       }
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
       const viewport = renderingEngine.getViewport(this.viewportId)
-      viewport.setProperties({ colormap: { name: presetName } }, this.volumeId)
+      let volumeId = this.isFusion ? this.ptVolumeId : this.volumeId
+      viewport.setProperties({ colormap: { name: presetName } }, volumeId)
       viewport.render()
     },
     async prefetchMetadataInformation(imageIdsToPrefetch) {
@@ -478,9 +479,10 @@ export default {
     async setSeriesInfo(obj, isLocate = false, option = {}) {
       try {
         let { data } = obj
-        if (this.series && data.Id === this.series.Id && data.Description === this.series.Description) {
-          data.SliceIndex = this.series.SliceIndex
-        }
+        // if (this.series && data.Id === this.series.Id && data.Description === this.series.Description) {
+        //   data.SliceIndex = this.series.SliceIndex
+        // }
+        // this.series = { ...data }
         const renderingEngine = getRenderingEngine(this.renderingEngineId)
         const viewport = renderingEngine.getViewport(this.viewportId)
         if (isLocate) return csUtils.jumpToSlice(viewport.element, { imageIndex: data.SliceIndex });
@@ -550,6 +552,9 @@ export default {
                 if (colorMap) {
                   this.setColorMap(this.presetName)
                 }
+                if (isLocate) {
+                  setTimeout(() => { csUtils.jumpToSlice(viewport.element, { imageIndex: data.SliceIndex }); })
+                }
               })
           } else {
             viewport
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 f9b95a0b..6b917441 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2813,7 +2813,7 @@ export default {
           if (this.isFusion) {
             this.activeViewportIndex = 0
             if (series.Modality === 'PT') {
-              this.activeViewportIndex = 1
+              this.activeViewportIndex = 2
             }
             series = {
               data: series,
@@ -2870,7 +2870,7 @@ export default {
           if (this.isFusion) {
             this.activeViewportIndex = 0
             if (series.Modality === 'PT') {
-              this.activeViewportIndex = 1
+              this.activeViewportIndex = 2
             }
             series = {
               data: series,
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index c2685030..dec9f6b8 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -109,7 +109,7 @@
               e,
               data: {
                 TableQuestionId: question.Id,
-                RowIndex: question.RowIndex,
+                RowIndex: questionForm.RowIndex,
                 QuestionName: question.QuestionName
               }
             })" />

From 35cc08e53c96a0083106857556ef1678a6431d87 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 14:26:37 +0800
Subject: [PATCH 187/333] =?UTF-8?q?=E3=80=90=E7=97=85=E7=81=B6=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88=E3=80=91=E8=9E=8D=E5=90=88=E6=8C=89=E9=92=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E4=BD=8D=E7=BD=AE=E5=85=B6=E4=BB=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=B0=83=E6=95=B4=E4=B8=8Elugano=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IRecist/QuestionList.vue          | 2 +-
 .../reading/dicoms/components/Recist/QuestionList.vue           | 2 +-
 .../reading/dicoms/components/RecistBM/QuestionList.vue         | 2 +-
 .../reading/dicoms3D/components/Recist/QuestionList.vue         | 2 +-
 .../reading/dicoms3D/components/mRecist/QuestionList.vue        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index ff0df539..951c6a67 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -155,7 +155,7 @@
                       </div>
                       <div
                         v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1, 4, 5].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 5 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1) || (item.LesionType === 6 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 7 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 8 && parseInt(item.TableQuestions.Answers[i].lesionState) === 1)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
-                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip
                           v-show="readingTaskState < 2 && !!item.TableQuestions.Answers[i].RowId && (!isBaseLineTask && !isFirstChangeTask) && item.TableQuestions.Answers[i].isDicomReading !== false"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index 5680e32c..b1ab1e84 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -125,7 +125,7 @@
                       </div>
                       <div
                         v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
-                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip
                           v-show="readingTaskState < 2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index 96829b4e..4fb5c7f5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -118,7 +118,7 @@
                       </div>
                       <div
                         v-if="((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
-                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip
                           v-show="readingTaskState < 2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
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
index 2b2c5e03..7d2d36eb 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -142,7 +142,7 @@
                       <!-- 分裂 -->
                       <div
                         v-if="((table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (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);">
+                        style="position: absolute;right: 5px;top: 2px;">
                         <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">
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
index 0154ec63..9b3a5841 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -140,7 +140,7 @@
                       <!-- 分裂 -->
                       <div
                         v-if="((table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)))) || ((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);">
+                        style="position: absolute;right: 5px;top: 2px;">
                         <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">

From 73e9f30f7e28be70237b8d19c0cca85cdbddac99 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 14:29:48 +0800
Subject: [PATCH 188/333] =?UTF-8?q?=E3=80=90=E7=97=85=E7=81=B6=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88=E3=80=91=E5=BD=93=E5=89=8D=E8=AE=BF=E8=A7=86=EF=BC=8C?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E7=97=85=E7=81=B6=E8=9E=8D=E5=90=88=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=E8=A3=82=E6=8C=89=E9=92=AE=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IRecist/QuestionList.vue          | 2 +-
 .../reading/dicoms/components/Recist/QuestionList.vue           | 2 +-
 .../reading/dicoms/components/RecistBM/QuestionList.vue         | 2 +-
 .../reading/dicoms3D/components/Recist/QuestionList.vue         | 2 +-
 .../reading/dicoms3D/components/mRecist/QuestionList.vue        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index 951c6a67..09d877a4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -158,7 +158,7 @@
                         style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2 && !!item.TableQuestions.Answers[i].RowId && (!isBaseLineTask && !isFirstChangeTask) && item.TableQuestions.Answers[i].isDicomReading !== false"
+                          v-show="readingTaskState < 2 && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && (!isBaseLineTask && !isFirstChangeTask) && item.TableQuestions.Answers[i].isDicomReading !== false"
                           class="item" :content="$t('trials:reading:button:split')" placement="left">
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index b1ab1e84..f5d1f6ac 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -128,7 +128,7 @@
                         style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
+                          v-show="readingTaskState < 2&& item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
                           class="item" :content="$t('trials:reading:button:split')" placement="left">
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index 4fb5c7f5..5ca55c5a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -121,7 +121,7 @@
                         style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
+                          v-show="readingTaskState < 2&& item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
                           class="item" :content="$t('trials:reading:button:split')" placement="left">
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
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
index 7d2d36eb..64fa95e7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -144,7 +144,7 @@
                         v-if="((table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (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;">
                         <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false"
+                          v-show="readingTaskState < 2 && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '4' && !!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)" />
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
index 9b3a5841..8fe5179d 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -142,7 +142,7 @@
                         v-if="((table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)))) || ((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;">
                         <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false"
+                          v-show="readingTaskState < 2 && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '4' && !!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)" />

From 93b7477aa651b492d7c1bbb94ae73adc569d9c40 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 15:09:41 +0800
Subject: [PATCH 189/333] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E9=87=8D=E9=98=85=E6=97=B6=EF=BC=9A=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=90=8E=E7=BB=AD=E8=AE=BF=E8=A7=86=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E8=A1=A8=E5=8D=95=E7=9A=84=E9=80=89=E9=A1=B9=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE=E9=98=85=E7=89=87=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/read-task/index.vue     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 47bdfb0b..183d3779 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -208,7 +208,7 @@
         </el-form-item>
         <!-- 是否复制阅片表单 -->
         <el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')"
-          v-if="ApplyforReasonForm.IsCopyOrigenalForms" prop="IsCopyFollowForms" :rules="[
+          v-if="ApplyforReasonForm.IsCopyOrigenalForms && isTumor" prop="IsCopyFollowForms" :rules="[
             { required: true, message: $t('common:ruleMessage:select') },
           ]">
           <el-radio-group v-model="ApplyforReasonForm.IsCopyFollowForms">
@@ -375,6 +375,16 @@ export default {
       }
     }
   },
+  computed: {
+    isTumor() {
+      let criterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.TrialReadingCriterionId)
+      if (criterion) {
+        return [1, 18, 2, 3, 7].includes(Number(criterion.CriterionType))
+      } else {
+        return false
+      }
+    }
+  },
   mounted() {
     this.trialId = this.$route.query.trialId
     this.getTrialCriterionList()
@@ -470,8 +480,8 @@ export default {
         if (!valid) return
         this.loading = true
         this.btnLoading = true
-        if (!this.ApplyforReasonForm.IsCopyOrigenalForms) {
-          this.ApplyforReasonForm.IsCopyFollowForms = null
+        if (!this.ApplyforReasonForm.IsCopyOrigenalForms || !this.isTumor) {
+          this.ApplyforReasonForm.IsCopyFollowForms = false
         }
         var params = {
           TaskIdList: [

From b5f327fc3cbb1d78da9aafd7186ed3c3cff06811 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 16:24:23 +0800
Subject: [PATCH 190/333] =?UTF-8?q?MPR=E5=A2=9E=E5=8A=A0=E5=BD=B1=E5=83=8F?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=89=8D=E7=9A=84=E9=AA=8C=E8=AF=81=EF=BC=9A?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=9D=A1=E4=BB=B6=EF=BC=9A=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E6=95=B0=E9=87=8F>5,=E5=BD=B1?=
 =?UTF-8?q?=E5=83=8F=E5=85=B7=E5=A4=87imageOrientationPatient,imagePositio?=
 =?UTF-8?q?nPatient?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/PetCtViewport.vue         | 6 +++---
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue | 8 ++++++--
 .../trials-panel/reading/dicoms3D/components/Viewport.vue | 6 +++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
index 28eb5452..3125926b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
@@ -479,9 +479,9 @@ export default {
     async setSeriesInfo(obj, isLocate = false, option = {}) {
       try {
         let { data } = obj
-        // if (this.series && data.Id === this.series.Id && data.Description === this.series.Description) {
-        //   data.SliceIndex = this.series.SliceIndex
-        // }
+        if (this.series && data.Id === this.series.Id && data.Description === this.series.Description && !isLocate) {
+          data.SliceIndex = this.series.SliceIndex
+        }
         // this.series = { ...data }
         const renderingEngine = getRenderingEngine(this.renderingEngineId)
         const viewport = renderingEngine.getViewport(this.viewportId)
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 6b917441..7ffb0a12 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -3280,13 +3280,17 @@ export default {
           let viewportSeries = this.$refs[`viewport-volume-0`][0].series
           if (data && viewportSeries.SeriesInstanceUid === data.SeriesInstanceUid) return resolve(true)
         }
-
+        if (!data) {
+          let { imageOrientationPatient, imagePositionPatient } = this.$refs[`viewport-${this.activeViewportIndex}`][0].imageInfo
+          if (!imageOrientationPatient || !imagePositionPatient || imagePositionPatient.length <= 0 || imageOrientationPatient.length <= 0) return this.$confirm(this.$t('trials:reading:confirm:imageNotMPR'))
+        }
+        const series = data ? data : this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+        if (series.ImageIds.length <= 5) return this.$confirm(this.$t('trials:reading:confirm:smallNumberOfimage'))
         this.isMPR = true
         this.rows = 3
         this.cols = 1
         this.loading = true
         this.loadingText = this.$t('trials:lugano:message:loadVolumes')
-        const series = data ? data : this.$refs[`viewport-${this.activeViewportIndex}`][0].series
         if (!data) this.activeViewportIndex = 0
         const visitTaskId = this.visitTaskList[this.activeTaskIndex].VisitTaskId
         this.$refs[visitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
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 7698146c..549618a5 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
@@ -141,7 +141,9 @@ export default {
         size: null,
         location: null,
         sliceThickness: null,
-        wwwc: null
+        wwwc: null,
+        imageOrientationPatient: [],
+        imagePositionPatient: []
       },
       digitPlaces: 2,
       orientationMarkers: [],
@@ -194,6 +196,8 @@ export default {
       this.imageInfo.zoom = zoom.toFixed(4)
       this.imageInfo.size = `${detail.image.columns}*${detail.image.rows}`
       const imagePlaneModule = metaData.get('imagePlaneModule', detail.imageId)
+      this.imageInfo.imageOrientationPatient = imagePlaneModule.imageOrientationPatient
+      this.imageInfo.imagePositionPatient = imagePlaneModule.imagePositionPatient
       this.imageInfo.location = imagePlaneModule.sliceLocation
       // this.imageInfo.wwwc = `${Math.round(detail.image.windowWidth)}/${Math.round(detail.image.windowCenter)}`
       this.getOrientationMarker()

From e7fdee114764395976b4036959171e4ae4bd5129 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 16:45:22 +0800
Subject: [PATCH 191/333] =?UTF-8?q?MPR=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 7ffb0a12..3f905c82 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2068,7 +2068,7 @@ export default {
           this.activeTool = ''
         } else {
           if (this.activeTool) {
-            if (toolName === CrosshairsTool.toolName) {
+            if (this.activeTool === CrosshairsTool.toolName) {
               toolGroup.setToolDisabled(this.activeTool)
             } else {
               toolGroup.setToolPassive(this.activeTool)
@@ -2092,7 +2092,7 @@ export default {
         const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
         const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
         if (this.activeTool) {
-          if (toolName === CrosshairsTool.toolName) {
+          if (this.activeTool === CrosshairsTool.toolName) {
             toolGroup.setToolDisabled(this.activeTool)
           } else {
             toolGroup.setToolPassive(this.activeTool)
@@ -2792,13 +2792,13 @@ export default {
           let viewPlaneNormal = obj.annotation?.metadata?.viewPlaneNormal.map(i => i == 0 ? 0 : i).join(',')
           if (viewPlaneNormal === '0,0,-1') {
             this.activeViewportIndex = 0
-            series = Object.assign({ orientation: 'AXIAL' }, series)
+            // series = Object.assign({ orientation: 'AXIAL' }, series)
           } else if (viewPlaneNormal === '0,-1,0') {
             this.activeViewportIndex = 2
-            series = Object.assign({ orientation: 'CORONAL' }, series)
+            // series = Object.assign({ orientation: 'CORONAL' }, series)
           } else if (viewPlaneNormal === '1,0,0') {
             this.activeViewportIndex = 1
-            series = Object.assign({ orientation: 'SAGITTAL' }, series)
+            // series = Object.assign({ orientation: 'SAGITTAL' }, series)
           }
           let res = await this.openMPRViewport(series)
           if (!res) return false
@@ -2838,13 +2838,13 @@ export default {
           let viewPlaneNormal = obj.annotation?.metadata?.viewPlaneNormal.map(i => i == 0 ? 0 : i).join(',')
           if (viewPlaneNormal === '0,0,-1') {
             this.activeViewportIndex = 0
-            series = Object.assign({ orientation: 'AXIAL' }, series)
+            // series = Object.assign({ orientation: 'AXIAL' }, series)
           } else if (viewPlaneNormal === '0,-1,0') {
             this.activeViewportIndex = 2
-            series = Object.assign({ orientation: 'CORONAL' }, series)
+            // series = Object.assign({ orientation: 'CORONAL' }, series)
           } else if (viewPlaneNormal === '1,0,0') {
             this.activeViewportIndex = 1
-            series = Object.assign({ orientation: 'SAGITTAL' }, series)
+            // series = Object.assign({ orientation: 'SAGITTAL' }, series)
           }
           let res = await this.openMPRViewport(series)
           if (!res) {
@@ -3287,6 +3287,7 @@ export default {
         const series = data ? data : this.$refs[`viewport-${this.activeViewportIndex}`][0].series
         if (series.ImageIds.length <= 5) return this.$confirm(this.$t('trials:reading:confirm:smallNumberOfimage'))
         this.isMPR = true
+        console.log(series, 'series')
         this.rows = 3
         this.cols = 1
         this.loading = true

From b2119c3acd7395428a7910fedc0f378929ed608c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 17:06:30 +0800
Subject: [PATCH 192/333] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0=E7=BB=91=E5=AE=9A=E6=97=B6=E6=9C=AA=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/customize/QuestionFormItem.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index a7102075..f798b8cd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -1240,6 +1240,7 @@ export default {
         }
         const val = this.getAnnotationProp(item.MeasureData, item.ImageToolAttribute)
         this.$set(this.QuestionsForm, item.TableQuestionId, val)
+        this.formItemTableNumberChange()
       })
     },
     getAnnotationProp(annotation, prop) {

From ef46e4cb08cdadc93b27ba88630f5be1d3db6cfe Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 17:13:31 +0800
Subject: [PATCH 193/333] =?UTF-8?q?mpr=E8=A7=86=E5=9B=BE=E6=97=B6=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E5=88=87=E6=8D=A2=E5=A4=9A=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3f905c82..a74a98da 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -3141,7 +3141,7 @@ export default {
       return typeof value === 'number' && value !== null && !isNaN(value)
     },
     showPanel(e, toolName) {
-      if (toolName === 'layout' && this.isFusion) return false
+      if (toolName === 'layout' && (this.isFusion || this.isMPR)) return false
       e.currentTarget.firstChild.lastChild.style.display = 'block'
     },
     toolMouseout(e) {

From 11940798e8e669f261742cd0dc271b97c2990495 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Dec 2025 17:39:07 +0800
Subject: [PATCH 194/333] 1

---
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue     | 4 ++++
 1 file changed, 4 insertions(+)

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 a74a98da..e4ecaaa3 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2533,6 +2533,10 @@ export default {
       if (this.isFusion || this.isMPR) {
         const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
         if (!confirm) return false
+        if (this.isMPR) {
+          this.rows = 1
+          this.cols = 1
+        }
         this.isFusion = false
         this.isMPR = false
         this.fullScreenIndex = null

From 17b1cc476f66145470ffed57c4534ef15811aa1b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 25 Dec 2025 14:50:44 +0800
Subject: [PATCH 195/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9=E3=80=81IVUS=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E9=80=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/customSort.js                       | 346 ++++++++++++++++++
 src/views/none-dicom-show/index.vue           |  28 +-
 .../dicoms/components/IVUS/QuestionList.vue   |  18 +-
 .../components/IVUS/QuestionTableFormItem.vue | 183 +++------
 .../dicoms/components/OCT/QuestionList.vue    |   8 +-
 .../reading/dicoms/none-dicoms.vue            |  24 +-
 .../none-dicoms/components/VisitReview.vue    |  24 +-
 7 files changed, 473 insertions(+), 158 deletions(-)
 create mode 100644 src/utils/customSort.js

diff --git a/src/utils/customSort.js b/src/utils/customSort.js
new file mode 100644
index 00000000..ba42c940
--- /dev/null
+++ b/src/utils/customSort.js
@@ -0,0 +1,346 @@
+class FileNameSorter {
+    /**
+     * 判断是否为纯数字字符串
+     * @param {any} value - 要检查的值
+     * @returns {boolean} 是否为纯数字
+     */
+    static isPureNumber(value) {
+        if (typeof value !== 'string') return false;
+        return /^\d+$/.test(value);
+    }
+
+    /**
+     * 获取排序键值
+     * @param {any} item - 要排序的项目
+     * @returns {Array} 排序键值数组
+     */
+    static getSortKey(item) {
+        const str = String(item);
+        const isNumber = this.isPureNumber(str);
+
+        // 排序优先级: [类型优先级, 数字值/字符串值]
+        if (isNumber) {
+            // 纯数字: 类型优先级为0, 使用数字值排序
+            return [0, BigInt(str)];
+        } else {
+            // 非纯数字: 类型优先级为1, 使用字符串排序
+            return [1, str.toLowerCase()];
+        }
+    }
+
+    /**
+     * 文件名排序
+     * @param {Array} arr - 要排序的数组
+     * @param {Object} options - 排序选项
+     * @returns {Array} 排序后的数组
+     */
+    static sortFileNames(arr, options = {}) {
+        if (!Array.isArray(arr)) {
+            throw new TypeError('输入必须是一个数组');
+        }
+
+        const {
+            direction = 'asc', // 'asc' 升序, 'desc' 降序
+            caseSensitive = false, // 是否区分大小写
+            trim = true, // 是否去除前后空格
+            key = null
+        } = options;
+
+        // 创建数组的副本
+        const result = [...arr];
+
+        return result.sort((a, b) => {
+            let aStr = key ? String(a[key]).split(".")[0] : String(a);
+            let bStr = key ? String(b[key]).split(".")[0] : String(b);
+            // 处理空格
+            if (trim) {
+                aStr = aStr.trim();
+                bStr = bStr.trim();
+            }
+
+            // 处理大小写
+            if (!caseSensitive) {
+                aStr = aStr.toLowerCase();
+                bStr = bStr.toLowerCase();
+            }
+
+            // 获取排序键值
+            const aKey = this.getSortKey(aStr);
+            const bKey = this.getSortKey(bStr);
+
+            // 比较类型优先级
+            if (aKey[0] !== bKey[0]) {
+                // 纯数字(0) < 非纯数字(1)
+                return direction === 'asc' ? aKey[0] - bKey[0] : bKey[0] - aKey[0];
+            }
+
+            // 相同类型下的比较
+            if (aKey[0] === 0) {
+                // 都是纯数字，按数字大小比较
+                if (aKey[1] < bKey[1]) return direction === 'asc' ? -1 : 1;
+                if (aKey[1] > bKey[1]) return direction === 'asc' ? 1 : -1;
+                return 0;
+            } else {
+                // 都是非纯数字，按字符串比较
+                if (aStr < bStr) return direction === 'asc' ? -1 : 1;
+                if (aStr > bStr) return direction === 'asc' ? 1 : -1;
+                return 0;
+            }
+        });
+    }
+
+    /**
+     * 自然排序 - 处理文件名中的数字序列
+     * 例如: file1, file2, file10
+     * @param {Array} arr - 要排序的数组
+     * @param {Object} options - 排序选项
+     * @returns {Array} 排序后的数组
+     */
+    static naturalSort(arr, options = {}) {
+        const {
+            direction = 'asc',
+            caseSensitive = false
+        } = options;
+
+        return [...arr].sort((a, b) => {
+            const aStr = String(a);
+            const bStr = String(b);
+
+            // 检查是否都是纯数字
+            const aIsPureNumber = this.isPureNumber(aStr);
+            const bIsPureNumber = this.isPureNumber(bStr);
+
+            // 如果一个纯数字，一个非纯数字
+            if (aIsPureNumber && !bIsPureNumber) {
+                return direction === 'asc' ? -1 : 1;
+            }
+            if (!aIsPureNumber && bIsPureNumber) {
+                return direction === 'asc' ? 1 : -1;
+            }
+
+            // 都是纯数字，按数字比较
+            if (aIsPureNumber && bIsPureNumber) {
+                const aNum = BigInt(aStr);
+                const bNum = BigInt(bStr);
+
+                if (aNum < bNum) return direction === 'asc' ? -1 : 1;
+                if (aNum > bNum) return direction === 'asc' ? 1 : -1;
+                return 0;
+            }
+
+            // 都是非纯数字，使用自然排序算法
+            return this.naturalCompare(aStr, bStr, direction, caseSensitive);
+        });
+    }
+
+    /**
+     * 自然比较算法
+     * @private
+     */
+    static naturalCompare(a, b, direction = 'asc', caseSensitive = false) {
+        let aStr = caseSensitive ? a : a.toLowerCase();
+        let bStr = caseSensitive ? b : b.toLowerCase();
+
+        const regex = /(\d+|\D+)/g;
+        const aParts = aStr.match(regex) || [];
+        const bParts = bStr.match(regex) || [];
+
+        const maxLength = Math.max(aParts.length, bParts.length);
+
+        for (let i = 0; i < maxLength; i++) {
+            const aPart = aParts[i] || '';
+            const bPart = bParts[i] || '';
+
+            const aIsNumber = /^\d+$/.test(aPart);
+            const bIsNumber = /^\d+$/.test(bPart);
+
+            // 如果都是数字，按数字比较
+            if (aIsNumber && bIsNumber) {
+                const aNum = BigInt(aPart);
+                const bNum = BigInt(bPart);
+
+                if (aNum < bNum) return direction === 'asc' ? -1 : 1;
+                if (aNum > bNum) return direction === 'asc' ? 1 : -1;
+                continue;
+            }
+
+            // 都是文本，按字符串比较
+            if (aPart < bPart) return direction === 'asc' ? -1 : 1;
+            if (aPart > bPart) return direction === 'asc' ? 1 : -1;
+        }
+
+        return 0;
+    }
+
+    /**
+     * 分组排序 - 将纯数字和非纯数字分开显示
+     * @param {Array} arr - 要排序的数组
+     * @param {Object} options - 排序选项
+     * @returns {Array} 排序后的数组
+     */
+    static groupSort(arr, options = {}) {
+        const {
+            direction = 'asc',
+            groupOrder = 'numbers-first' // 'numbers-first' 或 'names-first'
+        } = options;
+
+        // 分组
+        const numbers = [];
+        const names = [];
+
+        arr.forEach(item => {
+            const str = String(item);
+            if (this.isPureNumber(str)) {
+                numbers.push(item);
+            } else {
+                names.push(item);
+            }
+        });
+
+        // 对各组排序
+        const sortedNumbers = this.sortFileNames(numbers, { direction });
+        const sortedNames = this.sortFileNames(names, { direction });
+
+        // 按指定顺序合并
+        if (groupOrder === 'numbers-first') {
+            return [...sortedNumbers, ...sortedNames];
+        } else {
+            return [...sortedNames, ...sortedNumbers];
+        }
+    }
+
+    /**
+     * 文件扩展名排序 - 先按扩展名排序，再按文件名排序
+     * @param {Array} arr - 要排序的数组
+     * @param {Object} options - 排序选项
+     * @returns {Array} 排序后的数组
+     */
+    static sortByExtension(arr, options = {}) {
+        const {
+            direction = 'asc',
+            extensionsFirst = false // 扩展名优先还是文件名优先
+        } = options;
+
+        return [...arr].sort((a, b) => {
+            const aStr = String(a);
+            const bStr = String(b);
+
+            // 分离文件名和扩展名
+            const getFileParts = (str) => {
+                const lastDotIndex = str.lastIndexOf('.');
+                if (lastDotIndex > 0) {
+                    return {
+                        name: str.substring(0, lastDotIndex),
+                        ext: str.substring(lastDotIndex + 1)
+                    };
+                }
+                return { name: str, ext: '' };
+            };
+
+            const aParts = getFileParts(aStr);
+            const bParts = getFileParts(bStr);
+
+            let compareResult;
+
+            if (extensionsFirst) {
+                // 先比较扩展名
+                compareResult = this.sortFileNames([aParts.ext, bParts.ext], { direction })[0] === aParts.ext ? -1 : 1;
+                if (compareResult !== 0) return compareResult;
+
+                // 扩展名相同，再比较文件名
+                return this.sortFileNames([aParts.name, bParts.name], { direction })[0] === aParts.name ? -1 : 1;
+            } else {
+                // 先比较文件名
+                compareResult = this.sortFileNames([aParts.name, bParts.name], { direction })[0] === aParts.name ? -1 : 1;
+                if (compareResult !== 0) return compareResult;
+
+                // 文件名相同，再比较扩展名
+                return this.sortFileNames([aParts.ext, bParts.ext], { direction })[0] === aParts.ext ? -1 : 1;
+            }
+        });
+    }
+
+    /**
+     * 测试和演示函数
+     */
+    static demonstrate() {
+        const testData = [
+            '100',
+            '23',
+            '1',
+            '003',
+            'file.txt',
+            '10',
+            '5',
+            'alpha',
+            'beta',
+            'gamma',
+            '00100',
+            'zebra',
+            'apple',
+            'banana',
+            '123',
+            'file10.txt',
+            'file2.txt',
+            'File1.txt',
+            'file20.txt',
+            'image.jpg',
+            'document.pdf',
+            'data.xlsx'
+        ];
+
+        console.log('=== 文件名排序演示 ===\n');
+
+        console.log('原始数据:');
+        console.log(testData);
+
+        console.log('\n1. 基本排序 (纯数字 < 非纯数字):');
+        const basicSorted = this.sortFileNames(testData);
+        console.log(basicSorted);
+
+        console.log('\n2. 自然排序 (智能数字识别):');
+        const naturalSorted = this.naturalSort(testData);
+        console.log(naturalSorted);
+
+        console.log('\n3. 分组排序 (数字组和文件组):');
+        const groupSorted = this.groupSort(testData);
+        console.log(groupSorted);
+
+        console.log('\n4. 降序排序:');
+        const descSorted = this.sortFileNames(testData, { direction: 'desc' });
+        console.log(descSorted);
+
+        console.log('\n5. 按扩展名排序:');
+        const extSorted = this.sortByExtension(testData);
+        console.log(extSorted);
+
+        console.log('\n6. 大小写敏感排序:');
+        const caseSensitiveSorted = this.sortFileNames(testData, { caseSensitive: true });
+        console.log(caseSensitiveSorted);
+
+        // 验证排序规则
+        console.log('\n=== 排序规则验证 ===');
+        const validationData = ['100', '23', 'file.txt', '1', 'alpha', '003', '10'];
+        console.log('验证数据:', validationData);
+        console.log('排序结果:', this.sortFileNames(validationData));
+        console.log('规则验证:');
+        console.log('  - 纯数字: 1, 3(003), 10, 23, 100 (按数字大小)');
+        console.log('  - 非纯数字: alpha, file.txt (按字母顺序)');
+        console.log('  - 非纯数字 > 纯数字');
+
+        return {
+            basic: basicSorted,
+            natural: naturalSorted,
+            group: groupSorted,
+            descending: descSorted,
+            byExtension: extSorted,
+            caseSensitive: caseSensitiveSorted
+        };
+    }
+}
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = FileNameSorter;
+} else if (typeof window !== 'undefined') {
+    window.FileNameSorter = FileNameSorter;
+}
\ No newline at end of file
diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index 4b6a63f8..be3040c7 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -3,8 +3,10 @@
     <el-card class="box-card left">
       <div class="title" style="display: flex;align-items: center;">
         <div style="margin-right: 5px;cursor: pointer;" @click.stop="sortFile">
-          <i :class="['el-icon-caret-top', Asc ? '' : 'icon_check']" style="display: block;margin-bottom: -5px;"></i>
-          <i :class="['el-icon-caret-bottom', !Asc ? '' : 'icon_check']" style="display: block; margin-top: -5px;"></i>
+          <i :class="['el-icon-caret-top', Asc === false || Asc === null ? '' : 'icon_check']"
+            style="display: block;margin-bottom: -5px;"></i>
+          <i :class="['el-icon-caret-bottom', Asc === true || Asc === null ? '' : 'icon_check']"
+            style="display: block; margin-top: -5px;"></i>
         </div>
         {{ $t('trials:none-dicom-show:fileList') }}
       </div>
@@ -103,6 +105,7 @@ import zip from '@/assets/zip.jpg'
 import { changeURLStatic } from '@/utils/history.js'
 import Preview from './components/preview'
 import PreviewFile from '@/components/PreviewFile'
+import FileNameSorter from "@/utils/customSort";
 // import CheckForm from './components/form'
 export default {
   name: 'Notice',
@@ -162,6 +165,11 @@ export default {
     this.getNoneDicomList()
     // 默认选择第一个文件
   },
+  computed: {
+    CriterionType() {
+      return this.OtherInfo.CriterionType ? this.OtherInfo.CriterionType : 0
+    }
+  },
   methods: {
     sortFile() {
       if (this.Asc) {
@@ -169,15 +177,13 @@ export default {
       } else {
         this.Asc = true
       }
-      console.log(this.Asc, 'Asc')
+      console.log(this.Asc, 'this.Asc')
       this.studyList.forEach(study => {
         if (study.NoneDicomStudyFileList.length > 0) {
-          if (this.Asc) {
-            study.NoneDicomStudyFileList.sort((a, b) => b.FileName.localeCompare(a.FileName))
-          } else {
-            study.NoneDicomStudyFileList.sort((a, b) => a.FileName.localeCompare(b.FileName))
-          }
-
+          study.NoneDicomStudyFileList = FileNameSorter.sortFileNames(study.NoneDicomStudyFileList, {
+            direction: this.Asc ? 'asc' : 'desc',
+            key: 'FileName'
+          })
         }
       })
       this.previewImage.imgList = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList
@@ -316,11 +322,13 @@ export default {
             return item.NoneDicomStudyFileList.length > 0
           })
           this.activeNames = this.studyList.map((item) => item.CodeView)
-          console.log(this.activeNames)
           if (studyIndex > -1) {
             var fileObj = this.studyList[studyIndex]['NoneDicomStudyFileList']
             this.selected(fileObj[0], studyIndex, 0, true)
           }
+          if (this.CriterionType === 19 || this.CriterionType === 20) {
+            this.sortFile()
+          }
         })
         .catch(() => {
           this.loading = false
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 6302e20a..9cc80593 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -65,7 +65,11 @@
                           {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
                         </span>
                         <span v-else-if="q.DictionaryCode">
-                          {{ `${$fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}` }}
+                          {{`${scope.row[q.Id] instanceof Array ? scope.row[q.Id].map(item => $fd(q.DictionaryCode,
+                            parseInt(item))).join(',') : $fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}`}}
+                        </span>
+                        <span v-else-if="q.OptionTypeEnum === 1">
+                          {{ `${scope.row[q.Id] instanceof Array ? scope.row[q.Id].join(',') : scope.row[q.Id]}` }}
                         </span>
                         <span v-else>
                           {{ `${scope.row[q.Id]}` }}
@@ -108,7 +112,7 @@
                       </template>
                       <template v-if="item.Type === 'select'">
                         <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
-                          @change="((val) => { formItemChange(val, item) })">
+                          :multiple="item.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, item) })">
                           <el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
                             :label="dict.label" />
                         </el-select>
@@ -117,10 +121,10 @@
                     <template v-if="item.Childrens && item.Childrens.length > 0">
                       <template v-for="child in item.Childrens">
                         <el-form-item :key="child.Id"
-                          v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
+                          v-if="(child.ShowQuestion === 1 && (child.ParentTriggerValueList.includes(String(questionForm[item.Id])) || (Array.isArray(questionForm[item.Id]) && child.ParentTriggerValueList.some(da => questionForm[item.Id].includes(da))))) || child.ShowQuestion === 0"
                           :label="`${child.QuestionName}`" :prop="child.Id" :rules="[
                             {
-                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
+                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && ((child.RelevanceValue.includes(questionForm[child.RelevanceId])) || (Array.isArray(questionForm[child.RelevanceId]) && child.RelevanceValueList.some(da => questionForm[child.RelevanceId].includes(da)))))) && child.Type !== 'group' && child.Type !== 'summary',
                               message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
                             },
                           ]">
@@ -326,7 +330,7 @@ export default {
       const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
       questions.forEach(item => {
         if (type.includes(item.Type)) {
-          const answer = item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
+          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
           this.$set(this.questionForm, item.Id, answer)
         }
         if (item.Childrens.length > 0) {
@@ -486,7 +490,7 @@ export default {
       const loading = this.$loading({ fullscreen: true })
       var answers = []
       for (const k in this.questionForm) {
-        answers.push({ id: k, answer: this.questionForm[k] })
+        answers.push({ id: k, answer: Array.isArray(this.questionForm[k]) ? JSON.stringify(this.questionForm[k]) : this.questionForm[k] })
       }
       var params = {
         visitTaskId: this.visitTaskId,
@@ -610,7 +614,7 @@ export default {
         for (const k in this.qsForm) {
           if (reg.test(k)) {
             if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
-              answers.push({ tableQuestionId: k, answer: this.qsForm[k] })
+              answers.push({ tableQuestionId: k, answer: Array.isArray(this.qsForm[k]) ? JSON.stringify(this.qsForm[k]) : this.qsForm[k] })
             }
           }
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
index 8500284f..b349a9ff 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
@@ -1,119 +1,66 @@
 <template>
   <div>
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'">
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ 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']},
+        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' : '']"
-      >
+        :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-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-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]"
+        <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)})"
-        >
+          clearable :multiple="question.OptionTypeEnum === 1" @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]"
-            />
+            <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"
-            />
+            <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
+            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"
-            />
+            <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)})"
-        >
+        <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)"
-            >
+            <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"
-            >
+            <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"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
+        <el-checkbox-group v-else-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2" @change="((val) => { formItemChange(val, question) })">
+          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
             {{ val }}
           </el-checkbox>
         </el-checkbox-group>
@@ -144,24 +91,15 @@
           />
         </template> -->
         <!-- 数值类型 -->
-        <el-input
-          v-else-if="question.Type==='number'"
-          v-model="questionForm[question.Id]"
-          :disabled="readingTaskState>=2 "
-          type="number"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+        <el-input v-else-if="question.Type === 'number'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2" type="number" @change="((val) => { formItemChange(val, question) })">
           <template v-if="question.Unit" slot="append">
             {{ $fd('ValueUnit', parseInt(question.Unit)) }}
           </template>
         </el-input>
 
-        <el-input
-          v-else-if="question.Type==='calculation'"
-          v-model="questionForm[question.Id]"
-          disabled
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+        <el-input v-else-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled
+          @change="((val) => { formItemChange(val, question) })">
           <template v-if="question.Unit" slot="append">
             {{ $fd('ValueUnit', parseInt(question.Unit)) }}
           </template>
@@ -169,15 +107,9 @@
       </el-form-item>
     </template>
 
-    <QuestionTableFormItem
-      v-for="item in question.Childrens"
-      :key="item.Id"
-      :question="item"
-      :question-form="questionForm"
-      :reading-task-state="readingTaskState"
-      @setFormItemData="setFormItemData"
-      @resetFormItemData="resetFormItemData"
-    />
+    <QuestionTableFormItem v-for="item in question.Childrens" :key="item.Id" :question="item"
+      :question-form="questionForm" :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
+      @resetFormItemData="resetFormItemData" />
   </div>
 </template>
 <script>
@@ -269,29 +201,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
-.disabled{
+
+.disabled {
   ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
-.uploadWrapper{
+
+.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;
-  }
+
+::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/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index ec70327c..d5a97a3f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -107,7 +107,7 @@
                       </template>
                       <template v-if="item.Type === 'select'">
                         <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
-                          @change="((val) => { formItemChange(val, item) })">
+                          :multiple="item.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, item) })">
                           <el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
                             :label="dict.label" />
                         </el-select>
@@ -116,10 +116,10 @@
                     <template v-if="item.Childrens && item.Childrens.length > 0">
                       <template v-for="child in item.Childrens">
                         <el-form-item :key="child.Id"
-                          v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
+                          v-if="(child.ShowQuestion === 1 && (child.ParentTriggerValueList.includes(String(questionForm[item.Id])) || (Array.isArray(questionForm[item.Id]) && child.ParentTriggerValueList.some(da => questionForm[item.Id].includes(da))))) || child.ShowQuestion === 0"
                           :label="`${child.QuestionName}`" :prop="child.Id" :rules="[
                             {
-                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
+                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && ((child.RelevanceValue.includes(questionForm[child.RelevanceId])) || (Array.isArray(questionForm[child.RelevanceId]) && child.RelevanceValueList.some(da => questionForm[child.RelevanceId].includes(da)))))) && child.Type !== 'group' && child.Type !== 'summary',
                               message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
                             },
                           ]">
@@ -482,7 +482,7 @@ export default {
       const loading = this.$loading({ fullscreen: true })
       var answers = []
       for (const k in this.questionForm) {
-        answers.push({ id: k, answer: this.questionForm[k] })
+        answers.push({ id: k, answer: Array.isArray(this.questionForm[k]) ? JSON.stringify(this.questionForm[k]) : this.questionForm[k] })
       }
       var params = {
         visitTaskId: this.visitTaskId,
diff --git a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
index d971c2ca..d161def8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
@@ -4,8 +4,10 @@
       <div v-if="otherInfo && otherInfo.IsReadingShowSubjectInfo" class="title"
         style="display: flex;align-items: center;flex-wrap: wrap;">
         <div style="margin-right: 5px;cursor: pointer;display: inline-block" @click.stop="sortFile">
-          <i :class="['el-icon-caret-top', Asc ? '' : 'icon_check']" style="display: block;margin-bottom: -5px;"></i>
-          <i :class="['el-icon-caret-bottom', !Asc ? '' : 'icon_check']" style="display: block; margin-top: -5px;"></i>
+          <i :class="['el-icon-caret-top', Asc === false || Asc === null ? '' : 'icon_check']"
+            style="display: block;margin-bottom: -5px;"></i>
+          <i :class="['el-icon-caret-bottom', Asc === true || Asc === null ? '' : 'icon_check']"
+            style="display: block; margin-top: -5px;"></i>
         </div>
         <span>{{ otherInfo.SubjectCode }} </span>
         <span>({{ otherInfo.TaskBlindName }})</span>
@@ -59,6 +61,7 @@ import { getReadingImageFile } from '@/api/trials'
 import { changeURLStatic } from '@/utils/history.js'
 import store from '@/store'
 import NoneDicomsViewer from './components/NoneDicomsViewer'
+import FileNameSorter from "@/utils/customSort";
 export default {
   name: 'VisitReview',
   components: {
@@ -99,6 +102,11 @@ export default {
       Asc: null
     }
   },
+  computed: {
+    CriterionType() {
+      return this.otherInfo.CriterionType ? this.otherInfo.CriterionType : 0
+    }
+  },
   async mounted() {
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     if (this.$router.currentRoute.query.TokenKey) {
@@ -127,11 +135,10 @@ export default {
       }
       this.studyList.forEach(study => {
         if (study.NoneDicomStudyFileList.length > 0) {
-          if (this.Asc) {
-            study.NoneDicomStudyFileList.sort((a, b) => b.FileName.localeCompare(a.FileName))
-          } else {
-            study.NoneDicomStudyFileList.sort((a, b) => a.FileName.localeCompare(b.FileName))
-          }
+          study.NoneDicomStudyFileList = FileNameSorter.sortFileNames(study.NoneDicomStudyFileList, {
+            direction: this.Asc ? 'asc' : 'desc',
+            key: 'FileName'
+          })
 
         }
       })
@@ -159,6 +166,9 @@ export default {
           }
         }
         this.loading = false
+        if (this.CriterionType === 19 || this.CriterionType === 20) {
+          this.sortFile()
+        }
       }).catch(() => { this.loading = false })
     },
     selected(file, studyIndex, fileIndex, isChangeSub = false) {
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
index 1c08b481..05d0f3d7 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
@@ -3,8 +3,10 @@
     <el-card v-loading="loading" class="box-card left">
       <div v-if="isReadingShowSubjectInfo" class="title" style="display: flex;align-items: center;">
         <div style="margin-right: 5px;cursor: pointer;" @click.stop="sortFile">
-          <i :class="['el-icon-caret-top', Asc ? '' : 'icon_check']" style="display: block;margin-bottom: -5px;"></i>
-          <i :class="['el-icon-caret-bottom', !Asc ? '' : 'icon_check']" style="display: block; margin-top: -5px;"></i>
+          <i :class="['el-icon-caret-top', Asc === false || Asc === null ? '' : 'icon_check']"
+            style="display: block;margin-bottom: -5px;"></i>
+          <i :class="['el-icon-caret-bottom', Asc === true || Asc === null ? '' : 'icon_check']"
+            style="display: block; margin-top: -5px;"></i>
         </div>
         <h4>{{ subjectCode }} </h4>
         <h4>{{ taskBlindName }}</h4>
@@ -102,6 +104,7 @@ import { getReadingImageFile, getReadingPastResultList } from '@/api/trials'
 import { getToken } from '@/utils/auth'
 import Preview from '@/views/none-dicom-show/components/preview'
 import Criterions from './Criterions'
+import FileNameSorter from "@/utils/customSort";
 export default {
   name: 'VisitReview',
   components: {
@@ -190,6 +193,9 @@ export default {
   computed: {
     showOtherTask() {
       return this.otherInfo && this.otherInfo.IsReadingShowPreviousResults && this.isReadingShowPreviousResults
+    },
+    CriterionType() {
+      return this.otherInfo.CriterionType ? this.otherInfo.CriterionType : 0
     }
   },
   async mounted() {
@@ -209,14 +215,13 @@ export default {
       } else {
         this.Asc = true
       }
+      console.log(this.Asc, 'this.Asc')
       this.studyList.forEach(study => {
         if (study.NoneDicomStudyFileList.length > 0) {
-          if (this.Asc) {
-            study.NoneDicomStudyFileList.sort((a, b) => b.FileName.localeCompare(a.FileName))
-          } else {
-            study.NoneDicomStudyFileList.sort((a, b) => a.FileName.localeCompare(b.FileName))
-          }
-
+          study.NoneDicomStudyFileList = FileNameSorter.sortFileNames(study.NoneDicomStudyFileList, {
+            direction: this.Asc ? 'asc' : 'desc',
+            key: 'FileName'
+          })
         }
       })
     },
@@ -243,6 +248,9 @@ export default {
           // this.$alert('当前影像存在问题，请联系PM！')
         }
         this.loading = false
+        if (this.CriterionType === 19 || this.CriterionType === 20) {
+          this.sortFile()
+        }
       }).catch(() => { this.loading = false })
     },
     selected(file, studyIndex, fileIndex, isChangeSub = false) {

From da41fa11391a613560a1f53f93b7610af40032e2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 25 Dec 2025 15:14:52 +0800
Subject: [PATCH 196/333] =?UTF-8?q?=E8=9E=8D=E5=90=88=E5=9B=BE=E5=83=8F?=
 =?UTF-8?q?=E4=BC=AA=E5=BD=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/PetCt.vue            | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 9cdb0864..1bb495da 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -351,6 +351,7 @@ const ctVolumeName = 'CT_VOLUME_ID' // Id of the volume less loader prefix
 const ctVolumeId = `${volumeLoaderScheme}:${ctVolumeName}` // VolumeId with loader id + volume id
 const ptVolumeName = 'PT_VOLUME_ID'
 const ptVolumeId = `${volumeLoaderScheme}:${ptVolumeName}`
+const ptVolumeId2 = `${volumeLoaderScheme}:${ptVolumeName}2`
 const ctToolGroupId = 'CT_TOOLGROUP_ID'
 const ptToolGroupId = 'PT_TOOLGROUP_ID'
 const fusionToolGroupId = 'FUSION_TOOLGROUP_ID'
@@ -416,8 +417,10 @@ export default {
       renderingEngineId: renderingEngineId,
       ctVolumeId: `${volumeLoaderScheme}:${ctVolumeName}`,
       ptVolumeId: `${volumeLoaderScheme}:${ptVolumeName}`,
+      ptVolumeId2: `${volumeLoaderScheme}:${ptVolumeName}2`,
       ctVolume: null,
       ptVolume: null,
+      ptVolume2: null,
       isReadingShowSubjectInfo: false,
       subjectCode: '',
       taskBlindName: '',
@@ -988,6 +991,9 @@ export default {
         this.ptVolume = await volumeLoader.createAndCacheVolume(ptVolumeId, {
           imageIds: ptImageIds
         })
+        this.ptVolume2 = await volumeLoader.createAndCacheVolume(ptVolumeId2, {
+          imageIds: ptImageIds
+        })
         // 重置计时器
         this.resetTimer()
       } catch (error) {
@@ -1495,7 +1501,7 @@ export default {
         renderingEngine,
         [
           {
-            volumeId: ptVolumeId,
+            volumeId: ptVolumeId2,
             callback: setPetColorMapTransferFunctionForVolumeActor
           },
           {

From 6f3ca769a675c057bf68fbb2f862875d24871ea4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 25 Dec 2025 15:38:29 +0800
Subject: [PATCH 197/333] =?UTF-8?q?=E8=A2=AB=E8=9E=8D=E5=90=88=E7=9A=84?=
 =?UTF-8?q?=E7=97=85=E7=81=B6=E7=8A=B6=E6=80=81=E4=B8=8D=E5=8F=AF=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IRecist/QuestionForm.vue          | 2 +-
 .../reading/dicoms/components/Recist/QuestionForm.vue           | 2 +-
 .../reading/dicoms/components/RecistBM/QuestionForm.vue         | 2 +-
 .../dicoms3D/components/Recist/TableQuestionFormItem.vue        | 2 +-
 .../dicoms3D/components/mRecist/TableQuestionFormItem.vue       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index c1badfd8..02db661e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -63,7 +63,7 @@
         <!-- 下拉框 -->
         <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
           :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && isFirstChangeTask) || (qs.QuestionMark === 8 && isFirstChangeTask)"
+          :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (answers.SplitOrMergeType === '3' || answers.SplitOrMergeType === '1')) || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && isFirstChangeTask) || (qs.QuestionMark === 8 && isFirstChangeTask)"
           @change="((val) => { formItemChange(val, qs) })">
           <template v-if="qs.QuestionMark === 8" #prefix>
             <span style="padding-left: 5px;">
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index 27e52181..c72b70c9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -44,7 +44,7 @@
         <template v-if="qs.Type === 'input' || qs.Type === 'number'">
           <div style="display: flex;justify-content: space-between;">
             <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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))"
+              :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (answers.SplitOrMergeType === '3' || answers.SplitOrMergeType === '1')) || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))"
               @change="((val) => { formItemChange(val, qs) })">
               <template v-if="(qs.QuestionMark === 0 || qs.QuestionMark === 1) && qs.Unit" slot="append">
                 {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index 9a44ca37..ac3df227 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -63,7 +63,7 @@
 
         <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
           :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $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) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
+          :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (answers.SplitOrMergeType === '3' || answers.SplitOrMergeType === '1')) || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
           @change="((val) => { formItemChange(val, qs) })">
           <template v-if="qs.QuestionMark === 8" #prefix>
             <span style="padding-left: 5px;">
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
index 8d2fb470..af1ce32f 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -58,7 +58,7 @@
       <!-- 下拉框 -->
       <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))"
+        :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (qsForm.SplitOrMergeType === '3' || qsForm.SplitOrMergeType === '1')) || (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;">
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
index 81d42831..3e05bae9 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
@@ -68,7 +68,7 @@
       <!-- 下拉框 -->
       <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)) || (qs.QuestionMark === 21 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName)) || (questionForm.LesionOrgan && questionForm.LesionOrgan !== '肝脏' && questionForm.LesionOrgan !== 'Liver' && qs.QuestionMark === 21)"
+        :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (qsForm.SplitOrMergeType === '3' || qsForm.SplitOrMergeType === '1')) || (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)) || (qs.QuestionMark === 21 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName)) || (questionForm.LesionOrgan && questionForm.LesionOrgan !== '肝脏' && questionForm.LesionOrgan !== 'Liver' && qs.QuestionMark === 21)"
         @change="((val) => { formItemChange(val, qs) })">
         <template v-if="qs.QuestionMark === 8" #prefix>
           <span style="padding-left: 5px;">

From 47594536f1d7b31697d710ba55802aa7f7fbce73 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 10:47:52 +0800
Subject: [PATCH 198/333] =?UTF-8?q?=E3=80=90=E5=8C=BB=E5=AD=A6=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E3=80=91=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=EF=BC=8C=E5=8C=85=E6=8B=AC=E8=AE=BF=E8=A7=86?=
 =?UTF-8?q?=E3=80=81=E8=A3=81=E5=88=A4=E3=80=81=E5=85=A8=E5=B1=80=E3=80=81?=
 =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mim-medical-audit/components/AdReview.vue | 236 ++++++------------
 .../components/GlobalReview.vue               | 211 ++++++----------
 .../components/OncologyReview.vue             | 127 +++-------
 .../components/VisitReview.vue                | 179 ++++++-------
 vue.config.js                                 |   4 +-
 5 files changed, 273 insertions(+), 484 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
index b524b547..5c8c26d1 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
@@ -1,82 +1,53 @@
 <template>
   <div class="ad_review_wrapper">
     <div style="text-align: left">
-      <el-button
-        v-if="auditInfo.IsExistsClinicalData"
-        type="text"
-        @click="previewCD"
-      >
+      <el-button v-if="auditInfo.IsExistsClinicalData" type="text" @click="previewCD">
         {{ $t("trials:adReview:title:clinicalData") }}
       </el-button>
     </div>
     <el-table :data="adInfo.VisitInfoList" style="width: 100%">
       <!-- 访视名称 -->
-      <el-table-column
-        prop="VisitName"
-        :label="$t('trials:adReview:table:visitName')"
-        show-overflow-tooltip
-        width="150"
-      />
+      <el-table-column prop="VisitName" :label="$t('trials:adReview:table:visitName')" show-overflow-tooltip
+        width="150" />
 
       <!-- 评估结果 -->
-      <el-table-column
-        v-for="j in judgeQuestion"
-        :key="j.armEnum"
-        :label="$fd('ArmEnum', j.armEnum)"
-        align="center"
-        prop=""
-        show-overflow-tooltip
-      >
+      <el-table-column v-for="j in judgeQuestion" :key="j.armEnum" :label="$fd('ArmEnum', j.armEnum)" align="center"
+        prop="" show-overflow-tooltip>
         <template>
-          <el-table-column
-            v-for="(qs, i) in j.judgeQuestionList"
-            :key="i"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, i) in j.judgeQuestionList" :key="i" prop="" :label="qs" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
-              <div
-                v-if="
+              <span v-if="
+                scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                  .QuestionType === 1
+              ">
+                <span v-if="
                   scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                    .QuestionType === 1
-                "
-              >
-                <span
-                  v-if="
+                    .DictionaryCode
+                ">{{
+                  $fd(
                     scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                      .DictionaryCode
-                  "
-                  >{{
-                    $fd(
-                      scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                        .DictionaryCode,
-                      parseInt(
-                        scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[
-                          i
-                        ].Answer
-                      )
+                      .DictionaryCode,
+                    parseInt(
+                      scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[
+                        i
+                      ].Answer
                     )
-                  }}</span
-                >
+                  )
+                }}</span>
                 <span v-else>{{
                   scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
                     .Answer
                 }}</span>
-              </div>
-              <div
-                v-else-if="
+              </span>
+              <span v-else-if="
+                scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                  .QuestionType === 2
+              ">
+                <div v-if="
                   scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                    .QuestionType === 2
-                "
-              >
-                <div
-                  v-if="
-                    scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                      .Answer
-                  "
-                >
+                    .Answer
+                ">
                   <span>{{
                     $fd(
                       "YesOrNo",
@@ -85,15 +56,11 @@
                     )
                   }}</span>
                   <!-- 查看详情 -->
-                  <el-button
-                    type="text"
-                    style="margin-left: 5px"
-                    @click="
-                      handleViewDetail(
-                        scope.row.VisitTaskInfoList[j.index].GlobalVisitTaskId
-                      )
-                    "
-                  >
+                  <el-button type="text" style="margin-left: 5px" @click="
+                    handleViewDetail(
+                      scope.row.VisitTaskInfoList[j.index].GlobalVisitTaskId
+                    )
+                    ">
                     {{ $t("trials:adReview:table:view") }}
                   </el-button>
                 </div>
@@ -107,115 +74,70 @@
                     )
                   }}
                 </div>
-              </div>
-              <div v-else>
+              </span>
+              <span v-else>
                 {{
                   scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
                     .Answer
                 }}
-              </div>
+              </span>
+              <span>
+                {{
+                  scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].ValueType == 2 ? '%' :
+                    scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].CustomUnit ?
+                      scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].CustomUnit :
+                      scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit ? $fd("Unit",
+                        scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit) : ''
+                }}
+              </span>
             </template>
           </el-table-column>
         </template>
       </el-table-column>
       <!-- 查看详情 -->
-      <el-table-column
-        :label="$t('trials:adReview:table:view')"
-        width="200"
-        :fixed="isFixed ? 'right' : false"
-      >
+      <el-table-column :label="$t('trials:adReview:table:view')" width="200" :fixed="isFixed ? 'right' : false">
         <template slot-scope="scope">
           <!-- 查看R1详情 -->
-          <el-button
-            type="text"
-            :title="$t('trials:adReview:table:viewR1')"
-            @click="handleView(scope.row, 1)"
-          >
+          <el-button type="text" :title="$t('trials:adReview:table:viewR1')" @click="handleView(scope.row, 1)">
             R1
           </el-button>
           <!-- 查看R2详情 -->
-          <el-button
-            type="text"
-            :title="$t('trials:adReview:table:viewR2')"
-            @click="handleView(scope.row, 2)"
-          >
+          <el-button type="text" :title="$t('trials:adReview:table:viewR2')" @click="handleView(scope.row, 2)">
             R2
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <h3>{{ $t("trials:adReview:title:adResult") }}</h3>
-    <el-form
-      ref="adForm"
-      :model="adForm"
-      style="width: 800px"
-      label-width="100"
-    >
+    <el-form ref="adForm" :model="adForm" style="width: 800px" label-width="100">
       <!-- 选择阅片人 -->
-      <el-form-item
-        :label="$t('trials:adReview:title:choseReader')"
-        prop="judgeResultTaskId"
-      >
+      <el-form-item :label="$t('trials:adReview:title:choseReader')" prop="judgeResultTaskId">
         <el-radio-group v-model="adForm.judgeResultTaskId" disabled>
-          <el-radio
-            v-for="t in visitTaskArmList"
-            :key="t.VisitTaskId"
-            :label="t.VisitTaskId"
-          >
+          <el-radio v-for="t in visitTaskArmList" :key="t.VisitTaskId" :label="t.VisitTaskId">
             {{ $fd("ArmEnum", t.ArmEnum) }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 裁判原因 -->
-      <el-form-item
-        :label="$t('trials:adReview:title:adReason')"
-        prop="judgeResultRemark"
-      >
-        <el-input
-          v-model="adForm.judgeResultRemark"
-          type="textarea"
-          :autosize="{ minRows: 4, maxRows: 6 }"
-          disabled
-        />
+      <el-form-item :label="$t('trials:adReview:title:adReason')" prop="judgeResultRemark">
+        <el-input v-model="adForm.judgeResultRemark" type="textarea" :autosize="{ minRows: 4, maxRows: 6 }" disabled />
       </el-form-item>
       <!-- 截图说明 -->
       <el-form-item :label="$t('trials:adReview:title:screenShot')">
-        <el-upload
-          action=".png,.jpg,.jpeg"
-          list-type="picture-card"
-          :file-list="fileList"
-          disabled
-          class="disabled"
-        >
+        <el-upload action=".png,.jpg,.jpeg" list-type="picture-card" :file-list="fileList" disabled class="disabled">
           <i slot="default" class="el-icon-plus" />
-          <div
-            slot="file"
-            slot-scope="{ file }"
-            style="width: 100%; height: 100%"
-          >
-            <viewer
-              :ref="file.url"
-              :images="images"
-              style="
+          <div slot="file" slot-scope="{ file }" style="width: 100%; height: 100%">
+            <viewer :ref="file.url" :images="images" style="
                 display: flex;
                 align-items: center;
                 justify-content: center;
                 width: 100%;
                 height: 100%;
-              "
-            >
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="OSSclientConfig.basePath + file.url"
-                alt=""
-                crossorigin="anonymous"
-                style="max-width: 100%; max-height: 100%"
-              />
+              ">
+              <img class="el-upload-list__item-thumbnail" :src="OSSclientConfig.basePath + file.url" alt=""
+                crossorigin="anonymous" style="max-width: 100%; max-height: 100%" />
               <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
+                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                   <i class="el-icon-zoom-in" />
                 </span>
               </span>
@@ -329,17 +251,13 @@ export default {
 
       var path = "";
       if (readingTool === 0 || readingTool === 2) {
-        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
-          this.rowData.SubjectCode
-        }&subjectId=${
-          this.rowData.SubjectId
-        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode
+          }&subjectId=${this.rowData.SubjectId
+          }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
       } else {
-        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
-          this.rowData.SubjectCode
-        }&subjectId=${
-          this.rowData.SubjectId
-        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode
+          }&subjectId=${this.rowData.SubjectId
+          }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
       }
       var routeData = this.$router.resolve({ path });
       window.open(routeData.href, "_blank");
@@ -356,17 +274,13 @@ export default {
 
       var path = "";
       if (readingTool === 0 || readingTool === 2) {
-        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
-          this.rowData.SubjectCode
-        }&subjectId=${this.rowData.SubjectId}&visitTaskId=${
-          task.VisitTaskId
-        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode
+          }&subjectId=${this.rowData.SubjectId}&visitTaskId=${task.VisitTaskId
+          }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
       } else {
-        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
-          this.rowData.SubjectCode
-        }&subjectId=${this.rowData.SubjectId}&visitTaskId=${
-          task.VisitTaskId
-        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode
+          }&subjectId=${this.rowData.SubjectId}&visitTaskId=${task.VisitTaskId
+          }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
       }
       var routeData = this.$router.resolve({ path });
       window.open(routeData.href, "_blank");
@@ -389,9 +303,11 @@ export default {
       display: none;
     }
   }
+
   ::v-deep .el-upload-list__item {
     transition: none !important;
   }
+
   ::v-deep .el-upload-list__item-thumbnail {
     /* 图片在方框内显示长边 */
     object-fit: scale-down !important;
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index 01ee9a75..fe3cca3b 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -5,54 +5,50 @@
       <el-button v-if="auditInfo.IsExistsClinicalData" type="text" @click="previewCD">
         {{ $t('trials:adReview:title:clinicalData') }}
       </el-button>
-      <el-button v-if="auditInfo.GlobalInfo.OtherGlobalTaskId" type="text" @click="handleView(auditInfo.GlobalInfo.OtherGlobalTaskId)">{{ $t('trials:medicalFeedback:title:otherReader') }}</el-button>
+      <el-button v-if="auditInfo.GlobalInfo.OtherGlobalTaskId" type="text"
+        @click="handleView(auditInfo.GlobalInfo.OtherGlobalTaskId)">{{ $t('trials:medicalFeedback:title:otherReader')
+        }}</el-button>
 
       <!-- 关联裁判任务 -->
-      <el-button v-if="auditInfo.GlobalInfo.JudgeTaskName" type="text" @click="handleView(auditInfo.GlobalInfo.JudgeTaskId)">{{ auditInfo.GlobalInfo.JudgeTaskName }}</el-button>
+      <el-button v-if="auditInfo.GlobalInfo.JudgeTaskName" type="text"
+        @click="handleView(auditInfo.GlobalInfo.JudgeTaskId)">{{ auditInfo.GlobalInfo.JudgeTaskName }}</el-button>
     </div>
 
-    <el-table
-      v-if="rowData.CriterionType === 10"
-      :data="taskList"
-    >
-      <el-table-column
-        prop="BlindName"
-        :label="$t('trials:medicalFeedback:table:taskBlindName')"
-        show-overflow-tooltip
-        width="150"
-      >
+    <el-table v-if="rowData.CriterionType === 10" :data="taskList">
+      <el-table-column prop="BlindName" :label="$t('trials:medicalFeedback:table:taskBlindName')" show-overflow-tooltip
+        width="150">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleView(scope.row.VisitTaskId)"
-          >
+          <el-button type="text" @click="handleView(scope.row.VisitTaskId)">
             {{ scope.row.BlindName }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 访视点计数 -->
-      <el-table-column
-        :label="$t('trials:medicalFeedback:table:visitPointCount')"
-        align="center"
-        prop=""
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:medicalFeedback:table:visitPointCount')" align="center" prop=""
+        show-overflow-tooltip>
         <template>
-          <el-table-column
-            v-for="(qs,index) in evaluationQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs"
+            show-overflow-tooltip width="150">
             <template slot-scope="scope">
-              <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer">
+              <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.BeforeQuestionList[index].DictionaryCode,
+                      parseInt(scope.row.BeforeQuestionList[index].Answer))
+                  }}
                 </span>
-                <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{ scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:medicalFeedback:table:unKnow') : scope.row.BeforeQuestionList[index].Answer }}</span>
+                <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{
+                  scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:medicalFeedback:table:unKnow') :
+                    scope.row.BeforeQuestionList[index].Answer }}</span>
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
+                <span>
+                  {{
+                    scope.row.BeforeQuestionList[index].ValueType == 2 ? '%' :
+                      scope.row.BeforeQuestionList[index].CustomUnit ?
+                        scope.row.BeforeQuestionList[index].CustomUnit :
+                        scope.row.BeforeQuestionList[index].Unit ? $fd("Unit", scope.row.BeforeQuestionList[index].Unit) : ''
+                  }}
+                </span>
               </div>
             </template>
           </el-table-column>
@@ -60,48 +56,36 @@
       </el-table-column>
 
       <!-- 是否同意访视结果 -->
-      <el-table-column
-        v-for="(qs, index) in agreeOrNotList"
-        :key="index"
-        prop=""
-        :label="$t('trials:medicalFeedback:table:agreeToVisitPointCount')"
-        show-overflow-tooltip
-        width="170"
-      >
+      <el-table-column v-for="(qs, index) in agreeOrNotList" :key="index" prop=""
+        :label="$t('trials:medicalFeedback:table:agreeToVisitPointCount')" show-overflow-tooltip width="170">
         <template slot-scope="scope">
           <el-tag v-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 1" type="primary">
-            {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}
+            {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}
           </el-tag>
-          <el-tag v-else-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
+          <el-tag v-else-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{
+            $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
           <span v-else />
         </template>
       </el-table-column>
 
       <!-- 评估结果 -->
-      <el-table-column
-        :label="$t('trials:medicalFeedback:table:assessmentResults')"
-        align="center"
-        prop=""
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:medicalFeedback:table:assessmentResults')" align="center" prop=""
+        show-overflow-tooltip>
         <template>
-          <el-table-column
-            v-for="(qs,index) in adjustedQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in adjustedQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
               <!-- {{ scope.row.AfterQuestionList.length>index?scope.row.AfterQuestionList[index].Answer:'' }} -->
-              <div v-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-if="scope.row.AfterQuestionList.length > index && scope.row.AfterQuestionList[index].Answer">
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.AfterQuestionList[index].DictionaryCode,
+                      parseInt(scope.row.AfterQuestionList[index].Answer))
+                  }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
               </div>
@@ -110,60 +94,36 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('common:action:action')"
-        width="100"
-      >
+      <el-table-column :label="$t('common:action:action')" width="100">
         <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:medicalFeedback:table:view')"
-            icon="el-icon-view"
-            @click="handleView(scope.row.VisitTaskId)"
-          />
+          <el-button circle :title="$t('trials:medicalFeedback:table:view')" icon="el-icon-view"
+            @click="handleView(scope.row.VisitTaskId)" />
         </template>
       </el-table-column>
     </el-table>
 
-    <el-table
-      v-else
-      :data="taskList"
-    >
+    <el-table v-else :data="taskList">
       <!-- 访视名称 -->
-      <el-table-column
-        prop="BlindName"
-        :label="$t('trials:globalReview:table:visitName')"
-        show-overflow-tooltip
-        width="150"
-      >
+      <el-table-column prop="BlindName" :label="$t('trials:globalReview:table:visitName')" show-overflow-tooltip
+        width="150">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleView(scope.row.VisitTaskId)"
-          >
+          <el-button type="text" @click="handleView(scope.row.VisitTaskId)">
             {{ scope.row.BlindName }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 评估结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:evaluationRes')"
-        align="center"
-        prop=""
-      >
+      <el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
         <template>
-          <el-table-column
-            v-for="(qs,index) in evaluationQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs"
+            show-overflow-tooltip width="150">
             <template slot-scope="scope">
-              <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer">
+              <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.BeforeQuestionList[index].DictionaryCode,
+                      parseInt(scope.row.BeforeQuestionList[index].Answer))
+                  }}
                 </span>
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
               </div>
@@ -172,46 +132,34 @@
         </template>
       </el-table-column>
       <!-- 是否同意访视结果 -->
-      <el-table-column
-        v-for="(qs,index) in agreeOrNotList"
-        :key="index"
-        prop=""
-        :label="$t('trials:globalReview:table:isAgreeEvaluationRes')"
-        show-overflow-tooltip
-        width="170"
-      >
+      <el-table-column v-for="(qs, index) in agreeOrNotList" :key="index" prop=""
+        :label="$t('trials:globalReview:table:isAgreeEvaluationRes')" show-overflow-tooltip width="170">
         <template slot-scope="scope">
           <el-tag v-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 1" type="primary">
-            {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}
+            {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}
           </el-tag>
-          <el-tag v-else-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
+          <el-tag v-else-if="parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{
+            $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
           <span v-else />
         </template>
       </el-table-column>
 
       <!-- 调整后结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:adjustedRes')"
-        align="center"
-        prop=""
-      >
+      <el-table-column :label="$t('trials:globalReview:table:adjustedRes')" align="center" prop="">
         <template>
-          <el-table-column
-            v-for="(qs,index) in adjustedQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in adjustedQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
-              <div v-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-if="scope.row.AfterQuestionList.length > index && scope.row.AfterQuestionList[index].Answer">
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.AfterQuestionList[index].DictionaryCode,
+                      parseInt(scope.row.AfterQuestionList[index].Answer))
+                  }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
               </div>
@@ -220,18 +168,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('common:action:action')"
-        width="120"
-        :fixed="adjustedQsList.length > 4 ? 'right' : false"
-      >
+      <el-table-column :label="$t('common:action:action')" width="120"
+        :fixed="adjustedQsList.length > 4 ? 'right' : false">
         <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:globalReview:table:view')"
-            icon="el-icon-view"
-            @click="handleView(scope.row.VisitTaskId)"
-          />
+          <el-button circle :title="$t('trials:globalReview:table:view')" icon="el-icon-view"
+            @click="handleView(scope.row.VisitTaskId)" />
         </template>
       </el-table-column>
     </el-table>
@@ -320,7 +261,7 @@ export default {
       var isReadingTaskViewInOrder = this.rowData.IsReadingTaskViewInOrder
       var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0 || readingTool === 2 ) {
+      if (readingTool === 0 || readingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
index fc9c4af4..bcc1f7dc 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
@@ -5,109 +5,65 @@
         {{ $t('trials:adReview:title:clinicalData') }}
       </el-button>
     </div>
-    <el-table
-      :data="oncologyInfo.OncologyVisits"
-      style="width: 100%"
-    >
+    <el-table :data="oncologyInfo.OncologyVisits" style="width: 100%">
       <!-- 访视名称 -->
-      <el-table-column
-        prop="VisitName"
-        :label="$t('trials:oncologyReview:title:visitName')"
-        show-overflow-tooltip
-        width="150"
-      />
+      <el-table-column prop="VisitName" :label="$t('trials:oncologyReview:title:visitName')" show-overflow-tooltip
+        width="150" />
       <!-- 影像学阅片结果 -->
-      <el-table-column
-        :label="$t('trials:oncologyReview:title:readingRes')"
-        align="center"
-        prop=""
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:oncologyReview:title:readingRes')" align="center" prop=""
+        show-overflow-tooltip>
         <template>
-          <el-table-column
-            v-for="(qs,index) in questionCols"
-            :key="qs"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in questionCols" :key="qs" prop="" :label="qs" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
               <span v-if="scope.row.QuestionList[index].DictionaryCode">
-                {{ $fd(scope.row.QuestionList[index].DictionaryCode,parseInt(scope.row.QuestionList[index].Answer)) }}
+                {{ $fd(scope.row.QuestionList[index].DictionaryCode, parseInt(scope.row.QuestionList[index].Answer))
+                }}
               </span>
               <span v-else>
-                {{ scope.row.QuestionList.length>index?scope.row.QuestionList[index].Answer:'' }}
+                {{ scope.row.QuestionList.length > index ? scope.row.QuestionList[index].Answer : '' }}
+              </span>
+              <span>
+                {{
+                  scope.row.QuestionList[index].ValueType == 2 ? '%' : scope.row.QuestionList[index].CustomUnit ?
+                    scope.row.QuestionList[index].CustomUnit :
+                    scope.row.QuestionList[index].Unit ? $fd("Unit", scope.row.QuestionList[index].Unit) : ''
+                }}
               </span>
-
             </template>
           </el-table-column>
           <!-- 全局是否有更新 -->
-          <el-table-column
-            v-if="oncologyInfo.IsShowDetail"
-            prop="IsHaveChange"
-            :label="$t('trials:oncologyReview:title:isGlobalUpdate')"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-if="oncologyInfo.IsShowDetail" prop="IsHaveChange"
+            :label="$t('trials:oncologyReview:title:isGlobalUpdate')" show-overflow-tooltip width="150">
             <template slot-scope="scope">
-              <span>{{ $fd('YesOrNo', scope.row.IsHaveChange ) }}</span>
+              <span>{{ $fd('YesOrNo', scope.row.IsHaveChange) }}</span>
               <!-- 查看详情 -->
-              <el-button
-                v-if="scope.row.IsHaveChange && !!oncologyInfo.GlobalTaskId"
-                type="text"
-                style="margin-left:5px;"
-                @click="handleViewDetail(oncologyInfo.GlobalTaskId)"
-              >
+              <el-button v-if="scope.row.IsHaveChange && !!oncologyInfo.GlobalTaskId" type="text"
+                style="margin-left:5px;" @click="handleViewDetail(oncologyInfo.GlobalTaskId)">
                 {{ $t('trials:oncologyReview:title:view') }}
               </el-button>
             </template>
           </el-table-column>
           <!-- 访视点注释 -->
-          <el-table-column
-            v-if="oncologyInfo.IsShowDetail"
-            prop="VisitRemark"
-            :label="$t('trials:oncologyReview:title:visitRemark')"
-            show-overflow-tooltip
-            width="150"
-          />
+          <el-table-column v-if="oncologyInfo.IsShowDetail" prop="VisitRemark"
+            :label="$t('trials:oncologyReview:title:visitRemark')" show-overflow-tooltip width="150" />
         </template>
       </el-table-column>
       <!-- 肿瘤学阅片结果 -->
-      <el-table-column
-        :label="$t('trials:oncologyReview:title:oReviewRes')"
-        align="center"
-        prop=""
-      >
+      <el-table-column :label="$t('trials:oncologyReview:title:oReviewRes')" align="center" prop="">
         <template>
           <!-- 结论 -->
-          <el-table-column
-            prop="EvaluationResult"
-            :label="$t('trials:oncologyReview:title:findings')"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column prop="EvaluationResult" :label="$t('trials:oncologyReview:title:findings')"
+            show-overflow-tooltip width="150">
             <template slot-scope="scope">
-              <el-select
-                v-if="oncologyInfo.ReadingTaskState < 2"
-                v-model="scope.row.EvaluationResult"
-                :placeholder="$t('common:ruleMessage:select')"
-              >
-                <el-option
-                  v-for="item in assessTypeList"
-                  :key="item.Id"
-                  :label="item.Value"
-                  :value="item.Code"
-                />
+              <el-select v-if="oncologyInfo.ReadingTaskState < 2" v-model="scope.row.EvaluationResult"
+                :placeholder="$t('common:ruleMessage:select')">
+                <el-option v-for="item in assessTypeList" :key="item.Id" :label="item.Value" :value="item.Code" />
               </el-select>
               <span v-else>{{ getAssessType(scope.row.EvaluationResult) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="EvaluationReason"
-            show-overflow-tooltip
-            width="250"
-          >
+          <el-table-column prop="EvaluationReason" show-overflow-tooltip width="250">
             <template slot="header">
               <el-tooltip placement="top">
 
@@ -123,29 +79,18 @@
               </el-tooltip>
             </template>
             <template slot-scope="scope">
-              <el-input
-                v-if="oncologyInfo.ReadingTaskState < 2"
-                v-model="scope.row.EvaluationReason"
-              />
+              <el-input v-if="oncologyInfo.ReadingTaskState < 2" v-model="scope.row.EvaluationReason" />
               <span v-else>{{ scope.row.EvaluationReason }}</span>
             </template>
           </el-table-column>
         </template>
       </el-table-column>
 
-      <el-table-column
-        v-if="oncologyInfo.IsShowDetail"
-        :label="$t('common:action:action')"
-        width="120"
-      >
+      <el-table-column v-if="oncologyInfo.IsShowDetail" :label="$t('common:action:action')" width="120">
         <template slot-scope="scope">
           <!-- 查看详情 -->
-          <el-button
-            circle
-            :title="$t('trials:oncologyReview:title:view')"
-            icon="el-icon-view"
-            @click="handleViewDetail(scope.row.VisitTaskId)"
-          />
+          <el-button circle :title="$t('trials:oncologyReview:title:view')" icon="el-icon-view"
+            @click="handleViewDetail(scope.row.VisitTaskId)" />
         </template>
       </el-table-column>
     </el-table>
@@ -201,7 +146,7 @@ export default {
       var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
       var path = ''
 
-      if (readingTool === 0 || readingTool === 2 ) {
+      if (readingTool === 0 || readingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
index b1c0359e..e002c690 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
@@ -1,48 +1,42 @@
 <template>
-  <el-table
-    ref="taskTbl"
-    :data="taskList"
-    :row-class-name="rowClass"
-    class="historicAssess_wrapper"
-  >
+  <el-table ref="taskTbl" :data="taskList" :row-class-name="rowClass" class="historicAssess_wrapper">
     <!-- 访视/阅片期名称 -->
-    <el-table-column
-      prop="VisitTaskNum"
-      :label="$t('trials:medicalFeedback:table:taskName')"
-      width="200"
-      sortable="custom"
-      show-overflow-tooltip
-    >
+    <el-table-column prop="VisitTaskNum" :label="$t('trials:medicalFeedback:table:taskName')" width="200"
+      sortable="custom" show-overflow-tooltip>
       <template slot-scope="scope">
         {{ scope.row.TaskName }}
       </template>
     </el-table-column>
     <!-- 盲态任务标识 -->
-    <el-table-column
-      prop="TaskBlindName"
-      :label="$t('trials:medicalFeedback:table:taskBlindName')"
-      width="200"
-      sortable="custom"
-      show-overflow-tooltip
-    />
+    <el-table-column prop="TaskBlindName" :label="$t('trials:medicalFeedback:table:taskBlindName')" width="200"
+      sortable="custom" show-overflow-tooltip />
 
     <template v-if="judgeQuestion && judgeQuestion.length > 0">
-      <el-table-column
-        v-for="(qs,index) in judgeQuestion"
-        :key="qs"
-        prop=""
-        :label="qs"
-        show-overflow-tooltip
-        width="150"
-      >
+      <el-table-column v-for="(qs, index) in judgeQuestion" :key="qs" prop="" :label="qs" show-overflow-tooltip
+        width="150">
         <template slot-scope="scope">
-          <span v-if="scope.row.JudgeQuestionAnswerInfoList[index] && scope.row.JudgeQuestionAnswerInfoList[index].QuestionGenre === 3 && scope.row.JudgeQuestionAnswerInfoList[index].DictionaryCode">
-            {{ scope.row.JudgeQuestionAnswerInfoList[index].Answer?$fd(scope.row.JudgeQuestionAnswerInfoList[index].DictionaryCode,parseInt(scope.row.JudgeQuestionAnswerInfoList[index].Answer)):'' }}
+          <span
+            v-if="scope.row.JudgeQuestionAnswerInfoList[index] && scope.row.JudgeQuestionAnswerInfoList[index].QuestionGenre === 3 && scope.row.JudgeQuestionAnswerInfoList[index].DictionaryCode">
+            {{
+              scope.row.JudgeQuestionAnswerInfoList[index].Answer ?
+                $fd(scope.row.JudgeQuestionAnswerInfoList[index].DictionaryCode,
+                  parseInt(scope.row.JudgeQuestionAnswerInfoList[index].Answer)):''
+            }}
           </span>
           <span v-else>
-            {{ scope.row.JudgeQuestionAnswerInfoList.length>index?scope.row.JudgeQuestionAnswerInfoList[index].Answer:'' }}
+            {{ scope.row.JudgeQuestionAnswerInfoList.length > index ?
+              scope.row.JudgeQuestionAnswerInfoList[index].Answer : ''
+            }}
+          </span>
+          <span>
+            {{
+              scope.row.JudgeQuestionAnswerInfoList[index].ValueType == 2 ? '%' :
+                scope.row.JudgeQuestionAnswerInfoList[index].CustomUnit ?
+                  scope.row.JudgeQuestionAnswerInfoList[index].CustomUnit :
+                  scope.row.JudgeQuestionAnswerInfoList[index].Unit ? $fd("Unit",
+                    scope.row.JudgeQuestionAnswerInfoList[index].Unit) : ''
+            }}
           </span>
-
         </template>
       </el-table-column>
     </template>
@@ -59,73 +53,65 @@
       </template>
     </el-table-column> -->
     <!-- 当前阅片人 -->
-    <el-table-column
-      prop="ArmEnum"
-      :label="$t('trials:medicalFeedback:title:currentReader')"
-      show-overflow-tooltip
-      width="120"
-    >
+    <el-table-column prop="ArmEnum" :label="$t('trials:medicalFeedback:title:currentReader')" show-overflow-tooltip
+      width="120">
       <template slot-scope="scope">
-        <el-button
-          v-if="scope.row.TaskId"
-          type="text"
-          @click="handleView(scope.row,scope.row.TaskId)"
-        >
+        <el-button v-if="scope.row.TaskId" type="text" @click="handleView(scope.row, scope.row.TaskId)">
           {{ $fd('ArmEnum', scope.row.ArmEnum) }}
         </el-button>
       </template>
     </el-table-column>
     <!-- 关联阅片人 -->
-<!--    <el-table-column-->
-<!--      prop="OtherArmEnum"-->
-<!--      :label="$t('trials:medicalFeedback:title:otherReader')"-->
-<!--      show-overflow-tooltip-->
-<!--      width="100"-->
-<!--    >-->
-<!--      <template slot-scope="scope">-->
-<!--        <el-button-->
-<!--          v-if="scope.row.OtherTaskId"-->
-<!--          type="text"-->
-<!--          @click="handleView(scope.row,scope.row.OtherTaskId)"-->
-<!--        >-->
-<!--          {{ $fd('ArmEnum', scope.row.OtherArmEnum) }}-->
-<!--        </el-button>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    &lt;!&ndash; 关联全局任务 &ndash;&gt;-->
-<!--    <el-table-column-->
-<!--      prop="GlobalTaskName"-->
-<!--      :label="$t('trials:medicalFeedback:title:relatedGlobalTask')"-->
-<!--      show-overflow-tooltip-->
-<!--      width="120"-->
-<!--    >-->
-<!--      <template slot-scope="scope">-->
-<!--        <el-button-->
-<!--          v-if="scope.row.GlobalTaskId"-->
-<!--          type="text"-->
-<!--          @click="handleView(scope.row,scope.row.GlobalTaskId)"-->
-<!--        >-->
-<!--          {{ scope.row.GlobalTaskName }}-->
-<!--        </el-button>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    &lt;!&ndash; 关联裁判任务 &ndash;&gt;-->
-<!--    <el-table-column-->
-<!--      prop="JudgeTaskName"-->
-<!--      :label="$t('trials:medicalFeedback:title:relatedadjudicationTask')"-->
-<!--      show-overflow-tooltip-->
-<!--      width="120"-->
-<!--    >-->
-<!--      <template slot-scope="scope">-->
-<!--        <el-button-->
-<!--          v-if="scope.row.JudgeTaskId"-->
-<!--          type="text"-->
-<!--          @click="handleView(scope.row,scope.row.JudgeTaskId)"-->
-<!--        >-->
-<!--          {{ scope.row.JudgeTaskName }}-->
-<!--        </el-button>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
+    <!--    <el-table-column-->
+    <!--      prop="OtherArmEnum"-->
+    <!--      :label="$t('trials:medicalFeedback:title:otherReader')"-->
+    <!--      show-overflow-tooltip-->
+    <!--      width="100"-->
+    <!--    >-->
+    <!--      <template slot-scope="scope">-->
+    <!--        <el-button-->
+    <!--          v-if="scope.row.OtherTaskId"-->
+    <!--          type="text"-->
+    <!--          @click="handleView(scope.row,scope.row.OtherTaskId)"-->
+    <!--        >-->
+    <!--          {{ $fd('ArmEnum', scope.row.OtherArmEnum) }}-->
+    <!--        </el-button>-->
+    <!--      </template>-->
+    <!--    </el-table-column>-->
+    <!--    &lt;!&ndash; 关联全局任务 &ndash;&gt;-->
+    <!--    <el-table-column-->
+    <!--      prop="GlobalTaskName"-->
+    <!--      :label="$t('trials:medicalFeedback:title:relatedGlobalTask')"-->
+    <!--      show-overflow-tooltip-->
+    <!--      width="120"-->
+    <!--    >-->
+    <!--      <template slot-scope="scope">-->
+    <!--        <el-button-->
+    <!--          v-if="scope.row.GlobalTaskId"-->
+    <!--          type="text"-->
+    <!--          @click="handleView(scope.row,scope.row.GlobalTaskId)"-->
+    <!--        >-->
+    <!--          {{ scope.row.GlobalTaskName }}-->
+    <!--        </el-button>-->
+    <!--      </template>-->
+    <!--    </el-table-column>-->
+    <!--    &lt;!&ndash; 关联裁判任务 &ndash;&gt;-->
+    <!--    <el-table-column-->
+    <!--      prop="JudgeTaskName"-->
+    <!--      :label="$t('trials:medicalFeedback:title:relatedadjudicationTask')"-->
+    <!--      show-overflow-tooltip-->
+    <!--      width="120"-->
+    <!--    >-->
+    <!--      <template slot-scope="scope">-->
+    <!--        <el-button-->
+    <!--          v-if="scope.row.JudgeTaskId"-->
+    <!--          type="text"-->
+    <!--          @click="handleView(scope.row,scope.row.JudgeTaskId)"-->
+    <!--        >-->
+    <!--          {{ scope.row.JudgeTaskName }}-->
+    <!--        </el-button>-->
+    <!--      </template>-->
+    <!--    </el-table-column>-->
   </el-table>
 </template>
 <script>
@@ -178,7 +164,7 @@ export default {
       var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
       var path = ''
 
-      if (readingTool === 0 || readingTool === 2 ) {
+      if (readingTool === 0 || readingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
@@ -195,11 +181,12 @@ export default {
 }
 </script>
 <style lang="scss">
-.historicAssess_wrapper{
-  .highlight_row{
+.historicAssess_wrapper {
+  .highlight_row {
     color: #000;
     background-color: #ffde7b;
   }
+
   .highlight_row:hover>td {
     background-color: #ffde7b !important;
   }
diff --git a/vue.config.js b/vue.config.js
index 3a8a38f0..dd4a5f12 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,8 +52,8 @@ module.exports = defineConfig({
       },
 
       '/api': {
-        target: 'http://106.14.89.110:30000',
-        // target: 'http://101.132.253.119:7010', // uat 
+        // target: 'http://106.14.89.110:30000',
+        target: 'http://101.132.253.119:7010', // uat 
         changeOrigin: true,
         secure: false,
         pathRewrite: {

From cce6122e9e04f7ad417405be00ff53348fb4e4ef Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 13:10:47 +0800
Subject: [PATCH 199/333] =?UTF-8?q?=E5=B7=B2=E8=9E=8D=E5=90=88=E7=9A=84?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1=E7=9A=84=E7=97=85=E7=81=B6=E4=B8=8D=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E7=94=BB=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IRecist/QuestionList.vue    | 3 ++-
 .../reading/dicoms/components/Lugano/QuestionList.vue     | 2 +-
 .../dicoms/components/LuganoWithoutPET/QuestionList.vue   | 2 +-
 .../reading/dicoms/components/Recist/QuestionList.vue     | 5 +++--
 .../reading/dicoms/components/RecistBM/QuestionList.vue   | 3 ++-
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue | 4 ++--
 .../reading/dicoms3D/components/Recist/QuestionList.vue   | 8 ++++++++
 .../reading/dicoms3D/components/mRecist/QuestionList.vue  | 8 ++++++++
 8 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index 09d877a4..91ee976d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -985,7 +985,8 @@ export default {
         this.$nextTick(() => {
           const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
           if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
-            var markTool = this.$refs[refName][0].currentMarkTool
+            var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType
+            var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : ''
             var readingTaskState = this.readingTaskState
             var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
             var obj = { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index fb7f527a..1e8876ba 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -976,7 +976,7 @@ export default {
           const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
           if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
             var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType
-            var markTool = splitOrMergeType !== '3' ? this.$refs[refName][0].currentMarkTool : ''
+            var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : ''
             var readingTaskState = this.readingTaskState
             var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
             DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
index 15b65e75..b62cdbc2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
@@ -974,7 +974,7 @@ export default {
           const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
           if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
             var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType
-            var markTool = splitOrMergeType !== '3' ? this.$refs[refName][0].currentMarkTool : ''
+            var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : ''
             var readingTaskState = this.readingTaskState
             var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
             DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index f5d1f6ac..b73324de 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -128,7 +128,7 @@
                         style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2&& item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
+                          v-show="readingTaskState < 2 && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
                           class="item" :content="$t('trials:reading:button:split')" placement="left">
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
@@ -882,7 +882,8 @@ export default {
         this.$nextTick(() => {
           const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
           if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
-            var markTool = this.$refs[refName][0].currentMarkTool
+            var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType
+            var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : ''
             var readingTaskState = this.readingTaskState
             var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
             DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index 5ca55c5a..c73f9f29 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -841,7 +841,8 @@ export default {
         this.$nextTick(() => {
           const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
           if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
-            var markTool = this.$refs[refName][0].currentMarkTool
+            var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType
+            var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : ''
             var readingTaskState = this.readingTaskState
             var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
             DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked })
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 e4ecaaa3..63f926ed 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2969,7 +2969,7 @@ export default {
             firstAddSeries = currentAddSeries
           } else if (Object.keys(firstAddSeries).length === 0 && Object.keys(currentAddSeries).length === 0) {
             this.setToolsPassive()
-            if (obj.isActiveTarget) {
+            if (obj.isActiveTarget && obj.SplitOrMergeType !== '1' && obj.SplitOrMergeType !== '3') {
               this.setToolToTarget(obj)
             }
             resolve()
@@ -3005,7 +3005,7 @@ export default {
           }
         }
         this.setToolsPassive()
-        if (obj.isActiveTarget) {
+        if (obj.isActiveTarget && obj.SplitOrMergeType !== '1' && obj.SplitOrMergeType !== '3') {
           this.setToolToTarget(obj)
         }
 
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
index 64fa95e7..146a68e1 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -1540,6 +1540,7 @@ export default {
       obj.lesionName = innerForm.LesionName
       obj.markTool = innerForm.MarkTool ? innerForm.MarkTool : ''
       obj.isMarked = !!innerForm.MeasureData
+      obj.SplitOrMergeType = innerForm.SplitOrMergeType
       if (this.visitTaskId === this.taskInfo.VisitTaskId) {
         obj.isActiveTarget = true
       }
@@ -1550,6 +1551,7 @@ export default {
       if (!innerForm.MeasureData) return
       const obj = Object.assign({ visitTaskId: this.visitTaskId }, innerForm.MeasureData)
       obj.lesionName = innerForm.LesionName
+      obj.SplitOrMergeType = innerForm.SplitOrMergeType
       this.$emit('imageLocation', obj)
       e.stopImmediatePropagation()
       e.stopPropagation()
@@ -1862,6 +1864,9 @@ export default {
           const tableId = this.activeName.split('_')[0]
           const rowIndex = this.activeName.split('_')[1]
           const innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+          if (innerForm.SplitOrMergeType === '1' || innerForm.SplitOrMergeType === '3') {
+            return { isCanActiveTool: false, reason: '' }
+          }
           if (!innerForm.MeasureData) {
             return this.checkToolCanActive(toolName)
           } else {
@@ -1897,6 +1902,9 @@ export default {
       const rowIndex = this.activeName.split('_')[1]
       const innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
       const isLymphNodes = innerForm.IsLymphNodes
+      if (innerForm.SplitOrMergeType === '1' || innerForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!innerForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (innerForm.LesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
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
index 8fe5179d..dc9a8aff 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -1636,6 +1636,7 @@ export default {
       obj.lesionName = innerForm.LesionName
       obj.markTool = innerForm.MarkTool ? innerForm.MarkTool : ''
       obj.isMarked = !!innerForm.MeasureData
+      obj.SplitOrMergeType = innerForm.SplitOrMergeType
       if (this.visitTaskId === this.taskInfo.VisitTaskId) {
         obj.isActiveTarget = true
       }
@@ -1646,6 +1647,7 @@ export default {
       if (!innerForm.MeasureData) return
       const obj = Object.assign({ visitTaskId: this.visitTaskId }, innerForm.MeasureData)
       obj.lesionName = innerForm.LesionName
+      obj.SplitOrMergeType = innerForm.SplitOrMergeType
       this.$emit('imageLocation', obj)
       e.stopImmediatePropagation()
       e.stopPropagation()
@@ -1953,6 +1955,9 @@ export default {
           const tableId = this.activeName.split('_')[0]
           const rowIndex = this.activeName.split('_')[1]
           const innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
+          if (innerForm.SplitOrMergeType === '1' || innerForm.SplitOrMergeType === '3') {
+            return { isCanActiveTool: false, reason: '' }
+          }
           if (!innerForm.MeasureData) {
             return this.checkToolCanActive(toolName)
           } else {
@@ -1989,6 +1994,9 @@ export default {
       const innerForm = this.innerFormData[`${tableId}_${rowIndex}`]
       const isLymphNodes = innerForm.IsLymphNodes
       const intrahepaticLesion = innerForm.IntrahepaticLesion
+      if (innerForm.SplitOrMergeType === '1' || innerForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!innerForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (innerForm.LesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {

From 096e11e9fd73a27f5b9e3847c7703c4eb0bef986 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 13:24:26 +0800
Subject: [PATCH 200/333] =?UTF-8?q?irecist=20=E8=BD=AC=E5=8F=98=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=9E=8D=E5=90=88=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IRecist/QuestionList.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index 91ee976d..cf14ecec 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -165,7 +165,7 @@
                         </el-tooltip>
                         <!-- 融合 -->
                         <el-tooltip
-                          v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          v-show="!isConvertedTask && !!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
                           class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
                           <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
                             @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />

From 3dc99d096d8070d20686b6ea076a9aa8b1d5cbe0 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 13:46:21 +0800
Subject: [PATCH 201/333] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IRecist/QuestionList.vue      | 2 +-
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue   | 6 ++----
 .../setting/reading-unit/components/QuestionsList.vue       | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index cf14ecec..b8676390 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -165,7 +165,7 @@
                         </el-tooltip>
                         <!-- 融合 -->
                         <el-tooltip
-                          v-show="!isConvertedTask && !!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          v-show="!isFirstChangeTask && !!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
                           class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
                           <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
                             @click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
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 63f926ed..ca1dedf5 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2533,15 +2533,13 @@ export default {
       if (this.isFusion || this.isMPR) {
         const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
         if (!confirm) return false
-        if (this.isMPR) {
-          this.rows = 1
-          this.cols = 1
-        }
         this.isFusion = false
         this.isMPR = false
         this.fullScreenIndex = null
         this.setToolsPassive()
       }
+      this.rows = 1
+      this.cols = 1
       if (taskIndex === this.activeTaskIndex) return
       if (!this.selectArr.includes(taskInfo.VisitTaskId)) {
         this.selectArr.push(taskInfo.VisitTaskId)
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
index b6f6aab2..761a293b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
@@ -36,14 +36,14 @@
       />
       <!-- 分组 -->
       <el-table-column
-        prop="GroupName"
+        prop="QuestionGroupName"
         v-if="$i18n.locale === 'zh'"
         :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
         show-overflow-tooltip
       />
       <!-- 分组(EN) -->
       <el-table-column
-        prop="GroupEnName"
+        prop="QuestionGroupEnName"
         v-if="$i18n.locale === 'en'"
         :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
         show-overflow-tooltip

From 4ee7906dcdca8cf36e6ba26669ba96eadf8ce4d2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 14:14:55 +0800
Subject: [PATCH 202/333] =?UTF-8?q?=E8=A2=AB=E8=9E=8D=E5=90=88=E7=97=85?=
 =?UTF-8?q?=E7=81=B6=E4=B8=8D=E5=85=81=E8=AE=B8=E7=94=BB=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/IRecist/QuestionForm.vue       |  7 ++++---
 .../components/IRecist/QuestionList.vue       |  6 ++++++
 .../dicoms/components/Lugano/QuestionForm.vue |  2 +-
 .../dicoms/components/Lugano/QuestionList.vue |  6 ++++++
 .../LuganoWithoutPET/QuestionForm.vue         |  4 ++--
 .../LuganoWithoutPET/QuestionList.vue         | 20 +++++++++++++------
 .../dicoms/components/Recist/QuestionForm.vue |  7 ++++---
 .../dicoms/components/Recist/QuestionList.vue |  6 ++++++
 .../components/RecistBM/QuestionForm.vue      |  7 ++++---
 .../components/RecistBM/QuestionList.vue      |  8 +++++++-
 .../components/Recist/QuestionList.vue        |  6 ++++--
 .../components/mRecist/QuestionList.vue       |  6 ++++--
 12 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 02db661e..213f3399 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -133,8 +133,9 @@
 
     </div>
 
-    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;">
+    <div
+      v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+      class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <!-- 清除标记 -->
       <el-button
         v-if="questionForm.MeasureData && (!isFirstChangeTask || (isFirstChangeTask && (lesionType === 5 || lesionType === 6)))"
@@ -275,7 +276,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index b8676390..28972399 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -737,6 +737,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -770,6 +773,9 @@ export default {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
       var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
       isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index f263ae25..67a7b3ae 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -340,7 +340,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 1e8876ba..1d6e324d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -735,6 +735,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -765,6 +768,9 @@ export default {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
       var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
       isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index 0d990f34..67a7b3ae 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -340,7 +340,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
@@ -1244,7 +1244,7 @@ export default {
             // }
           } else {
             // 非淋巴结靶病灶 箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
               this.$confirm(this.$t('trials:lugano:warnning:validState7'), {
                 type: 'warning',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
index b62cdbc2..1beda61f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
@@ -87,11 +87,13 @@
                             placement="bottom">
                             <div
                               v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
-                              <span class="login-cycle" />
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
                             </div>
                           </el-tooltip>
                           <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
-                            <span class="login-cycle" />
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
                           </div>
                           <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
                             :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
@@ -194,7 +196,7 @@
   </div>
 </template>
 <script>
-import { splitLesion, getSplitPPdSumNoPet, getCanMergeLesion, mergeLesion } from '@/api/trials'
+import { splitLesion, getSplitPPdSum, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -312,7 +314,7 @@ export default {
       })
     })
     DicomEvent.$on('refreshSplitTargetLesionPDD', async (callback) => {
-      const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
+      const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
       this.splitTargetLesions = res.Result
       if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
         this.splitTargetLesions.map(i => {
@@ -369,7 +371,7 @@ export default {
           loading.close()
         }
         if (!this.isBaseLineTask) {
-          const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
+          const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
           this.splitTargetLesions = res.Result
         }
         this.questions = this.visitTaskList[i].ReadingQuestions
@@ -512,7 +514,7 @@ export default {
               this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
             }
             if (!this.isBaseLineTask) {
-              const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
+              const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
               this.splitTargetLesions = res.Result
             }
             this.getTableQuestions()
@@ -733,6 +735,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -763,6 +768,9 @@ export default {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
       var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
       isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index c72b70c9..0b49ae12 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -127,8 +127,9 @@
 
     </div>
 
-    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;">
+    <div
+      v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+      class="base-dialog-footer" style="text-align:right;margin-top:10px;">
 
       <!-- 清除标记 -->
       <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
@@ -254,7 +255,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index b73324de..92b5d6a7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -665,6 +665,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -694,6 +697,9 @@ export default {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
       var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
       isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index ac3df227..cd448991 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -117,8 +117,9 @@
 
     </div>
 
-    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;">
+    <div
+      v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+      class="base-dialog-footer" style="text-align:right;margin-top:10px;">
 
       <!-- 清除标记 -->
       <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
@@ -243,7 +244,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index c73f9f29..ba9127c5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -121,7 +121,7 @@
                         style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2&& item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
+                          v-show="readingTaskState < 2 && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
                           class="item" :content="$t('trials:reading:button:split')" placement="left">
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
@@ -656,6 +656,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -683,6 +686,9 @@ export default {
 
     checkToolCanActive(toolName) {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && toolName !== 'Length') {
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
index 146a68e1..d6f2a3bd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -151,7 +151,7 @@
                         </el-tooltip>
                         <!-- 融合 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
+                          v-show="readingTaskState < 2 && !isBaseLineTask && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
                           class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
                           <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
                             @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
@@ -168,7 +168,9 @@
                       :reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask"
                       :is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm"
                       @lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart" />
-                    <div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;">
+                    <div
+                      v-if="readingTaskState < 2 && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '1' && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '3'"
+                      style="text-align:right;margin-top:10px;">
                       <!-- 清除标记 -->
                       <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
                         @click="clearMeasureData(table, answer.RowIndex)">
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
index dc9a8aff..198ae925 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -149,7 +149,7 @@
                         </el-tooltip>
                         <!-- 融合 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
+                          v-show="readingTaskState < 2 && !isBaseLineTask && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
                           class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
                           <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
                             @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
@@ -166,7 +166,9 @@
                       :reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask"
                       :is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm"
                       @lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart" />
-                    <div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;">
+                    <div
+                      v-if="readingTaskState < 2 && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '1' && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '3'"
+                      style="text-align:right;margin-top:10px;">
                       <!-- 清除标记 -->
                       <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
                         @click="clearMeasureData(table, answer.RowIndex)">

From accac374ffcf7232fb8fe53a760f840a719c3735 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 14:42:27 +0800
Subject: [PATCH 203/333] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E9=9C=80=E8=A6=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../site-research/components/ImageManual.vue   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
index 970ee285..d2fb481b 100644
--- a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
@@ -44,7 +44,7 @@
             </div>
             <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 99 }" placeholder=""
                 v-model="form.ReplaceContent" @input="handleInput" style="width: 70%;" />
-            <div style="text-align: right;margin: 20px;">
+            <div style="text-align: right;margin: 20px;" class="btnBox">
                 <el-button type="primary" :loading="loading" size="small" @click="handleSave">
                     {{ $t('common:button:save') }}
                 </el-button>
@@ -150,7 +150,7 @@ export default {
                 let res = await getTrialDocumentList(data)
                 if (res.IsSuccess) {
                     const { CurrentPageData } = res.Result
-                    if (CurrentPageData.length <= 0) this.$message.warning(this.$t("trials:researchRecord:ImageManual:message:noImageManual"))
+                    if (CurrentPageData.length <= 0) this.$confirm(this.$t("trials:researchRecord:ImageManual:message:noImageManual"))
                 }
             } catch (err) {
                 console.log(err)
@@ -205,16 +205,28 @@ export default {
     width: 100%;
     height: 100%;
     display: flex;
+    position: relative;
 
     .config,
     .preview {
-        width: 50%;
+        width: 65%;
         height: 100%;
         overflow-y: auto;
     }
 
     .config {
+        width: 35%;
         border-right: 1px solid #EBEEF5;
     }
+
+    .btnBox {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+    }
+
+    ::v-deep .el-checkbox__label {
+        white-space: normal;
+    }
 }
 </style>

From 63772f46f8168ea2979fa47d6823421c1c512944 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 14:45:22 +0800
Subject: [PATCH 204/333] =?UTF-8?q?=E3=80=90=E9=82=AE=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E5=90=8E=E5=8F=B0=E9=82=AE=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=EF=BC=8C=E6=98=AF=E5=90=A6=E5=8A=A0=E6=80=A5?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9=E4=B8=AD=E9=80=89=E9=A1=B9=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E6=98=AF=E7=B4=A7=E6=80=A5=E3=80=81=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E5=8A=A0=E6=80=A5=E3=80=81=E4=B8=8D=E5=8A=A0=E6=80=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dictionary/template/email/components/EmailList.vue   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/dictionary/template/email/components/EmailList.vue b/src/views/dictionary/template/email/components/EmailList.vue
index 627dafcf..2039d031 100644
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@@ -9,11 +9,11 @@
           </el-select>
         </el-form-item>
         <!-- 是否加急 -->
-        <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
+        <!-- <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
           <el-select v-model="searchData.IsUrgent" clearable style="width: 100px">
             <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <!-- 是否启用 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" v-if="!systemLevel">
           <el-select v-model="searchData.IsEnable" clearable style="width: 100px">
@@ -41,7 +41,8 @@
             <el-option v-for="item of UserTypeList" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:form:EmailUrgent')" v-if="systemLevel === 1">
+        <!--v-if="systemLevel === 1"-->
+        <el-form-item :label="$t('trials:emailManageCfg:form:EmailUrgent')">
           <el-select v-model="searchData.EmailUrgentEnum" clearable style="width: 100px">
             <el-option v-for="item of $d.EmailUrgent" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
@@ -86,7 +87,7 @@
         :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
         <template slot-scope="scope">
           {{scope.row.CriterionTypeList ? scope.row.CriterionTypeList.map(item => $fd('CriterionType', item)).join(', ')
-          : ''}}
+            : ''}}
         </template>
       </el-table-column>
       <!-- 邮件主题（中文） -->

From 281c900e0c4862b25f4ba7dbb47606946a14dfab Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 14:51:25 +0800
Subject: [PATCH 205/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E7=9A=84=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=9C=80=E8=A6=81=E6=9C=89=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CriterionDictionary.vue        | 57 ++++++-------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/CriterionDictionary.vue b/src/views/trials/trials-panel/setting/reading-unit/components/CriterionDictionary.vue
index 93357de0..a3d06a34 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/CriterionDictionary.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/CriterionDictionary.vue
@@ -1,43 +1,23 @@
 <template>
   <div>
-    <el-table
-      v-loading="loading"
-      style="width: 100%"
-      :data="list"
-      stripe
-    >
-      <el-table-column
-        prop=""
-        label=""
-        width="50"
-      >
+    <el-table v-loading="loading" style="width: 100%" :data="list" stripe>
+      <el-table-column prop="" label="" width="50">
         <template slot-scope="scope">
           {{ scope.$index + 1 }}
         </template>
       </el-table-column>
       <!-- 字典表名 -->
-      <el-table-column
-        prop="Code"
-        :label="$t('trials:readingUnit:baseDataCfg:title:dictTbl')"
-        show-overflow-tooltip
-      />
+      <el-table-column prop="Code" :label="$t('trials:readingUnit:baseDataCfg:title:dictTbl')" show-overflow-tooltip />
+      <!-- 描述 -->
+      <el-table-column prop="Description" :label="$t('trials:readingUnit:baseDataCfg:title:Description')"
+        show-overflow-tooltip />
       <!-- 子项数量 -->
-      <el-table-column
-        prop="Count"
-        :label="$t('trials:readingUnit:baseDataCfg:title:dictChildCount')"
-        show-overflow-tooltip
-      />
+      <el-table-column prop="Count" :label="$t('trials:readingUnit:baseDataCfg:title:dictChildCount')"
+        show-overflow-tooltip />
       <!-- 排序 -->
-      <el-table-column
-        prop="ShowOrder"
-        :label="$t('trials:readingUnit:baseDataCfg:title:dictOrder')"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="Description"
-        :label="$t('common:action:action')"
-        show-overflow-tooltip
-      >
+      <el-table-column prop="ShowOrder" :label="$t('trials:readingUnit:baseDataCfg:title:dictOrder')"
+        show-overflow-tooltip />
+      <el-table-column prop="Description" :label="$t('common:action:action')" show-overflow-tooltip>
         <template slot-scope="scope">
           <!-- 查看 -->
           <el-button size="small" type="primary" @click="openChildren(scope.row)">
@@ -46,15 +26,10 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-drawer
-      :title="drawer_cfg.title"
-      :append-to-body="true"
-      :modal-append-to-body="false"
-      :visible.sync="drawer_cfg.drawerChild"
-      direction="rtl"
-      size="80%"
-    >
-      <CriterionDictionaryConfig v-if="drawer_cfg.drawerChild" :criterion-id="criterionId" :parent-code="drawer_cfg.title" @getList="getList" />
+    <el-drawer :title="drawer_cfg.title" :append-to-body="true" :modal-append-to-body="false"
+      :visible.sync="drawer_cfg.drawerChild" direction="rtl" size="80%">
+      <CriterionDictionaryConfig v-if="drawer_cfg.drawerChild" :criterion-id="criterionId"
+        :parent-code="drawer_cfg.title" @getList="getList" />
     </el-drawer>
   </div>
 </template>
@@ -111,7 +86,7 @@ export default {
 </script>
 
 <style scoped>
-::v-deep .el-form-item__content{
+::v-deep .el-form-item__content {
   width: calc(100% - 110px);
 }
 </style>

From 24c7c6139891002deb0bcee109eff5eed5e09b56 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 15:00:51 +0800
Subject: [PATCH 206/333] 1

---
 .../dicoms3D/components/Recist/TableQuestionFormItem.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index af1ce32f..ce43dfd0 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -45,7 +45,7 @@
               data: {
                 TableQuestionId: qs.Id,
                 RowIndex: qsForm.RowIndex,
-                QuestionName: question.QuestionName
+                QuestionName: qs.QuestionName
               }
             })" />
         </div>

From 03c7aa3d996547e172c2ec30df4d6471827dfa83 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 15:08:41 +0800
Subject: [PATCH 207/333] 1

---
 .../reading/dicoms3D/components/mRecist/QuestionList.vue         | 1 +
 1 file changed, 1 insertion(+)

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
index 198ae925..c8b33d0f 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -236,6 +236,7 @@ import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
 import QuestionFormItem from './QuestionFormItem'
 import TableQuestionFormItem from './TableQuestionFormItem'
+import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 export default {
   name: 'QuestionList',
   components: {

From f72cab082a54d5a5fca7e731a1a4da1719d6c117 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 15:27:46 +0800
Subject: [PATCH 208/333] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E8=A1=A8=E9=85=8D=E7=BD=AE=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/components/BaseInfo.vue             |  3 ++-
 .../site-research/components/ImageManual.vue           | 10 +++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/views/research/components/BaseInfo.vue b/src/views/research/components/BaseInfo.vue
index 9ef0402c..c0b19c49 100644
--- a/src/views/research/components/BaseInfo.vue
+++ b/src/views/research/components/BaseInfo.vue
@@ -1,5 +1,6 @@
 <template>
-  <el-form v-if="isShow" ref="researchBSForm" size="small" :model="form" :rules="rules" style="width:80%">
+  <el-form v-if="isShow" ref="researchBSForm" size="small" :model="form" :rules="rules" style="width:80%"
+    label-position="left">
     <!-- 项目编号 -->
     <el-form-item :label="$t('trials:researchForm:form:trialId')">
       <el-input v-model="form.TrialCode" disabled />
diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
index d2fb481b..2369253d 100644
--- a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
@@ -24,7 +24,7 @@
                 <el-form-item>
                     <el-checkbox v-model="form.IsFollowStudyParameters"
                         @change="(val) => handleChange(val, 'IsFollowStudyParameters')">
-                        {{ $t('trials:researchForm:form:isFollowStudyParam') }}
+                        <span v-html="$t('trials:researchForm:form:isFollowStudyParam')"></span>
                     </el-checkbox>
                 </el-form-item>
             </el-form>
@@ -219,14 +219,10 @@ export default {
         border-right: 1px solid #EBEEF5;
     }
 
-    .btnBox {
-        position: absolute;
-        bottom: 0;
-        left: 0;
-    }
-
     ::v-deep .el-checkbox__label {
         white-space: normal;
+
+        i {}
     }
 }
 </style>

From 754fe5f7975422df3f5ceb1341772447964638c6 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 15:48:40 +0800
Subject: [PATCH 209/333] 1

---
 .../trials-panel/trial-summary/report-forms/index.vue      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index 0ca37ab9..ac2b5dab 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -21,6 +21,10 @@
             <div class="chartBox">
                 <div ref="chartContainer_bottom" style="width: 100%; height: 100%;" v-loading="loading_bottom"></div>
             </div>
+            <div class="chartBox">
+                <div ref="chartContainer_bottom_right" style="width: 100%; height: 100%;" v-loading="loading_bottom">
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -344,9 +348,6 @@ export default {
             width: 50%;
             height: 50%;
 
-            &:last-child {
-                width: 100%;
-            }
         }
     }
 }

From a48dc114e817978f18d5b115a89d776a457f6a48 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 29 Dec 2025 09:13:58 +0800
Subject: [PATCH 210/333] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/export.js                             |  2 +-
 .../components/GlobalReview.vue               | 35 -------------------
 .../reading/reading-task/index.vue            |  3 --
 .../components/exportList.vue                 |  5 +--
 4 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/src/api/export.js b/src/api/export.js
index 738eb5e8..da589d90 100644
--- a/src/api/export.js
+++ b/src/api/export.js
@@ -239,7 +239,7 @@ export function getPatientList_Export(data) {
     data
   })
 }
-export function getTumor_CDISC_Export(data) {
+export function getTumor_CDISC_IVUSOCT_Export(data) {
   return requestDownload({
     url: `/IVUS_OCTExport/getTumor_CDISC_Export`,
     responseType: 'blob',
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index 295008f2..278e2f9a 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -27,18 +27,12 @@
       <el-table-column :label="$t('trials:medicalFeedback:table:visitPointCount')" align="center" prop=""
         show-overflow-tooltip>
         <template>
-<<<<<<< HEAD
           <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
             width="150">
-=======
-          <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs"
-            show-overflow-tooltip width="150">
->>>>>>> uat
             <template slot-scope="scope">
               <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
                   {{
-<<<<<<< HEAD
                     $fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
                   }}
                 </span>
@@ -46,15 +40,6 @@
                   scope.row.BeforeQuestionList[index].Answer === '-2' ? "NA" : scope.row.BeforeQuestionList[index].Answer
                     === '-1' ? $t('trials:medicalFeedback:table:unKnow') : scope.row.BeforeQuestionList[index].Answer
                   }}</span>
-=======
-                    $fd(scope.row.BeforeQuestionList[index].DictionaryCode,
-                      parseInt(scope.row.BeforeQuestionList[index].Answer))
-                  }}
-                </span>
-                <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{
-                  scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:medicalFeedback:table:unKnow') :
-                    scope.row.BeforeQuestionList[index].Answer }}</span>
->>>>>>> uat
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
                 <span>
                   {{
@@ -98,12 +83,7 @@
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
                   {{
-<<<<<<< HEAD
                     $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
-=======
-                    $fd(scope.row.AfterQuestionList[index].DictionaryCode,
-                      parseInt(scope.row.AfterQuestionList[index].Answer))
->>>>>>> uat
                   }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
@@ -134,23 +114,13 @@
       <!-- 评估结果 -->
       <el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
         <template>
-<<<<<<< HEAD
           <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
             width="150">
-=======
-          <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs"
-            show-overflow-tooltip width="150">
->>>>>>> uat
             <template slot-scope="scope">
               <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
                   {{
-<<<<<<< HEAD
                     $fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
-=======
-                    $fd(scope.row.BeforeQuestionList[index].DictionaryCode,
-                      parseInt(scope.row.BeforeQuestionList[index].Answer))
->>>>>>> uat
                   }}
                 </span>
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
@@ -185,12 +155,7 @@
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
                   {{
-<<<<<<< HEAD
                     $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
-=======
-                    $fd(scope.row.AfterQuestionList[index].DictionaryCode,
-                      parseInt(scope.row.AfterQuestionList[index].Answer))
->>>>>>> uat
                   }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index 148ffeaf..d21da111 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -184,12 +184,9 @@ import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
-<<<<<<< HEAD
 import { getAutoCutNextTask } from '@/api/user'
 import { openWindow } from "@/utils/splitScreen";
-=======
 import TargetSection from "./components/TargetSection"
->>>>>>> uat
 const searchDataDefault = () => {
   return {
     SubjectCode: '',
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
index e1d8c159..1dbeb472 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
@@ -28,6 +28,7 @@ import {
   getReadingTaskList_Export,
   getTrialReadingCriterionCanExportDocumentList,
   getTumor_CDISC_Export,
+  getTumor_CDISC_IVUSOCT_Export,
   getOverallTumorEvaluationList_Export,
   getEvaluationOfTumorEfficacy_Export,
   getDetailedOfEvaluatedLesion_Export,
@@ -157,7 +158,7 @@ export default {
           break
         case 21:
           searchData.ReadingExportType = 21
-          getTumor_CDISC_Export(searchData)
+          getTumor_CDISC_IVUSOCT_Export(searchData)
             .then((res) => { })
             .catch(() => {
               this.loading = false
@@ -165,7 +166,7 @@ export default {
           break
         case 22:
           searchData.ReadingExportType = 22
-          getTumor_CDISC_Export(searchData)
+          getTumor_CDISC_IVUSOCT_Export(searchData)
             .then((res) => { })
             .catch(() => {
               this.loading = false

From 95681864979ad80ba48c367ecb1403bec8d82960 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 29 Dec 2025 13:11:15 +0800
Subject: [PATCH 211/333] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/form.vue  | 5 +++--
 src/views/research/login.vue | 2 ++
 vue.config.js                | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 29c1d695..ad398c13 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -8,7 +8,7 @@
       <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
       <div style="display: flex;justify-content: space-between;" v-if="!isPreview">
         <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state)
-            }}</el-tag></div>
+        }}</el-tag></div>
         <div>
           <!-- 提交 -->
           <el-button v-if="(state === 0 && userTypeEnumInt === 0)" type="primary" size="small"
@@ -323,7 +323,8 @@ export default {
       this.$emit('refreshPage')
     },
     // 退出
-    handleBack() {
+    async handleBack() {
+      await this.$store.dispatch('user/logout')
       this.$router.push({ path: `/researchLogin?trialId=${this.trialId}&lang=${this.$i18n.locale}` })
     },
     handleHistory() {
diff --git a/src/views/research/login.vue b/src/views/research/login.vue
index 10f84628..8009844c 100644
--- a/src/views/research/login.vue
+++ b/src/views/research/login.vue
@@ -263,6 +263,8 @@ export default {
             this.setLanguage(this.$route.query.lang)
             store.dispatch('user/setToken', res.Result.Token)
             zzSessionStorage.setItem('TokenKey', res.Result.Token)
+            zzSessionStorage.setItem('userId', res.Result.UserRoleId);
+            zzSessionStorage.setItem('identityUserId', res.Result.IdentityUserId);
             var permissions = await getUserPermissions()
             var menuTree = await getUserMenuTree()
             store.dispatch('user/setTree', menuTree.Result)
diff --git a/vue.config.js b/vue.config.js
index dd4a5f12..3a8a38f0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,8 +52,8 @@ module.exports = defineConfig({
       },
 
       '/api': {
-        // target: 'http://106.14.89.110:30000',
-        target: 'http://101.132.253.119:7010', // uat 
+        target: 'http://106.14.89.110:30000',
+        // target: 'http://101.132.253.119:7010', // uat 
         changeOrigin: true,
         secure: false,
         pathRewrite: {

From f1c36ea6885f7ea644ae84ffebc76221cbd6a2d3 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 29 Dec 2025 13:11:34 +0800
Subject: [PATCH 212/333] =?UTF-8?q?=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

---
 .../dicoms3D/components/customize/QuestionFormItem.vue        | 3 +++
 .../reading/dicoms3D/components/customize/ReportPage.vue      | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 56efef5c..091ed105 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -1162,6 +1162,9 @@ export default {
           if (isNAN) {
             num = ''
           }
+          if (isNaN(parseFloat(num))) {
+            num = Number(num).toFixed(this.digitPlaces)
+          }
           this.$set(this.QuestionsForm, v.Id, num.toString());
         }
       });
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
index dbde7dba..2d27e2b6 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
@@ -333,6 +333,10 @@ export default {
       }
       this.$refs.readingChart_report.init(e, obj, zIndex)
     },
+    foo() {
+      if (!this.$refs.readingChart_report) return false
+      this.$refs.readingChart_report.foo()
+    },
     limitBlur(questionForm, id, valueType) {
       const value = questionForm[id]
       if (valueType === 0) {

From 0c2ed13cd463de16f9ff742e5f1179e086a1272a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 29 Dec 2025 13:55:00 +0800
Subject: [PATCH 213/333] =?UTF-8?q?=E3=80=90LiLi=20&=20EICS=E3=80=91?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/report-forms/index.vue      | 72 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index ac2b5dab..2601170c 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -18,8 +18,9 @@
             <div class="chartBox">
                 <div ref="chartContainer_right" style="width: 100%; height: 100%;" v-loading="loading_right"></div>
             </div>
-            <div class="chartBox">
+            <div class="chartBox" style="position: relative;">
                 <div ref="chartContainer_bottom" style="width: 100%; height: 100%;" v-loading="loading_bottom"></div>
+                <span v-if="ORR" style="position: absolute;top: 0;right:20px">ORR: {{ ORR }}</span>
             </div>
             <div class="chartBox">
                 <div ref="chartContainer_bottom_right" style="width: 100%; height: 100%;" v-loading="loading_bottom">
@@ -55,6 +56,18 @@ export default {
             searchData: {
                 TrialReadingCriterionId: null
             },
+            color: [
+                '#0ca8df',
+                '#ffd10a',
+                '#b6d634',
+                '#3fbe95',
+                '#785db0',
+                '#5070dd',
+                '#505372',
+                '#ff994d',
+                '#fb628b',
+
+            ],
             trialCriterionList: [],
             loading_left: false,
             chart_left: null,
@@ -62,6 +75,8 @@ export default {
             chart_right: null,
             loading_bottom: false,
             chart_bottom: null,
+            chart_bottom_right: null,
+            ORR: null
         }
     },
     created() {
@@ -130,6 +145,7 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                color: this.color,
                 tooltip: {
                     trigger: 'item',
                     formatter: `${obj.titleText} <br/>{b} : {c}`
@@ -239,6 +255,7 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                color: this.color,
                 tooltip: {
                     trigger: 'axis',
                     axisPointer: {
@@ -274,6 +291,7 @@ export default {
                 let res = await getTrialEfficacyEvaluationStatList(data)
                 this.loading_bottom = false
                 if (res.IsSuccess) {
+                    this.ORR = res.OtherInfo.ORR
                     let obj = {
                         xAxisData: [],
                         seriesData: [],
@@ -284,7 +302,18 @@ export default {
                         obj.xAxisData.push(this.$fd(item.DictionaryCode, Number(item.OverallTumorEvaluation)))
                         obj.seriesData.push(item.SubjectCount)
                     })
+                    let obj2 = {
+                        xAxisData: [],
+                        seriesData: [],
+                        unit: this.$t("trials:reportForms:cjart:unit:DaysDiff"),
+                        titleText: this.$t("trials:reportForms:cjart:title:dataDistribution"),
+                    }
+                    res.OtherInfo.PDList.forEach(item => {
+                        obj.xAxisData.push(item.SubjectCode)
+                        obj.seriesData.push(item.DaysDiff)
+                    })
                     this.initChart_bottom(obj)
+                    this.initChart_bottom_right(obj2)
                 }
             } catch (err) {
                 console.log(err)
@@ -297,6 +326,7 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                color: this.color,
                 tooltip: {
                     trigger: 'axis',
                     axisPointer: {
@@ -322,6 +352,46 @@ export default {
             // 4. 使用配置项渲染图表
             this.chart_bottom.setOption(option);
         },
+        initChart_bottom_right(obj) {
+            this.chart_bottom_right = echarts.init(this.$refs.chartContainer_bottom_right);
+            // ...图表配置
+            const option = {
+                title: {
+                    text: obj.titleText
+                },
+                color: this.color,
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    }
+                },
+                xAxis: {
+                    type: 'category',
+                    data: obj.xAxisData
+                },
+                yAxis: {
+                    name: obj.unit,
+                    type: 'value'
+                },
+                series: [
+                    {
+                        markLine: {
+                            data: [
+                                {
+                                    type: 'average', name: this.$t("trials:reportForms:cjart:data:average")
+                                }
+                            ]
+                        },
+                        data: obj.seriesData,
+                        type: 'bar',
+                        barWidth: 20,
+                    }
+                ]
+            };
+            // 4. 使用配置项渲染图表
+            this.chart_bottom_right.setOption(option);
+        },
     }
 }
 </script>

From 2c47541737b0f896b479342441066c6bedf46465 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 29 Dec 2025 14:53:28 +0800
Subject: [PATCH 214/333] =?UTF-8?q?=E7=94=B5=E8=84=91=E5=8F=8A=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E5=85=BC=E5=AE=B9=E6=80=A7=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/systemInfo.js                       | 475 ++++++++++++++++++
 src/views/dictionary/template/browser/tip.vue |  46 +-
 .../reading/dicoms/components/DicomViewer.vue |  26 +-
 .../reading/dicoms3D/components/ReadPage.vue  |  29 +-
 4 files changed, 559 insertions(+), 17 deletions(-)
 create mode 100644 src/utils/systemInfo.js

diff --git a/src/utils/systemInfo.js b/src/utils/systemInfo.js
new file mode 100644
index 00000000..fe1fe00a
--- /dev/null
+++ b/src/utils/systemInfo.js
@@ -0,0 +1,475 @@
+// 浏览器信息检测
+class SystemInfo {
+    constructor() {
+        this.info = {
+            browser: this.getBrowserInfo(),
+            os: this.getOSInfo(),
+            hardware: this.getHardwareInfo(),
+            webgl: this.getWebGLInfo()
+        };
+    }
+
+    // 获取浏览器信息
+    getBrowserInfo() {
+        const ua = navigator.userAgent;
+        let browser = {
+            name: 'Unknown',
+            version: 'Unknown',
+            fullVersion: navigator.appVersion
+        };
+
+        // 检测浏览器类型
+        if (ua.includes('Firefox')) {
+            browser.name = 'Firefox';
+            browser.version = this.extractVersion(ua, 'Firefox');
+        } else if (ua.includes('Chrome') && !ua.includes('Edg') && !ua.includes('OPR')) {
+            browser.name = 'Chrome';
+            browser.version = this.extractVersion(ua, 'Chrome');
+        } else if (ua.includes('Safari') && !ua.includes('Chrome')) {
+            browser.name = 'Safari';
+            browser.version = this.extractVersion(ua, 'Version');
+        } else if (ua.includes('Edg')) {
+            browser.name = 'Edge';
+            browser.version = this.extractVersion(ua, 'Edg');
+        } else if (ua.includes('OPR') || ua.includes('Opera')) {
+            browser.name = 'Opera';
+            browser.version = this.extractVersion(ua, 'OPR') || this.extractVersion(ua, 'Opera');
+        } else if (ua.includes('Trident') || ua.includes('MSIE')) {
+            browser.name = 'Internet Explorer';
+            browser.version = this.extractVersion(ua, 'MSIE') || this.extractVersion(ua, 'rv:');
+        }
+
+        return browser;
+    }
+
+    // 提取版本号
+    extractVersion(userAgent, browserName) {
+        const match = userAgent.match(new RegExp(`${browserName}/([0-9]+(\\.[0-9]+)?)`));
+        return match ? match[1] : 'Unknown';
+    }
+
+    // 获取操作系统信息
+    getOSInfo() {
+        const ua = navigator.userAgent;
+        let os = {
+            name: 'Unknown',
+            version: 'Unknown',
+            architecture: this.getArchitecture()
+        };
+
+        if (ua.includes('Windows')) {
+            os.name = 'Windows';
+            if (ua.includes('Windows NT 10.0')) os.version = '10';
+            else if (ua.includes('Windows NT 6.3')) os.version = '8.1';
+            else if (ua.includes('Windows NT 6.2')) os.version = '8';
+            else if (ua.includes('Windows NT 6.1')) os.version = '7';
+            else if (ua.includes('Windows NT 6.0')) os.version = 'Vista';
+            else if (ua.includes('Windows NT 5.1')) os.version = 'XP';
+        } else if (ua.includes('Mac OS X')) {
+            os.name = 'macOS';
+            const match = ua.match(/Mac OS X (\d+[._]\d+)/);
+            if (match) os.version = match[1].replace('_', '.');
+        } else if (ua.includes('Linux')) {
+            os.name = 'Linux';
+        } else if (ua.includes('Android')) {
+            os.name = 'Android';
+            const match = ua.match(/Android ([0-9.]+)/);
+            if (match) os.version = match[1];
+        } else if (ua.includes('like Mac')) {
+            os.name = 'iOS';
+            const match = ua.match(/OS (\d+[_]\d+)/);
+            if (match) os.version = match[1].replace('_', '.');
+        }
+
+        return os;
+    }
+
+    // 获取系统架构
+    getArchitecture() {
+        if (navigator.userAgent.includes('x64') || navigator.userAgent.includes('x86_64')) {
+            return '64-bit';
+        } else if (navigator.userAgent.includes('x86') || navigator.userAgent.includes('i686')) {
+            return '32-bit';
+        } else if (navigator.userAgent.includes('ARM')) {
+            return 'ARM';
+        } else if (navigator.userAgent.includes('Win64')) {
+            return '64-bit';
+        }
+        return 'Unknown';
+    }
+
+    // 获取硬件信息
+    getHardwareInfo() {
+        return {
+            logicalCores: navigator.hardwareConcurrency || 'Unknown',
+            deviceMemory: navigator.deviceMemory ? `${navigator.deviceMemory} GB` : 'Unknown',
+            maxTouchPoints: navigator.maxTouchPoints || 0
+        };
+    }
+
+    // 获取WebGL和显卡信息
+    getWebGLInfo() {
+        const webglInfo = {
+            webgl1: this.getWebGLContextInfo('webgl'),
+            webgl2: this.getWebGLContextInfo('webgl2'),
+            supported: false,
+            renderer: 'Unknown',
+            vendor: 'Unknown',
+            version: 'Unknown',
+            shadingLanguage: 'Unknown',
+            extensions: []
+        };
+
+        const canvas = document.createElement('canvas');
+        let gl = null;
+
+        // 尝试获取WebGL2上下文
+        try {
+            gl = canvas.getContext('webgl2') || canvas.getContext('experimental-webgl2');
+        } catch (e) {
+            console.log('WebGL2 not supported:', e.message);
+        }
+
+        // 如果WebGL2不可用，尝试WebGL1
+        if (!gl) {
+            try {
+                gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
+            } catch (e) {
+                console.log('WebGL not supported:', e.message);
+            }
+        }
+
+        if (gl) {
+            webglInfo.supported = true;
+
+            // 获取显卡信息
+            const debugInfo = gl.getExtension('WEBGL_debug_renderer_info');
+            if (debugInfo) {
+                webglInfo.renderer = gl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL) || 'Unknown';
+                webglInfo.vendor = gl.getParameter(debugInfo.UNMASKED_VENDOR_WEBGL) || 'Unknown';
+            }
+
+            // 获取WebGL版本信息
+            webglInfo.version = gl.getParameter(gl.VERSION) || 'Unknown';
+            webglInfo.shadingLanguage = gl.getParameter(gl.SHADING_LANGUAGE_VERSION) || 'Unknown';
+
+            // 获取支持的扩展
+            try {
+                webglInfo.extensions = gl.getSupportedExtensions() || [];
+            } catch (e) {
+                console.log('无法获取WebGL扩展:', e.message);
+            }
+
+            // 检查GPU性能级别
+            webglInfo.performance = this.getGPUPerformanceInfo(gl);
+
+            // 检查内存信息（如果支持）
+            webglInfo.memoryInfo = this.getGPUMemoryInfo(gl);
+
+            // 检查是否使用集成显卡
+            if (webglInfo.renderer) {
+                webglInfo.gpuType = this.detectGPUType(webglInfo.renderer);
+            }
+        }
+
+        return webglInfo;
+    }
+
+    // 获取WebGL上下文的具体信息
+    getWebGLContextInfo(contextType) {
+        const canvas = document.createElement('canvas');
+        let gl = null;
+
+        try {
+            gl = canvas.getContext(contextType) ||
+                canvas.getContext(`experimental-${contextType}`);
+        } catch (e) {
+            return { supported: false, error: e.message };
+        }
+
+        if (!gl) {
+            return { supported: false };
+        }
+
+        return {
+            supported: true,
+            context: gl
+        };
+    }
+
+    // 获取GPU性能信息
+    getGPUPerformanceInfo(gl) {
+        const info = { tier: 'unknown', features: [] };
+
+        // 检查是否支持高性能特性
+        try {
+            // 检查帧缓冲
+            if (gl.checkFramebufferStatus) {
+                info.features.push('framebuffer');
+            }
+
+            // 检查浮点纹理
+            const floatExt = gl.getExtension('OES_texture_float') ||
+                gl.getExtension('EXT_color_buffer_float');
+            if (floatExt) info.features.push('float_textures');
+
+            // 检查多重采样
+            const msaaExt = gl.getExtension('WEBGL_multisampled_render_to_texture');
+            if (msaaExt) info.features.push('msaa');
+
+            // 检查实例化渲染
+            const instancingExt = gl.getExtension('ANGLE_instanced_arrays') ||
+                gl.getExtension('WEBGL_draw_buffers');
+            if (instancingExt) info.features.push('instancing');
+
+            // 尝试检测性能级别（基于支持的扩展）
+            if (info.features.includes('float_textures') &&
+                info.features.includes('msaa') &&
+                info.features.includes('instancing')) {
+                info.tier = 'high';
+            } else if (info.features.length >= 2) {
+                info.tier = 'medium';
+            } else {
+                info.tier = 'low';
+            }
+        } catch (e) {
+            console.log('获取GPU性能信息失败:', e);
+        }
+
+        return info;
+    }
+
+    // 获取GPU内存信息
+    getGPUMemoryInfo(gl) {
+        const memoryInfo = { estimatedMemory: 'Unknown' };
+
+        // 尝试通过扩展获取内存信息
+        try {
+            // 检查是否支持内存信息扩展
+            const memoryExt = gl.getExtension('WEBGL_debug_renderer_info');
+            if (memoryExt) {
+                // 一些浏览器会通过UNMASKED_RENDERER_WEBGL暴露内存信息
+                const renderer = gl.getParameter(memoryExt.UNMASKED_RENDERER_WEBGL);
+                if (renderer) {
+                    // 尝试从渲染器字符串中提取内存信息
+                    const match = renderer.match(/(\d+)\s*MB|(\d+)\s*GB|VRAM\s*:\s*(\d+)/i);
+                    if (match) {
+                        memoryInfo.estimatedMemory = match[0];
+                    }
+                }
+            }
+
+            // 通过创建大纹理测试内存
+            memoryInfo.maxTextureSize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
+            memoryInfo.maxRenderbufferSize = gl.getParameter(gl.MAX_RENDERBUFFER_SIZE);
+        } catch (e) {
+            // 静默失败
+        }
+
+        return memoryInfo;
+    }
+
+    // 检测GPU类型
+    detectGPUType(renderer) {
+        const r = renderer.toLowerCase();
+
+        if (r.includes('nvidia') || r.includes('geforce') || r.includes('gtx') || r.includes('rtx')) {
+            return { type: 'NVIDIA', discrete: true };
+        } else if (r.includes('amd') || r.includes('radeon') || r.includes('rx')) {
+            return { type: 'AMD', discrete: true };
+        } else if (r.includes('intel') || r.includes('hd graphics') || r.includes('iris') || r.includes('uhd')) {
+            return { type: 'Intel', discrete: false };
+        } else if (r.includes('apple') || r.includes('apple gpu') || r.includes('apple m')) {
+            return { type: 'Apple Silicon', discrete: false };
+        } else if (r.includes('mali') || r.includes('adreno') || r.includes('powervr')) {
+            return { type: 'Mobile GPU', discrete: false };
+        } else if (r.includes('microsoft') || r.includes('basic')) {
+            return { type: 'Software Renderer', discrete: false };
+        }
+
+        return { type: 'Unknown', discrete: false };
+    }
+
+    // 获取屏幕信息
+    getScreenInfo() {
+        return {
+            width: window.screen.width,
+            height: window.screen.height,
+            colorDepth: window.screen.colorDepth,
+            pixelDepth: window.screen.pixelDepth,
+            devicePixelRatio: window.devicePixelRatio || 1,
+            orientation: window.screen.orientation ? window.screen.orientation.type : 'unknown'
+        };
+    }
+
+    // 获取所有系统信息
+    getAllInfo() {
+        return {
+            ...this.info,
+            screen: this.getScreenInfo(),
+            userAgent: navigator.userAgent,
+            platform: navigator.platform,
+            language: navigator.language,
+            languages: navigator.languages,
+            cookiesEnabled: navigator.cookieEnabled,
+            online: navigator.onLine,
+            javaEnabled: navigator.javaEnabled ? navigator.javaEnabled() : false,
+            pdfViewerEnabled: navigator.pdfViewerEnabled || false,
+            doNotTrack: navigator.doNotTrack || 'unknown',
+            timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+            dateTimeFormat: new Date().toString()
+        };
+    }
+
+    // 格式化输出
+    formatAsText() {
+        const info = this.getAllInfo();
+        let output = '========== 系统信息 ==========\n\n';
+
+        // 浏览器信息
+        output += '=== 浏览器信息 ===\n';
+        output += `浏览器: ${info.browser.name} ${info.browser.version}\n`;
+        output += `完整版本: ${info.browser.fullVersion}\n`;
+        output += `用户代理: ${info.userAgent}\n\n`;
+
+        // 操作系统信息
+        output += '=== 操作系统信息 ===\n';
+        output += `系统: ${info.os.name} ${info.os.version}\n`;
+        output += `架构: ${info.os.architecture}\n`;
+        output += `平台: ${info.platform}\n\n`;
+
+        // 硬件信息
+        output += '=== 硬件信息 ===\n';
+        output += `逻辑核心数: ${info.hardware.logicalCores}\n`;
+        output += `设备内存: ${info.hardware.deviceMemory}\n`;
+        output += `最大触摸点数: ${info.hardware.maxTouchPoints}\n\n`;
+
+        // 屏幕信息
+        output += '=== 屏幕信息 ===\n';
+        output += `分辨率: ${info.screen.width} × ${info.screen.height}\n`;
+        output += `设备像素比: ${info.screen.devicePixelRatio}\n`;
+        output += `颜色深度: ${info.screen.colorDepth} 位\n`;
+        output += `像素深度: ${info.screen.pixelDepth} 位\n`;
+        output += `方向: ${info.screen.orientation}\n\n`;
+
+        // WebGL信息
+        output += '=== WebGL 信息 ===\n';
+        output += `WebGL 支持: ${info.webgl.supported ? '是' : '否'}\n`;
+
+        if (info.webgl.supported) {
+            output += `WebGL 版本: ${info.webgl.version}\n`;
+            output += `显卡型号: ${info.webgl.renderer}\n`;
+            output += `显卡厂商: ${info.webgl.vendor}\n`;
+            output += `着色语言: ${info.webgl.shadingLanguage}\n`;
+
+            if (info.webgl.gpuType) {
+                output += `GPU 类型: ${info.webgl.gpuType.type}\n`;
+                output += `独立显卡: ${info.webgl.gpuType.discrete ? '是' : '否'}\n`;
+            }
+
+            output += `性能等级: ${info.webgl.performance.tier}\n`;
+            output += `支持特性: ${info.webgl.performance.features.join(', ')}\n`;
+
+            if (info.webgl.memoryInfo.estimatedMemory !== 'Unknown') {
+                output += `显存估计: ${info.webgl.memoryInfo.estimatedMemory}\n`;
+            }
+
+            if (info.webgl.memoryInfo.maxTextureSize) {
+                output += `最大纹理尺寸: ${info.webgl.memoryInfo.maxTextureSize}\n`;
+            }
+
+            output += `WebGL 扩展数: ${info.webgl.extensions.length}\n`;
+        }
+
+        // 其他信息
+        output += '\n=== 其他信息 ===\n';
+        output += `语言: ${info.language}\n`;
+        output += `支持语言: ${info.languages.join(', ')}\n`;
+        output += `时区: ${info.timezone}\n`;
+        output += `Cookie 支持: ${info.cookiesEnabled ? '是' : '否'}\n`;
+        output += `在线状态: ${info.online ? '在线' : '离线'}\n`;
+        output += `Java 支持: ${info.javaEnabled ? '是' : '否'}\n`;
+        output += `PDF 查看器: ${info.pdfViewerEnabled ? '支持' : '不支持'}\n`;
+        output += `Do Not Track: ${info.doNotTrack}\n`;
+        output += `当前时间: ${info.dateTimeFormat}\n`;
+
+        return output;
+    }
+
+    // 创建HTML显示
+    createInfoHTML() {
+        const info = this.getAllInfo();
+        let html = `
+      <div class="system-info">
+        <h2>系统信息</h2>
+        
+        <div class="info-section">
+          <h3>🌐 浏览器信息</h3>
+          <table>
+            <tr><td>浏览器</td><td>${info.browser.name} ${info.browser.version}</td></tr>
+            <tr><td>用户代理</td><td><code>${info.userAgent}</code></td></tr>
+            <tr><td>平台</td><td>${info.platform}</td></tr>
+          </table>
+        </div>
+        
+        <div class="info-section">
+          <h3>💻 操作系统</h3>
+          <table>
+            <tr><td>系统</td><td>${info.os.name} ${info.os.version}</td></tr>
+            <tr><td>架构</td><td>${info.os.architecture}</td></tr>
+            <tr><td>语言</td><td>${info.language}</td></tr>
+            <tr><td>时区</td><td>${info.timezone}</td></tr>
+          </table>
+        </div>
+        
+        <div class="info-section">
+          <h3>🖥️ 硬件信息</h3>
+          <table>
+            <tr><td>CPU 核心数</td><td>${info.hardware.logicalCores}</td></tr>
+            <tr><td>设备内存</td><td>${info.hardware.deviceMemory}</td></tr>
+            <tr><td>屏幕分辨率</td><td>${info.screen.width} × ${info.screen.height}</td></tr>
+            <tr><td>设备像素比</td><td>${info.screen.devicePixelRatio}</td></tr>
+          </table>
+        </div>
+    `;
+
+        if (info.webgl.supported) {
+            html += `
+        <div class="info-section">
+          <h3>🎮 WebGL & 显卡信息</h3>
+          <table>
+            <tr><td>WebGL 支持</td><td>✅ 已支持</td></tr>
+            <tr><td>WebGL 版本</td><td>${info.webgl.version}</td></tr>
+            <tr><td>显卡型号</td><td><strong>${info.webgl.renderer}</strong></td></tr>
+            <tr><td>显卡厂商</td><td>${info.webgl.vendor}</td></tr>
+            <tr><td>GPU 类型</td><td>${info.webgl.gpuType.type} ${info.webgl.gpuType.discrete ? '（独立显卡）' : '（集成显卡）'}</td></tr>
+            <tr><td>着色语言</td><td>${info.webgl.shadingLanguage}</td></tr>
+            <tr><td>性能等级</td><td><span class="perf-${info.webgl.performance.tier}">${info.webgl.performance.tier}</span></td></tr>
+            <tr><td>WebGL 扩展数</td><td>${info.webgl.extensions.length} 个</td></tr>
+      `;
+
+            if (info.webgl.memoryInfo.estimatedMemory !== 'Unknown') {
+                html += `<tr><td>显存估计</td><td>${info.webgl.memoryInfo.estimatedMemory}</td></tr>`;
+            }
+
+            html += `</table></div>`;
+        } else {
+            html += `
+        <div class="info-section">
+          <h3>🎮 WebGL & 显卡信息</h3>
+          <p style="color: red;">❌ WebGL 不支持</p>
+        </div>
+      `;
+        }
+
+        html += `</div>`;
+
+        return html;
+    }
+}
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = SystemInfo;
+} else if (typeof window !== 'undefined') {
+    window.SystemInfo = SystemInfo;
+}
\ No newline at end of file
diff --git a/src/views/dictionary/template/browser/tip.vue b/src/views/dictionary/template/browser/tip.vue
index 5e380a6e..a88e10d1 100644
--- a/src/views/dictionary/template/browser/tip.vue
+++ b/src/views/dictionary/template/browser/tip.vue
@@ -6,12 +6,13 @@
 </template>
 <script>
 import { getExploreRecommentInfo } from "@/api/dictionary";
+import SystemInfo from "@/utils/systemInfo";
 export default {
   name: "browserTip",
   data() {
     return {
       form: {},
-      tip: this.$t("browser:tip:changeBorwser"),
+      tip: '',
       visible: false,
     };
   },
@@ -36,6 +37,7 @@ export default {
         // console.log(type, No);
         if (type !== "Chrome" && type !== "Edge") {
           this.tip = this.$t("browser:tip:changeBorwser");
+          this.getSystemInfo()
           return (this.visible = true);
         }
         let res = await this.getInfo();
@@ -51,12 +53,29 @@ export default {
               this.tip += "、";
             }
           });
+          this.getSystemInfo()
           return (this.visible = true);
         }
+        this.getSystemInfo()
       } catch (err) {
         console.log(err);
       }
     },
+    getSystemInfo() {
+      const systemInfo = new SystemInfo();
+      const allInfo = systemInfo.getAllInfo();
+      let deviceMemory = allInfo.hardware.deviceMemory; // 设备内存
+      let { width, height } = allInfo.screen; // 分辨率
+      // let discrete = allInfo.webgl.gpuType.discrete; // 是否独立显卡
+      // let estimatedMemory = allInfo.webgl.memoryInfo.estimatedMemory; // 显卡内存
+      if (parseFloat(deviceMemory) < 16 || width < 1920 || height < 1080) {
+        if (this.tip) {
+          this.tip += `<br/>`
+        }
+        this.tip += `<span>${this.$t("browser:tip:Configuration")}</span>`
+        this.visible = true
+      }
+    },
     getExplore() {
       var Sys = {};
       var ua = navigator.userAgent.toLowerCase();
@@ -64,18 +83,18 @@ export default {
       (s = ua.match(/rv:([\d.]+)\) like gecko/))
         ? (Sys.ie = s[1])
         : (s = ua.match(/msie ([\d\.]+)/))
-        ? (Sys.ie = s[1])
-        : (s = ua.match(/edg\/([\d\.]+)/) || ua.match(/edge\/([\d\.]+)/))
-        ? (Sys.edge = s[1])
-        : (s = ua.match(/firefox\/([\d\.]+)/))
-        ? (Sys.firefox = s[1])
-        : (s = ua.match(/(?:opera|opr).([\d\.]+)/))
-        ? (Sys.opera = s[1])
-        : (s = ua.match(/chrome\/([\d\.]+)/))
-        ? (Sys.chrome = s[1])
-        : (s = ua.match(/version\/([\d\.]+).*safari/))
-        ? (Sys.safari = s[1])
-        : 0;
+          ? (Sys.ie = s[1])
+          : (s = ua.match(/edg\/([\d\.]+)/) || ua.match(/edge\/([\d\.]+)/))
+            ? (Sys.edge = s[1])
+            : (s = ua.match(/firefox\/([\d\.]+)/))
+              ? (Sys.firefox = s[1])
+              : (s = ua.match(/(?:opera|opr).([\d\.]+)/))
+                ? (Sys.opera = s[1])
+                : (s = ua.match(/chrome\/([\d\.]+)/))
+                  ? (Sys.chrome = s[1])
+                  : (s = ua.match(/version\/([\d\.]+).*safari/))
+                    ? (Sys.safari = s[1])
+                    : 0;
       // 根据关系进行判断
       if (Sys.ie) return "IE: " + Sys.ie;
       if (Sys.edge) return "Edge: " + Sys.edge;
@@ -100,6 +119,7 @@ export default {
   align-items: center;
   padding: 0 20px;
   color: #555;
+
   i {
     color: red;
     font-size: 24px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index b33996c4..ec2dbdc5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -703,6 +703,7 @@ import { setSkipReadingCache } from '@/api/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
 import { changeURLStatic } from '@/utils/history.js'
+import SystemInfo from "@/utils/systemInfo";
 export default {
   name: 'DicomViewer',
   components: {
@@ -2439,7 +2440,7 @@ export default {
       }
     },
     handleSubmitFusionSeries() {
-      this.$refs['fusionForm'].validate((valid) => {
+      this.$refs['fusionForm'].validate(async (valid) => {
         if (!valid) return
         if (Object.keys(this.ctSeriesInfo).length === 0 || Object.keys(this.petSeriesInfo).length === 0) {
           // '请选择序列信息！'
@@ -2449,6 +2450,10 @@ export default {
           }).then(() => { }).catch(() => { })
           return
         }
+        if (this.ctSeriesInfo.instanceCount > 400) {
+          let res = await this.getSystemInfo()
+          if (!res) return false
+        }
         var count = Math.abs(this.ctSeriesInfo.instanceCount - this.petSeriesInfo.instanceCount)
         if (count > 10) {
           // '选择的两组序列，影像数存在较大差距, 是否继续?'
@@ -2477,7 +2482,24 @@ export default {
       }
       this.petctWindow = window.open(routeData.href, '_blank')
       this.$nextTick(() => { this.petct.visible = true })
-    }
+    },
+    getSystemInfo() {
+      return new Promise(async resolve => {
+        const systemInfo = new SystemInfo();
+        const allInfo = systemInfo.getAllInfo();
+        let deviceMemory = allInfo.hardware.deviceMemory; // 设备内存
+        let { width, height } = allInfo.screen; // 分辨率
+        let discrete = allInfo.webgl.gpuType.discrete; // 是否独立显卡
+        let estimatedMemory = allInfo.webgl.memoryInfo.estimatedMemory; // 显卡内存
+        if (parseFloat(deviceMemory) < 16 || width < 1920 || height < 1080 || !discrete || parseFloat(estimatedMemory) < 2) {
+          let res = await this.$confirm(this.$t('browser:tip:ReadingConfiguration'))
+          resolve(res)
+        } else {
+          resolve(true)
+        }
+
+      })
+    },
   }
 }
 </script>
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 f76e71b5..e82995b7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -498,6 +498,7 @@ import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import { getNetWorkSpeed, setNetWorkSpeedSizeAll, workSpeedclose } from "@/utils"
 import readingChart from '@/components/readingChart'
+import SystemInfo from "@/utils/systemInfo";
 const { visibility } = annotation
 const { ViewportType, Events } = Enums
 const renderingEngineId = 'myRenderingEngine'
@@ -3289,8 +3290,11 @@ export default {
         }
         const series = data ? data : this.$refs[`viewport-${this.activeViewportIndex}`][0].series
         if (series.ImageIds.length <= 5) return this.$confirm(this.$t('trials:reading:confirm:smallNumberOfimage'))
+        if (series.ImageIds.length > 500) {
+          let res = await this.getSystemInfo()
+          if (!res) return false
+        }
         this.isMPR = true
-        console.log(series, 'series')
         this.rows = 3
         this.cols = 1
         this.loading = true
@@ -3315,11 +3319,15 @@ export default {
           if (!confirm) return false
           this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].removeAllNoSaveAnnotation()
         }
+        const { ct, pt } = data
+        if (ct.ImageIds.length > 400) {
+          let res = await this.getSystemInfo()
+          if (!res) return false
+        }
         this.fusionVisible = false
         this.isFusion = true
         this.rows = 2
         this.cols = 2
-        const { ct, pt } = data
         this.loading = true
         this.loadingText = this.$t('trials:lugano:message:loadVolumes')
         this.renderedTaskIds = []
@@ -3456,6 +3464,23 @@ export default {
       this.uploadStatus = status
       this[`${status}ImageVisible`] = true
     },
+    getSystemInfo() {
+      return new Promise(async resolve => {
+        const systemInfo = new SystemInfo();
+        const allInfo = systemInfo.getAllInfo();
+        let deviceMemory = allInfo.hardware.deviceMemory; // 设备内存
+        let { width, height } = allInfo.screen; // 分辨率
+        let discrete = allInfo.webgl.gpuType.discrete; // 是否独立显卡
+        let estimatedMemory = allInfo.webgl.memoryInfo.estimatedMemory; // 显卡内存
+        if (parseFloat(deviceMemory) < 16 || width < 1920 || height < 1080 || !discrete || parseFloat(estimatedMemory) < 2) {
+          let res = await this.$confirm(this.$t('browser:tip:ReadingConfiguration'))
+          resolve(res)
+        } else {
+          resolve(true)
+        }
+
+      })
+    },
   },
   beforeDestroy() {
     DicomEvent.$off('isCanActiveNoneDicomTool')

From 3f48bc0ba525d43fadd8916e7e63f78902d6c1e1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 29 Dec 2025 16:01:24 +0800
Subject: [PATCH 215/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/report-forms/index.vue         | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index 2601170c..b1958ae8 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -291,7 +291,8 @@ export default {
                 let res = await getTrialEfficacyEvaluationStatList(data)
                 this.loading_bottom = false
                 if (res.IsSuccess) {
-                    this.ORR = res.OtherInfo.ORR
+                    let OtherInfo = res.OtherInfo || {}
+                    this.ORR = OtherInfo.ORR
                     let obj = {
                         xAxisData: [],
                         seriesData: [],
@@ -299,7 +300,7 @@ export default {
                         titleText: this.$t("trials:reportForms:cjart:title:EfficacyEvaluationStat"),
                     }
                     res.Result.forEach(item => {
-                        obj.xAxisData.push(this.$fd(item.DictionaryCode, Number(item.OverallTumorEvaluation)))
+                        obj.xAxisData.push(item.OverallTumorEvaluation)
                         obj.seriesData.push(item.SubjectCount)
                     })
                     let obj2 = {
@@ -308,10 +309,13 @@ export default {
                         unit: this.$t("trials:reportForms:cjart:unit:DaysDiff"),
                         titleText: this.$t("trials:reportForms:cjart:title:dataDistribution"),
                     }
-                    res.OtherInfo.PDList.forEach(item => {
-                        obj.xAxisData.push(item.SubjectCode)
-                        obj.seriesData.push(item.DaysDiff)
-                    })
+                    if (OtherInfo.PDList && OtherInfo.PDList.length > 0) {
+                        OtherInfo.PDList.forEach(item => {
+                            obj.xAxisData.push(item.SubjectCode)
+                            obj.seriesData.push(item.DaysDiff)
+                        })
+                    }
+
                     this.initChart_bottom(obj)
                     this.initChart_bottom_right(obj2)
                 }

From 264f00f5a800125f3fe48ddcf17c093657f8d8c4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 30 Dec 2025 09:16:31 +0800
Subject: [PATCH 216/333] 1

---
 .../reading/dicoms3D/components/customize/QuestionFormItem.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 091ed105..3cf9a747 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -1162,7 +1162,7 @@ export default {
           if (isNAN) {
             num = ''
           }
-          if (isNaN(parseFloat(num))) {
+          if (!isNaN(parseFloat(num))) {
             num = Number(num).toFixed(this.digitPlaces)
           }
           this.$set(this.QuestionsForm, v.Id, num.toString());

From 040814c3d674ddf7b06470f42832581577c4f378 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 30 Dec 2025 10:24:50 +0800
Subject: [PATCH 217/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/report-forms/index.vue      | 69 ++++++++++++++-----
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index b1958ae8..44318f2f 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -33,7 +33,7 @@
 import BaseContainer from '@/components/BaseContainer'
 let echarts = require('echarts/lib/echarts');
 
-// require('echarts/lib/chart/line');
+require('echarts/lib/component/markLine');
 require('echarts/lib/chart/funnel');
 require('echarts/lib/chart/bar');
 // 按需引入组件
@@ -158,7 +158,8 @@ export default {
                     }
                 },
                 legend: {
-                    data: obj.legendData
+                    data: obj.legendData,
+                    bottom: 0
                 },
                 series: [
                     {
@@ -262,7 +263,9 @@ export default {
                         type: 'shadow'
                     }
                 },
-                legend: {},
+                legend: {
+                    bottom: 0
+                },
                 xAxis: [
                     {
                         type: 'category',
@@ -306,16 +309,17 @@ export default {
                     let obj2 = {
                         xAxisData: [],
                         seriesData: [],
+                        medianValue: 0,
                         unit: this.$t("trials:reportForms:cjart:unit:DaysDiff"),
                         titleText: this.$t("trials:reportForms:cjart:title:dataDistribution"),
                     }
                     if (OtherInfo.PDList && OtherInfo.PDList.length > 0) {
                         OtherInfo.PDList.forEach(item => {
-                            obj.xAxisData.push(item.SubjectCode)
-                            obj.seriesData.push(item.DaysDiff)
+                            obj2.xAxisData.push(item.SubjectCode)
+                            obj2.seriesData.push(item.DaysDiff)
                         })
                     }
-
+                    obj2.medianValue = this.calculateMedian(obj2.seriesData)
                     this.initChart_bottom(obj)
                     this.initChart_bottom_right(obj2)
                 }
@@ -373,29 +377,56 @@ export default {
                 xAxis: {
                     type: 'category',
                     data: obj.xAxisData
+                    // data: ['aaa', 'bbb', 'ccc']
                 },
                 yAxis: {
                     name: obj.unit,
                     type: 'value'
                 },
-                series: [
-                    {
-                        markLine: {
-                            data: [
-                                {
-                                    type: 'average', name: this.$t("trials:reportForms:cjart:data:average")
-                                }
-                            ]
+                series: {
+                    markLine: {
+                        // symbol: ['none', 'none'], // 隐藏标记线两端的箭头
+                        label: {
+                            show: true,
+                            position: 'end', // 将标签显示在线的起点
+                            formatter: `${this.$t('trials:reportForms:cjart:data:median')}: {c}` // 使用 {c} 自动显示 yAxis 的值
                         },
-                        data: obj.seriesData,
-                        type: 'bar',
-                        barWidth: 20,
-                    }
-                ]
+                        data: [
+                            {
+                                name: this.$t('trials:reportForms:cjart:data:median'),
+                                // yAxis 的值设置为我们计算出的中位数
+                                yAxis: obj.medianValue,
+                                lineStyle: {
+                                    type: 'dashed', // 设置为虚线
+                                    color: this.color[7]
+                                }
+                            }
+                        ]
+                    },
+                    data: obj.seriesData,
+                    // data: [1, 2, 3],
+                    type: 'bar',
+                    barWidth: 20,
+                }
+
             };
             // 4. 使用配置项渲染图表
             this.chart_bottom_right.setOption(option);
         },
+        calculateMedian(numbers) {
+            // 1. 创建副本并排序
+            const sorted = [...numbers].sort((a, b) => a - b);
+            const middle = Math.floor(sorted.length / 2);
+
+            // 2. 判断数组长度是奇数还是偶数
+            if (sorted.length % 2 === 0) {
+                // 偶数长度：取中间两个数的平均值
+                return (sorted[middle - 1] + sorted[middle]) / 2;
+            } else {
+                // 奇数长度：直接取中间的数
+                return sorted[middle];
+            }
+        }
     }
 }
 </script>

From 5216bf9f62c3d97238cf6c76a51ceca05cea0131 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 30 Dec 2025 11:44:10 +0800
Subject: [PATCH 218/333] =?UTF-8?q?=E5=8F=97=E8=AF=95=E8=80=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=9B=BE=E8=A1=A8=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |   8 +
 src/components/readingChart/index.vue         |   1 -
 .../subject-list/components/SubjectChart.vue  | 289 ++++++++++++++++++
 .../subject/subject-list/index.vue            | 266 +++++-----------
 4 files changed, 379 insertions(+), 185 deletions(-)
 create mode 100644 src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index 3227472a..764286a0 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -4407,6 +4407,14 @@ export function getTrialEfficacyEvaluationStatList(data) {
     data
   })
 }
+// 受试者图表
+export function getReportsChartSummary(data) {
+  return request({
+    url: `/ReadingImageTask/getReportsChartSummary`,
+    method: 'post',
+    data
+  })
+}
 // 靶段标注列表
 export function getTrialSubjectVisitMarkList(data) {
   return request({
diff --git a/src/components/readingChart/index.vue b/src/components/readingChart/index.vue
index 4d51866d..1c4ae9a8 100644
--- a/src/components/readingChart/index.vue
+++ b/src/components/readingChart/index.vue
@@ -8,7 +8,6 @@
 
 <script>
 import { getReportsChartData } from "@/api/reading"
-import moment from "moment"
 let echarts = require('echarts/lib/echarts');
 
 // 按需引入图表
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
new file mode 100644
index 00000000..c64cc13b
--- /dev/null
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
@@ -0,0 +1,289 @@
+<template>
+    <div class="subjectChart" v-loading="loading">
+        <el-form :inline="true">
+            <!-- Site -->
+            <el-form-item :label="$t('subjectChart:table:subject')">
+                <span>{{ data.Code }}</span>
+            </el-form-item>
+            <el-form-item :label="$t('subjectChart:table:CriterionType')">
+                <el-select v-model="CriterionType" clearable filterable @change="handleChange">
+                    <el-option v-for="(item) of trialCriterionList" :key="item.TrialReadingCriterionId"
+                        :label="item.TrialReadingCriterionName" :value="item.CriterionType" />
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <el-table :data="tableList" border style="width: 100%">
+            <el-table-column v-for="item in tableKey" :key="item.key" :prop="item.key" :label="item.title">
+                <template slot-scope="scope">
+                    <span>{{ scope.row[item.key] }}</span>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="chartBox">
+            <div class="R1box" v-if="R1ChartList.length > 0">
+                <div v-for="item in R1ChartList" :key="item.id">
+                    <div class="title">{{ item.title }}</div>
+                    <div v-for="d in item.list" :key="d.id" :ref="`chartContainer_${d.id}`" class="canvasBox"
+                        :style="{ width: R2ChartList.length > 0 ? '490px' : '980px', height: '290px' }">
+                    </div>
+                </div>
+            </div>
+            <div class="R2box" v-if="R2ChartList.length > 0">
+                <div v-for="item in R2ChartList" :key="item.id">
+                    <div class="title">{{ item.title }}</div>
+                    <div v-for="d in item.list" :key="d.id" :ref="`chartContainer_${d.id}`" class="canvasBox"
+                        style="width: 490px; height: 290px;">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import {
+    getTrialCriterionList,
+    getReportsChartSummary
+} from '@/api/trials'
+let echarts = require('echarts/lib/echarts');
+
+// 按需引入图表
+// require('echarts/lib/chart/bar');
+require('echarts/lib/chart/line');
+// require('echarts/lib/chart/pie');
+// require('echarts/lib/chart/scatter');
+
+// 按需引入组件
+require('echarts/lib/component/tooltip');
+require('echarts/lib/component/title');
+require('echarts/lib/component/legend');
+require('echarts/lib/component/grid');
+require('echarts/lib/component/dataZoom');
+export default {
+    name: "SubjectChart",
+    props: {
+        data: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        }
+    },
+    data() {
+        return {
+            loading: false,
+            trialCriterionList: [],
+            CriterionType: null,
+            tableKey: [],
+            tableList: [],
+            R1ChartList: [],
+            R2ChartList: []
+        }
+    },
+    mounted() {
+        this.getTrialCriterionList()
+    },
+    methods: {
+        handleChange() {
+            this.getList()
+        },
+        getTrialCriterionList() {
+            this.loading = true
+            getTrialCriterionList(this.$route.query.trialId, false).then(res => {
+                this.trialCriterionList = res.Result
+                if (this.trialCriterionList.length > 0) {
+                    this.CriterionType = this.trialCriterionList[0].CriterionType
+                    this.getList()
+                    this.loading = false
+                }
+            }).catch(() => { this.loading = false })
+        },
+        async getList() {
+            try {
+                let data = {
+                    SubjectId: this.data.Id,
+                    CriterionType: this.CriterionType
+                }
+                this.loading = true
+                let res = await getReportsChartSummary(data)
+                this.loading = false
+                if (res.IsSuccess) {
+                    let Evaluation = res.Result.Evaluation.Evaluation
+                    let DictionaryCode = res.Result.Evaluation.DictionaryCode
+                    this.tableKey = [
+                        {
+                            title: this.$t(`subjectChart:table:label:visit`),
+                            key: 'visit'
+                        }
+                    ]
+                    Evaluation[0].forEach(key => {
+                        let obj = {
+                            title: key,
+                            key
+                        }
+                        this.tableKey.push(obj)
+                    })
+                    this.tableList = []
+                    if (Evaluation[1] && Evaluation[1].length > 0) {
+                        let obj = {}
+                        this.tableKey.forEach((item, index) => {
+                            obj[item.key] = index === 0 ? 'R1' : DictionaryCode ? this.$fd(DictionaryCode, Evaluation[1][index - 1]) : Evaluation[1][index - 1]
+                        })
+                        this.tableList.push(obj)
+                    }
+                    if (Evaluation[2] && Evaluation[2].length > 0) {
+                        let obj = {}
+                        this.tableKey.forEach((item, index) => {
+                            obj[item.key] = index === 0 ? 'R2' : DictionaryCode ? this.$fd(DictionaryCode, Evaluation[2][index - 1]) : Evaluation[2][index - 1]
+                        })
+                        this.tableList.push(obj)
+                    }
+                    let chartData = [...res.Result.TargetCharts, ...res.Result.QuestionCharts]
+                    let R1ChartData = chartData.map(item => {
+                        if (item.Arm === 1) return item
+                    }).filter(item => item && item.VisitTaskNameList.length > 0)
+                    let R2ChartData = chartData.map(item => {
+                        if (item.Arm === 2) return item
+                    }).filter(item => item && item.VisitTaskNameList.length > 0)
+                    if (Array.isArray(R1ChartData)) {
+                        this.R1ChartList = []
+                        R1ChartData.forEach(item => {
+                            let index = this.R1ChartList.findIndex(i => i.title === item.GroupName)
+                            let o = {
+                                id: this.$guid(),
+                                series: [],
+                                unit: this.$fd("ValueUnit", item.Unit),
+                                visitName: item.VisitTaskNameList,
+                            }
+                            item.ChartDataList.forEach((i) => {
+                                let arr = []
+                                i.Value.forEach((d) => {
+                                    arr.push(d)
+                                })
+                                o.series.push({
+                                    name: i.Name,
+                                    data: arr,
+                                    type: 'line'
+                                })
+                            });
+                            if (index < 0) {
+                                let obj = {
+                                    title: item.GroupName,
+                                    list: [o],
+                                    id: this.$guid(),
+                                }
+                                this.R1ChartList.push(obj)
+                            } else {
+                                this.R1ChartList[index].list.push(o)
+                            }
+                        })
+                        this.$nextTick(() => {
+                            if (this.R1ChartList.length > 0) {
+                                this.R1ChartList.forEach(item => {
+                                    if (item.list.length > 0) {
+                                        item.list.forEach(d => {
+                                            this.initChart(d)
+                                        })
+                                    }
+                                })
+                            }
+                        })
+                    }
+                    if (Array.isArray(R2ChartData)) {
+                        this.R2ChartList = []
+                        R2ChartData.forEach(item => {
+                            let index = this.R2ChartList.findIndex(i => i.title === item.GroupName)
+                            let o = {
+                                id: this.$guid(),
+                                series: [],
+                                unit: this.$fd("ValueUnit", item.Unit),
+                                visitName: item.VisitTaskNameList,
+                            }
+                            item.ChartDataList.forEach((i) => {
+                                let arr = []
+                                i.Value.forEach((d) => {
+                                    arr.push(d)
+                                })
+                                o.series.push({
+                                    name: i.Name,
+                                    data: arr,
+                                    type: 'line'
+                                })
+                            });
+                            if (index < 0) {
+                                let obj = {
+                                    title: item.GroupName,
+                                    list: [o],
+                                    id: this.$guid(),
+                                }
+                                this.R2ChartList.push(obj)
+                            } else {
+                                this.R2ChartList[index].list.push(o)
+                            }
+                        })
+                        this.$nextTick(() => {
+                            if (this.R2ChartList.length > 0) {
+                                this.R2ChartList.forEach(item => {
+                                    if (item.list.length > 0) {
+                                        item.list.forEach(d => {
+                                            this.initChart(d)
+                                        })
+                                    }
+                                })
+                            }
+                        })
+                    }
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+
+        },
+        initChart(obj) {
+            let chart = echarts.init(this.$refs[`chartContainer_${obj.id}`][0]);
+            // ...图表配置
+            const option = {
+                // title: {
+                //     text: obj.title,
+                //     textStyle: {
+                //         color: "#fff"
+                //     }
+                // },
+                tooltip: {
+                    trigger: 'axis',
+                },
+                xAxis: {
+                    data: obj.visitName,
+                },
+                yAxis: {
+                    name: obj.unit,
+                    type: 'value',
+                },
+                series: obj.series
+            };
+            // 4. 使用配置项渲染图表
+            chart.setOption(option);
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.chartBox {
+    display: flex;
+
+    width: 100%;
+
+    .R1box,
+    .R2box {
+        width: 100%;
+
+        .title {
+            margin-top: 10px;
+        }
+
+        .canvasBox {
+            margin: auto;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index e0ab3a4c..b963d297 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -6,12 +6,8 @@
         <!-- Site -->
         <el-form-item :label="$t('trials:subject:table:site')">
           <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:130px;">
-            <el-option
-              v-for="(item,index) of siteOptions"
-              :key="index"
-              :label="item.TrialSiteCode"
-              :value="item.TrialSiteId"
-            />
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
+              :value="item.TrialSiteId" />
           </el-select>
         </el-form-item>
         <!-- Subject ID -->
@@ -21,7 +17,8 @@
         <!-- Status -->
         <el-form-item :label="$t('trials:subject:table:status')">
           <el-select v-model="searchData.Status" clearable style="width:130px;">
-            <el-option v-for="item of $d.Subject_Visit_Status" :key="item.value" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.Subject_Visit_Status" :key="item.value" :value="item.value"
+              :label="item.label" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:subject:table:isMissingImages')">
@@ -45,14 +42,8 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto;">
-        <el-button
-          v-if="visitPlanConfirmed"
-          v-hasPermi="['trials:trials-panel:subject:new']"
-          type="primary"
-          icon="el-icon-plus"
-
-          @click="handleAdd"
-        >
+        <el-button v-if="visitPlanConfirmed" v-hasPermi="['trials:trials-panel:subject:new']" type="primary"
+          icon="el-icon-plus" @click="handleAdd">
           {{ $t('common:button:new') }}
         </el-button>
       </span>
@@ -61,226 +52,127 @@
 
     <template slot="main-container">
       <!-- 受试者列表 -->
-      <el-table
-        ref="subjectList"
-        v-loading="loading"
-        v-adaptive="{bottomOffset:60}"
-        :data="list"
-        stripe
-        height="100"
-        @sort-change="handleSortByColumn"
-      >
+      <el-table ref="subjectList" v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe height="100"
+        @sort-change="handleSortByColumn">
         <el-table-column type="index" width="40" />
         <!-- Site -->
-        <el-table-column
-          prop="TrialSiteCode"
-          :label="$t('trials:subject:table:site')"
-          sortable="custom"
-          show-overflow-tooltip
-          width="120"
-        />
+        <el-table-column prop="TrialSiteCode" :label="$t('trials:subject:table:site')" sortable="custom"
+          show-overflow-tooltip width="120" />
         <!-- Code -->
-        <el-table-column
-          prop="Code"
-          :label="$t('trials:subject:table:subjectId')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="130"
-        />
+        <el-table-column prop="Code" :label="$t('trials:subject:table:subjectId')" show-overflow-tooltip
+          sortable="custom" width="130" />
         <!-- 第二编号 -->
-        <el-table-column
-          v-if="otherInfo.IsSubjectSecondCodeView"
-          prop="MedicalNo"
-          :label="$t('trials:subject:table:medicalNo')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="150"
-        />
+        <el-table-column v-if="otherInfo.IsSubjectSecondCodeView" prop="MedicalNo"
+          :label="$t('trials:subject:table:medicalNo')" show-overflow-tooltip sortable="custom" width="150" />
         <!-- 访视基准日期 -->
-        <el-table-column
-          prop="FirstGiveMedicineTime"
-          :label="$t('trials:subject:table:firstGiveMedicineTime')"
-          sortable="custom"
-          show-overflow-tooltip
-          width="150"
-        >
+        <el-table-column prop="FirstGiveMedicineTime" :label="$t('trials:subject:table:firstGiveMedicineTime')"
+          sortable="custom" show-overflow-tooltip width="150">
           <template slot-scope="scope">
-            {{ scope.row.FirstGiveMedicineTime?moment(scope.row.FirstGiveMedicineTime).format('YYYY-MM-DD'):'' }}
+            {{ scope.row.FirstGiveMedicineTime ? moment(scope.row.FirstGiveMedicineTime).format('YYYY-MM-DD') : '' }}
           </template>
         </el-table-column>
         <!-- Status -->
-        <el-table-column
-          prop="Status"
-          :label="$t('trials:subject:table:status')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="120"
-        >
+        <el-table-column prop="Status" :label="$t('trials:subject:table:status')" show-overflow-tooltip
+          sortable="custom" width="120">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.Status === 1" type="primary">{{ $fd('Subject_Visit_Status', scope.row.Status) }}</el-tag>
-            <el-tag v-if="scope.row.Status === 2" type="danger">{{ $fd('Subject_Visit_Status', scope.row.Status) }}</el-tag>
-            <el-tag v-if="scope.row.Status === 3" type="danger">{{ $fd('Subject_Visit_Status', scope.row.Status) }}</el-tag>
+            <el-tag v-if="scope.row.Status === 1" type="primary">{{ $fd('Subject_Visit_Status', scope.row.Status)
+            }}</el-tag>
+            <el-tag v-if="scope.row.Status === 2" type="danger">{{ $fd('Subject_Visit_Status', scope.row.Status)
+            }}</el-tag>
+            <el-tag v-if="scope.row.Status === 3" type="danger">{{ $fd('Subject_Visit_Status', scope.row.Status)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 总访视量 -->
-        <el-table-column
-          prop="TotalVisitCount"
-          :label="$t('trials:subject:table:totalVisitCount')"
-          show-overflow-tooltip
-          min-width="120"
-        >
+        <el-table-column prop="TotalVisitCount" :label="$t('trials:subject:table:totalVisitCount')"
+          show-overflow-tooltip min-width="120">
           <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.TotalVisitCount > 0 && (hasCrcRoute || hasQCRoute)"
-              type="text"
-              @click="handleTotalVisitCount(scope.row.Code)"
-            >
+            <el-button v-if="scope.row.TotalVisitCount > 0 && (hasCrcRoute || hasQCRoute)" type="text"
+              @click="handleTotalVisitCount(scope.row.Code)">
               {{ scope.row.TotalVisitCount }}
             </el-button>
             <span v-else> {{ scope.row.TotalVisitCount }}</span>
           </template>
         </el-table-column>
         <!-- 计划访视量 -->
-        <el-table-column
-          prop="InPlanVisitCount"
-          :label="$t('trials:subject:table:inPlanVisitCount')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="140"
-        />
+        <el-table-column prop="InPlanVisitCount" :label="$t('trials:subject:table:inPlanVisitCount')"
+          show-overflow-tooltip sortable="custom" min-width="140" />
         <!-- 计划外访视量 -->
-        <el-table-column
-          prop="OutPlanVisitCount"
-          :label="$t('trials:subject:table:outPlanVisitCount')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="160"
-        />
+        <el-table-column prop="OutPlanVisitCount" :label="$t('trials:subject:table:outPlanVisitCount')"
+          show-overflow-tooltip sortable="custom" width="160" />
         <!-- 当前提交访视量 -->
-        <el-table-column
-          prop="TotalVisitSubmmitCount"
-          :label="$t('trials:subject:table:totalVisitSubmmitCount')"
-          show-overflow-tooltip
-          min-width="130"
-        />
+        <el-table-column prop="TotalVisitSubmmitCount" :label="$t('trials:subject:table:totalVisitSubmmitCount')"
+          show-overflow-tooltip min-width="130" />
         <!-- 是否漏传 -->
-        <el-table-column
-          prop="IsMissingImages"
-          :label="$t('trials:subject:table:isMissingImages')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="140"
-        >
+        <el-table-column prop="IsMissingImages" :label="$t('trials:subject:table:isMissingImages')"
+          show-overflow-tooltip sortable="custom" min-width="140">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsMissingImages" type="danger">{{ $fd('YesOrNo', scope.row.IsMissingImages) }}</el-tag>
+            <el-tag v-if="scope.row.IsMissingImages" type="danger">{{ $fd('YesOrNo', scope.row.IsMissingImages)
+            }}</el-tag>
             <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsMissingImages) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 漏提交访视量 -->
-        <el-table-column
-          prop="MissingSubmmitCount"
-          :label="$t('trials:subject:table:missingSubmmitCount')"
-          show-overflow-tooltip
-          min-width="120"
-        />
+        <el-table-column prop="MissingSubmmitCount" :label="$t('trials:subject:table:missingSubmmitCount')"
+          show-overflow-tooltip min-width="120" />
         <!-- 失访访视量 -->
-        <el-table-column
-          prop="LostVisitCount"
-          :label="$t('trials:subject:table:lostVisitCount')"
-          show-overflow-tooltip
-          min-width="120"
-        />
+        <el-table-column prop="LostVisitCount" :label="$t('trials:subject:table:lostVisitCount')" show-overflow-tooltip
+          min-width="120" />
         <!-- 最新提交访视名称 -->
-        <el-table-column
-          prop="LatestVisitName"
-          :label="$t('trials:subject:table:latestVisitName')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="120"
-        />
+        <el-table-column prop="LatestVisitName" :label="$t('trials:subject:table:latestVisitName')"
+          show-overflow-tooltip sortable="custom" min-width="120" />
 
         <el-table-column
-          v-if="hasPermi(['trials:trials-panel:subject:edit', 'trials:trials-panel:subject:status', 'trials:trials-panel:subject:delete'])"
-          :label="$t('common:action:action')"
-          width="200"
-          fixed="right"
-        >
+          v-if="hasPermi(['trials:trials-panel:subject:edit', 'trials:trials-panel:subject:status', 'trials:trials-panel:subject:delete', 'trials:trials-panel:subject:chart', 'trials:trials-panel:subject:report'])"
+          :label="$t('common:action:action')" width="240" fixed="right">
           <template slot-scope="scope">
             <!-- 编辑 -->
-            <el-button
-              v-hasPermi="['trials:trials-panel:subject:edit']"
-              circle
-              :title="$t('trials:subject:action:edit')"
-              icon="el-icon-edit-outline"
-              @click="handleEdit(scope.row)"
-            />
+            <el-button v-hasPermi="['trials:trials-panel:subject:edit']" circle
+              :title="$t('trials:subject:action:edit')" icon="el-icon-edit-outline" @click="handleEdit(scope.row)" />
             <!-- 修改状态 -->
-            <el-button
-              v-hasPermi="['trials:trials-panel:subject:status']"
-              circle
-              :title="$t('trials:subject:action:status')"
-              icon="el-icon-edit"
-              @click="handleEditStatus(scope.row)"
-            />
+            <el-button v-hasPermi="['trials:trials-panel:subject:status']" circle
+              :title="$t('trials:subject:action:status')" icon="el-icon-edit" @click="handleEditStatus(scope.row)" />
             <!-- 删除 -->
-            <el-button
-              v-hasPermi="['trials:trials-panel:subject:delete']"
-              circle
-              :title="$t('trials:subject:action:delete')"
-              icon="el-icon-delete"
-              :disabled="scope.row.StudyCount>0"
-              @click="handleDelete(scope.row)"
-            />
+            <el-button v-hasPermi="['trials:trials-panel:subject:delete']" circle
+              :title="$t('trials:subject:action:delete')" icon="el-icon-delete" :disabled="scope.row.StudyCount > 0"
+              @click="handleDelete(scope.row)" />
             <!-- 删除 -->
-            <el-button
-              v-hasPermi="['trials:trials-panel:subject:report']"
-              icon="el-icon-message"
-              circle
-              :title="$t('trials:subject:title:report')"
-              @click="handleMessage(scope.row)"
-            />
+            <el-button v-hasPermi="['trials:trials-panel:subject:report']" icon="el-icon-message" circle
+              :title="$t('trials:subject:title:report')" @click="handleMessage(scope.row)" />
+            <!-- 图表 -->
+            <el-button v-hasPermi="['trials:trials-panel:subject:chart']" icon="el-icon-s-data" circle
+              :title="$t('trials:subject:title:report')" @click="handleopenSubjectChart(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
     </template>
 
     <!-- 新增/编辑 -->
-    <el-dialog
-      v-if="editDialog.visible"
-      :visible.sync="editDialog.visible"
-      :close-on-click-modal="false"
-      :title="editDialog.title"
-      width="700px"
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="editDialog.visible" :visible.sync="editDialog.visible" :close-on-click-modal="false"
+      :title="editDialog.title" width="700px" custom-class="base-dialog-wrapper">
       <SubjectsForm :data="rowData" :other-info="otherInfo" @close="closeEditDialog" @getList="getList" />
     </el-dialog>
 
     <!-- 修改受试者状态 -->
-    <el-dialog
-      v-if="statusVisible"
-      :visible.sync="statusVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:subject:dialogTitle:editStatus')"
-      width="700px"
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="statusVisible" :visible.sync="statusVisible" :close-on-click-modal="false"
+      :title="$t('trials:subject:dialogTitle:editStatus')" width="700px" custom-class="base-dialog-wrapper">
       <SubjectStatusForm :data="rowData" @closeDialog="closeStatusDialog" @getList="getList" />
     </el-dialog>
     <!-- 修改受试者状态 -->
-    <el-dialog
-      v-if="MessageVisible"
-      :visible.sync="MessageVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:subject:title:sendReport').replace('xxx',rowData.Code)"
-      width="720px"
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="MessageVisible" :visible.sync="MessageVisible" :close-on-click-modal="false"
+      :title="$t('trials:subject:title:sendReport').replace('xxx', rowData.Code)" width="720px"
+      custom-class="base-dialog-wrapper">
       <MessageTable :data="rowData" @closeDialog="closeStatusDialog" @getList="getList" />
     </el-dialog>
+    <!-- 图表 -->
+    <el-dialog :visible.sync="chartVisible" :close-on-click-modal="false" :fullscreen="true"
+      custom-class="base-dialog-wrapper">
+      <SubjectChart v-if="chartVisible" :data="rowData" />
+    </el-dialog>
   </BaseContainer>
 </template>
 <script>
@@ -291,6 +183,7 @@ import Pagination from '@/components/Pagination'
 import SubjectsForm from './components/SubjectsForm'
 import SubjectStatusForm from './components/SubjectStatusForm'
 import MessageTable from './components/MessageTable'
+import SubjectChart from './components/SubjectChart'
 import moment from 'moment'
 import { changeURLStatic } from '@/utils/history.js'
 const searchDataDefault = () => {
@@ -306,7 +199,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'SubjectList',
-  components: { BaseContainer, Pagination, SubjectsForm, SubjectStatusForm, MessageTable },
+  components: { BaseContainer, Pagination, SubjectsForm, SubjectStatusForm, MessageTable, SubjectChart },
   data() {
     return {
       moment,
@@ -325,7 +218,8 @@ export default {
       statusVisible: false,
       trialId: '',
       hasCrcRoute: false,
-      hasQCRoute: false
+      hasQCRoute: false,
+      chartVisible: false
     }
   },
   watch: {
@@ -353,6 +247,10 @@ export default {
       this.rowData = { ...row }
       this.MessageVisible = true
     },
+    handleopenSubjectChart(row) {
+      this.rowData = { ...row }
+      this.chartVisible = true
+    },
     handleExport() {
       getSubjectList_Export(this.searchData).then(res => {
       }).catch(() => { this.loading = false })
@@ -447,7 +345,7 @@ export default {
     // 关闭状态编辑框
     closeStatusDialog() {
       this.statusVisible = false
-    }, 
+    },
     handleTotalVisitCount(subjectCode) {
       if (this.hasCrcRoute) {
         this.$router.push({ path: `/trials/trials-panel/visit/crc-upload?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&subjectCode=${subjectCode}` })

From 2716b379b5f96a05ce2f3320bcf62b7b34db115c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 30 Dec 2025 13:22:34 +0800
Subject: [PATCH 219/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E6=A8=A1=E6=9D=BF=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9A=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/email-manage/components/EmailList.vue            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
index cdb7256f..293c5c33 100644
--- a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
@@ -17,6 +17,10 @@
               :label="item.TrialReadingCriterionName" />
           </el-select>
         </el-form-item>
+        <el-form-item style="margin-bottom: 10px" :label="$t('trials:reviewTrack:table:EmailTopic')">
+          <el-input v-model="searchData.EmailTopic" clearable style="width: 120px">
+          </el-input>
+        </el-form-item>
         <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
           <el-select v-model="searchData.ToUserType" clearable class="mr">
             <el-option v-for="item of UserTypeList" :key="`ToUserTypeList${item.label}`" :label="item.label"
@@ -229,6 +233,7 @@ const searchDataDefault = () => {
     TrialReadingCriterionId: null,
     ToUserType: null,
     IsEnable: null,
+    EmailTopic: null
   }
 }
 export default {

From 08dba4b364573ebb9bdb0860e68312d38e78478b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 30 Dec 2025 14:00:40 +0800
Subject: [PATCH 220/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E9=9C=80=E8=A6=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/read-task/index.vue  |  2 +-
 .../trial-summary/report-forms/index.vue      | 65 ++++++++++++++-----
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 183d3779..8ce46f1e 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -379,7 +379,7 @@ export default {
     isTumor() {
       let criterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.TrialReadingCriterionId)
       if (criterion) {
-        return [1, 18, 2, 3, 7].includes(Number(criterion.CriterionType))
+        return [1, 18, 2, 3, 7, 17].includes(Number(criterion.CriterionType))
       } else {
         return false
       }
diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index 44318f2f..e15b1b06 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -12,17 +12,18 @@
             </el-form>
         </div>
         <div class="contentBox">
-            <div class="chartBox">
+            <div class="chartBox" :style="{ height: isTumor ? '50%' : '100%' }">
                 <div ref="chartContainer_left" style="width: 100%; height: 100%;" v-loading="loading_left"></div>
             </div>
-            <div class="chartBox">
+            <div class="chartBox" :style="{ height: isTumor ? '50%' : '100%' }">
                 <div ref="chartContainer_right" style="width: 100%; height: 100%;" v-loading="loading_right"></div>
             </div>
-            <div class="chartBox" style="position: relative;">
+            <div class="chartBox" :style="{ position: 'relative', width: isHas_bottom_right ? '50%' : '100%' }"
+                v-if="isTumor">
                 <div ref="chartContainer_bottom" style="width: 100%; height: 100%;" v-loading="loading_bottom"></div>
                 <span v-if="ORR" style="position: absolute;top: 0;right:20px">ORR: {{ ORR }}</span>
             </div>
-            <div class="chartBox">
+            <div class="chartBox" v-if="isHas_bottom_right && isTumor">
                 <div ref="chartContainer_bottom_right" style="width: 100%; height: 100%;" v-loading="loading_bottom">
                 </div>
             </div>
@@ -76,22 +77,35 @@ export default {
             loading_bottom: false,
             chart_bottom: null,
             chart_bottom_right: null,
+            isHas_bottom_right: false,
             ORR: null
         }
     },
     created() {
         this.getTrialCriterionList()
     },
+    computed: {
+        isTumor() {
+            let criterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.searchData.TrialReadingCriterionId)
+            if (criterion) {
+                return [1, 18, 2, 3, 7, 17].includes(Number(criterion.CriterionType))
+            } else {
+                return false
+            }
+        }
+    },
     watch: {
         'searchData.TrialReadingCriterionId': {
             handler() {
                 if (this.searchData.TrialReadingCriterionId) {
                     this.getTrialVisitFinishedStatList()
                     this.getTrialQuestionStatList()
-                    this.getTrialEfficacyEvaluationStatList()
+                    if (this.isTumor) {
+                        this.getTrialEfficacyEvaluationStatList()
+                    }
                 }
             }
-        }
+        },
     },
     methods: {
         getTrialCriterionList() {
@@ -177,15 +191,20 @@ export default {
                         gap: 2,
                         label: {
                             show: true,
-                            position: 'inside'
-                        },
-                        labelLine: {
-                            length: 10,
-                            lineStyle: {
-                                width: 1,
-                                type: 'solid'
+                            position: 'inside',
+                            textStyle: {
+                                fontSize: 14, // 设置字体大小为 14px
+                                color: '#000', // 设置字体颜色为白色
+                                // fontWeight: 'bold' // 设置字体加粗
                             }
                         },
+                        // labelLine: {
+                        //     length: 10,
+                        //     lineStyle: {
+                        //         width: 1,
+                        //         type: 'solid'
+                        //     }
+                        // },
                         itemStyle: {
                             borderColor: '#fff',
                             borderWidth: 1
@@ -201,6 +220,9 @@ export default {
             };
             // 4. 使用配置项渲染图表
             this.chart_left.setOption(option);
+            this.$nextTick(() => {
+                this.chart_left.resize()
+            })
         },
         // 获取质疑统计列表
         async getTrialQuestionStatList() {
@@ -282,6 +304,9 @@ export default {
             };
             // 4. 使用配置项渲染图表
             this.chart_right.setOption(option);
+            this.$nextTick(() => {
+                this.chart_right.resize()
+            })
         },
         // 获取疗效统计表
         async getTrialEfficacyEvaluationStatList() {
@@ -306,6 +331,9 @@ export default {
                         obj.xAxisData.push(item.OverallTumorEvaluation)
                         obj.seriesData.push(item.SubjectCount)
                     })
+                    this.$nextTick(() => {
+                        this.initChart_bottom(obj)
+                    })
                     let obj2 = {
                         xAxisData: [],
                         seriesData: [],
@@ -314,14 +342,19 @@ export default {
                         titleText: this.$t("trials:reportForms:cjart:title:dataDistribution"),
                     }
                     if (OtherInfo.PDList && OtherInfo.PDList.length > 0) {
+                        this.isHas_bottom_right = true
                         OtherInfo.PDList.forEach(item => {
                             obj2.xAxisData.push(item.SubjectCode)
                             obj2.seriesData.push(item.DaysDiff)
                         })
+                        obj2.medianValue = this.calculateMedian(obj2.seriesData)
+                        this.$nextTick(() => {
+                            this.initChart_bottom_right(obj2)
+                        })
+                    } else {
+                        this.isHas_bottom_right = false
                     }
-                    obj2.medianValue = this.calculateMedian(obj2.seriesData)
-                    this.initChart_bottom(obj)
-                    this.initChart_bottom_right(obj2)
+
                 }
             } catch (err) {
                 console.log(err)

From 8d0f0094ba4431a8da01bbc7331d1c7e4bffa01c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 30 Dec 2025 15:25:01 +0800
Subject: [PATCH 221/333] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/subject-list/components/SubjectChart.vue | 12 ++++++++++--
 .../trial-summary/report-forms/index.vue             | 11 ++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
index c64cc13b..10c04f95 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
@@ -21,18 +21,20 @@
         </el-table>
         <div class="chartBox">
             <div class="R1box" v-if="R1ChartList.length > 0">
+                <h3>{{ $t("subjectChart:chart:titie:R1") }}</h3>
                 <div v-for="item in R1ChartList" :key="item.id">
                     <div class="title">{{ item.title }}</div>
                     <div v-for="d in item.list" :key="d.id" :ref="`chartContainer_${d.id}`" class="canvasBox"
-                        :style="{ width: R2ChartList.length > 0 ? '490px' : '980px', height: '290px' }">
+                        style="width: 90%; height: 290px;">
                     </div>
                 </div>
             </div>
             <div class="R2box" v-if="R2ChartList.length > 0">
+                <h3>{{ $t("subjectChart:chart:titie:R2") }}</h3>
                 <div v-for="item in R2ChartList" :key="item.id">
                     <div class="title">{{ item.title }}</div>
                     <div v-for="d in item.list" :key="d.id" :ref="`chartContainer_${d.id}`" class="canvasBox"
-                        style="width: 490px; height: 290px;">
+                        style="width: 90%; height: 290px;">
                     </div>
                 </div>
             </div>
@@ -268,6 +270,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.subjectChart {
+    width: 80%;
+    min-width: 800px;
+    margin: auto;
+}
+
 .chartBox {
     display: flex;
 
diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index e15b1b06..d4cb703b 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -23,7 +23,7 @@
                 <div ref="chartContainer_bottom" style="width: 100%; height: 100%;" v-loading="loading_bottom"></div>
                 <span v-if="ORR" style="position: absolute;top: 0;right:20px">ORR: {{ ORR }}</span>
             </div>
-            <div class="chartBox" v-if="isHas_bottom_right && isTumor">
+            <div class="chartBox" v-if="isTumor">
                 <div ref="chartContainer_bottom_right" style="width: 100%; height: 100%;" v-loading="loading_bottom">
                 </div>
             </div>
@@ -77,7 +77,7 @@ export default {
             loading_bottom: false,
             chart_bottom: null,
             chart_bottom_right: null,
-            isHas_bottom_right: false,
+            // isHas_bottom_right: false,
             ORR: null
         }
     },
@@ -342,7 +342,7 @@ export default {
                         titleText: this.$t("trials:reportForms:cjart:title:dataDistribution"),
                     }
                     if (OtherInfo.PDList && OtherInfo.PDList.length > 0) {
-                        this.isHas_bottom_right = true
+                        // this.isHas_bottom_right = true
                         OtherInfo.PDList.forEach(item => {
                             obj2.xAxisData.push(item.SubjectCode)
                             obj2.seriesData.push(item.DaysDiff)
@@ -351,9 +351,10 @@ export default {
                         this.$nextTick(() => {
                             this.initChart_bottom_right(obj2)
                         })
-                    } else {
-                        this.isHas_bottom_right = false
                     }
+                    //  else {
+                    //     this.isHas_bottom_right = false
+                    // }
 
                 }
             } catch (err) {

From d21c01076d8d29a00325f647b10f7194a58b0fcc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 30 Dec 2025 17:05:27 +0800
Subject: [PATCH 222/333] =?UTF-8?q?=E9=98=85=E7=89=87=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=B6=E6=AE=B5=E6=A0=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/dicomFile.vue     |  8 ++++--
 .../uploadDicomAndNonedicom/index.vue         | 10 ++++---
 .../uploadDicomAndNonedicom/nonedicomFile.vue |  6 ++++-
 .../reading-task/components/TargetSection.vue | 14 ++++++----
 .../reading/reading-tracking/index.vue        | 27 +++++++++++++++++--
 5 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index c9981b17..ea223cc9 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -42,7 +42,7 @@
         <template slot-scope="scope">
           <div class="btnBox">
             <!--上传--->
-            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data">
+            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data" v-if="!forbid">
               <div class="form-group" style="margin-right: 10px">
                 <div :id="`directoryInputWrapper_${scope.row.Id}`" class="btn btn-link file-input">
                   <el-button circle icon="el-icon-upload2" :disabled="btnLoading" :loading="btnLoading"
@@ -69,7 +69,7 @@
     </el-table>
     <div style="margin: 10px 0" class="top">
       <span>{{ $t('upload:dicom:uploadTitle') }}</span>
-      <div class="btnBox">
+      <div class="btnBox" v-if="!forbid">
         <span style="margin-right: 10px">
           {{ $store.state.trials.uploadTip }}
         </span>
@@ -354,6 +354,10 @@ export default {
         return {}
       },
     },
+    forbid: {
+      type: Boolean,
+      default: false,
+    },
     TaskId: {
       type: String,
       default: '',
diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue
index dd9264f5..b8217bb0 100644
--- a/src/components/uploadDicomAndNonedicom/index.vue
+++ b/src/components/uploadDicomAndNonedicom/index.vue
@@ -6,12 +6,12 @@
       <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:dicom')" name="dicom">
         <dicomFile v-if="activeName === 'dicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
           :Criterion="Criterion" :TaskId="VisitTaskId" :isUpload.sync="isUpload"
-          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :IsImageSegment="IsImageSegment" />
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :IsImageSegment="IsImageSegment" :forbid="forbid" />
       </el-tab-pane>
       <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:nonedicom')" name="nonedicom">
         <nonedicomFile v-if="activeName === 'nonedicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
-          :Criterion="Criterion" :VisitTaskId="VisitTaskId" :isUpload.sync="isUpload"
-          :IsImageSegment="IsImageSegment" />
+          :Criterion="Criterion" :VisitTaskId="VisitTaskId" :isUpload.sync="isUpload" :IsImageSegment="IsImageSegment"
+          :forbid="forbid" />
       </el-tab-pane>
     </el-tabs>
   </el-dialog>
@@ -29,6 +29,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    forbid: {
+      type: Boolean,
+      default: false,
+    },
     SubjectId: {
       type: String,
       default: '',
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 5715210b..b87a8d6f 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -109,7 +109,7 @@
           <el-button circle :disabled="scope.row.UploadedFileCount <= 0" icon="el-icon-view"
             :title="$t('upload:nonedicom:button:preview')" @click.stop="handlePreviewNoneDicomFiles(scope.row)" />
           <!--上传--->
-          <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')"
+          <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')" v-if="!forbid"
             @click.native.prevent="handleUpload(scope.row)" />
           <!--删除--->
           <el-button :disabled="scope.row.UploadedFileCount <= 0 ||
@@ -239,6 +239,10 @@ export default {
       type: String,
       default: '',
     },
+    forbid: {
+      type: Boolean,
+      default: false,
+    },
     SubjectCode: {
       type: String,
       default: '',
diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
index 442c57e5..d41c8cf0 100644
--- a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -69,12 +69,12 @@
                             : $t('trials:pendingReadingTasks:button:review')
                             " icon="el-icon-edit-outline" @click="handleReadImage(scope.row)" /> -->
                         <!-- 上传 -->
-                        <el-button v-hasPermi="['role:ir']" circle icon="el-icon-upload2"
-                            :title="$t('trials:pendingReadingTasks:button:upload')"
+                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle
+                            icon="el-icon-upload2" :title="$t('trials:pendingReadingTasks:button:upload')"
                             @click="openUploadImage(scope.row, 'upload')" />
                         <!-- 下载 -->
-                        <el-button v-hasPermi="['role:ir']" circle icon="el-icon-download"
-                            :title="$t('trials:pendingReadingTasks:button:download')"
+                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle
+                            icon="el-icon-download" :title="$t('trials:pendingReadingTasks:button:download')"
                             @click="openUploadImage(scope.row, 'download')" />
                     </template>
                 </el-table-column>
@@ -84,7 +84,7 @@
         </div>
         <upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId"
             :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible"
-            :IsImageSegment="true" />
+            :IsImageSegment="true" :forbid="forbid" />
         <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
             :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="downloadImageVisible"
             :IsImageSegment="true" />
@@ -121,6 +121,10 @@ export default {
             default: () => {
                 return []
             }
+        },
+        forbid: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index 32ae9761..402b2b66 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -116,6 +116,11 @@
           <el-button v-if="!viewStatus" type="primary" icon="el-icon-info" @click="handleViewRecord">
             {{ $t('common:button:failureRecord') }}
           </el-button>
+          <!-- 靶段标注 -->
+          <el-button type="primary" v-if="hasIVUSOROCT" v-hasPermi="['role:pm', 'role:apm']"
+            @click="handleTargetSection">
+            {{ $t('trials:pendingReadingTasks:button:TargetSection') }}
+          </el-button>
           <!--          <el-button type="primary" @click="openReadingRules">-->
           <!--            阅片任务规则-->
           <!--          </el-button>-->
@@ -340,8 +345,8 @@
         <el-table-column fixed="right" :label="$t('common:action:action')" width="220">
           <template slot-scope="scope">
             <!-- 查看阅片结果 -->
-            <el-button :disabled="scope.row.ReadingTaskState !== 2" icon="el-icon-view"
-              circle :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
+            <el-button :disabled="scope.row.ReadingTaskState !== 2" icon="el-icon-view" circle
+              :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
             <!-- 申请重阅 -->
             <el-button :disabled="scope.row.ReadingCategory !== 1 ||
               (scope.row.TaskState !== 0 && scope.row.TaskState !== 5) ||
@@ -860,6 +865,11 @@
         custom-class="base-dialog-wrapper">
         <RecordList />
       </el-dialog>
+      <el-dialog :title="$t('trials:pendingReadingTasks:button:TargetSection')" :visible.sync="TargetSection_visible"
+        :fullscreen="true">
+        <TargetSection v-if="TargetSection_visible" :TrialReadingCriterionId="TrialReadingCriterionId" :forbid="true"
+          :trialCriterionList="trialCriterionList" />
+      </el-dialog>
     </template>
   </BaseContainer>
 </template>
@@ -884,6 +894,7 @@ import RefereeRules from './components/RefereeRules.vue'
 import ReviewResults from './components/ReviewResults'
 import ClinicalData from '../../subject/reading-period/components/ClinicalData'
 import RecordList from './components/RecordList.vue'
+import TargetSection from "@/views/trials/trials-panel/reading/reading-task/components/TargetSection"
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
@@ -920,6 +931,7 @@ export default {
     ClinicalData,
     ReviewResults,
     RecordList,
+    TargetSection
   },
   props: {
     AllocationReadingCategory: {
@@ -1031,6 +1043,13 @@ export default {
       dialogLoading: false,
       openWindow: null,
       recordVisible: false,
+
+      TargetSection_visible: false
+    }
+  },
+  computed: {
+    hasIVUSOROCT() {
+      return this.trialCriterionList.some(item => item.CriterionType === 19 || item.CriterionType === 20)
     }
   },
   mounted() {
@@ -1065,6 +1084,10 @@ export default {
     }
   },
   methods: {
+    handleTargetSection() {
+      this.TrialReadingCriterionId = this.trialCriterionList.find(item => item.CriterionType === 19 || item.CriterionType === 20).TrialReadingCriterionId
+      this.TargetSection_visible = true
+    },
     // 打开意见反馈
     openFeedBack(row) {
       this.$FB({

From 2ffffd2bf04f199c00c1d8b4fb3f17cb2f00769c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 31 Dec 2025 10:09:53 +0800
Subject: [PATCH 223/333] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/reading-unit/index.vue            |  4 +--
 .../subject-list/components/SubjectChart.vue  | 26 +++++++++++--------
 .../trial-summary/report-forms/index.vue      | 20 ++++++++------
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index 999de213..0505457c 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -232,9 +232,9 @@ export default {
     setReadingTools(data) {
       let { readingTools, isNoneDicom } = data
       if (isNoneDicom) {
-        this.readingTools = getCustomizeStandardsNoneDicomTools(readingTools).filter(item => item.toolName !== 'ArrowAnnotate')
+        this.readingTools = getCustomizeStandardsNoneDicomTools(readingTools)
       } else {
-        this.readingTools = getCustomizeStandardsTools(readingTools).filter(item => item.toolName !== 'ArrowAnnotate')
+        this.readingTools = getCustomizeStandardsTools(readingTools)
       }
 
     },
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
index 10c04f95..c3f5dd55 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
@@ -6,9 +6,9 @@
                 <span>{{ data.Code }}</span>
             </el-form-item>
             <el-form-item :label="$t('subjectChart:table:CriterionType')">
-                <el-select v-model="CriterionType" clearable filterable @change="handleChange">
+                <el-select v-model="TrialReadingCriterionId" clearable filterable @change="handleChange">
                     <el-option v-for="(item) of trialCriterionList" :key="item.TrialReadingCriterionId"
-                        :label="item.TrialReadingCriterionName" :value="item.CriterionType" />
+                        :label="item.TrialReadingCriterionName" :value="item.TrialReadingCriterionId" />
                 </el-select>
             </el-form-item>
         </el-form>
@@ -74,7 +74,7 @@ export default {
         return {
             loading: false,
             trialCriterionList: [],
-            CriterionType: null,
+            TrialReadingCriterionId: null,
             tableKey: [],
             tableList: [],
             R1ChartList: [],
@@ -85,7 +85,7 @@ export default {
         this.getTrialCriterionList()
     },
     methods: {
-        handleChange() {
+        handleChange(v) {
             this.getList()
         },
         getTrialCriterionList() {
@@ -93,7 +93,7 @@ export default {
             getTrialCriterionList(this.$route.query.trialId, false).then(res => {
                 this.trialCriterionList = res.Result
                 if (this.trialCriterionList.length > 0) {
-                    this.CriterionType = this.trialCriterionList[0].CriterionType
+                    this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
                     this.getList()
                     this.loading = false
                 }
@@ -103,14 +103,13 @@ export default {
             try {
                 let data = {
                     SubjectId: this.data.Id,
-                    CriterionType: this.CriterionType
+                    TrialCriterionId: this.TrialReadingCriterionId
                 }
                 this.loading = true
                 let res = await getReportsChartSummary(data)
                 this.loading = false
                 if (res.IsSuccess) {
                     let Evaluation = res.Result.Evaluation.Evaluation
-                    let DictionaryCode = res.Result.Evaluation.DictionaryCode
                     this.tableKey = [
                         {
                             title: this.$t(`subjectChart:table:label:visit`),
@@ -119,8 +118,8 @@ export default {
                     ]
                     Evaluation[0].forEach(key => {
                         let obj = {
-                            title: key,
-                            key
+                            title: key.Value,
+                            key: key.Value,
                         }
                         this.tableKey.push(obj)
                     })
@@ -128,14 +127,19 @@ export default {
                     if (Evaluation[1] && Evaluation[1].length > 0) {
                         let obj = {}
                         this.tableKey.forEach((item, index) => {
-                            obj[item.key] = index === 0 ? 'R1' : DictionaryCode ? this.$fd(DictionaryCode, Evaluation[1][index - 1]) : Evaluation[1][index - 1]
+                            if (index === 0) {
+                                obj[item.key] = 'R1'
+                            } else {
+                                console.log(Evaluation[1][index - 1].DictionaryCode, Evaluation[1][index - 1].Value)
+                                obj[item.key] = Evaluation[1][index - 1].DictionaryCode ? this.$fd(Evaluation[1][index - 1].DictionaryCode, parseFloat(Evaluation[1][index - 1].Value)) : Evaluation[1][index - 1].Value
+                            }
                         })
                         this.tableList.push(obj)
                     }
                     if (Evaluation[2] && Evaluation[2].length > 0) {
                         let obj = {}
                         this.tableKey.forEach((item, index) => {
-                            obj[item.key] = index === 0 ? 'R2' : DictionaryCode ? this.$fd(DictionaryCode, Evaluation[2][index - 1]) : Evaluation[2][index - 1]
+                            obj[item.key] = index === 0 ? 'R2' : Evaluation[2][index - 1].DictionaryCode ? this.$fd(Evaluation[2][index - 1].DictionaryCode, parseFloat(Evaluation[2][index - 1].Value)) : Evaluation[2][index - 1].Value
                         })
                         this.tableList.push(obj)
                     }
diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index d4cb703b..cfa37a24 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -18,8 +18,7 @@
             <div class="chartBox" :style="{ height: isTumor ? '50%' : '100%' }">
                 <div ref="chartContainer_right" style="width: 100%; height: 100%;" v-loading="loading_right"></div>
             </div>
-            <div class="chartBox" :style="{ position: 'relative', width: isHas_bottom_right ? '50%' : '100%' }"
-                v-if="isTumor">
+            <div class="chartBox" :style="{ position: 'relative' }" v-if="isTumor">
                 <div ref="chartContainer_bottom" style="width: 100%; height: 100%;" v-loading="loading_bottom"></div>
                 <span v-if="ORR" style="position: absolute;top: 0;right:20px">ORR: {{ ORR }}</span>
             </div>
@@ -127,9 +126,11 @@ export default {
                 let res = await getTrialVisitFinishedStatList(data)
                 this.loading_left = false
                 if (res.IsSuccess) {
+                    let arr = []
                     let obj = {
                         titleText: this.$t("trials:reportForms:cjart:title:VisitFinishedStat"),
                         seriesData: [],
+                        max: 0,
                         legendData: [
                             this.$t("trials:reportForms:cjart:title:UploadedCount"),
                             this.$t("trials:reportForms:cjart:title:QCFinishedCount"),
@@ -145,7 +146,9 @@ export default {
                             value: res.Result[keys[index]]
                         }
                         obj.seriesData.push(o)
+                        arr.push(res.Result[keys[index]])
                     })
+                    obj.max = Math.max(...arr)
                     this.initChart_left(obj)
                 }
             } catch (err) {
@@ -180,17 +183,18 @@ export default {
                         name: 'Funnel',
                         type: 'funnel',
                         left: '10%',
-                        top: 60,
-                        bottom: 60,
+                        top: 30,
+                        bottom: 40,
                         width: '80%',
                         min: 0,
-                        max: 100,
+                        max: obj.max ? obj.max : 100,
                         minSize: '0%',
                         maxSize: '100%',
                         sort: 'descending',
                         gap: 2,
                         label: {
                             show: true,
+                            formatter: `{c}`,
                             position: 'inside',
                             textStyle: {
                                 fontSize: 14, // 设置字体大小为 14px
@@ -348,10 +352,10 @@ export default {
                             obj2.seriesData.push(item.DaysDiff)
                         })
                         obj2.medianValue = this.calculateMedian(obj2.seriesData)
-                        this.$nextTick(() => {
-                            this.initChart_bottom_right(obj2)
-                        })
                     }
+                    this.$nextTick(() => {
+                        this.initChart_bottom_right(obj2)
+                    })
                     //  else {
                     //     this.isHas_bottom_right = false
                     // }

From 2f20696827616272afa2dc7f05b11e9c821d2d5a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 31 Dec 2025 10:53:53 +0800
Subject: [PATCH 224/333] =?UTF-8?q?Lugano2014=E7=97=85=E7=81=B6=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=AE=AD=E5=A4=B4=E5=B7=A5=E5=85=B7=E6=97=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=95=BF=E7=9F=AD=E7=BB=8F=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue         | 4 ++--
 .../dicoms/components/LuganoWithoutPET/QuestionForm.vue       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 67a7b3ae..1ef29375 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -681,8 +681,8 @@ export default {
             }
             this.$set(this.questionForm, shortObj.Id, short)
           } else if (measureData.type === 'ArrowAnnotate') {
-            this.$set(this.questionForm, lengthObj.Id, '')
-            this.$set(this.questionForm, shortObj.Id, '')
+            this.$set(this.questionForm, lengthObj.Id, '0')
+            this.$set(this.questionForm, shortObj.Id, '0')
           }
           var isLymphLesion = this.getQuestionVal(2)
           this.organList = []
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index 67a7b3ae..1ef29375 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -681,8 +681,8 @@ export default {
             }
             this.$set(this.questionForm, shortObj.Id, short)
           } else if (measureData.type === 'ArrowAnnotate') {
-            this.$set(this.questionForm, lengthObj.Id, '')
-            this.$set(this.questionForm, shortObj.Id, '')
+            this.$set(this.questionForm, lengthObj.Id, '0')
+            this.$set(this.questionForm, shortObj.Id, '0')
           }
           var isLymphLesion = this.getQuestionVal(2)
           this.organList = []

From a45ab4edf8c2ef6173dd36575f4e690ac278748e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 31 Dec 2025 11:04:18 +0800
Subject: [PATCH 225/333] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../site-research/components/ImageManual.vue     |  4 +++-
 .../reading/dicoms3D/components/ReadPage.vue     | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
index 2369253d..38bed5ab 100644
--- a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
@@ -150,7 +150,9 @@ export default {
                 let res = await getTrialDocumentList(data)
                 if (res.IsSuccess) {
                     const { CurrentPageData } = res.Result
-                    if (CurrentPageData.length <= 0) this.$confirm(this.$t("trials:researchRecord:ImageManual:message:noImageManual"))
+                    if (CurrentPageData.length <= 0) this.$confirm(this.$t("trials:researchRecord:ImageManual:message:noImageManual"), this.$t('system:menu:confirm:title:warning'), {
+                        type: 'warning'
+                    })
                 }
             } catch (err) {
                 console.log(err)
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 e82995b7..e7adbdeb 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -3286,10 +3286,14 @@ export default {
         }
         if (!data) {
           let { imageOrientationPatient, imagePositionPatient } = this.$refs[`viewport-${this.activeViewportIndex}`][0].imageInfo
-          if (!imageOrientationPatient || !imagePositionPatient || imagePositionPatient.length <= 0 || imageOrientationPatient.length <= 0) return this.$confirm(this.$t('trials:reading:confirm:imageNotMPR'))
+          if (!imageOrientationPatient || !imagePositionPatient || imagePositionPatient.length <= 0 || imageOrientationPatient.length <= 0) return this.$confirm(this.$t('trials:reading:confirm:imageNotMPR'), this.$t('system:menu:confirm:title:warning'), {
+            type: 'warning'
+          })
         }
         const series = data ? data : this.$refs[`viewport-${this.activeViewportIndex}`][0].series
-        if (series.ImageIds.length <= 5) return this.$confirm(this.$t('trials:reading:confirm:smallNumberOfimage'))
+        if (series.ImageIds.length <= 5) return this.$confirm(this.$t('trials:reading:confirm:smallNumberOfimage'), this.$t('system:menu:confirm:title:warning'), {
+          type: 'warning'
+        })
         if (series.ImageIds.length > 500) {
           let res = await this.getSystemInfo()
           if (!res) return false
@@ -3315,7 +3319,9 @@ export default {
     async handleFusion(data) {
       try {
         if (!this.isFusion && this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].verifyAnnotationIsSave()) {
-          const confirm = await this.$confirm(this.$t('trials:reading:confirm:clearnAnnotation'))
+          const confirm = await this.$confirm(this.$t('trials:reading:confirm:clearnAnnotation'), this.$t('system:menu:confirm:title:warning'), {
+            type: 'warning'
+          })
           if (!confirm) return false
           this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].removeAllNoSaveAnnotation()
         }
@@ -3473,7 +3479,9 @@ export default {
         let discrete = allInfo.webgl.gpuType.discrete; // 是否独立显卡
         let estimatedMemory = allInfo.webgl.memoryInfo.estimatedMemory; // 显卡内存
         if (parseFloat(deviceMemory) < 16 || width < 1920 || height < 1080 || !discrete || parseFloat(estimatedMemory) < 2) {
-          let res = await this.$confirm(this.$t('browser:tip:ReadingConfiguration'))
+          let res = await this.$confirm(this.$t('browser:tip:ReadingConfiguration'), this.$t('system:menu:confirm:title:warning'), {
+            type: 'warning'
+          })
           resolve(res)
         } else {
           resolve(true)

From b4db6b4990abb3ce810bb3aefed54a504b98001d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 31 Dec 2025 11:29:10 +0800
Subject: [PATCH 226/333] =?UTF-8?q?mRECIST=20HCC=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=9C=A8=E8=AF=84=E4=BC=B0=E6=8A=A5=E5=91=8A=E6=9C=AA=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E9=AA=8C=E8=AF=81=E6=97=B6=EF=BC=8C=E5=BC=B9=E4=BA=86?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/ReportPage.vue      |  4 +++-
 .../reading/dicoms3D/components/ReportPage.vue    | 15 +++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index f0aac9dc..aa9db3d3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -658,6 +658,8 @@ export default {
       this.loading = true
       try {
         await this.handleSave(false)
+        let r = await this.handleSave(false)
+        if (!r) return
         await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
         var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
         var isBaseline = this.visitTaskList[i].IsBaseLine
@@ -859,7 +861,7 @@ export default {
             this.$message.success(this.$t('common:message:savedSuccessfully'))
           }
           this.loading = false
-          resolve()
+          resolve(true)
         } catch (e) {
           this.loading = false
           reject()
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 e971a0a2..b937df3d 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -38,7 +38,9 @@
           :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 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 }}
                 <svg-icon
                   v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) || (scope.row.LesionType === 4 && scope.row.ReportLayType === 1)"
                   icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
@@ -608,7 +610,8 @@ export default {
     async handleConfirm() {
       this.loading = true
       try {
-        await this.handleSave(false)
+        let r = await this.handleSave(false)
+        if (!r) return
         await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
         var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
         var isBaseline = this.visitTaskList[i].IsBaseLine
@@ -770,7 +773,7 @@ export default {
             showCancelButton: false,
             callback: action => { }
           })
-          resolve()
+          resolve(false)
           return
         }
         if (isExistEvaluateResult && (evaluateResult === null && !this.isBaselineTask)) {
@@ -780,7 +783,7 @@ export default {
             showCancelButton: false,
             callback: action => { }
           })
-          resolve()
+          resolve(false)
           return
         }
         if (isExistEvaluateResult && (evaluateResult !== this.tumorEvaluate) && !evaluateAjustReason) {
@@ -790,7 +793,7 @@ export default {
             showCancelButton: false,
             callback: action => { }
           })
-          resolve()
+          resolve(false)
           return
         }
         this.loading = true
@@ -804,7 +807,7 @@ export default {
             this.$message.success(this.$t('common:message:savedSuccessfully'))
           }
           this.loading = false
-          resolve()
+          resolve(true)
         } catch (e) {
           this.loading = false
           reject()

From fdc23361f92df0ca54b805fced885af261f76c7c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 31 Dec 2025 15:50:01 +0800
Subject: [PATCH 227/333] =?UTF-8?q?=E7=A3=81=E5=85=B1=E6=8C=AF=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E5=83=8F=E5=9C=A8=E5=81=9AMPR=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=87=8D=E5=BB=BA=E7=9A=84=E4=BD=93=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E5=90=84=E4=B8=AA=E8=BD=B4=E5=90=91=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E5=83=8F=E6=95=B0=E9=87=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dictionary/template/browser/tip.vue |   3 +-
 .../reading/dicoms/components/DicomViewer.vue |   3 +-
 .../reading/dicoms3D/components/ReadPage.vue  |  22 +++-
 .../dicoms3D/components/VolumeViewport.vue    | 102 +++++++++++++++---
 4 files changed, 108 insertions(+), 22 deletions(-)

diff --git a/src/views/dictionary/template/browser/tip.vue b/src/views/dictionary/template/browser/tip.vue
index a88e10d1..391ea8ec 100644
--- a/src/views/dictionary/template/browser/tip.vue
+++ b/src/views/dictionary/template/browser/tip.vue
@@ -68,7 +68,8 @@ export default {
       let { width, height } = allInfo.screen; // 分辨率
       // let discrete = allInfo.webgl.gpuType.discrete; // 是否独立显卡
       // let estimatedMemory = allInfo.webgl.memoryInfo.estimatedMemory; // 显卡内存
-      if (parseFloat(deviceMemory) < 16 || width < 1920 || height < 1080) {
+      // parseFloat(deviceMemory) < 16 || 
+      if (width < 1920 || height < 1080) {
         if (this.tip) {
           this.tip += `<br/>`
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index ec2dbdc5..5957f7b7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -2491,7 +2491,8 @@ export default {
         let { width, height } = allInfo.screen; // 分辨率
         let discrete = allInfo.webgl.gpuType.discrete; // 是否独立显卡
         let estimatedMemory = allInfo.webgl.memoryInfo.estimatedMemory; // 显卡内存
-        if (parseFloat(deviceMemory) < 16 || width < 1920 || height < 1080 || !discrete || parseFloat(estimatedMemory) < 2) {
+        // parseFloat(deviceMemory) < 16 ||
+        if (width < 1920 || height < 1080 || !discrete || parseFloat(estimatedMemory) < 2) {
           let res = await this.$confirm(this.$t('browser:tip:ReadingConfiguration'))
           resolve(res)
         } else {
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 e7adbdeb..1af9c593 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -317,7 +317,7 @@
                   @dblclick="toggleFullScreen($event, index)" @click="activeViewport(index)">
                   <VolumeViewport :ref="`viewport-volume-${index}`" :data-viewport-uid="`viewport-volume-${index}`"
                     :rendering-engine-id="renderingEngineId" :viewport-id="`viewport-volume-${index}`"
-                    :viewport-index="index" @activeViewport="activeViewport"
+                    :viewport-index="index" :MPRInfo="MPRInfo" @activeViewport="activeViewport" @setMPRInfo="setMPRInfo"
                     @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD"
                     @renderAnnotations="renderAnnotations" @contentMouseup="contentMouseup" />
                 </div>
@@ -673,7 +673,18 @@ export default {
       ManualsClose: false,
 
       isMPR: false,
-      volumeToolGroupId: "share-viewport-volume"
+      volumeToolGroupId: "share-viewport-volume",
+      MPRInfo: {
+        AXIAL: {
+          imageNum: 0
+        },
+        CORONAL: {
+          imageNum: 0
+        },
+        SAGITTAL: {
+          imageNum: 0
+        },
+      }
     }
   },
   computed: {
@@ -801,6 +812,10 @@ export default {
     document.addEventListener("click", this.foo);
   },
   methods: {
+    setMPRInfo(obj) {
+      let { type, key, value } = obj
+      this.$set(this.MPRInfo[type], key, value)
+    },
     handleReadingChart(row) {
       let { e, data } = row
       let obj = Object.assign({}, data)
@@ -3478,7 +3493,8 @@ export default {
         let { width, height } = allInfo.screen; // 分辨率
         let discrete = allInfo.webgl.gpuType.discrete; // 是否独立显卡
         let estimatedMemory = allInfo.webgl.memoryInfo.estimatedMemory; // 显卡内存
-        if (parseFloat(deviceMemory) < 16 || width < 1920 || height < 1080 || !discrete || parseFloat(estimatedMemory) < 2) {
+        // parseFloat(deviceMemory) < 16 ||
+        if (width < 1920 || height < 1080 || !discrete || parseFloat(estimatedMemory) < 2) {
           let res = await this.$confirm(this.$t('browser:tip:ReadingConfiguration'), this.$t('system:menu:confirm:title:warning'), {
             type: 'warning'
           })
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
index dd44c9c7..427f84bb 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
@@ -70,6 +70,7 @@ import {
     metaData,
     getRenderingEngine,
     utilities as csUtils,
+    cache
 } from '@cornerstonejs/core'
 import * as cornerstoneTools from '@cornerstonejs/tools'
 import { createImageIdsAndCacheMetaData } from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/createImageIdsAndCacheMetaData'
@@ -91,6 +92,12 @@ export default {
             type: Number,
             required: true
         },
+        MPRInfo: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        }
     },
     data() {
         return {
@@ -142,6 +149,25 @@ export default {
             this.initViewport()
         })
     },
+    watch: {
+        MPRInfo: {
+            handler() {
+                if (!this.series.orientation) return false
+                switch (this.series.orientation) {
+                    case 'AXIAL':
+                        this.imageInfo.size = `${this.MPRInfo.SAGITTAL.imageNum}*${this.MPRInfo.CORONAL.imageNum}`
+                        break;
+                    case 'CORONAL':
+                        this.imageInfo.size = `${this.MPRInfo.SAGITTAL.imageNum}*${this.MPRInfo.AXIAL.imageNum}`
+                        break;
+                    case 'SAGITTAL':
+                        this.imageInfo.size = `${this.MPRInfo.CORONAL.imageNum}*${this.MPRInfo.AXIAL.imageNum}`
+                        break;
+                }
+            },
+            deep: true
+        }
+    },
     methods: {
         initViewport() {
             this.element = this.$refs['viewport-volume']
@@ -185,6 +211,58 @@ export default {
 
             })
         },
+
+        determineImagePlane(imageOrientationPatient) {
+            // imageOrientationPatient 是 [rowX, rowY, rowZ, colX, colY, colZ]
+            // 我们只关心行方向向量 (rowX, rowY, rowZ)
+            const [rowX, rowY, rowZ] = imageOrientationPatient;
+
+            // 计算行方向向量与 X, Y, Z 轴的点积（因为轴向量是单位向量，所以点积就是投影长度）
+            const dotX = Math.abs(rowX);
+            const dotY = Math.abs(rowY);
+            const dotZ = Math.abs(rowZ);
+
+            // 找到最大的点积，确定主方向
+            const maxDot = Math.max(dotX, dotY, dotZ);
+
+            // 根据主方向判断解剖面
+            if (maxDot === dotX) {
+                // 行方向接近 X 轴，说明视线方向接近 Y 或 Z 轴。
+                // 更准确的判断是看视线方向（由行和列向量叉乘得到）。
+                // 但一个简化的、在大多数情况下都成立的规则是：
+                // 如果行向量主要在 X-Y 平面 (rowZ 很小)，则为 Axial。
+                // 如果行向量主要在 X-Z 平面 (rowY 很小)，则为 Sagittal。
+                // 为了简化，我们可以直接根据视线方向（法线）来判断。
+                // 法线方向 = 行向量 × 列向量
+                const [colX, colY, colZ] = imageOrientationPatient.slice(3);
+                const normalX = rowY * colZ - rowZ * colY;
+                const normalY = rowZ * colX - rowX * colZ;
+                const normalZ = rowX * colY - rowY * colX;
+
+                const absNormalX = Math.abs(normalX);
+                const absNormalY = Math.abs(normalY);
+                const absNormalZ = Math.abs(normalZ);
+
+                const maxNormal = Math.max(absNormalX, absNormalY, absNormalZ);
+
+                if (maxNormal === absNormalZ) {
+                    return 'AXIAL';
+                } else if (maxNormal === absNormalY) {
+                    return 'SAGITTAL';
+                } else if (maxNormal === absNormalX) {
+                    return 'CORONAL';
+                }
+
+            } else if (maxDot === dotY) {
+                // 行方向接近 Y 轴，通常是 Coronal 面。
+                return 'SAGITTAL';
+            } else if (maxDot === dotZ) {
+                // 行方向接近 Z 轴，通常是 Sagittal 面。
+                return 'CORONAL';
+            }
+
+            return 'unknown';
+        },
         stackNewImage(e) {
             const { detail } = e
             this.series.SliceIndex = detail.imageIndex
@@ -195,26 +273,16 @@ export default {
             this.imageInfo.zoom = zoom.toFixed(4)
             let imageIds = viewport.getImageIds(this.volumeId)
             let imageId = imageIds[0]
+            let volume = cache.getVolume(this.volumeId)
+            let { spacing } = volume
             // if (this.series.orientation === 'AXIAL') imageId = viewport.getCurrentImageId() 
             if (imageId) {
+                this.$emit('setMPRInfo', { type: this.series.orientation, key: "imageNum", value: detail.numberOfSlices })
                 const imagePlaneModule = metaData.get('imagePlaneModule', imageId)
-                if (this.series.orientation === 'AXIAL') {
-                    this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}`
-                    this.imageInfo.location = imagePlaneModule.sliceLocation
-                    this.imageInfo.total = imageIds.length
-                    this.imageInfo.sliceThickness = imagePlaneModule.sliceThickness
-                }
-                if (this.series.orientation === 'CORONAL') {
-                    this.imageInfo.size = `${imagePlaneModule.columns}*${imageIds.length}`
-                    this.imageInfo.total = imagePlaneModule.rows
-                    this.imageInfo.sliceThickness = imagePlaneModule.rowPixelSpacing
-                }
-                if (this.series.orientation === 'SAGITTAL') {
-                    this.imageInfo.size = `${imagePlaneModule.rows}*${imageIds.length}`
-                    this.imageInfo.total = imagePlaneModule.columns
-                    this.imageInfo.sliceThickness = imagePlaneModule.columnPixelSpacing
-                }
-
+                let type = this.determineImagePlane(imagePlaneModule.imageOrientationPatient)
+                this.imageInfo.location = type === this.series.orientation ? imagePlaneModule.sliceLocation : ''
+                this.imageInfo.sliceThickness = type === this.series.orientation ? spacing[2] : spacing[0]
+                this.imageInfo.total = detail.numberOfSlices
                 this.getOrientationMarker()
                 let properties = viewport.getProperties(this.volumeId)
                 if (properties && properties.voiRange) {

From 78f2f530c4bd75b5605a45cac42b2527153e990b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 31 Dec 2025 15:51:40 +0800
Subject: [PATCH 228/333] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=88=97=E8=A1=A8=E4=B8=8B=E6=96=B9?=
 =?UTF-8?q?=E6=98=AF=E7=A9=BA=E7=99=BD=E7=9A=84=E3=80=82=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=98=AF=E9=9C=80=E8=A6=81=E9=93=BA=E6=BB=A1=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/visit/qc-check/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 2ddb19fa..1e95f066 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -98,7 +98,7 @@
 
     <!-- qc审核列表 -->
     <template slot="main-container">
-      <el-table ref="qcCheckList" v-loading="loading" v-adaptive="{ bottomOffset: 110 }" :data="list" stripe
+      <el-table ref="qcCheckList" v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe
         height="100" @sort-change="handleSortByColumn">
         <el-table-column prop="ChallengeState" :label="$t('trials:qcCheck:table:challengeState')" show-overflow-tooltip
           width="140" sortable="custom">

From 65edc781526c7094ee1d2c7c79e82b6cb622dc81 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 31 Dec 2025 15:56:54 +0800
Subject: [PATCH 229/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=E4=B8=8A=E6=98=BE=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/report-forms/index.vue      | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index cfa37a24..c15880b0 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -249,6 +249,16 @@ export default {
                                 emphasis: {
                                     focus: 'series'
                                 },
+                                label: {
+                                    show: true,
+                                    formatter: `{c}`,
+                                    position: 'inside',
+                                    textStyle: {
+                                        fontSize: 14, // 设置字体大小为 14px
+                                        color: '#000', // 设置字体颜色为白色
+                                        // fontWeight: 'bold' // 设置字体加粗
+                                    }
+                                },
                                 data: [res.Result.QCQuestion_IngCount, res.Result.CheckQuestion_IngCount, res.Result.MedicalReviewQuestion_IngCount]
                             },
                             {
@@ -259,6 +269,16 @@ export default {
                                 emphasis: {
                                     focus: 'series'
                                 },
+                                label: {
+                                    show: true,
+                                    formatter: `{c}`,
+                                    position: 'inside',
+                                    textStyle: {
+                                        fontSize: 14, // 设置字体大小为 14px
+                                        color: '#000', // 设置字体颜色为白色
+                                        // fontWeight: 'bold' // 设置字体加粗
+                                    }
+                                },
                                 data: [res.Result.QCQuestion_ClosedCount, res.Result.CheckQuestion_ClosedCount, res.Result.MedicalReviewQuestion_ClosedCount]
                             }
                         ],
@@ -392,6 +412,16 @@ export default {
                         data: obj.seriesData,
                         type: 'bar',
                         barWidth: 20,
+                        label: {
+                            show: true,
+                            formatter: `{c}`,
+                            position: 'inside',
+                            textStyle: {
+                                fontSize: 14, // 设置字体大小为 14px
+                                color: '#000', // 设置字体颜色为白色
+                                // fontWeight: 'bold' // 设置字体加粗
+                            }
+                        },
                     }
                 ]
             };
@@ -441,6 +471,16 @@ export default {
                             }
                         ]
                     },
+                    label: {
+                        show: true,
+                        formatter: `{c}`,
+                        position: 'inside',
+                        textStyle: {
+                            fontSize: 14, // 设置字体大小为 14px
+                            color: '#000', // 设置字体颜色为白色
+                            // fontWeight: 'bold' // 设置字体加粗
+                        }
+                    },
                     data: obj.seriesData,
                     // data: [1, 2, 3],
                     type: 'bar',

From e36ae0404d40d8d15b0e9d4b2eda30146fa20a07 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 31 Dec 2025 16:09:03 +0800
Subject: [PATCH 230/333] 1

---
 src/views/trials/trials-panel/subject/subject-list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index b963d297..72139a26 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -170,7 +170,7 @@
     </el-dialog>
     <!-- 图表 -->
     <el-dialog :visible.sync="chartVisible" :close-on-click-modal="false" :fullscreen="true"
-      custom-class="base-dialog-wrapper">
+      :title="$t('trials:subject:title:SubjectChart')" custom-class="base-dialog-wrapper">
       <SubjectChart v-if="chartVisible" :data="rowData" />
     </el-dialog>
   </BaseContainer>

From 99955b2eff1fe21e4281cf623dbd4b2629923b6f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Sun, 4 Jan 2026 13:12:26 +0800
Subject: [PATCH 231/333] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2:?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=80=BC=E5=87=BA=E7=8E=B0=E4=BA=86=20?=
 =?UTF-8?q?=E3=80=90Object=20object=E3=80=91=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/customize/ReportPage.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
index 2d27e2b6..754d8218 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
@@ -87,7 +87,7 @@
                     </template>
                   </el-select>
                   <span
-                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && questionForm[scope.row.QuestionId][scope.row.xfIndex] && questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
+                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && questionForm[scope.row.QuestionId][scope.row.xfIndex] && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
                     {{
 
                       Array.isArray(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId])

From 443a31df975de708375640ac33ae30778c59b842 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Sun, 4 Jan 2026 16:38:53 +0800
Subject: [PATCH 232/333] 1

---
 src/components/downloadDicomAndNonedicom/index.vue     |  6 +++++-
 .../reading/reading-task/components/TargetSection.vue  | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 05f623dd..7f08671f 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -68,7 +68,7 @@
       <el-table-column :label="$t('common:action:action')" fixed="right" width="150">
         <template slot-scope="scope">
           <!--预览--->
-          <el-button circle icon="el-icon-view" :title="$t('download:button:preview')"
+          <el-button circle icon="el-icon-view" :title="$t('download:button:preview')" :disabled="forbid"
             @click.stop="preview(scope.row)" />
           <!--下载--->
           <el-button circle icon="el-icon-download" :title="$t('download:button:download')"
@@ -111,6 +111,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    forbid: {
+      type: Boolean,
+      default: false,
+    },
     SubjectId: {
       type: String,
       default: '',
diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
index d41c8cf0..4042945b 100644
--- a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -69,12 +69,12 @@
                             : $t('trials:pendingReadingTasks:button:review')
                             " icon="el-icon-edit-outline" @click="handleReadImage(scope.row)" /> -->
                         <!-- 上传 -->
-                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle
-                            icon="el-icon-upload2" :title="$t('trials:pendingReadingTasks:button:upload')"
+                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle icon="el-icon-upload2"
+                            :title="$t('trials:pendingReadingTasks:button:upload')"
                             @click="openUploadImage(scope.row, 'upload')" />
                         <!-- 下载 -->
-                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle
-                            icon="el-icon-download" :title="$t('trials:pendingReadingTasks:button:download')"
+                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle icon="el-icon-download"
+                            :title="$t('trials:pendingReadingTasks:button:download')"
                             @click="openUploadImage(scope.row, 'download')" />
                     </template>
                 </el-table-column>
@@ -87,7 +87,7 @@
             :IsImageSegment="true" :forbid="forbid" />
         <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
             :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="downloadImageVisible"
-            :IsImageSegment="true" />
+            :IsImageSegment="true" :forbid="forbid" />
     </BaseContainer>
 </template>
 <script>

From feab37c4accc448e4e5f78fd4c67855fcf17de57 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 5 Jan 2026 09:32:50 +0800
Subject: [PATCH 233/333] 1

---
 .../trials-panel/reading/dicoms/components/ReportPage.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index aa9db3d3..9775a33c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -657,7 +657,7 @@ export default {
     async handleConfirm() {
       this.loading = true
       try {
-        await this.handleSave(false)
+        // await this.handleSave(false)
         let r = await this.handleSave(false)
         if (!r) return
         await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })

From d8712f26cddb3720511aff9b4eb657fa8303af67 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 5 Jan 2026 15:23:30 +0800
Subject: [PATCH 234/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0ORR=E5=88=86=E5=B8=83=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=8A=A5=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TrialsTab/index.vue            | 135 ++++++-----
 .../components/staffExternalForm.vue          | 215 +++++-------------
 .../subject/subject-list/index.vue            |  11 +-
 .../trial-summary/report-forms/index.vue      |  82 ++++++-
 4 files changed, 215 insertions(+), 228 deletions(-)

diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue
index 2549e6fc..deade4f8 100644
--- a/src/components/TrialsTab/index.vue
+++ b/src/components/TrialsTab/index.vue
@@ -2,16 +2,16 @@
 <template>
   <div class="trialsTab">
     <el-tabs v-model="trialsTab" @tab-click="clickTab">
-      <el-tab-pane v-for="item of trialsRouter.children.find(v => {return v.name == 'TrialsPanel'}).children" :key="`tab${item.path}`" :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'" :label="$t(item.LanguageMark)" :name="item.path">
-        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab" style="background-color: #f5f7fa;">
+      <el-tab-pane v-for="item of trialsRouter.children.find(v => { return v.name == 'TrialsPanel' }).children"
+        :key="`tab${item.path}`"
+        :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'"
+        :label="$t(item.LanguageMark)" :name="item.path">
+        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab"
+          style="background-color: #f5f7fa;">
           <template v-for="item1 of item.children">
-            <el-tab-pane
-              v-if="TrialConfig && isShow(item1.path)"
-              :key="`tab1${item1.path}`"
+            <el-tab-pane v-if="TrialConfig && isShow(item1.path)" :key="`tab1${item1.path}`"
               :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
-              :label="$t(item1.LanguageMark)"
-              :name="item1.path"
-            />
+              :label="$t(item1.LanguageMark)" :name="item1.path" />
           </template>
         </el-tabs>
       </el-tab-pane>
@@ -83,7 +83,7 @@ export default {
       getUserDocumentList({ TrialId: this.$route.query.trialId }).then(async res => {
         var total = res.OtherInfo.NeedSignCount
         var TrialStatusStr = res.OtherInfo.TrialStatusStr
-        this.IsAdditionalAssessment   = res.OtherInfo.IsAdditionalAssessment
+        this.IsAdditionalAssessment = res.OtherInfo.IsAdditionalAssessment
         this.TrialStatusStr = TrialStatusStr
         await store.dispatch('user/setTotalNeedSignTrialDocCount', total)
         await store.dispatch('user/setTrialStatusStr', TrialStatusStr)
@@ -100,7 +100,7 @@ export default {
     getUserDocumentList({ TrialId: this.$route.query.trialId }).then(async res => {
       var total = res.OtherInfo.NeedSignCount
       var TrialStatusStr = res.OtherInfo.TrialStatusStr
-      this.IsAdditionalAssessment   = res.OtherInfo.IsAdditionalAssessment
+      this.IsAdditionalAssessment = res.OtherInfo.IsAdditionalAssessment
       this.TrialStatusStr = TrialStatusStr
       await store.dispatch('user/setTotalNeedSignTrialDocCount', total)
       await store.dispatch('user/setTrialStatusStr', TrialStatusStr)
@@ -117,8 +117,11 @@ export default {
     }
   },
   methods: {
-    isShow: function(path) {
+    isShow: function (path) {
       var isShow = true
+      let chartList = [
+        '/trials/trials-panel/trial-summary/report-forms'
+      ]
       var qualityList = [
         '/trials/trials-panel/visit/crc-question',
         '/trials/trials-panel/visit/qc-check',
@@ -134,6 +137,9 @@ export default {
         '/trials/trials-panel/trial-summary/image-inspect',
         '/trials/trials-panel/trial-summary/push-record',
       ]
+      if (!this.$store.state.trials.config.IsExternalViewTrialChart && ~chartList.indexOf(path) && this.hasPermi(['role:cmm', 'role:cpm', 'role:ea', 'role:mc', 'role:smm', 'role:spm'])) {
+        isShow = false
+      }
       if (this.TrialConfig.QCProcessEnum === 0 && ~qualityList.indexOf(path)) {
         isShow = false
       }
@@ -205,56 +211,69 @@ export default {
 }
 </script>
 <style lang="scss">
-  .trialsTab{
-    .my_icon_box{
-      padding:0 20px 0 0;
-      transition: color,transform .3s;
-      cursor: pointer;
-      color: #666;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      &:hover{
-        color: #428bca;
-      }
-      span{
-        margin-left: 3px;
-        font-size: 14px;
-      }
+.trialsTab {
+  .my_icon_box {
+    padding: 0 20px 0 0;
+    transition: color, transform .3s;
+    cursor: pointer;
+    color: #666;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      color: #428bca;
     }
-    .el-tabs__header{
-      margin-bottom: 3px;
-    }
-    .el-tabs__item.is-active{
-      font-weight: bold;
-    }
-    position: relative;
-    .el-input--medium .el-input__inner{
-      height: 44px;line-height: 44px;width: 280px;
-      border: none;
-      text-align: right;
+
+    span {
+      margin-left: 3px;
+      font-size: 14px;
     }
   }
-  .base-model-wrapper{
-    .el-dialog__header{
-      padding: 10px;
-      .el-dialog__headerbtn{
-        top: 10px;
-        right: 10px;
-      }
-    }
-    .el-dialog__body{
-      padding:10px 10px 10px 10px;
-      .base-modal-body{
-        min-height: 100px;
-        max-height:650px;
-        overflow-y: auto;
-        padding: 10px;
-        border: 1px solid #e0e0e0;
-      }
-    }
-    .el-dialog__footer{
-      padding: 10px;
+
+  .el-tabs__header {
+    margin-bottom: 3px;
+  }
+
+  .el-tabs__item.is-active {
+    font-weight: bold;
+  }
+
+  position: relative;
+
+  .el-input--medium .el-input__inner {
+    height: 44px;
+    line-height: 44px;
+    width: 280px;
+    border: none;
+    text-align: right;
+  }
+}
+
+.base-model-wrapper {
+  .el-dialog__header {
+    padding: 10px;
+
+    .el-dialog__headerbtn {
+      top: 10px;
+      right: 10px;
     }
   }
+
+  .el-dialog__body {
+    padding: 10px 10px 10px 10px;
+
+    .base-modal-body {
+      min-height: 100px;
+      max-height: 650px;
+      overflow-y: auto;
+      padding: 10px;
+      border: 1px solid #e0e0e0;
+    }
+  }
+
+  .el-dialog__footer {
+    padding: 10px;
+  }
+}
 </style>
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index 18dc25d1..d26d4b30 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -12,226 +12,110 @@
         <span>{{ $t('trials:externalStaff:table:phone') }}:</span>
         <el-input v-model="listQuery.Phone" size="mini" class="mr" clearable />
         <!-- 查询 -->
-        <el-button
-          type="primary"
-          size="mini"
-          icon="el-icon-search"
-          @click="handleSearch"
-        >
+        <el-button type="primary" size="mini" icon="el-icon-search" @click="handleSearch">
           {{ $t('common:button:search') }}
         </el-button>
         <!-- 重置 -->
-        <el-button
-          size="mini"
-          type="primary"
-          style="margin-right: 10px"
-          icon="el-icon-refresh-left"
-          @click="handleReset"
-        >
+        <el-button size="mini" type="primary" style="margin-right: 10px" icon="el-icon-refresh-left"
+          @click="handleReset">
           {{ $t('common:button:reset') }}
         </el-button>
         <!-- 权限配置 -->
-        <el-button
-          type="primary"
-          size="mini"
-          style="margin-left: auto"
-          :loading="assignLoadStatus"
-          @click="openPermission"
-        >
+        <el-button type="primary" size="mini" style="margin-left: auto" :loading="assignLoadStatus"
+          @click="openPermission">
           {{ $t('trials:staff:button:permissionConfiguration') }}
         </el-button>
         <!-- 发送邮件 -->
-        <el-button
-          type="primary"
-          size="mini"
-          style="margin-left: 10px"
-          :disabled="selectArr.length === 0"
-          :loading="assignLoadStatus"
-          icon="el-icon-message"
-          @click="sendEmail"
-        >
+        <el-button type="primary" size="mini" style="margin-left: 10px" :disabled="selectArr.length === 0"
+          :loading="assignLoadStatus" icon="el-icon-message" @click="sendEmail">
           {{ $t('trials:staff:button:sendEmail') }}
         </el-button>
         <!-- 添加 -->
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          style="margin-left: 10px"
-          :loading="assignLoadStatus"
-          @click="handleAdd"
-        >
+        <el-button type="primary" icon="el-icon-plus" size="mini" style="margin-left: 10px" :loading="assignLoadStatus"
+          @click="handleAdd">
           {{ $t('trials:staff:button:addExternalStaff') }}
         </el-button>
       </div>
     </el-header>
     <el-main>
       <div class="data-table">
-        <el-table
-          v-loading="loading"
-          :data="list"
-          stripe
-          height="400px"
-          class="participant-table-list"
-          @selection-change="handleSelectChange"
-          @sort-change="handleSortByColumn"
-        >
-          <el-table-column
-            type="selection"
-            width="50"
-            :selectable="handleSelectable"
-          />
+        <el-table v-loading="loading" :data="list" stripe height="400px" class="participant-table-list"
+          @selection-change="handleSelectChange" @sort-change="handleSortByColumn">
+          <el-table-column type="selection" width="50" :selectable="handleSelectable" />
           <el-table-column type="index" width="50" />
-          <el-table-column
-            prop="UserRealName"
-            :label="$t('trials:externalStaff:table:name')"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="100"
-          >
+          <el-table-column prop="UserRealName" :label="$t('trials:externalStaff:table:name')" show-overflow-tooltip
+            sortable="custom" min-width="100">
             <template slot-scope="scope">{{
               scope.row.LastName + ' / ' + scope.row.FirstName
             }}</template>
           </el-table-column>
-          <el-table-column
-            prop="UserType"
-            :label="$t('trials:externalStaff:table:userType')"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="120"
-          >
+          <el-table-column prop="UserType" :label="$t('trials:externalStaff:table:userType')" show-overflow-tooltip
+            sortable="custom" min-width="120">
             <template slot-scope="scope">
               {{
                 userTypeOptions.length > 0
                   ? userTypeOptions.find((v) => {
-                      return v.Id == scope.row.UserTypeId
-                    }).UserTypeShortName
+                    return v.Id == scope.row.UserTypeId
+                  }).UserTypeShortName
                   : ''
               }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="Phone"
-            :label="$t('trials:externalStaff:table:phone')"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="120"
-          />
-          <el-table-column
-            prop="Email"
-            :label="$t('trials:externalStaff:table:email')"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="120"
-          />
-          <el-table-column
-            prop="OrganizationName"
-            :label="$t('trials:externalStaff:table:organization')"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="120"
-          />
+          <el-table-column prop="Phone" :label="$t('trials:externalStaff:table:phone')" show-overflow-tooltip
+            sortable="custom" min-width="120" />
+          <el-table-column prop="Email" :label="$t('trials:externalStaff:table:email')" show-overflow-tooltip
+            sortable="custom" min-width="120" />
+          <el-table-column prop="OrganizationName" :label="$t('trials:externalStaff:table:organization')"
+            show-overflow-tooltip sortable="custom" min-width="120" />
 
-          <el-table-column
-            prop="inviteState"
-            :label="$t('trials:externalStaff:table:status')"
-            fixed="right"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="120"
-          >
+          <el-table-column prop="inviteState" :label="$t('trials:externalStaff:table:status')" fixed="right"
+            show-overflow-tooltip sortable="custom" min-width="120">
             <template slot-scope="scope">{{
               $fd('IsJoin', scope.row.IsJoin)
             }}</template>
           </el-table-column>
-          <el-table-column
-            :label="$t('common:action:action')"
-            fixed="right"
-            min-width="150"
-          >
+          <el-table-column :label="$t('common:action:action')" fixed="right" min-width="150">
             <template slot-scope="scope">
-              <el-button
-                circle
-                icon="el-icon-delete"
-                :disabled="scope.row.IsJoin"
-                :title="$t('trials:externalStaff:button:delete')"
-                @click="deleteTrialExternalUser(scope.row)"
-              />
+              <el-button circle icon="el-icon-delete" :disabled="scope.row.IsJoin"
+                :title="$t('trials:externalStaff:button:delete')" @click="deleteTrialExternalUser(scope.row)" />
             </template>
           </el-table-column>
         </el-table>
       </div>
     </el-main>
-    <StaffExternalAdd
-      ref="StaffExternalAdd"
-      :user-type-options="userTypeOptions"
-      @getList="refeshList"
-    />
+    <StaffExternalAdd ref="StaffExternalAdd" :user-type-options="userTypeOptions" @getList="refeshList" />
     <base-model v-if="model_config.visible" :config="model_config">
       <template slot="dialog-body">
-        <el-form
-          :model="permission"
-          :rules="permissionRole"
-          ref="permissionForm"
-          label-width="230px"
-          class="demo-ruleForm"
-        >
-          <el-form-item
-            :label="$t('trials:externalStaff:form:IsSPMJoinReReadingApproval')"
-            prop="IsSPMJoinReReadingApproval"
-          >
+        <el-form :model="permission" :rules="permissionRole" ref="permissionForm" label-width="230px"
+          class="demo-ruleForm">
+          <el-form-item :label="$t('trials:externalStaff:form:IsSPMJoinReReadingApproval')"
+            prop="IsSPMJoinReReadingApproval">
             <el-radio-group v-model="permission.IsSPMJoinReReadingApproval">
-              <el-radio
-                v-for="item in $d.YesOrNo"
-                :key="item.id"
-                :label="item.value"
-                >{{ item.label }}</el-radio
-              >
+              <el-radio v-for="item in $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item
-            :label="$t('trials:externalStaff:form:IsSPMJoinReviewerSelect')"
-            prop="IsSPMJoinReviewerSelect"
-          >
+          <el-form-item :label="$t('trials:externalStaff:form:IsSPMJoinReviewerSelect')" prop="IsSPMJoinReviewerSelect">
             <el-radio-group v-model="permission.IsSPMJoinReviewerSelect">
-              <el-radio
-                v-for="item in $d.YesOrNo"
-                :key="item.id"
-                :label="item.value"
-                >{{ item.label }}</el-radio
-              >
+              <el-radio v-for="item in $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item
-            :label="$t('trials:externalStaff:form:IsSPMJoinSiteSurvey')"
-            prop="IsSPMJoinSiteSurvey"
-          >
+          <el-form-item :label="$t('trials:externalStaff:form:IsSPMJoinSiteSurvey')" prop="IsSPMJoinSiteSurvey">
             <el-radio-group v-model="permission.IsSPMJoinSiteSurvey">
-              <el-radio
-                v-for="item in $d.YesOrNo"
-                :key="item.id"
-                :label="item.value"
-                >{{ item.label }}</el-radio
-              >
+              <el-radio v-for="item in $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item :label="$t('trials:externalStaff:form:IsExternalViewTrialChart')" prop="IsSPMJoinSiteSurvey">
+            <el-radio-group v-model="permission.IsExternalViewTrialChart">
+              <el-radio v-for="item in $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button
-          :disabled="assignLoadStatus"
-          size="small"
-          type="primary"
-          @click="model_config.visible = false"
-        >
+        <el-button :disabled="assignLoadStatus" size="small" type="primary" @click="model_config.visible = false">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button
-          size="small"
-          type="primary"
-          :loading="assignLoadStatus"
-          @click="savePermission"
-        >
+        <el-button size="small" type="primary" :loading="assignLoadStatus" @click="savePermission">
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -286,6 +170,7 @@ export default {
         IsSPMJoinReReadingApproval: false,
         IsSPMJoinReviewerSelect: false,
         IsSPMJoinSiteSurvey: false,
+        IsExternalViewTrialChart: false
       },
       permissionRole: {},
     }
@@ -491,24 +376,30 @@ export default {
 <style lang="scss" scoped>
 .participant-container {
   height: 100%;
+
   .el-header {
     padding-right: 5px;
+
     .filter-container {
       display: flex;
       align-items: center;
+
       span {
         font-size: 13px;
         margin-right: 5px;
       }
+
       .mr {
         margin-right: 5px;
         width: 120px;
       }
     }
   }
+
   .el-main {
     padding: 0px;
   }
+
   .el-footer {
     padding: 0 20px;
   }
diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index 72139a26..957ab68f 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -123,7 +123,7 @@
           show-overflow-tooltip sortable="custom" min-width="120" />
 
         <el-table-column
-          v-if="hasPermi(['trials:trials-panel:subject:edit', 'trials:trials-panel:subject:status', 'trials:trials-panel:subject:delete', 'trials:trials-panel:subject:chart', 'trials:trials-panel:subject:report'])"
+          v-if="hasPermi(['trials:trials-panel:subject:edit', 'trials:trials-panel:subject:status', 'trials:trials-panel:subject:delete', 'trials:trials-panel:subject:report']) || (hasPermi(['trials:trials-panel:subject:chart']) && isShowChart)"
           :label="$t('common:action:action')" width="240" fixed="right">
           <template slot-scope="scope">
             <!-- 编辑 -->
@@ -140,8 +140,8 @@
             <el-button v-hasPermi="['trials:trials-panel:subject:report']" icon="el-icon-message" circle
               :title="$t('trials:subject:title:report')" @click="handleMessage(scope.row)" />
             <!-- 图表 -->
-            <el-button v-hasPermi="['trials:trials-panel:subject:chart']" icon="el-icon-s-data" circle
-              :title="$t('trials:subject:title:report')" @click="handleopenSubjectChart(scope.row)" />
+            <el-button v-hasPermi="['trials:trials-panel:subject:chart']" v-if="isShowChart" icon="el-icon-s-data"
+              circle :title="$t('trials:subject:title:report')" @click="handleopenSubjectChart(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -229,6 +229,11 @@ export default {
       })
     }
   },
+  computed: {
+    isShowChart() {
+      return this.$store.state.trials.config.IsExternalViewTrialChart || !this.hasPermi(['role:cmm', 'role:cpm', 'role:ea', 'role:mc', 'role:smm', 'role:spm'])
+    }
+  },
   mounted() {
     const trialsRouter = this.$store.getters.routes.find(r => { return r.name === 'Trials' })
     const trialsPanelRouter = trialsRouter.children.find(r => { return r.name === 'TrialsPanel' }).children
diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index c15880b0..5b144217 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -18,11 +18,16 @@
             <div class="chartBox" :style="{ height: isTumor ? '50%' : '100%' }">
                 <div ref="chartContainer_right" style="width: 100%; height: 100%;" v-loading="loading_right"></div>
             </div>
-            <div class="chartBox" :style="{ position: 'relative' }" v-if="isTumor">
-                <div ref="chartContainer_bottom" style="width: 100%; height: 100%;" v-loading="loading_bottom"></div>
-                <span v-if="ORR" style="position: absolute;top: 0;right:20px">ORR: {{ ORR }}</span>
-            </div>
             <div class="chartBox" v-if="isTumor">
+                <div ref="chartContainer_bottom" style="width: 100%; height: 100%;" v-loading="loading_bottom"></div>
+            </div>
+            <div class="chartBox" :style="{ position: 'relative' }" v-if="isTumor">
+                <div ref="chartContainer_bottom_left" style="width: 100%; height: 100%;" v-loading="loading_bottom">
+                </div>
+                <span v-if="ORR" style="position: absolute;top: 0;right:20px">{{
+                    $t("trials:reportForms:cjart:title:totleORR") }} {{ ORR }}</span>
+            </div>
+            <div class="chartBox" v-if="isTumor" style="width:100%">
                 <div ref="chartContainer_bottom_right" style="width: 100%; height: 100%;" v-loading="loading_bottom">
                 </div>
             </div>
@@ -76,6 +81,7 @@ export default {
             loading_bottom: false,
             chart_bottom: null,
             chart_bottom_right: null,
+            chart_bottom_left: null,
             // isHas_bottom_right: false,
             ORR: null
         }
@@ -369,12 +375,26 @@ export default {
                         // this.isHas_bottom_right = true
                         OtherInfo.PDList.forEach(item => {
                             obj2.xAxisData.push(item.SubjectCode)
-                            obj2.seriesData.push(item.DaysDiff)
+                            obj2.seriesData.push(item.MonthsDiff)
                         })
                         obj2.medianValue = this.calculateMedian(obj2.seriesData)
                     }
+                    let obj3 = {
+                        xAxisData: [],
+                        seriesData: [],
+                        unit: this.$t("trials:reportForms:cjart:unit:ORRValue"),
+                        titleText: this.$t("trials:reportForms:cjart:title:ORR"),
+                    }
+                    if (OtherInfo.SiteORRList && OtherInfo.SiteORRList.length > 0) {
+                        // this.isHas_bottom_right = true
+                        OtherInfo.SiteORRList.forEach(item => {
+                            obj3.xAxisData.push(item.TrialSiteCode)
+                            obj3.seriesData.push(item.OrrPercent.split("%")[0])
+                        })
+                    }
                     this.$nextTick(() => {
                         this.initChart_bottom_right(obj2)
+                        this.initChart_bottom_left(obj3)
                     })
                     //  else {
                     //     this.isHas_bottom_right = false
@@ -428,6 +448,57 @@ export default {
             // 4. 使用配置项渲染图表
             this.chart_bottom.setOption(option);
         },
+        initChart_bottom_left(obj) {
+            this.chart_bottom_left = echarts.init(this.$refs.chartContainer_bottom_left);
+            // ...图表配置
+            const option = {
+                title: {
+                    text: obj.titleText
+                },
+                color: this.color,
+                tooltip: {
+                    trigger: 'item',
+                    formatter: `{b} : {c}%`
+                },
+                // tooltip: {
+                //     trigger: 'axis',
+                //     axisPointer: {
+                //         type: 'shadow'
+                //     }
+                // },
+                xAxis: {
+                    type: 'category',
+                    data: obj.xAxisData
+                    // data: ['aaa', 'bbb', 'ccc']
+                },
+                yAxis: {
+                    name: obj.unit,
+                    type: 'value',
+                    axisLabel: {
+                        formatter: '{value}%'
+                    }
+                },
+                series: {
+                    label: {
+                        show: true,
+                        formatter: `{c}%`,
+                        position: 'inside',
+                        textStyle: {
+                            fontSize: 14, // 设置字体大小为 14px
+                            color: '#000', // 设置字体颜色为白色
+                            // fontWeight: 'bold' // 设置字体加粗
+                        }
+                    },
+                    data: obj.seriesData,
+                    // data: [1, 2, 3],
+                    type: 'bar',
+                    barWidth: 20,
+                }
+
+            };
+            // 4. 使用配置项渲染图表
+            this.chart_bottom_left.setOption(option);
+        },
         initChart_bottom_right(obj) {
             this.chart_bottom_right = echarts.init(this.$refs.chartContainer_bottom_right);
             // ...图表配置
@@ -513,6 +584,7 @@ export default {
     width: 100%;
     height: 100%;
     background-color: #fff;
+    overflow-y: auto;
 
     .search {
         padding: 5px;

From 2781d02afaf9d5079ead13420baf9d59da558a2b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 5 Jan 2026 15:41:11 +0800
Subject: [PATCH 235/333] 1

---
 src/views/trials/trials-panel/reading/read-task/index.vue       | 2 +-
 .../trials/trials-panel/trial-summary/report-forms/index.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 8ce46f1e..d0815b60 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -379,7 +379,7 @@ export default {
     isTumor() {
       let criterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.TrialReadingCriterionId)
       if (criterion) {
-        return [1, 18, 2, 3, 7, 17].includes(Number(criterion.CriterionType))
+        return [1, 18, 2, 3, 7, 10, 17].includes(Number(criterion.CriterionType))
       } else {
         return false
       }
diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index 5b144217..f580aefe 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -93,7 +93,7 @@ export default {
         isTumor() {
             let criterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.searchData.TrialReadingCriterionId)
             if (criterion) {
-                return [1, 18, 2, 3, 7, 17].includes(Number(criterion.CriterionType))
+                return [1, 18, 2, 3, 7, 10, 17].includes(Number(criterion.CriterionType))
             } else {
                 return false
             }

From 30b5ee24a0fb6ae4260604c8f5967bf647cc40b9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 5 Jan 2026 15:54:56 +0800
Subject: [PATCH 236/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E8=B4=A8=E7=96=91=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AEI=E6=9F=A5=E8=AF=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/trial-summary/report-forms/index.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index f580aefe..f7ddde6a 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -239,6 +239,7 @@ export default {
             try {
                 let data = {
                     TrialId: this.$route.query.trialId,
+                    TrialReadingCriterionId: this.searchData.TrialReadingCriterionId
                 }
                 this.loading_right = true
                 let res = await getTrialQuestionStatList(data)

From c662e6cc3aa9def5a37141acc02d550caf57bd62 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 5 Jan 2026 16:37:48 +0800
Subject: [PATCH 237/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8PCW?=
 =?UTF-8?q?G3=E5=8E=BB=E9=99=A4ORR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/report-forms/index.vue      | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index f7ddde6a..6067ae71 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -21,13 +21,13 @@
             <div class="chartBox" v-if="isTumor">
                 <div ref="chartContainer_bottom" style="width: 100%; height: 100%;" v-loading="loading_bottom"></div>
             </div>
-            <div class="chartBox" :style="{ position: 'relative' }" v-if="isTumor">
+            <div class="chartBox" :style="{ position: 'relative' }" v-if="isTumor && !isPCWG">
                 <div ref="chartContainer_bottom_left" style="width: 100%; height: 100%;" v-loading="loading_bottom">
                 </div>
                 <span v-if="ORR" style="position: absolute;top: 0;right:20px">{{
                     $t("trials:reportForms:cjart:title:totleORR") }} {{ ORR }}</span>
             </div>
-            <div class="chartBox" v-if="isTumor" style="width:100%">
+            <div class="chartBox" v-if="isTumor" :style="{ width: isPCWG ? '50%' : '100%' }">
                 <div ref="chartContainer_bottom_right" style="width: 100%; height: 100%;" v-loading="loading_bottom">
                 </div>
             </div>
@@ -97,6 +97,14 @@ export default {
             } else {
                 return false
             }
+        },
+        isPCWG() {
+            let criterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.searchData.TrialReadingCriterionId)
+            if (criterion) {
+                return [10].includes(Number(criterion.CriterionType))
+            } else {
+                return false
+            }
         }
     },
     watch: {
@@ -448,6 +456,9 @@ export default {
             };
             // 4. 使用配置项渲染图表
             this.chart_bottom.setOption(option);
+            this.$nextTick(() => {
+                this.chart_bottom.resize()
+            })
         },
         initChart_bottom_left(obj) {
             this.chart_bottom_left = echarts.init(this.$refs.chartContainer_bottom_left);
@@ -499,6 +510,9 @@ export default {
             };
             // 4. 使用配置项渲染图表
             this.chart_bottom_left.setOption(option);
+            this.$nextTick(() => {
+                this.chart_bottom_left.resize()
+            })
         },
         initChart_bottom_right(obj) {
             this.chart_bottom_right = echarts.init(this.$refs.chartContainer_bottom_right);
@@ -562,6 +576,9 @@ export default {
             };
             // 4. 使用配置项渲染图表
             this.chart_bottom_right.setOption(option);
+            this.$nextTick(() => {
+                this.chart_bottom_right.resize()
+            })
         },
         calculateMedian(numbers) {
             // 1. 创建副本并排序

From 1191b97688d6a9cf2adc3315778d9372c262727e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 5 Jan 2026 17:13:02 +0800
Subject: [PATCH 238/333] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BD=AE=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ClinicalData.vue               | 676 +++++-------------
 1 file changed, 198 insertions(+), 478 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
index e07c86eb..ffb5842e 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="clinical-data_content">
-    <el-tabs
-      type="card"
-      v-model="clinicalType"
-      v-if="!(data.IsVisit || data.IsBaseLine)"
-    >
+    <el-tabs type="card" v-model="clinicalType" v-if="!(data.IsVisit || data.IsBaseLine)">
       <div v-if="type === 'readingPeriod'">
         <!--style="margin:0"-->
         <h4>
@@ -21,114 +17,69 @@
       </div>
       <div class="top">
         <!-- 预览 -->
-        <el-button
-          type="primary"
-          icon="el-icon-view"
-          size="small"
-          :disabled="list.length === 0"
-          @click="handlePreview()"
-        >
+        <el-button type="primary" icon="el-icon-view" size="small" :disabled="list.length === 0"
+          @click="handlePreview()">
           {{ $t('trials:readingPeriod:cd:title:preview') }}
         </el-button>
         <!-- 添加 -->
-        <el-button
-          v-if="
-            otherInfo.IsCanAddClinicalData &&
-            hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) &&
-            clinicalType === '1' &&
-            type !== 'consistencyAnalysis'
-          "
-          type="primary"
-          icon="el-icon-plus"
-          size="small"
-          @click="handleAdd"
-        >
+        <el-button v-if="
+          otherInfo.IsCanAddClinicalData &&
+          hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) &&
+          clinicalType === '1' &&
+          type !== 'consistencyAnalysis'
+        " type="primary" icon="el-icon-plus" size="small" @click="handleAdd">
           {{ $t('common:button:add') }}
         </el-button>
         <!--下载模板-->
-        <el-button
-          v-if="
-            otherInfo.IsCanAddClinicalData &&
-            hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) &&
-            clinicalType === '1' &&
-            type !== 'consistencyAnalysis'
-          "
-          type="primary"
-          icon="el-icon-download"
-          size="small"
-          @click="downLoadTemplate"
-        >
+        <el-button v-if="
+          otherInfo.IsCanAddClinicalData &&
+          hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) &&
+          clinicalType === '1' &&
+          type !== 'consistencyAnalysis'
+        " type="primary" icon="el-icon-download" size="small" :disabled="clinicalDatas.length <= 0"
+          @click="downLoadTemplate">
           {{ $t('trials:readingPeriod:cd:title:downLoadTemplate') }}
         </el-button>
-        <el-button
-          v-if="
-            hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) &&
-            clinicalType === '2' &&
-            list.length > 0 &&
-            list[0].ReadingClinicalDataState !== 3 &&
-            list[0].IsCRCApplicationRevoke &&
-            type !== 'consistencyAnalysis'
-          "
-          type="primary"
-          icon="el-icon-plus"
-          size="small"
-          :disabled="list.length === 0"
-          @click="handleVerification(list[0], 'unconfirm')"
-        >
+        <el-button v-if="
+          hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) &&
+          clinicalType === '2' &&
+          list.length > 0 &&
+          list[0].ReadingClinicalDataState !== 3 &&
+          list[0].IsCRCApplicationRevoke &&
+          type !== 'consistencyAnalysis'
+        " type="primary" icon="el-icon-plus" size="small" :disabled="list.length === 0"
+          @click="handleVerification(list[0], 'unconfirm')">
           撤回审批
         </el-button>
       </div>
       <div class="main">
-        <el-table
-          v-loading="loading"
-          :data="list"
-          stripe
-          style="width: 100%"
-          height="500"
-        >
+        <el-table v-loading="loading" :data="list" stripe style="width: 100%" height="500">
           <el-table-column type="index" width="40" />
           <!-- 临床数据名称 -->
-          <el-table-column
-            prop="ClinicalDataSetName"
-            :label="$t('trials:readingPeriod:cd:table:clinicalDataName')"
-            min-width="100"
-          />
-          <el-table-column
-            prop="UploadRole"
-            :label="$t('trials:studyList:table:uploader')"
-            show-overflow-tooltip
-            min-width="100"
-          >
+          <el-table-column prop="ClinicalDataSetName" :label="$t('trials:readingPeriod:cd:table:clinicalDataName')"
+            min-width="100" />
+          <el-table-column prop="UploadRole" :label="$t('trials:studyList:table:uploader')" show-overflow-tooltip
+            min-width="100">
             <template slot-scope="scope">
               {{ $fd('ClinicalDataUploadRole', scope.row.UploadRole) }}
             </template>
           </el-table-column>
           <!-- 数据级别 -->
-          <el-table-column
-            prop="ClinicalDataLevel"
-            :label="$t('trials:readingPeriod:cd:table:dataLevel')"
-            min-width="100"
-          >
+          <el-table-column prop="ClinicalDataLevel" :label="$t('trials:readingPeriod:cd:table:dataLevel')"
+            min-width="100">
             <template slot-scope="scope">
               {{ $fd('ClinicalLevel', scope.row.ClinicalDataLevel) }}
             </template>
           </el-table-column>
           <!-- 传输方式 -->
-          <el-table-column
-            prop="ClinicalUploadType"
-            :label="$t('trials:readingPeriod:cd:table:transferType')"
-            min-width="120"
-          >
+          <el-table-column prop="ClinicalUploadType" :label="$t('trials:readingPeriod:cd:table:transferType')"
+            min-width="120">
             <template slot-scope="scope">
               {{ $fd('ClinicalUploadType', scope.row.ClinicalUploadType) }}
             </template>
           </el-table-column>
           <!-- 文件数量 -->
-          <el-table-column
-            prop="FileCount"
-            :label="$t('trials:readingPeriod:cd:table:fileCount')"
-            min-width="120"
-          >
+          <el-table-column prop="FileCount" :label="$t('trials:readingPeriod:cd:table:fileCount')" min-width="120">
             <template slot-scope="scope">
               {{
                 scope.row.ClinicalUploadType === 0 ? 'NA' : scope.row.FileCount
@@ -136,162 +87,83 @@
             </template>
           </el-table-column>
           <!-- 阅片临床数据状态 -->
-          <el-table-column
-            prop="ReadingClinicalDataState"
-            :label="$t('trials:readingPeriod:cd:title:cdStatus')"
-            width="150"
-          >
+          <el-table-column prop="ReadingClinicalDataState" :label="$t('trials:readingPeriod:cd:title:cdStatus')"
+            width="150">
             <template slot-scope="scope">
-              <el-tag
-                v-if="scope.row.ReadingClinicalDataState === 0"
-                type="info"
-                >{{
-                  $fd(
-                    'ReadingClinicalDataState',
-                    scope.row.ReadingClinicalDataState
-                  )
-                }}</el-tag
-              >
-              <el-tag
-                v-if="scope.row.ReadingClinicalDataState === 1"
-                type="danger"
-                >{{
-                  $fd(
-                    'ReadingClinicalDataState',
-                    scope.row.ReadingClinicalDataState
-                  )
-                }}</el-tag
-              >
-              <el-tag
-                v-if="scope.row.ReadingClinicalDataState === 2"
-                type="primary"
-                >{{
-                  $fd(
-                    'ReadingClinicalDataState',
-                    scope.row.ReadingClinicalDataState
-                  )
-                }}</el-tag
-              >
-              <el-tag
-                v-if="scope.row.ReadingClinicalDataState === 3"
-                type="warning"
-                >{{
-                  $fd(
-                    'ReadingClinicalDataState',
-                    scope.row.ReadingClinicalDataState
-                  )
-                }}</el-tag
-              >
+              <el-tag v-if="scope.row.ReadingClinicalDataState === 0" type="info">{{
+                $fd(
+                  'ReadingClinicalDataState',
+                  scope.row.ReadingClinicalDataState
+                )
+              }}</el-tag>
+              <el-tag v-if="scope.row.ReadingClinicalDataState === 1" type="danger">{{
+                $fd(
+                  'ReadingClinicalDataState',
+                  scope.row.ReadingClinicalDataState
+                )
+              }}</el-tag>
+              <el-tag v-if="scope.row.ReadingClinicalDataState === 2" type="primary">{{
+                $fd(
+                  'ReadingClinicalDataState',
+                  scope.row.ReadingClinicalDataState
+                )
+              }}</el-tag>
+              <el-tag v-if="scope.row.ReadingClinicalDataState === 3" type="warning">{{
+                $fd(
+                  'ReadingClinicalDataState',
+                  scope.row.ReadingClinicalDataState
+                )
+              }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column :label="$t('common:action:action')" width="260">
             <template slot-scope="scope">
               <!-- 查看 -->
-              <el-button
-                circle
-                :disabled="
-                  scope.row.ClinicalUploadType === 1 &&
-                  scope.row.FileCount === 0
-                "
-                :title="$t('trials:readingPeriod:cd:action:view')"
-                icon="el-icon-view"
-                @click="handlePreview(scope.row.Id, scope.row)"
-              />
+              <el-button circle :disabled="scope.row.ClinicalUploadType === 1 &&
+                scope.row.FileCount === 0
+                " :title="$t('trials:readingPeriod:cd:action:view')" icon="el-icon-view"
+                @click="handlePreview(scope.row.Id, scope.row)" />
               <!-- 编辑 -->
-              <el-button
-                v-if="clinicalType === '1'"
-                v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']"
-                circle
-                :title="$t('trials:readingPeriod:cd:action:edit')"
-                icon="el-icon-edit-outline"
-                :disabled="
-                  scope.row.IsCRCUpload ||
+              <el-button v-if="clinicalType === '1'" v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']"
+                circle :title="$t('trials:readingPeriod:cd:action:edit')" icon="el-icon-edit-outline" :disabled="scope.row.IsCRCUpload ||
                   scope.row.IsSign ||
                   scope.row.UploadRole === 0
-                "
-                @click="handleEdit(scope.row)"
-              />
+                  " @click="handleEdit(scope.row)" />
               <!-- 编辑 -->
-              <el-button
-                v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']"
-                v-if="clinicalType === '1'"
-                circle
-                :title="$t('trials:readingPeriod:cd:title:cdCheck')"
-                icon="el-icon-s-claim"
-                :disabled="
-                  (scope.row.IsCRCUpload ||
+              <el-button v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']" v-if="clinicalType === '1'"
+                circle :title="$t('trials:readingPeriod:cd:title:cdCheck')" icon="el-icon-s-claim" :disabled="(scope.row.IsCRCUpload ||
                     scope.row.IsSign ||
                     scope.row.UploadRole === 0) &&
                   scope.row.ReadingClinicalDataState !== 2
-                "
-                @click="handleVerification(scope.row, 'confirm')"
-              />
+                  " @click="handleVerification(scope.row, 'confirm')" />
               <!-- 删除 -->
-              <el-button
-                v-if="clinicalType === '1' && type !== 'consistencyAnalysis'"
-                v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']"
-                circle
-                :title="$t('trials:readingPeriod:cd:action:delete')"
-                icon="el-icon-delete"
-                :disabled="
-                  scope.row.IsCRCUpload ||
+              <el-button v-if="clinicalType === '1' && type !== 'consistencyAnalysis'"
+                v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']" circle
+                :title="$t('trials:readingPeriod:cd:action:delete')" icon="el-icon-delete" :disabled="scope.row.IsCRCUpload ||
                   scope.row.IsSign ||
                   scope.row.UploadRole === 0
-                "
-                @click="handleDelete(scope.row)"
-              />
+                  " @click="handleDelete(scope.row)" />
             </template>
           </el-table-column>
         </el-table>
 
         <!-- 添加或编辑 -->
-        <el-dialog
-          v-if="addOrUpdateCD.visible"
-          :visible.sync="addOrUpdateCD.visible"
-          :close-on-click-modal="false"
-          :title="addOrUpdateCD.title"
-          width="600px"
-          append-to-body
-          custom-class="base-dialog-wrapper"
-        >
-          <AddOrEditCD
-            :trial-reading-criterion-id="trialReadingCriterionId"
-            :data="currentData"
-            :option="currentOption"
-            :type="type"
-            @close="addOrUpdateCD.visible = false"
-            @getList="getList"
-          />
+        <el-dialog v-if="addOrUpdateCD.visible" :visible.sync="addOrUpdateCD.visible" :close-on-click-modal="false"
+          :title="addOrUpdateCD.title" width="600px" append-to-body custom-class="base-dialog-wrapper">
+          <AddOrEditCD :trial-reading-criterion-id="trialReadingCriterionId" :data="currentData" :option="currentOption"
+            :type="type" @close="addOrUpdateCD.visible = false" @getList="getList" />
         </el-dialog>
 
         <!-- 核查 -->
-        <el-dialog
-          v-if="verification.visible"
-          :visible.sync="verification.visible"
-          :close-on-click-modal="false"
-          :title="verification.title"
-          width="600px"
-          append-to-body
-          custom-class="base-dialog-wrapper"
-        >
-          <Verification
-            :data="currentData"
-            @close="verification.visible = false"
-            @getList="getList"
-            @handlePreview="handlePreview"
-            @sign="handleSign"
-          />
+        <el-dialog v-if="verification.visible" :visible.sync="verification.visible" :close-on-click-modal="false"
+          :title="verification.title" width="600px" append-to-body custom-class="base-dialog-wrapper">
+          <Verification :data="currentData" @close="verification.visible = false" @getList="getList"
+            @handlePreview="handlePreview" @sign="handleSign" />
         </el-dialog>
 
         <!-- 签名 -->
-        <el-dialog
-          v-if="signVisible"
-          :visible.sync="signVisible"
-          :close-on-click-modal="false"
-          width="600px"
-          custom-class="base-dialog-wrapper"
-          append-to-body
-        >
+        <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
+          custom-class="base-dialog-wrapper" append-to-body>
           <div slot="title">
             <span style="font-size: 18px">{{
               $t('common:dialogTitle:sign')
@@ -300,11 +172,7 @@
               `(${$t('common:label:sign')}${currentUser})`
             }}</span>
           </div>
-          <SignForm
-            ref="signForm"
-            :sign-code-enum="signCode"
-            @closeDialog="closeSignDialog"
-          />
+          <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
         </el-dialog>
       </div>
       <!-- <template v-for="item in $d.GetClinicalType">
@@ -316,75 +184,42 @@
     <div v-else>
       <div class="top">
         <!-- 预览 -->
-        <el-button
-          type="primary"
-          icon="el-icon-view"
-          size="small"
-          :disabled="list.length === 0"
-          @click="handlePreview()"
-        >
+        <el-button type="primary" icon="el-icon-view" size="small" :disabled="list.length === 0"
+          @click="handlePreview()">
           {{ $t('trials:readingPeriod:cd:title:preview') }}
         </el-button>
         <!-- 添加 -->
-        <el-button
-          v-if="
-            otherInfo.IsCanAddClinicalData &&
-            hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])
-          "
-          type="primary"
-          icon="el-icon-plus"
-          size="small"
-          @click="handleAdd"
-        >
+        <el-button v-if="
+          otherInfo.IsCanAddClinicalData &&
+          hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])
+        " type="primary" icon="el-icon-plus" size="small" @click="handleAdd">
           {{ $t('common:button:add') }}
         </el-button>
       </div>
       <div class="main">
-        <el-table
-          v-loading="loading"
-          :data="list"
-          stripe
-          style="width: 100%"
-          height="500"
-        >
+        <el-table v-loading="loading" :data="list" stripe style="width: 100%" height="500">
           <el-table-column type="index" width="40" />
           <!-- 临床数据名称 -->
-          <el-table-column
-            prop="ClinicalDataSetName"
-            :label="$t('trials:readingPeriod:cd:table:clinicalDataName')"
-          />
-          <el-table-column
-            prop="UploadRole"
-            :label="$t('trials:studyList:table:uploader')"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="ClinicalDataSetName" :label="$t('trials:readingPeriod:cd:table:clinicalDataName')" />
+          <el-table-column prop="UploadRole" :label="$t('trials:studyList:table:uploader')" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ $fd('ClinicalDataUploadRole', scope.row.UploadRole) }}
             </template>
           </el-table-column>
           <!-- 数据级别 -->
-          <el-table-column
-            prop="ClinicalDataLevel"
-            :label="$t('trials:readingPeriod:cd:table:dataLevel')"
-          >
+          <el-table-column prop="ClinicalDataLevel" :label="$t('trials:readingPeriod:cd:table:dataLevel')">
             <template slot-scope="scope">
               {{ $fd('ClinicalLevel', scope.row.ClinicalDataLevel) }}
             </template>
           </el-table-column>
           <!-- 传输方式 -->
-          <el-table-column
-            prop="ClinicalUploadType"
-            :label="$t('trials:readingPeriod:cd:table:transferType')"
-          >
+          <el-table-column prop="ClinicalUploadType" :label="$t('trials:readingPeriod:cd:table:transferType')">
             <template slot-scope="scope">
               {{ $fd('ClinicalUploadType', scope.row.ClinicalUploadType) }}
             </template>
           </el-table-column>
           <!-- 文件数量 -->
-          <el-table-column
-            prop="FileCount"
-            :label="$t('trials:readingPeriod:cd:table:fileCount')"
-          >
+          <el-table-column prop="FileCount" :label="$t('trials:readingPeriod:cd:table:fileCount')">
             <template slot-scope="scope">
               {{
                 scope.row.ClinicalUploadType === 0 ? 'NA' : scope.row.FileCount
@@ -392,160 +227,85 @@
             </template>
           </el-table-column>
           <!-- 阅片临床数据状态 -->
-          <el-table-column
-            prop="ReadingClinicalDataState"
-            :label="$t('trials:readingPeriod:cd:title:cdStatus')"
-            width="150"
-          >
+          <el-table-column prop="ReadingClinicalDataState" :label="$t('trials:readingPeriod:cd:title:cdStatus')"
+            width="150">
             <template slot-scope="scope">
-              <el-tag
-                v-if="scope.row.ReadingClinicalDataState === 0"
-                type="info"
-                >{{
-                  $fd(
-                    'ReadingClinicalDataState',
-                    scope.row.ReadingClinicalDataState
-                  )
-                }}</el-tag
-              >
-              <el-tag
-                v-if="scope.row.ReadingClinicalDataState === 1"
-                type="danger"
-                >{{
-                  $fd(
-                    'ReadingClinicalDataState',
-                    scope.row.ReadingClinicalDataState
-                  )
-                }}</el-tag
-              >
-              <el-tag
-                v-if="scope.row.ReadingClinicalDataState === 2"
-                type="primary"
-                >{{
-                  $fd(
-                    'ReadingClinicalDataState',
-                    scope.row.ReadingClinicalDataState
-                  )
-                }}</el-tag
-              >
-              <el-tag
-                v-if="scope.row.ReadingClinicalDataState === 3"
-                type="warning"
-                >{{
-                  $fd(
-                    'ReadingClinicalDataState',
-                    scope.row.ReadingClinicalDataState
-                  )
-                }}</el-tag
-              >
+              <el-tag v-if="scope.row.ReadingClinicalDataState === 0" type="info">{{
+                $fd(
+                  'ReadingClinicalDataState',
+                  scope.row.ReadingClinicalDataState
+                )
+              }}</el-tag>
+              <el-tag v-if="scope.row.ReadingClinicalDataState === 1" type="danger">{{
+                $fd(
+                  'ReadingClinicalDataState',
+                  scope.row.ReadingClinicalDataState
+                )
+              }}</el-tag>
+              <el-tag v-if="scope.row.ReadingClinicalDataState === 2" type="primary">{{
+                $fd(
+                  'ReadingClinicalDataState',
+                  scope.row.ReadingClinicalDataState
+                )
+              }}</el-tag>
+              <el-tag v-if="scope.row.ReadingClinicalDataState === 3" type="warning">{{
+                $fd(
+                  'ReadingClinicalDataState',
+                  scope.row.ReadingClinicalDataState
+                )
+              }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column :label="$t('common:action:action')" width="260">
             <template slot-scope="scope">
               <!-- 查看 -->
-              <el-button
-                circle
-                :disabled="
-                  scope.row.ClinicalUploadType === 1 &&
-                  scope.row.FileCount === 0
-                "
-                :title="$t('trials:readingPeriod:cd:action:view')"
-                icon="el-icon-view"
-                @click="handlePreview(scope.row.Id, scope.row)"
-              />
+              <el-button circle :disabled="scope.row.ClinicalUploadType === 1 &&
+                scope.row.FileCount === 0
+                " :title="$t('trials:readingPeriod:cd:action:view')" icon="el-icon-view"
+                @click="handlePreview(scope.row.Id, scope.row)" />
               <!-- 编辑 -->
-              <el-button
-                v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']"
-                circle
-                :title="$t('trials:readingPeriod:cd:action:edit')"
-                icon="el-icon-edit-outline"
-                :disabled="
-                  scope.row.IsCRCUpload ||
+              <el-button v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']" circle
+                :title="$t('trials:readingPeriod:cd:action:edit')" icon="el-icon-edit-outline" :disabled="scope.row.IsCRCUpload ||
                   scope.row.IsSign ||
                   scope.row.UploadRole === 0 ||
                   (type === 'consistencyAnalysis' &&
                     scope.row.ReadingClinicalDataState === 3)
-                "
-                @click="handleEdit(scope.row)"
-              />
+                  " @click="handleEdit(scope.row)" />
               <!-- 编辑 -->
-              <el-button
-                v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']"
-                circle
-                :title="$t('trials:readingPeriod:cd:title:cdCheck')"
-                icon="el-icon-s-claim"
-                :disabled="
-                  (scope.row.IsCRCUpload ||
+              <el-button v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']" circle
+                :title="$t('trials:readingPeriod:cd:title:cdCheck')" icon="el-icon-s-claim" :disabled="(scope.row.IsCRCUpload ||
                     scope.row.IsSign ||
                     scope.row.UploadRole === 0 ||
                     type === 'consistencyAnalysis') &&
                   scope.row.ReadingClinicalDataState !== 2
-                "
-                @click="handleVerification(scope.row, 'confirm')"
-              />
+                  " @click="handleVerification(scope.row, 'confirm')" />
               <!-- 删除 -->
-              <el-button
-                v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']"
-                circle
-                :title="$t('trials:readingPeriod:cd:action:delete')"
-                icon="el-icon-delete"
-                :disabled="
-                  scope.row.IsCRCUpload ||
+              <el-button v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']" circle
+                :title="$t('trials:readingPeriod:cd:action:delete')" icon="el-icon-delete" :disabled="scope.row.IsCRCUpload ||
                   scope.row.IsSign ||
                   scope.row.UploadRole === 0
-                "
-                @click="handleDelete(scope.row)"
-              />
+                  " @click="handleDelete(scope.row)" />
             </template>
           </el-table-column>
         </el-table>
 
         <!-- 添加 -->
-        <el-dialog
-          v-if="addOrUpdateCD.visible"
-          :visible.sync="addOrUpdateCD.visible"
-          :close-on-click-modal="false"
-          :title="addOrUpdateCD.title"
-          width="600px"
-          append-to-body
-          custom-class="base-dialog-wrapper"
-        >
-          <AddOrEditCD
-            :trial-reading-criterion-id="trialReadingCriterionId"
-            :data="currentData"
-            @close="addOrUpdateCD.visible = false"
-            @getList="getList"
-          />
+        <el-dialog v-if="addOrUpdateCD.visible" :visible.sync="addOrUpdateCD.visible" :close-on-click-modal="false"
+          :title="addOrUpdateCD.title" width="600px" append-to-body custom-class="base-dialog-wrapper">
+          <AddOrEditCD :trial-reading-criterion-id="trialReadingCriterionId" :data="currentData"
+            @close="addOrUpdateCD.visible = false" @getList="getList" />
         </el-dialog>
 
         <!-- 核查 -->
-        <el-dialog
-          v-if="verification.visible"
-          :visible.sync="verification.visible"
-          :close-on-click-modal="false"
-          :title="verification.title"
-          width="600px"
-          append-to-body
-          custom-class="base-dialog-wrapper"
-        >
-          <Verification
-            :data="currentData"
-            @close="verification.visible = false"
-            @getList="getList"
-            @handlePreview="handlePreview"
-            @sign="handleSign"
-          />
+        <el-dialog v-if="verification.visible" :visible.sync="verification.visible" :close-on-click-modal="false"
+          :title="verification.title" width="600px" append-to-body custom-class="base-dialog-wrapper">
+          <Verification :data="currentData" @close="verification.visible = false" @getList="getList"
+            @handlePreview="handlePreview" @sign="handleSign" />
         </el-dialog>
 
         <!-- 签名 -->
-        <el-dialog
-          v-if="signVisible"
-          :visible.sync="signVisible"
-          :close-on-click-modal="false"
-          width="600px"
-          custom-class="base-dialog-wrapper"
-          append-to-body
-        >
+        <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
+          custom-class="base-dialog-wrapper" append-to-body>
           <div slot="title">
             <span style="font-size: 18px">{{
               $t('common:dialogTitle:sign')
@@ -554,11 +314,7 @@
               `(${$t('common:label:sign')}${currentUser})`
             }}</span>
           </div>
-          <SignForm
-            ref="signForm"
-            :sign-code-enum="signCode"
-            @closeDialog="closeSignDialog"
-          />
+          <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
         </el-dialog>
       </div>
     </div>
@@ -652,9 +408,8 @@ export default {
     // 格式化下载文件路径
     formatDownloadFile() {
       let files = [],
-        name = `${this.$route.query.trialId}_${
-          this.data.CriterionName
-        }_template_${new Date().getTime()}.zip`
+        name = `${this.$route.query.trialId}_${this.data.CriterionName
+          }_template_${new Date().getTime()}.zip`
       this.clinicalDatas.forEach((item) => {
         if (item.Path) {
           let obj = {
@@ -826,27 +581,19 @@ export default {
       if (type === 'unconfirm') {
         var token = getToken()
         let routeData = this.$router.resolve({
-          path: `/clinicalData?type=unconfirm&ClinicalDataTrialSetId=${
-            row.ClinicalDataTrialSetId
-          }&subjectId=${this.data.SubjectId}&trialId=${
-            this.data.TrialId
-          }&readingId=${this.data.Id}&readingClinicalDataId=${
-            row.readingClinicalDataId || ''
-          }&readModuleId=${row.ReadModuleId}&getClinicalType=${
-            this.clinicalType
-          }&isConfirm=1&IsOnlyGetCRCReadModule=1&TokenKey=${token}`,
+          path: `/clinicalData?type=unconfirm&ClinicalDataTrialSetId=${row.ClinicalDataTrialSetId
+            }&subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+            }&readingId=${this.data.Id}&readingClinicalDataId=${row.readingClinicalDataId || ''
+            }&readModuleId=${row.ReadModuleId}&getClinicalType=${this.clinicalType
+            }&isConfirm=1&IsOnlyGetCRCReadModule=1&TokenKey=${token}`,
         })
         if (this.type === 'consistencyAnalysis') {
           routeData = this.$router.resolve({
-            path: `/clinicalData?type=unconfirm&ClinicalDataTrialSetId=${
-              row.ClinicalDataTrialSetId
-            }&subjectId=${this.data.SubjectId}&trialId=${
-              this.data.TrialId
-            }&visitTaskId=${this.data.Id}&readingClinicalDataId=${
-              row.readingClinicalDataId || ''
-            }&readModuleId=${row.ReadModuleId}&getClinicalType=${
-              this.clinicalType
-            }&isConfirm=1&IsOnlyGetCRCReadModule=1&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
+            path: `/clinicalData?type=unconfirm&ClinicalDataTrialSetId=${row.ClinicalDataTrialSetId
+              }&subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+              }&visitTaskId=${this.data.Id}&readingClinicalDataId=${row.readingClinicalDataId || ''
+              }&readModuleId=${row.ReadModuleId}&getClinicalType=${this.clinicalType
+              }&isConfirm=1&IsOnlyGetCRCReadModule=1&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
           })
         }
         window.open(routeData.href, '_blank')
@@ -855,27 +602,19 @@ export default {
       if (row.IsNeedMerge) {
         var token = getToken()
         let routeData = this.$router.resolve({
-          path: `/clinicalData?ClinicalDataTrialSetId=${
-            row.ClinicalDataTrialSetId
-          }&subjectId=${this.data.SubjectId}&trialId=${
-            this.data.TrialId
-          }&readingId=${this.data.Id}&readingClinicalDataId=${
-            row.readingClinicalDataId || ''
-          }&readModuleId=${row.ReadModuleId}&getClinicalType=${
-            this.clinicalType
-          }&isConfirm=1&IsOnlyGetCRCReadModule=1&TokenKey=${token}`,
+          path: `/clinicalData?ClinicalDataTrialSetId=${row.ClinicalDataTrialSetId
+            }&subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+            }&readingId=${this.data.Id}&readingClinicalDataId=${row.readingClinicalDataId || ''
+            }&readModuleId=${row.ReadModuleId}&getClinicalType=${this.clinicalType
+            }&isConfirm=1&IsOnlyGetCRCReadModule=1&TokenKey=${token}`,
         })
         if (this.type === 'consistencyAnalysis') {
           routeData = this.$router.resolve({
-            path: `/clinicalData?ClinicalDataTrialSetId=${
-              row.ClinicalDataTrialSetId
-            }&subjectId=${this.data.SubjectId}&trialId=${
-              this.data.TrialId
-            }&visitTaskId=${this.data.Id}&readingClinicalDataId=${
-              row.readingClinicalDataId || ''
-            }&readModuleId=${row.ReadModuleId}&getClinicalType=${
-              this.clinicalType
-            }&isConfirm=1&IsOnlyGetCRCReadModule=1&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
+            path: `/clinicalData?ClinicalDataTrialSetId=${row.ClinicalDataTrialSetId
+              }&subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+              }&visitTaskId=${this.data.Id}&readingClinicalDataId=${row.readingClinicalDataId || ''
+              }&readModuleId=${row.ReadModuleId}&getClinicalType=${this.clinicalType
+              }&isConfirm=1&IsOnlyGetCRCReadModule=1&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
           })
         }
         window.open(routeData.href, '_blank')
@@ -915,7 +654,7 @@ export default {
               this.loading = false
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     handleSign(from) {
       // this.currentData = { ...row }
@@ -1001,27 +740,19 @@ export default {
       if (row && row.IsNeedMerge) {
         var token = getToken()
         let routeData = this.$router.resolve({
-          path: `/clinicalData?ClinicalDataTrialSetId=${
-            row.ClinicalDataTrialSetId
-          }&subjectId=${this.data.SubjectId}&trialId=${
-            this.data.TrialId
-          }&readingId=${this.data.Id}&readingClinicalDataId=${
-            row.readingClinicalDataId || ''
-          }&getClinicalType=${this.clinicalType}&readModuleId=${
-            row.ReadModuleId
-          }&IsOnlyGetCRCReadModule=1&TokenKey=${token}`,
+          path: `/clinicalData?ClinicalDataTrialSetId=${row.ClinicalDataTrialSetId
+            }&subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+            }&readingId=${this.data.Id}&readingClinicalDataId=${row.readingClinicalDataId || ''
+            }&getClinicalType=${this.clinicalType}&readModuleId=${row.ReadModuleId
+            }&IsOnlyGetCRCReadModule=1&TokenKey=${token}`,
         })
         if (this.type === 'consistencyAnalysis') {
           routeData = this.$router.resolve({
-            path: `/clinicalData?ClinicalDataTrialSetId=${
-              row.ClinicalDataTrialSetId
-            }&subjectId=${this.data.SubjectId}&trialId=${
-              this.data.TrialId
-            }&visitTaskId=${this.data.Id}&readingClinicalDataId=${
-              row.readingClinicalDataId || ''
-            }&getClinicalType=${this.clinicalType}&readModuleId=${
-              row.ReadModuleId
-            }&IsOnlyGetCRCReadModule=1&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
+            path: `/clinicalData?ClinicalDataTrialSetId=${row.ClinicalDataTrialSetId
+              }&subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+              }&visitTaskId=${this.data.Id}&readingClinicalDataId=${row.readingClinicalDataId || ''
+              }&getClinicalType=${this.clinicalType}&readModuleId=${row.ReadModuleId
+              }&IsOnlyGetCRCReadModule=1&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
           })
         }
         window.open(routeData.href, '_blank')
@@ -1030,44 +761,32 @@ export default {
         var routeData
         if (row) {
           routeData = this.$router.resolve({
-            path: `/clinicalData?ClinicalDataTrialSetId=${
-              row.ClinicalDataTrialSetId
-            }&subjectId=${this.data.SubjectId}&trialId=${
-              this.data.TrialId
-            }&readingId=${this.data.Id}&readingClinicalDataId=${
-              readingClinicalDataId || ''
-            }&getClinicalType=${this.clinicalType}&TokenKey=${token}`,
+            path: `/clinicalData?ClinicalDataTrialSetId=${row.ClinicalDataTrialSetId
+              }&subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+              }&readingId=${this.data.Id}&readingClinicalDataId=${readingClinicalDataId || ''
+              }&getClinicalType=${this.clinicalType}&TokenKey=${token}`,
           })
           if (this.type === 'consistencyAnalysis') {
             routeData = this.$router.resolve({
-              path: `/clinicalData?ClinicalDataTrialSetId=${
-                row.ClinicalDataTrialSetId
-              }&subjectId=${this.data.SubjectId}&trialId=${
-                this.data.TrialId
-              }&visitTaskId=${this.data.Id}&readingClinicalDataId=${
-                readingClinicalDataId || ''
-              }&getClinicalType=${
-                this.clinicalType
-              }&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
+              path: `/clinicalData?ClinicalDataTrialSetId=${row.ClinicalDataTrialSetId
+                }&subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+                }&visitTaskId=${this.data.Id}&readingClinicalDataId=${readingClinicalDataId || ''
+                }&getClinicalType=${this.clinicalType
+                }&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
             })
           }
         } else {
           routeData = this.$router.resolve({
-            path: `/clinicalData?subjectId=${this.data.SubjectId}&trialId=${
-              this.data.TrialId
-            }&readingId=${this.data.Id}&readingClinicalDataId=${
-              readingClinicalDataId || ''
-            }&getClinicalType=${this.clinicalType}&TokenKey=${token}`,
+            path: `/clinicalData?subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+              }&readingId=${this.data.Id}&readingClinicalDataId=${readingClinicalDataId || ''
+              }&getClinicalType=${this.clinicalType}&TokenKey=${token}`,
           })
           if (this.type === 'consistencyAnalysis') {
             routeData = this.$router.resolve({
-              path: `/clinicalData?subjectId=${this.data.SubjectId}&trialId=${
-                this.data.TrialId
-              }&visitTaskId=${this.data.Id}&readingClinicalDataId=${
-                readingClinicalDataId || ''
-              }&getClinicalType=${
-                this.clinicalType
-              }&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
+              path: `/clinicalData?subjectId=${this.data.SubjectId}&trialId=${this.data.TrialId
+                }&visitTaskId=${this.data.Id}&readingClinicalDataId=${readingClinicalDataId || ''
+                }&getClinicalType=${this.clinicalType
+                }&TokenKey=${token}&&isGetAllConsistencyAnalysis=${0}`,
             })
           }
         }
@@ -1082,6 +801,7 @@ export default {
   .top {
     text-align: right;
   }
+
   ::v-deep .el-divider--horizontal {
     margin: 10px;
   }

From a0b39e7a0b5dcf0209af24204c567188d10fc6ba Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 6 Jan 2026 11:06:11 +0800
Subject: [PATCH 239/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/report-forms/index.vue             | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index 6067ae71..16967b88 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -267,7 +267,7 @@ export default {
                                 label: {
                                     show: true,
                                     formatter: `{c}`,
-                                    position: 'inside',
+                                    position: 'top',
                                     textStyle: {
                                         fontSize: 14, // 设置字体大小为 14px
                                         color: '#000', // 设置字体颜色为白色
@@ -356,6 +356,7 @@ export default {
                 }
                 this.loading_bottom = true
                 let res = await getTrialEfficacyEvaluationStatList(data)
+                if (data.TrialReadingCriterionId !== this.searchData.TrialReadingCriterionId) return false
                 this.loading_bottom = false
                 if (res.IsSuccess) {
                     let OtherInfo = res.OtherInfo || {}
@@ -434,7 +435,8 @@ export default {
                 },
                 yAxis: {
                     name: obj.unit,
-                    type: 'value'
+                    type: 'value',
+                    minInterval: 1
                 },
                 series: [
                     {
@@ -444,7 +446,7 @@ export default {
                         label: {
                             show: true,
                             formatter: `{c}`,
-                            position: 'inside',
+                            position: 'top',
                             textStyle: {
                                 fontSize: 14, // 设置字体大小为 14px
                                 color: '#000', // 设置字体颜色为白色
@@ -494,7 +496,7 @@ export default {
                     label: {
                         show: true,
                         formatter: `{c}%`,
-                        position: 'inside',
+                        position: 'top',
                         textStyle: {
                             fontSize: 14, // 设置字体大小为 14px
                             color: '#000', // 设置字体颜色为白色
@@ -560,7 +562,7 @@ export default {
                     label: {
                         show: true,
                         formatter: `{c}`,
-                        position: 'inside',
+                        position: 'top',
                         textStyle: {
                             fontSize: 14, // 设置字体大小为 14px
                             color: '#000', // 设置字体颜色为白色

From 98a3f9c5b5fbbb297e719b972912453f90be9c83 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 6 Jan 2026 13:36:38 +0800
Subject: [PATCH 240/333] =?UTF-8?q?=E5=8F=97=E8=AF=95=E8=80=85=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=AA=E6=98=BE=E7=A4=BA=E8=82=BF=E7=98=A4=E6=A0=87?=
 =?UTF-8?q?=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/subject-list/components/SubjectChart.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
index c3f5dd55..1886d1b1 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
@@ -91,7 +91,7 @@ export default {
         getTrialCriterionList() {
             this.loading = true
             getTrialCriterionList(this.$route.query.trialId, false).then(res => {
-                this.trialCriterionList = res.Result
+                this.trialCriterionList = res.Result.filter(item => [1, 18, 2, 3, 7, 10, 17].includes(Number(item.CriterionType)))
                 if (this.trialCriterionList.length > 0) {
                     this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
                     this.getList()

From ef08a5277d6fb37bec03654c0533fa2a7e80887c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 6 Jan 2026 13:46:30 +0800
Subject: [PATCH 241/333] 1

---
 .../reading-period/components/ClinicalData.vue     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
index ffb5842e..317fc1d9 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
@@ -36,8 +36,8 @@
           hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) &&
           clinicalType === '1' &&
           type !== 'consistencyAnalysis'
-        " type="primary" icon="el-icon-download" size="small" :disabled="clinicalDatas.length <= 0"
-          @click="downLoadTemplate">
+        " type="primary" icon="el-icon-download" size="small"
+          :disabled="clinicalDatas.filter(item => item.Path).length <= 0" @click="downLoadTemplate">
           {{ $t('trials:readingPeriod:cd:title:downLoadTemplate') }}
         </el-button>
         <el-button v-if="
@@ -132,8 +132,8 @@
               <!-- 编辑 -->
               <el-button v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']" v-if="clinicalType === '1'"
                 circle :title="$t('trials:readingPeriod:cd:title:cdCheck')" icon="el-icon-s-claim" :disabled="(scope.row.IsCRCUpload ||
-                    scope.row.IsSign ||
-                    scope.row.UploadRole === 0) &&
+                  scope.row.IsSign ||
+                  scope.row.UploadRole === 0) &&
                   scope.row.ReadingClinicalDataState !== 2
                   " @click="handleVerification(scope.row, 'confirm')" />
               <!-- 删除 -->
@@ -274,9 +274,9 @@
               <!-- 编辑 -->
               <el-button v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']" circle
                 :title="$t('trials:readingPeriod:cd:title:cdCheck')" icon="el-icon-s-claim" :disabled="(scope.row.IsCRCUpload ||
-                    scope.row.IsSign ||
-                    scope.row.UploadRole === 0 ||
-                    type === 'consistencyAnalysis') &&
+                  scope.row.IsSign ||
+                  scope.row.UploadRole === 0 ||
+                  type === 'consistencyAnalysis') &&
                   scope.row.ReadingClinicalDataState !== 2
                   " @click="handleVerification(scope.row, 'confirm')" />
               <!-- 删除 -->

From 8d1d5cb43a7b5c0b203248a989c854f3a7e5b77f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 7 Jan 2026 10:39:18 +0800
Subject: [PATCH 242/333] =?UTF-8?q?=E5=9B=BE=E5=83=8F=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=9F=A5=E7=9C=8B=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/report-forms/index.vue      | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index 16967b88..b9188783 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -179,14 +179,10 @@ export default {
                 color: this.color,
                 tooltip: {
                     trigger: 'item',
-                    formatter: `${obj.titleText} <br/>{b} : {c}`
+                    formatter: `{b} : {c}`
                 },
                 toolbox: {
-                    feature: {
-                        dataView: { readOnly: false },
-                        restore: {},
-                        saveAsImage: {}
-                    }
+                    show: false
                 },
                 legend: {
                     data: obj.legendData,
@@ -267,7 +263,7 @@ export default {
                                 label: {
                                     show: true,
                                     formatter: `{c}`,
-                                    position: 'top',
+                                    position: 'inside',
                                     textStyle: {
                                         fontSize: 14, // 设置字体大小为 14px
                                         color: '#000', // 设置字体颜色为白色
@@ -317,6 +313,9 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                toolbox: {
+                    show: false
+                },
                 color: this.color,
                 tooltip: {
                     trigger: 'axis',
@@ -422,6 +421,9 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                toolbox: {
+                    show: false
+                },
                 color: this.color,
                 tooltip: {
                     trigger: 'axis',
@@ -469,6 +471,9 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                toolbox: {
+                    show: false
+                },
                 color: this.color,
                 tooltip: {
                     trigger: 'item',
@@ -523,6 +528,9 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                toolbox: {
+                    show: false
+                },
                 color: this.color,
                 tooltip: {
                     trigger: 'axis',

From 47798750a4ab7216cdeb8a5a8138cfcaf5cfc5fc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 7 Jan 2026 11:31:37 +0800
Subject: [PATCH 243/333] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=9B=BE=E8=A1=A8=E5=90=8E=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TrialsTab/index.vue | 34 ++++++++++++++++++------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue
index deade4f8..2e642e08 100644
--- a/src/components/TrialsTab/index.vue
+++ b/src/components/TrialsTab/index.vue
@@ -2,19 +2,21 @@
 <template>
   <div class="trialsTab">
     <el-tabs v-model="trialsTab" @tab-click="clickTab">
-      <el-tab-pane v-for="item of trialsRouter.children.find(v => { return v.name == 'TrialsPanel' }).children"
-        :key="`tab${item.path}`"
-        :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'"
-        :label="$t(item.LanguageMark)" :name="item.path">
-        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab"
-          style="background-color: #f5f7fa;">
-          <template v-for="item1 of item.children">
-            <el-tab-pane v-if="TrialConfig && isShow(item1.path)" :key="`tab1${item1.path}`"
-              :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
-              :label="$t(item1.LanguageMark)" :name="item1.path" />
-          </template>
-        </el-tabs>
-      </el-tab-pane>
+      <template v-for="item of trialsRouter.children.find(v => { return v.name == 'TrialsPanel' }).children">
+        <el-tab-pane :key="`tab${item.path}`"
+          :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'"
+          :label="$t(item.LanguageMark)" :name="item.path" v-if="isShowNode(item)">
+          <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab"
+            style="background-color: #f5f7fa;">
+            <template v-for="item1 of item.children">
+              <el-tab-pane v-if="TrialConfig && isShow(item1.path)" :key="`tab1${item1.path}`"
+                :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
+                :label="$t(item1.LanguageMark)" :name="item1.path" />
+            </template>
+          </el-tabs>
+        </el-tab-pane>
+      </template>
+
     </el-tabs>
     <div style="position: absolute;top: 0;right: 0;display: flex;justify-content: space-between;align-items: center">
       <trials-select />
@@ -117,6 +119,12 @@ export default {
     }
   },
   methods: {
+    isShowNode(item) {
+      if (item.path === '/trials/trials-panel/trial-summary' && item.children.length === 1 && item.children[0].path === '/trials/trials-panel/trial-summary/report-forms' && !this.$store.state.trials.config.IsExternalViewTrialChart && this.hasPermi(['role:cmm', 'role:cpm', 'role:ea', 'role:mc', 'role:smm', 'role:spm'])) {
+        return false
+      }
+      return true
+    },
     isShow: function (path) {
       var isShow = true
       let chartList = [

From 21bdd0b07ed36ea4ed56bc5012bbe8b8dab9369d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 7 Jan 2026 13:31:19 +0800
Subject: [PATCH 244/333] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Breadcrumb/index.vue           | 15 ++++++++++++---
 src/layout/components/Sidebar/SidebarItem.vue |  6 ++++--
 src/store/modules/permission.js               |  2 ++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 50c958bd..1e1122bd 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -2,9 +2,17 @@
   <el-breadcrumb class="app-breadcrumb" separator-class="el-icon-arrow-right">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
-        <span v-else-if="item.name === 'TrialsPanel'" class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">
+          <!-- {{ item.meta.title }} -->
+            {{ item.meta.i18n ? $t(item.meta.i18n) : item.meta.title }}
+        </span>
+        <span v-else-if="item.name === 'TrialsPanel'" class="no-redirect">
+          <!-- {{ item.meta.title }} -->
+          {{ item.meta.i18n ? $t(item.meta.i18n) : item.meta.title }}
+        </span>
+        <a v-else @click.prevent="handleLink(item)">
+          {{ item.meta.i18n ? $t(item.meta.i18n) : item.meta.title }}
+        </a>
       </el-breadcrumb-item>
     </transition-group>
   </el-breadcrumb>
@@ -35,6 +43,7 @@ export default {
           item.meta.title = this.$route.query.trialCode // 暂时处理
         }
       })
+      
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
     },
     isDashboard(route) {
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index ea30dbe6..85eb77b9 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -3,14 +3,16 @@
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="!onlyOneChild.hidden" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}" @click="handleClick(onlyOneChild.meta.title)">
-          <item :icon="onlyOneChild.meta ? (onlyOneChild.meta.icon||(item.meta&&item.meta.icon)) : null" :title="onlyOneChild.meta ? onlyOneChild.meta.title : null" />
+          <!-- :title="onlyOneChild.meta ? onlyOneChild.meta.title : null" -->
+          <item :icon="onlyOneChild.meta ? (onlyOneChild.meta.icon||(item.meta&&item.meta.icon)) : null" :title="onlyOneChild.meta.i18n ? $t(onlyOneChild.meta.i18n) : null" />
         </el-menu-item>
       </app-link>
     </template>
 
     <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+        <!-- :title="item.meta.title" -->
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.i18n ? $t(item.meta.i18n) : null" />
       </template>
       <sidebar-item
         v-for="child in item.children"
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index aef32a5b..08df86dd 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -39,6 +39,8 @@ function filterAsyncRouter(asyncRouterMap = [], lastRouter = false, type = false
       // eslint-disable-next-line
       route.meta = eval('(' + route.Meta + ')')
       route.meta.icon = route.MenuIcon
+      route.meta.i18n = route.LanguageMark
+      console.log(route.LanguageMark)
       delete route.Meta
     }
     delete route.MenuIcon

From e17a89e1514a2ae66eef801957682d1f78a0d87f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 8 Jan 2026 12:34:47 +0800
Subject: [PATCH 245/333] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dictionary/checkConfig/index.vue    | 99 +++++++++++++------
 .../dictionary/newdictionary/bool/index.vue   | 34 ++++---
 .../components/DictionaryChild.vue            | 35 ++++---
 .../DictionaryChildAddOrUpdateForm.vue        | 24 +++--
 .../components/DictionaryTypeConfigForm.vue   | 34 ++++---
 .../dictionary/newdictionary/enum/index.vue   | 34 ++++---
 src/views/dictionary/newdictionary/index.vue  | 15 ++-
 .../components/DictionaryTypeConfigForm.vue   | 32 +++---
 .../dictionary/newdictionary/list/index.vue   | 56 +++++++----
 .../dictionary/newdictionary/select/index.vue | 39 ++++----
 .../setting/DictionaryTypeConfigForm.vue      | 16 +--
 .../newdictionary/setting/index.vue           | 26 ++---
 12 files changed, 278 insertions(+), 166 deletions(-)

diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index 8c6776fc..647bbd3c 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -1,75 +1,118 @@
 <template>
   <div class="app-container my_menu">
     <el-form :inline="true">
-      <el-form-item label="模块">
-        <el-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable>
+      <!-- 模块 -->
+      <el-form-item :label="$t('audit:label:moduleType')">
+        <el-select v-model="queryParams.ModuleTypeId" clearable>
           <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value"
             :label="item.raw.ValueCN" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+          {{ $t('common:button:search') }}
+        </el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
       </el-form-item>
     </el-form>
     <div>
-      <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
+      <!-- 展开/折叠 -->
+      <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">
+        {{ $t('audit:button:fold') }}
+      </el-button>
     </div>
     <el-table v-if="refreshTable" v-adaptive="{ bottomOffset: 45 }" v-loading="loading" height="100" :data="menuList"
       :default-expand-all="isExpandAll" row-key="Id" :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }">
-      <el-table-column prop="ModuleTypeValueCN" label="模块" show-overflow-tooltip align="left" min-width="230px" />
-      <el-table-column prop="Description" label="操作名称" :show-overflow-tooltip="true" min-width="200px">
+      <!-- 模块 -->
+      <el-table-column prop="ModuleTypeValueCN" :label="$t('audit:label:moduleType')" show-overflow-tooltip align="left" min-width="230px" />
+      <!-- 操作名称 -->
+      <el-table-column prop="Description" :label="$t('audit:label:desc')" :show-overflow-tooltip="true" min-width="200px">
         <template slot-scope="scope">
           <span>{{ scope.row.DescriptionCN }}（{{ scope.row.Description }}）</span>
         </template>
       </el-table-column>
-      <el-table-column prop="DescriptionCN" label="其他" :show-overflow-tooltip="true" min-width="140px">
+      <!-- 其他 -->
+      <el-table-column prop="DescriptionCN" :label="$t('audit:label:descCN')" :show-overflow-tooltip="true" min-width="140px">
         <template slot-scope="scope">
+          <!-- 被禁用 -->
+           <!-- 禁 -->
           <span v-if="!scope.row.IsEnable"
             style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: 	#DC143C;color: #fff;"
-            title="被禁用">禁</span>
+            :title="$t('audit:label:disable')">{{ $t('audit:label:disable1') }}</span>
+          <!-- 需要电签 签 -->
           <span v-if="scope.row.IsHaveSign"
             style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #428bca;color: #fff;"
-            title="需要电签">签</span>
+            :title="$t('audit:label:needSign')">{{ $t('audit:label:needSign1') }}</span>
+          <!-- 需要原因 因 -->
           <span v-if="scope.row.IsHaveReason"
             style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #fab6b6;color: #fff;"
-            title="需要原因">因</span>
+            :title="$t('audit:label:needReason')">{{ $t('audit:label:needReason1') }}</span>
+            <!-- 已经记录 记 -->
           <span v-if="scope.row.IsFinish"
             style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background:#3CB371;color: #fff;"
-            title="已经记录">记</span>
+            :title="$t('audit:label:isFinish')">{{ $t('audit:label:isFinish1') }}</span>
+            <!-- 核对完 核 -->
           <span v-if="scope.row.IsJoinPlan"
             style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #FFA500;color: #fff;"
-            title="核对完">核</span>
+            :title="$t('audit:label:isJoinPlan')">{{ $t('audit:label:isJoinPlan1') }}</span>
 
         </template>
       </el-table-column>
-      <el-table-column prop="Identification" label="标识" :show-overflow-tooltip="true" min-width="200px" />
-      <el-table-column prop="OptTypeValueCN" label="操作类型" show-overflow-tooltip width="100px" />
-      <el-table-column prop="ObjectTypeValueCN" label="对象类型" show-overflow-tooltip min-width="100px" />
-      <el-table-column prop="ChildrenTypeValueCN" label="数据类型" show-overflow-tooltip min-width="100px" />
-      <el-table-column prop="Sort" label="显示顺序" min-width="80" show-overflow-tooltip />
-      <el-table-column label="启用" align="center" prop="CreateTime" min-width="80">
+      <!-- 标识 -->
+      <el-table-column prop="Identification" :label="$t('audit:label:identification')" :show-overflow-tooltip="true" min-width="200px" />
+      <!-- 操作类型 -->
+      <el-table-column prop="OptTypeValueCN" :label="$t('audit:label:optType')" show-overflow-tooltip width="100px" />
+      <!-- 对象类型 -->
+      <el-table-column prop="ObjectTypeValueCN" :label="$t('audit:label:objectType')" show-overflow-tooltip min-width="100px" />
+      <!-- 数据类型 -->
+      <el-table-column prop="ChildrenTypeValueCN" :label="$t('audit:label:dataType')" show-overflow-tooltip min-width="100px" />
+      <!-- 显示顺序 -->
+      <el-table-column prop="Sort" :label="$t('audit:label:sort')" min-width="80" show-overflow-tooltip />
+      <!-- 启用 -->
+      <el-table-column :label="$t('audit:label:isEnable')" align="center" prop="CreateTime" min-width="80">
+        <!-- 启用/禁用 -->
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
-          <el-tag v-else size="danger">禁用</el-tag>
+          <!-- <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
+          <el-tag v-else size="danger">禁用</el-tag> -->
+          <el-tag :type="!scope.row.IsEnable ? 'info' : ''">
+            {{ $fd('IsEnable', scope.row.IsEnable) }}
+          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" min-width="340" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('common:action:action')" align="center" fixed="right" min-width="340" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <!-- 上移 -->
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text" @click="handleUpMove(scope.row)">上移</el-button>
-          <el-button type="text" @click="handleUpdate(scope.row)">修改</el-button>
+            type="text" @click="handleUpMove(scope.row)"
+          >
+            {{ $t('audit:button:upward') }}
+          </el-button>
+          <!-- 修改 -->
+          <el-button type="text" @click="handleUpdate(scope.row)">
+            {{ $t('audit:button:modify') }}
+          </el-button>
+          <!-- 新增 -->
           <el-button
             v-if="!(scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN)"
-            type="text" @click="handleAdd(scope.row)">新增</el-button>
+            type="text" @click="handleAdd(scope.row)">{{ $t('common:button:new') }}</el-button>
+          <!-- Children -->
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text" @click="handleChildren(scope.row)">Children</el-button>
+            type="text" @click="handleChildren(scope.row)"
+          >
+            {{ $t('audit:button:children') }}
+          </el-button>
+          <!-- 复制到 -->
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text" @click="handleCopy(scope.row)">复制到</el-button>
-          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
+            type="text" @click="handleCopy(scope.row)">
+            {{ $t('audit:button:copyTo') }}
+          </el-button>
+            <!-- 删除 -->
+          <el-button type="text" @click="handleDelete(scope.row)">{{ $t('common:button:delete') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/dictionary/newdictionary/bool/index.vue b/src/views/dictionary/newdictionary/bool/index.vue
index b63eb1c7..269ee6fc 100644
--- a/src/views/dictionary/newdictionary/bool/index.vue
+++ b/src/views/dictionary/newdictionary/bool/index.vue
@@ -3,11 +3,11 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" class="base-search-form">
-        <el-form-item label="字典表名称:">
+        <el-form-item :label="$t('dic:all:label:code')">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="字典分组:">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+        <el-form-item :label="$t('dic:all:label:group')">
+          <el-select v-model="searchData.ConfigTypeId" clearable size="small">
             <el-option v-for="item of basicDicList" :key="item.Id" :value="item.Id" :label="item.Code" />
           </el-select>
         </el-form-item>
@@ -29,7 +29,9 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
       </span>
     </div>
     <el-table
@@ -44,33 +46,33 @@
       <el-table-column type="index" width="60" />
       <el-table-column
         prop="Code"
-        label="字典表名称"
+        :label="$t('dic:all:label:code')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
       <el-table-column
         prop="ConfigType"
-        label="字典分组"
+        :label="$t('dic:all:label:group')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
       <el-table-column
         prop="Description"
-        label="描述"
+        :label="$t('dic:all:label:desc')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
       <el-table-column
         prop="ShowOrder"
-        label="显示顺序"
+        :label="$t('dic:all:label:showOrder')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -80,25 +82,25 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:action:edit') }}
           </el-button>
           <el-button
             type="text"
             @click="handleChild(scope.row)"
           >
-            子项
+            {{ $t('dic:all:label:childItem') }}
           </el-button>
           <el-button
             type="text"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -174,7 +176,7 @@ export default {
     switchChange(event, item) {
       this.loading = true
       addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
       }).catch(() => {
         this.loading = false
@@ -182,12 +184,12 @@ export default {
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
       })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', { DataTypeEnum: 3 })
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), { DataTypeEnum: 3 })
       })
     },
     handleDelete(row) {
diff --git a/src/views/dictionary/newdictionary/components/DictionaryChild.vue b/src/views/dictionary/newdictionary/components/DictionaryChild.vue
index 2ec36b9d..de14bfde 100644
--- a/src/views/dictionary/newdictionary/components/DictionaryChild.vue
+++ b/src/views/dictionary/newdictionary/components/DictionaryChild.vue
@@ -4,32 +4,39 @@
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form" />
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
+        <el-button type="primary" size="mini" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
     <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe size="small" height="100"
       @sort-change="handleSortByColumn">
       <el-table-column type="index" width="60" />
-      <el-table-column v-if="!~$route.path.indexOf('select')" prop="Code" label="字典键值" min-width="180"
+      <!-- 字典键值 -->
+      <el-table-column v-if="!~$route.path.indexOf('select')" prop="Code" :label="$t('dic:all:label:keyCode')" min-width="180"
         show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ValueCN" label="中文值" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="Value" label="英文值" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ChildGroup" label="分组" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ShowOrder" label="显示顺序" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="Description" label="描述" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <!-- 中文值 -->
+      <el-table-column prop="ValueCN" :label="$t('dic:all:label:valueCN')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 英文值 -->
+      <el-table-column prop="Value" :label="$t('dic:all:label:valueEN')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 分组 -->
+      <el-table-column prop="ChildGroup" :label="$t('dic:all:label:childGroup')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 显示顺序 -->
+      <el-table-column prop="ShowOrder" :label="$t('dic:all:label:showOrder')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 描述 -->
+      <el-table-column prop="Description" :label="$t('dic:all:label:desc')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 是否可用 -->
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
         <template slot-scope="scope">
           <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
             @change="(event) => { return switchChange(event, scope.row) }" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="150" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" @click="handleEdit(scope.row)">
-            编辑
+            {{ $t('common:action:edit') }}
           </el-button>
           <el-button type="text" @click="handleDelete(scope.row)">
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -101,7 +108,7 @@ export default {
     switchChange(event, item) {
       this.loading = true
       addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
       }).catch(() => {
         this.loading = false
@@ -109,12 +116,12 @@ export default {
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['DictionaryChildAddOrUpdateForm'].openDialog('DictionaryChild Edit', row, { DataTypeEnum: this.parent.DataTypeEnum })
+        this.$refs['DictionaryChildAddOrUpdateForm'].openDialog(this.$t('common:action:edit'), row, { DataTypeEnum: this.parent.DataTypeEnum })
       })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['DictionaryChildAddOrUpdateForm'].openDialog('DictionaryChild Add', {}, { ConfigTypeId: this.parent.ConfigTypeId, parentId: this.parent.Id, DataTypeEnum: this.parent.DataTypeEnum })
+        this.$refs['DictionaryChildAddOrUpdateForm'].openDialog(this.$t('common:button:new'), {}, { ConfigTypeId: this.parent.ConfigTypeId, parentId: this.parent.Id, DataTypeEnum: this.parent.DataTypeEnum })
       })
     },
     handleDelete(row) {
diff --git a/src/views/dictionary/newdictionary/components/DictionaryChildAddOrUpdateForm.vue b/src/views/dictionary/newdictionary/components/DictionaryChildAddOrUpdateForm.vue
index 24b0aee1..56ac40d0 100644
--- a/src/views/dictionary/newdictionary/components/DictionaryChildAddOrUpdateForm.vue
+++ b/src/views/dictionary/newdictionary/components/DictionaryChildAddOrUpdateForm.vue
@@ -8,25 +8,25 @@
         label-width="120px"
         size="small"
       >
-        <el-form-item label="Enum Value: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:keyCode')"  prop="Code">
           <el-input v-model="form.Code" />
         </el-form-item>
-        <el-form-item label="Value: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:valueCN')" prop="Code">
           <el-input v-model="form.ValueCN" />
         </el-form-item>
-        <el-form-item label="Value EN: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:valueEN')" prop="Code">
           <el-input v-model="form.Value" />
         </el-form-item>
-        <el-form-item label="ChildGroup: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:childGroup')" prop="Code">
           <el-input v-model="form.ChildGroup" />
         </el-form-item>
-        <el-form-item label="ShowOrder: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:showOrder')" prop="Code">
           <el-input-number v-model="form.ShowOrder" :min="0"  />
         </el-form-item>
-        <el-form-item label="Description: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:desc')" prop="Code">
           <el-input v-model="form.Description" />
         </el-form-item>
-        <el-form-item label="Is Enable: ">
+        <el-form-item :label="$t('dic:all:label:isEnable')">
           <el-switch
             v-model="form.IsEnable"
             :active-value="true"
@@ -36,8 +36,12 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
     </template>
   </base-model>
 </template>
@@ -90,7 +94,7 @@ export default {
           this.btnLoading = true
           addOrUpdateBasicDic(this.form).then(res => {
             this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
             this.model_cfg.visible = false
             this.$emit('getList')
           }).catch(() => {
diff --git a/src/views/dictionary/newdictionary/components/DictionaryTypeConfigForm.vue b/src/views/dictionary/newdictionary/components/DictionaryTypeConfigForm.vue
index 2894fc9b..c71de15a 100644
--- a/src/views/dictionary/newdictionary/components/DictionaryTypeConfigForm.vue
+++ b/src/views/dictionary/newdictionary/components/DictionaryTypeConfigForm.vue
@@ -7,8 +7,9 @@
         :rules="rules"
         label-width="120px"
         size="small"
-      >
-        <el-form-item label="ConfigTypeId: " prop="Code">
+      > 
+        <!-- 字典分组 -->
+        <el-form-item :label="$t('dic:all:label:group')" prop="Code">
           <el-select v-model="form.ConfigTypeId" filterable style="width:100%;">
             <el-option
               v-for="(item,index) of basicDicList"
@@ -18,7 +19,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="TypeEnum: " prop="DataTypeEnum">
+        <!-- 类型 -->
+        <el-form-item :label="$t('dic:all:label:dataType')" prop="DataTypeEnum">
           <el-select v-model="form.DataTypeEnum" filterable style="width:100%;">
             <el-option
               :label="`config`"
@@ -38,16 +40,19 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="Code: " prop="Code">
+        <!-- 字典表名称 -->
+        <el-form-item :label="$t('dic:all:label:code')" prop="Code">
           <el-input v-model="form.Code" />
         </el-form-item>
         <!--<el-form-item label="KeyName: " prop="Code">-->
         <!--<el-input v-model="form.KeyName" />-->
         <!--</el-form-item>-->
-        <el-form-item label="ShowOrder: " prop="Code">
+        <!-- 显示顺序 -->
+        <el-form-item :label="$t('dic:all:label:showOrder')" prop="Code">
           <el-input-number v-model="form.ShowOrder" :min="0"  />
         </el-form-item>
-        <el-form-item label="Description: " prop="Code">
+        <!-- 描述 -->
+        <el-form-item :label="$t('dic:all:label:desc')" prop="Code">
           <el-input v-model="form.Description" />
         </el-form-item>
         <!-- <el-form-item label="Value: " prop="Code">
@@ -56,7 +61,8 @@
         <el-form-item label="ValueCN: " prop="Code">
           <el-input v-model="form.ValueCN" />
         </el-form-item> -->
-        <el-form-item label="Is Enable: ">
+        <!-- 是否启用 -->
+        <el-form-item :label="$t('dic:all:label:isEnable')">
           <el-switch
             v-model="form.IsEnable"
             :active-value="true"
@@ -66,8 +72,12 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
     </template>
   </base-model>
 </template>
@@ -103,8 +113,8 @@ export default {
       btnLoading: false,
       form: formDataDefault(),
       rules: {
-        Code: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        DataTypeEnum: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+        Code: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        DataTypeEnum: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true }
     }
@@ -132,7 +142,7 @@ export default {
           this.btnLoading = true
           addOrUpdateBasicDic(this.form).then(res => {
             this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
             this.model_cfg.visible = false
             this.$emit('getList')
           }).catch(() => {
diff --git a/src/views/dictionary/newdictionary/enum/index.vue b/src/views/dictionary/newdictionary/enum/index.vue
index bbe12851..9eb7d3b8 100644
--- a/src/views/dictionary/newdictionary/enum/index.vue
+++ b/src/views/dictionary/newdictionary/enum/index.vue
@@ -3,11 +3,11 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" class="base-search-form">
-        <el-form-item label="字典表名称:">
+        <el-form-item :label="$t('dic:all:label:code')">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="字典分组:">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+        <el-form-item :label="$t('dic:all:label:group')">
+          <el-select v-model="searchData.ConfigTypeId" clearable size="small">
             <el-option v-for="item of basicDicList" :key="item.Id" :value="item.Id" :label="item.Code" />
           </el-select>
         </el-form-item>
@@ -29,7 +29,9 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
       </span>
     </div>
     <el-table
@@ -44,33 +46,33 @@
       <el-table-column type="index" width="60" />
       <el-table-column
         prop="Code"
-        label="字典表名称"
+        :label="$t('dic:all:label:code')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
       <el-table-column
         prop="ConfigType"
-        label="字典分组"
+        :label="$t('dic:all:label:group')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
       <el-table-column
         prop="Description"
-        label="描述"
+        :label="$t('dic:all:label:desc')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
       <el-table-column
         prop="ShowOrder"
-        label="显示顺序"
+        :label="$t('dic:all:label:showOrder')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -80,25 +82,25 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:action:edit') }}
           </el-button>
           <el-button
             type="text"
             @click="handleChild(scope.row)"
           >
-            子项
+            {{ $t('dic:all:label:childItem') }}
           </el-button>
           <el-button
             type="text"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -174,7 +176,7 @@ export default {
     switchChange(event, item) {
       this.loading = true
       addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
       }).catch(() => {
         this.loading = false
@@ -182,12 +184,12 @@ export default {
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
       })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', { DataTypeEnum: 2 })
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), { DataTypeEnum: 2 })
       })
     },
     handleDelete(row) {
diff --git a/src/views/dictionary/newdictionary/index.vue b/src/views/dictionary/newdictionary/index.vue
index 36487488..8344a58a 100644
--- a/src/views/dictionary/newdictionary/index.vue
+++ b/src/views/dictionary/newdictionary/index.vue
@@ -1,19 +1,24 @@
 <template>
   <div>
     <el-tabs v-model="activeTab" @tab-click="handleClick">
-      <el-tab-pane label="全部" name="/dictionary/newDictionary/list">
+      <!-- 全部 -->
+      <el-tab-pane :label="$t('dic:label:all')" name="/dictionary/newDictionary/list">
         <dictList v-if="activeTab == '/dictionary/newDictionary/list'" />
       </el-tab-pane>
-      <el-tab-pane label="下拉框字典" name="/dictionary/newDictionary/select">
+      <!-- 下拉框字典 -->
+      <el-tab-pane :label="$t('dic:label:select')" name="/dictionary/newDictionary/select">
         <dictSelect v-if="activeTab == '/dictionary/newDictionary/select'" />
       </el-tab-pane>
-      <el-tab-pane label="枚举字典" name="/dictionary/newDictionary/enum">
+      <!-- 枚举字典 -->
+      <el-tab-pane :label="$t('dic:label:enum')" name="/dictionary/newDictionary/enum">
         <dictEnum v-if="activeTab == '/dictionary/newDictionary/enum'" />
       </el-tab-pane>
-      <el-tab-pane label="布尔字典" name="/dictionary/newDictionary/bool">
+      <!-- 布尔字典 -->
+      <el-tab-pane :label="$t('dic:label:bool')" name="/dictionary/newDictionary/bool">
         <dictBool v-if="activeTab == '/dictionary/newDictionary/bool'" />
       </el-tab-pane>
-      <el-tab-pane label="字典类型配置" name="/dictionary/newDictionary/config">
+      <!-- 字典类型配置 -->
+      <el-tab-pane :label="$t('dic:label:config')" name="/dictionary/newDictionary/config">
         <dictConfig v-if="activeTab == '/dictionary/newDictionary/config'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/dictionary/newdictionary/list/components/DictionaryTypeConfigForm.vue b/src/views/dictionary/newdictionary/list/components/DictionaryTypeConfigForm.vue
index 09a9e422..51355105 100644
--- a/src/views/dictionary/newdictionary/list/components/DictionaryTypeConfigForm.vue
+++ b/src/views/dictionary/newdictionary/list/components/DictionaryTypeConfigForm.vue
@@ -8,7 +8,8 @@
         label-width="120px"
         size="small"
       >
-        <el-form-item label="ConfigTypeId: " prop="Code">
+        <!-- 字典分组 -->
+        <el-form-item :label="$t('dic:all:label:group')" prop="Code">
           <el-select v-model="form.ConfigTypeId" filterable style="width:100%;">
             <el-option
               v-for="(item,index) of basicDicList"
@@ -18,7 +19,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="DataTypeEnum: " prop="DataTypeEnum">
+        <!-- 类型 -->
+        <el-form-item :label="$t('dic:all:label:dataType')" prop="DataTypeEnum">
           <el-select v-model="form.DataTypeEnum" filterable style="width:100%;">
             <el-option
               :label="`config`"
@@ -38,16 +40,19 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="Code: " prop="Code">
+        <!-- 字典表名称 -->
+        <el-form-item :label="$t('dic:all:label:code')" prop="Code">
           <el-input v-model="form.Code" />
         </el-form-item>
         <!--<el-form-item label="KeyName: " prop="Code">-->
         <!--<el-input v-model="form.KeyName" />-->
         <!--</el-form-item>-->
-        <el-form-item label="ShowOrder: " prop="Code">
+        <!-- 显示顺序 -->
+        <el-form-item :label="$t('dic:all:label:showOrder')" prop="Code">
           <el-input-number v-model="form.ShowOrder" :min="0" />
         </el-form-item>
-        <el-form-item label="Description: " prop="Code">
+        <!-- 描述 -->
+        <el-form-item :label="$t('dic:all:label:desc')" prop="Code">
           <el-input v-model="form.Description" />
         </el-form-item>
         <!-- <el-form-item label="Value: " prop="Code">
@@ -56,7 +61,8 @@
         <el-form-item label="ValueCN: " prop="Code">
           <el-input v-model="form.ValueCN" />
         </el-form-item> -->
-        <el-form-item label="Is Enable: ">
+        <!-- 是否启用 -->
+        <el-form-item :label="$t('dic:all:label:isEnable')">
           <el-switch
             v-model="form.IsEnable"
             :active-value="true"
@@ -66,8 +72,12 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
     </template>
   </base-model>
 </template>
@@ -103,8 +113,8 @@ export default {
       btnLoading: false,
       form: formDataDefault(),
       rules: {
-        Code: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        DataTypeEnum: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+        Code: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        DataTypeEnum: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true }
     }
@@ -130,7 +140,7 @@ export default {
           this.btnLoading = true
           addOrUpdateBasicDic(this.form).then(res => {
             this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
             this.model_cfg.visible = false
             this.$emit('getList')
           }).catch(() => {
diff --git a/src/views/dictionary/newdictionary/list/index.vue b/src/views/dictionary/newdictionary/list/index.vue
index 4feb8daf..5a79b581 100644
--- a/src/views/dictionary/newdictionary/list/index.vue
+++ b/src/views/dictionary/newdictionary/list/index.vue
@@ -3,15 +3,18 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" class="base-search-form">
-        <el-form-item label="字典表名称:">
+        <!-- 字典表名称 -->
+        <el-form-item :label="$t('dic:all:label:code')">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="字典分组:">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+        <!-- 字典分组 -->
+        <el-form-item :label="$t('dic:all:label:group')">
+          <el-select v-model="searchData.ConfigTypeId" clearable size="small">
             <el-option v-for="item of basicDicList" :key="item.Id" :value="item.Id" :label="item.Code" />
           </el-select>
         </el-form-item>
-        <el-form-item label="关键字:">
+        <!-- 关键字 -->
+        <el-form-item :label="$t('dic:all:label:keyWord')">
           <el-input v-model="searchData.KeyInfo" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
@@ -32,8 +35,14 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" @click="handleAdd">新建</el-button>
-        <el-button type="primary" @click="handleBatchAdd">批量新建</el-button>
+        <!-- 新建 -->
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
+        <!-- 批量新建 -->
+        <el-button type="primary" @click="handleBatchAdd">
+          {{ $t('common:button:batchNew') }}
+        </el-button>
       </span>
     </div>
     <el-table
@@ -46,16 +55,18 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="60" />
+      <!-- 字典表名称 -->
       <el-table-column
         prop="Code"
-        label="字典表名称"
+        :label="$t('dic:all:label:code')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
+      <!-- 类型 -->
       <el-table-column
         prop="DataTypeEnum"
-        label="类型"
+        :label="$t('dic:all:label:dataType')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
@@ -64,28 +75,32 @@
           {{ DataTypeEnumList[scope.row.DataTypeEnum] }}
         </template>
       </el-table-column>
+      <!-- 字典分组 -->
       <el-table-column
         prop="ConfigType"
-        label="字典分组"
+        :label="$t('dic:all:label:group')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
+      <!-- 描述 -->
       <el-table-column
         prop="Description"
-        label="描述"
+        :label="$t('dic:all:label:desc')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
+      <!-- 显示顺序 -->
       <el-table-column
         prop="ShowOrder"
-        label="显示顺序"
+        :label="$t('dic:all:label:showOrder')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <!-- 是否可用 -->
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -95,25 +110,28 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="300" fixed="right">
         <template slot-scope="scope">
+          <!-- 编辑 -->
           <el-button
             type="text"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:action:edit') }}
           </el-button>
+          <!-- 子项 -->
           <el-button
             type="text"
             @click="handleChild(scope.row)"
           >
-            子项
+            {{ $t('dic:all:label:childItem') }}
           </el-button>
+          <!-- 删除 -->
           <el-button
             type="text"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -201,17 +219,17 @@ export default {
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
       })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', {})
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), {})
       })
     },
     handleBatchAdd() {
       this.$nextTick(() => {
-        this.$refs['batchAddForm'].openDialog('批量新建', {})
+        this.$refs['batchAddForm'].openDialog(this.$t('common:button:batchNew'), {})
       })
     },
     handleDelete(row) {
diff --git a/src/views/dictionary/newdictionary/select/index.vue b/src/views/dictionary/newdictionary/select/index.vue
index e711047a..7cde36b8 100644
--- a/src/views/dictionary/newdictionary/select/index.vue
+++ b/src/views/dictionary/newdictionary/select/index.vue
@@ -3,11 +3,11 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" class="base-search-form">
-        <el-form-item label="字典表名称:">
+        <el-form-item :label="$t('dic:all:label:code')">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="字典分组:">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+        <el-form-item :label="$t('dic:all:label:group')">
+          <el-select v-model="searchData.ConfigTypeId" clearable size="small">
             <el-option v-for="item of basicDicList" :key="item.Id" :value="item.Id" :label="item.Code" />
           </el-select>
         </el-form-item>
@@ -29,8 +29,13 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" @click="handleSetting">配置字典分组</el-button>
-        <el-button type="primary" @click="handleAdd">新建</el-button>
+        <!-- 配置字典分组 -->
+        <el-button type="primary" @click="handleSetting">
+          {{ $t('dic:select:button:setting') }}
+        </el-button>
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
       </span>
     </div>
     <el-table
@@ -45,33 +50,33 @@
       <el-table-column type="index" width="60" />
       <el-table-column
         prop="Code"
-        label="字典表名称"
+        :label="$t('dic:all:label:code')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
       <el-table-column
         prop="ConfigType"
-        label="字典分组"
+        :label="$t('dic:all:label:group')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
       <el-table-column
         prop="Description"
-        label="描述"
+        :label="$t('dic:all:label:desc')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
       <el-table-column
         prop="ShowOrder"
-        label="显示顺序"
+        :label="$t('dic:all:label:showOrder')"
         sortable="custom"
         min-width="180"
         show-overflow-tooltip
       />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -81,25 +86,25 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:action:edit') }}
           </el-button>
           <el-button
             type="text"
             @click="handleChild(scope.row)"
           >
-            子项
+            {{ $t('dic:all:label:childItem') }}
           </el-button>
           <el-button
             type="text"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -175,7 +180,7 @@ export default {
     switchChange(event, item) {
       this.loading = true
       addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
       }).catch(() => {
         this.loading = false
@@ -183,12 +188,12 @@ export default {
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
       })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', { DataTypeEnum: 1 })
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), { DataTypeEnum: 1 })
       })
     },
     handleDelete(row) {
diff --git a/src/views/dictionary/newdictionary/setting/DictionaryTypeConfigForm.vue b/src/views/dictionary/newdictionary/setting/DictionaryTypeConfigForm.vue
index f161f92c..a7405a81 100644
--- a/src/views/dictionary/newdictionary/setting/DictionaryTypeConfigForm.vue
+++ b/src/views/dictionary/newdictionary/setting/DictionaryTypeConfigForm.vue
@@ -8,13 +8,13 @@
         label-width="150px"
         size="small"
       >
-        <el-form-item label="Dictionary Type: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:group')"" prop="Code">
           <el-input v-model="form.Code" />
         </el-form-item>
-        <el-form-item label="Description: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:desc')">
           <el-input v-model="form.Description" />
         </el-form-item>
-        <el-form-item label="Is Enable: ">
+        <el-form-item :label="$t('dic:all:label:isEnable')">
           <el-switch
             v-model="form.IsEnable"
             :active-value="true"
@@ -24,8 +24,12 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
     </template>
   </base-model>
 </template>
@@ -52,7 +56,7 @@ export default {
       btnLoading: false,
       form: formDataDefault(),
       rules: {
-        Code: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+        Code: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       model_cfg: { visible: false, showClose: true, width: '600px', title: '' }
     }
diff --git a/src/views/dictionary/newdictionary/setting/index.vue b/src/views/dictionary/newdictionary/setting/index.vue
index 55fdf533..ee1291e7 100644
--- a/src/views/dictionary/newdictionary/setting/index.vue
+++ b/src/views/dictionary/newdictionary/setting/index.vue
@@ -3,10 +3,10 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" class="base-search-form">
-        <el-form-item label="Code:">
+        <el-form-item :label="$t('dic:all:label:group')">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="KeyName:">
+        <el-form-item :label="$t('dic:all:label:keyWord')">
           <el-input v-model="searchData.KeyName" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
@@ -27,7 +27,9 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" @click="handleAdd">New</el-button>
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
       </span>
     </div>
     <el-table
@@ -41,15 +43,15 @@
       <el-table-column type="index" width="60" />
       <el-table-column
         prop="Code"
-        label="Dictionary Type"
+        :label="$t('dic:all:label:group')"
         show-overflow-tooltip
       />
       <el-table-column
         prop="Description"
-        label="Description"
+        :label="$t('dic:all:label:desc')"
         show-overflow-tooltip
       />
-      <el-table-column label="Is Enable" width="100" fixed="right">
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -59,19 +61,19 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="Action" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:action:edit') }}
           </el-button>
           <el-button
             type="text"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -115,7 +117,7 @@ export default {
     switchChange(event, item) {
       this.loading = true
       addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
       }).catch(() => {
         this.loading = false
@@ -123,12 +125,12 @@ export default {
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
       })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', {})
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), {})
       })
     },
     handleDelete(row) {

From e58fbdcab63628a36e212b373107cdf9f6b18948 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 8 Jan 2026 15:17:18 +0800
Subject: [PATCH 246/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=86=E9=A2=91=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit-review/components/StudyList.vue     | 106 +++++++++---------
 1 file changed, 52 insertions(+), 54 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
index c688686a..bce65d3d 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
@@ -1,16 +1,10 @@
 <template>
   <div v-loading="loading" class="study-wrapper">
     <div class="study-info">
-      <div
-        v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo"
-        :title="taskInfo.SubjectCode"
-      >
+      <div v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo" :title="taskInfo.SubjectCode">
         {{ taskInfo.SubjectCode }}
       </div>
-      <div
-        v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo"
-        :title="visitTaskInfo.TaskBlindName"
-      >
+      <div v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo" :title="visitTaskInfo.TaskBlindName">
         {{ visitTaskInfo.TaskBlindName }}
       </div>
     </div>
@@ -18,14 +12,12 @@
       <el-collapse v-model="activeNames" @change="handleChange">
         <el-collapse-item v-for="(study, index) in studyList" :key="`${study.Id}`" :name="`${study.Id}`">
           <template slot="title">
-            <div
-              v-if="!study.IsCriticalSequence"
-              class="dicom-desc"
-            >
+            <div v-if="!study.IsCriticalSequence" class="dicom-desc">
               <!-- <div v-if="taskInfo && taskInfo.IsShowStudyName">{{ study.StudyName }}</div> -->
               <div style="text-overflow: ellipsis;overflow: hidden;">
                 <span :title="study.CodeView">{{ study.CodeView }}</span>
-                <span v-if="taskInfo && taskInfo.IsShowStudyName" :title="study.StudyName" style="margin-left: 5px;">{{ study.StudyName }}</span>
+                <span v-if="taskInfo && taskInfo.IsShowStudyName" :title="study.StudyName" style="margin-left: 5px;">{{
+                  study.StudyName }}</span>
               </div>
               <div style="text-overflow: ellipsis;overflow: hidden;">
                 <span :title="study.BodyPart">{{ study.BodyPart }}</span>
@@ -38,31 +30,17 @@
             </div>
           </template>
           <div class="file-list-container">
-            <div
-              v-for="(k, i) in study.NoneDicomStudyFileList"
-              :key="i"
-              style="position:relative;margin-top:1px;"
-              @click="selectFile(study, index, i)"
-            >
-              <div
-                :class="{'file-active': index === activeStudyIndex && i === activeFileIndex}"
-                class="file-wrapper"
-              >
+            <div v-for="(k, i) in study.NoneDicomStudyFileList" :key="i" style="position:relative;margin-top:1px;"
+              @click="selectFile(study, index, i, k)">
+              <div :class="{ 'file-active': index === activeStudyIndex && i === activeFileIndex }" class="file-wrapper">
                 <div class="file-image">
                   <el-image
                     v-if="k.FileType === 'image/jpeg' || k.FileType === 'image/jpg' || k.FileType === 'image/bmp' || k.FileType === 'image/png'"
                     style="width: 100%;height: 100%;"
                     :src="`${OSSclientConfig.basePath}${k.Path}?x-oss-process=image/resize,w_50,h_50/format,png`"
-                    fit="contain"
-                    crossorigin="anonymous"
-                  />
-                  <el-image
-                    v-else-if="k.FileType === 'application/pdf'"
-                    style="width: 100%;height: 100%;"
-                    :src="pdf"
-                    fit="contain"
-                    crossorigin="anonymous"
-                  />
+                    fit="contain" crossorigin="anonymous" />
+                  <el-image v-else-if="k.FileType === 'application/pdf'" style="width: 100%;height: 100%;" :src="pdf"
+                    fit="contain" crossorigin="anonymous" />
                 </div>
                 <div class="file-text" :title="k.FileName">
                   {{ k.FileName }}
@@ -117,7 +95,12 @@ export default {
       })
     },
     // 切换文件
-    selectFile(study, studyIndex, fileIndex) {
+    selectFile(study, studyIndex, fileIndex, item) {
+      if (item.FileType.includes('mp4')) return this.$preview({
+        path: item.Path || item.FilePath,
+        type: 'mp4',
+        title: item.FileName,
+      })
       this.activeStudyIndex = studyIndex
       this.activeFileIndex = fileIndex
       const fileList = study.NoneDicomStudyFileList
@@ -145,13 +128,14 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.study-wrapper{
-  width:100%;
+.study-wrapper {
+  width: 100%;
   height: 100%;
   overflow-y: hidden;
   overflow-x: hidden;
   display: flex;
   flex-direction: column;
+
   .study-info {
     font-size: 16px;
     font-weight: bold;
@@ -162,7 +146,8 @@ export default {
     background-color: #4c4c4c;
     height: 50px;
   }
-  .dicom-desc{
+
+  .dicom-desc {
     font-weight: bold;
     font-size: 13px;
     text-align: left;
@@ -179,19 +164,23 @@ export default {
     touch-action: auto;
     overflow-y: auto;
   }
+
   .file-active {
-    background-color: #607d8b!important;
-    border: 1px solid #607d8b!important;
+    background-color: #607d8b !important;
+    border: 1px solid #607d8b !important;
   }
-  ::v-deep.el-progress__text{
+
+  ::v-deep.el-progress__text {
     color: #ccc;
     font-size: 12px;
   }
-  .file-list-container{
+
+  .file-list-container {
     width: 100%;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
+
     .file-wrapper {
       width: 100%;
       padding: 5px;
@@ -200,20 +189,24 @@ export default {
       align-items: center;
       cursor: pointer;
       background-color: #3a3a3a;
+
       // color: #ddd;
       // white-space: nowrap;
       // overflow: hidden;
       // text-overflow: ellipsis;
-      .el-progress__text{
+      .el-progress__text {
         display: none;
       }
-      .el-progress-bar{
-        padding-right:0px;
+
+      .el-progress-bar {
+        padding-right: 0px;
       }
+
       .file-image {
         width: 50px;
         height: 50px;
       }
+
       .file-text {
         flex: 1;
         padding-left: 5px;
@@ -225,27 +218,32 @@ export default {
 
     }
   }
-  ::v-deep.el-collapse{
+
+  ::v-deep.el-collapse {
     border: none;
-    .el-collapse-item{
-      background-color: #000!important;
+
+    .el-collapse-item {
+      background-color: #000 !important;
       color: #ddd;
 
     }
-    .el-collapse-item__content{
-      padding-bottom:0px;
-      background-color: #000!important;
+
+    .el-collapse-item__content {
+      padding-bottom: 0px;
+      background-color: #000 !important;
     }
-    .el-collapse-item__header{
-      background-color: #000!important;
+
+    .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 60px;
       line-height: 20px;
     }
   }
-  ::v-deep .el-progress-bar__inner{
+
+  ::v-deep .el-progress-bar__inner {
     transition: width 0s ease;
   }
 }

From 16c0e84ca0f513a07990c09d7e9cd53b5ca8c46e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 14 Jan 2026 16:56:48 +0800
Subject: [PATCH 247/333] =?UTF-8?q?=E9=98=85=E7=89=87=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/customize/QuestionFormItem.vue | 26 ++++++++++++++-----
 .../customize/QuestionTableFormItem.vue       | 26 ++++++++++++++-----
 .../visit-review/components/StudyList.vue     |  2 +-
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 3cf9a747..b957a983 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -122,9 +122,16 @@
         <!-- 单选 -->
         <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
           @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState === 2">
-          <el-radio v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()">
-            {{ val.trim() }}
-          </el-radio>
+          <template v-if="question.DictionaryCode">
+            <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="val.value">
+              {{ val.label }}
+            </el-radio>
+          </template>
+          <template v-else>
+            <el-radio v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()">
+              {{ val.trim() }}
+            </el-radio>
+          </template>
         </el-radio-group>
         <!-- 复选框 -->
         <el-checkbox-group v-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
@@ -144,9 +151,16 @@
         <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
           v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
           @change="(val) => { formItemChange(val, question) }">
-          <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
-            {{ item.trim() }}
-          </el-radio>
+          <template v-if="question.DictionaryCode">
+            <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="val.value">
+              {{ val.label }}
+            </el-radio>
+          </template>
+          <template v-else>
+            <el-radio v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()">
+              {{ val.trim() }}
+            </el-radio>
+          </template>
         </el-radio-group>
         <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 4" type="number"
           :disabled="!question.ClassifyEditType || readingTaskState === 2" v-model="questionForm[question.Id]"
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index 6588fb15..3607343b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -47,9 +47,16 @@
       <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
         :disabled="question.TableQuestionType === 2 || question.IsPreinstall || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
         @change="((val) => { formItemChange(val, question) })">
-        <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
-          {{ val }}
-        </el-radio>
+        <template v-if="question.DictionaryCode">
+          <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="val.value">
+            {{ val.label }}
+          </el-radio>
+        </template>
+        <template v-else>
+          <el-radio v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()">
+            {{ val.trim() }}
+          </el-radio>
+        </template>
       </el-radio-group>
       <!-- 复选框 -->
       <el-checkbox-group v-if="question.Type === 'checkbox'"
@@ -70,9 +77,16 @@
       <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
         v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || question.IsPreinstall"
         @change="(val) => { formItemChange(val, question) }">
-        <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
-          {{ item.trim() }}
-        </el-radio>
+        <template v-if="question.DictionaryCode">
+          <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="val.value">
+            {{ val.label }}
+          </el-radio>
+        </template>
+        <template v-else>
+          <el-radio v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()">
+            {{ val.trim() }}
+          </el-radio>
+        </template>
       </el-radio-group>
       <!-- 自动计算 -->
       <!-- :precision="2" :step="0.1" :max="10" -->
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
index bce65d3d..1616a5d4 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
@@ -91,7 +91,7 @@ export default {
       if (this.studyList.length === 0) return
       this.$nextTick(() => {
         this.activeStudy(this.studyList[0].Id)
-        this.selectFile(this.studyList[0], 0, 0)
+        this.selectFile(this.studyList[0], 0, 0, this.studyList[0].NoneDicomStudyFileList[0])
       })
     },
     // 切换文件

From 5ad0da7a4a6f83a9a77a28523d180a8a6c6567fa Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 15 Jan 2026 10:56:45 +0800
Subject: [PATCH 248/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A4=96=E5=B1=82=E9=97=AE=E9=A2=98ABS?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/permission.js                        |  1 -
 .../setting/reading-unit/components/QuestionsForm.vue  | 10 +++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 08df86dd..7a95d341 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -40,7 +40,6 @@ function filterAsyncRouter(asyncRouterMap = [], lastRouter = false, type = false
       route.meta = eval('(' + route.Meta + ')')
       route.meta.icon = route.MenuIcon
       route.meta.i18n = route.LanguageMark
-      console.log(route.LanguageMark)
       delete route.Meta
     }
     delete route.MenuIcon
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index fe514648..4c661aa6 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -298,7 +298,7 @@
           <el-input :disabled="form.DataSource === 1" v-model="form.DefaultValue" />
         </el-form-item>
         <!-- 高亮标记值 -->
-        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio'|| form.Type === 'calculation')"
+        <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation')"
           :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
@@ -915,6 +915,14 @@ export default {
             TableQuestionId: null
           }
         ]
+      } else if (this.form.CustomCalculateMark === 15) {
+        this.form.CalculateQuestions = [
+          {
+            IsTable: false,
+            QuestionId: null,
+            TableQuestionId: null
+          }
+        ]
       } else {
         this.form.CalculateQuestions = [
           {

From 1586643fc2b06fe0aae5f2fd53272fab897307f5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 15 Jan 2026 12:26:24 +0800
Subject: [PATCH 249/333] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E5=88=86=E7=B1=BB=E9=97=AE=E9=A2=98=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/customize/QuestionFormItem.vue |  4 +++-
 .../components/customize/QuestionList.vue     | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index b957a983..61d76bc6 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -1077,6 +1077,7 @@ export default {
             }
           })
         }
+        
       }
       // this.$emit('formItemNumberChange')
     },
@@ -1335,7 +1336,8 @@ export default {
           }
         }
         const val = this.getAnnotationProp(item.MeasureData, item.ImageToolAttribute)
-        this.$set(this.QuestionsForm, item.TableQuestionId, val)
+        this.setFormTableItemData({key: item.TableQuestionId, val})
+        // this.$set(this.QuestionsForm, item.TableQuestionId, val)
         this.formItemTableNumberChange()
       })
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index d2d0b678..1db2a526 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -988,6 +988,27 @@ export default {
       }
       let val = this.getAnnotationProp(annotation, prop)
       this.$set(this.questionForm, questionId, val)
+      this.classArr.map(i => {
+        if (i.triggerId === questionId) {
+          let answer = null
+          const list = JSON.parse(i.classifyAlgorithms)
+          if (i.classifyType === 0) {
+            const o = list.find(v => {
+              return (
+                parseFloat(val) >= parseFloat(v.gt) &&
+                parseFloat(val) < parseFloat(v.lt)
+              )
+            })
+            answer = o ? o.label : null
+          } else if (i.classifyType === 1) {
+            const o = list.find(v => {
+              return v.val.includes(val)
+            })
+            answer = o ? o.label : null
+          }
+          this.$set(this.questionForm, i.classId, answer)
+        }
+      })
     },
     getAnnotationProp(annotation, prop) {
       if (!annotation || !prop) return

From f997cec4fb24059dfbe06e45ee0f2e6ec9f5623b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 15 Jan 2026 16:02:19 +0800
Subject: [PATCH 250/333] =?UTF-8?q?=E9=9D=9EDICOM=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=94=AF=E6=8C=81=E6=B5=8B=E9=87=8F=E4=B8=8E?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/toolConfig.js | 37 ++++++++++------
 .../visit-review/components/FileViewer.vue    | 43 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 16 deletions(-)

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 b92ed1c8..9dd68cc1 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
@@ -313,6 +313,15 @@ const config = {
       'isDisabled': false,
       'disabledReason': ''
     },
+    {
+      'name': '长短径测量工具',
+      'icon': 'bidirection',
+      'toolName': 'Bidirectional',
+      'props': ['length', 'width'],
+      'i18nKey': 'trials:reading:button:bidirectional',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
     {
       'name': '矩形工具',
       'icon': 'rectangle',
@@ -322,15 +331,6 @@ const config = {
       'isDisabled': false,
       'disabledReason': ''
     },
-    {
-      'name': '箭头工具',
-      'icon': 'arrow',
-      'toolName': 'ArrowAnnotate',
-      'props': [],
-      'i18nKey': 'trials:reading:button:arrowAnnotate',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
     {
       'name': '圆形工具',
       'icon': 'oval',
@@ -349,6 +349,15 @@ const config = {
       'isDisabled': false,
       'disabledReason': ''
     },
+    {
+      'name': '自由曲线',
+      'icon': 'polygon',
+      'toolName': 'PlanarFreehandROI',
+      'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'],
+      'i18nKey': 'trials:reading:button:planarFreehandROI',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
     {
       'name': '角度工具',
       'icon': 'angle',
@@ -359,11 +368,11 @@ const config = {
       'disabledReason': ''
     },
     {
-      'name': '自由曲线',
-      'icon': 'polygon',
-      'toolName': 'PlanarFreehandROI',
-      'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'],
-      'i18nKey': 'trials:reading:button:planarFreehandROI',
+      'name': '箭头工具',
+      'icon': 'arrow',
+      'toolName': 'ArrowAnnotate',
+      'props': [],
+      'i18nKey': 'trials:reading:button:arrowAnnotate',
       'isDisabled': false,
       'disabledReason': ''
     },
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index a874ede7..1ddbf378 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -308,7 +308,8 @@ const {
   LengthTool,
   EllipticalROITool,
   CircleROITool,
-  AngleTool
+  AngleTool,
+  BidirectionalTool,
   // cursors
 } = cornerstoneTools
 const { MouseBindings, Events: toolsEvents } = csToolsEnums
@@ -607,7 +608,7 @@ export default {
       cornerstoneTools.addTool(EraserTool)
       cornerstoneTools.addTool(LengthTool)
       cornerstoneTools.addTool(LengthscaleTool)
-
+      cornerstoneTools.addTool(BidirectionalTool)
       viewportIds.forEach((viewportId, i) => {
         const toolGroupId = `canvas-${i}`
         const toolGroup = ToolGroupManager.createToolGroup(toolGroupId)
@@ -635,6 +636,10 @@ export default {
           cachedStats: false,
           getTextLines: this.getRectangleROIToolTextLines
         })
+        toolGroup.addTool(BidirectionalTool.toolName, {
+          // cachedStats: true
+          getTextLines: this.getBidirectionalToolTextLines
+        })
         toolGroup.addTool(EllipticalROITool.toolName, {
           cachedStats: false,
           getTextLines: this.getEllipticalROIToolTextLines
@@ -684,6 +689,7 @@ export default {
           toolGroup.setToolPassive(SplineROITool.toolName)
           toolGroup.setToolPassive(LengthTool.toolName)
           toolGroup.setToolPassive(LengthscaleTool.toolName)
+          toolGroup.setToolPassive(BidirectionalTool.toolName)
         } else {
           toolGroup.setToolEnabled(ArrowAnnotateTool.toolName)
           toolGroup.setToolEnabled(RectangleROITool.toolName)
@@ -694,6 +700,7 @@ export default {
           toolGroup.setToolEnabled(SplineROITool.toolName)
           toolGroup.setToolEnabled(LengthTool.toolName)
           toolGroup.setToolEnabled(LengthscaleTool.toolName)
+          toolGroup.setToolEnabled(BidirectionalTool.toolName)
         }
         toolGroup.setToolPassive(EraserTool.toolName)
       })
@@ -1430,6 +1437,38 @@ export default {
       }
       return textLines
     },
+    // 长短径工具注释
+    getBidirectionalToolTextLines(data, targetId) {
+      const { cachedStats, label } = data
+      const { length, width, unit } = cachedStats[targetId]
+      let ps = null
+      const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
+      const i = this.psArr.findIndex(i => i.Path === path)
+      if (i > -1 && this.psArr[i].PS) {
+        ps = parseFloat(this.psArr[i].PS).toFixed(3)
+      }
+      const textLines = []
+      if (label) {
+        textLines.push(data.status ? `${label}(${data.status})` : label)
+      }
+      if (length === undefined) {
+        return textLines
+      }
+      if (ps) {
+        textLines.push(
+          `L: ${this.reRound(csUtils.roundNumber(length * ps), this.digitPlaces)} mm`,
+          `S: ${this.reRound(csUtils.roundNumber(width * ps), this.digitPlaces)} mm`
+        )
+      } else {
+        textLines.push(
+          `L: ${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit || unit}`,
+          `S: ${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit}`
+        )
+      }
+
+
+      return textLines
+    },
     // 直线工具注释
     getLengthToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]

From 46fdee6c016d36d1b67b2d30915973f592f2475b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 15 Jan 2026 16:10:58 +0800
Subject: [PATCH 251/333] =?UTF-8?q?SPM=E5=8F=91=E9=80=81=E6=9C=89=E9=99=90?=
 =?UTF-8?q?=E8=AE=A9=E4=B8=AD=E5=BF=83=E4=BA=BA=E5=91=98=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9A=84=E9=82=AE=E4=BB=B6=E4=B8=AD=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BA=A4=E4=BA=92=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/login.vue                 | 10 +++++++---
 src/views/trials/trials-panel/site/index.vue |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/research/login.vue b/src/views/research/login.vue
index 8009844c..9981902b 100644
--- a/src/views/research/login.vue
+++ b/src/views/research/login.vue
@@ -42,8 +42,8 @@
             <el-link v-if="!form.IsUpdate" type="primary" @click="form.IsUpdate = true">
               {{ $t('trials:researchForm:button:updateQsForm') }}
             </el-link>
-            <!-- 取消更新调研表 -->
-            <el-link v-else type="primary" @click="form.IsUpdate = false; form.ReplaceUserEmailOrPhone = ''">
+            <!-- 取消更新调研表  form.ReplaceUserEmailOrPhone = '' -->
+            <el-link v-else type="primary" @click="form.IsUpdate = false;">
               {{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
             </el-link>
           </el-form-item>
@@ -214,7 +214,11 @@ export default {
       let { email, oldEMail, trialSiteId } = this.$route.query
       if (trialSiteId) this.form.TrialSiteId = trialSiteId
       if (oldEMail) this.form.ReplaceUserEmailOrPhone = oldEMail
-      if (email) this.form.EmailOrPhone = email
+      if (email && email !== 'null') {
+        this.form.EmailOrPhone = email
+      } else {
+        this.form.EmailOrPhone = oldEMail
+      }
     }
   },
   methods: {
diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue
index 6a3fa3f0..6c37f5b1 100644
--- a/src/views/trials/trials-panel/site/index.vue
+++ b/src/views/trials/trials-panel/site/index.vue
@@ -193,7 +193,7 @@
         <el-button type="primary" @click="sendEMailTable" :loading="loading">
           {{ $t('common:button:confirm') }}
         </el-button>
-        <el-button @click="checkRemind_model.visible = false" :loading="loading">
+        <el-button @click="siteEmail_model.visible = false" :loading="loading">
           {{ $t('common:button:cancel') }}
         </el-button>
       </template>

From 95aa3e0be75f37556d027947b46c601f198fd857 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 15 Jan 2026 16:12:51 +0800
Subject: [PATCH 252/333] =?UTF-8?q?=E3=80=90=E5=8F=97=E8=AF=95=E8=80=85?=
 =?UTF-8?q?=E3=80=91=E5=8F=97=E8=AF=95=E8=80=85-=E5=8F=97=E8=AF=95?=
 =?UTF-8?q?=E8=80=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=B6=8B=E5=8A=BF=E5=9B=BE=E6=82=AC=E6=B5=AE=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/subject/subject-list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index 957ab68f..5ec8e551 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -141,7 +141,7 @@
               :title="$t('trials:subject:title:report')" @click="handleMessage(scope.row)" />
             <!-- 图表 -->
             <el-button v-hasPermi="['trials:trials-panel:subject:chart']" v-if="isShowChart" icon="el-icon-s-data"
-              circle :title="$t('trials:subject:title:report')" @click="handleopenSubjectChart(scope.row)" />
+              circle :title="$t('trials:subject:title:chart')" @click="handleopenSubjectChart(scope.row)" />
           </template>
         </el-table-column>
       </el-table>

From 20ad1c894a91f9c44038de9c1fa9340a65b063df Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 15 Jan 2026 16:16:54 +0800
Subject: [PATCH 253/333] =?UTF-8?q?DICOM=E4=B8=8A=E4=BC=A0=E5=BD=B1?=
 =?UTF-8?q?=E5=83=8F=E9=A1=B5=E9=9D=A2=EF=BC=8C=E9=A2=84=E8=A7=88=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=BD=B1=E5=83=8F=E7=9A=84=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/crc-upload/components/uploadDicomFiles2.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index b6a2d28f..bab309bb 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -423,7 +423,7 @@
     </el-tabs>
     <!-- 预览影像模态框 -->
     <el-dialog v-if="previewVisible" :fullscreen="true" :show-close="true" :visible.sync="previewVisible"
-      append-to-body>
+      :title="$t('trials:uploadDicoms:title:previewLocalImage')" append-to-body>
       <DicomPreview :uid="uid" :studyList="uploadQueues" />
     </el-dialog>
     <!--pet-ct临床数据上传-->

From 785ca4ad47e1f24b52c6dddb1bdc7a6308214e5e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 15 Jan 2026 16:54:29 +0800
Subject: [PATCH 254/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D=E7=BF=BB=E8=AF=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit-review/components/StudyList.vue     | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
index 1616a5d4..0ee5ef3e 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
@@ -20,7 +20,7 @@
                   study.StudyName }}</span>
               </div>
               <div style="text-overflow: ellipsis;overflow: hidden;">
-                <span :title="study.BodyPart">{{ study.BodyPart }}</span>
+                <span :title="study.BodyPart">{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
                 <span style="margin-left: 5px;" :title="study.Modality">{{ study.Modality }}</span>
               </div>
             </div>
@@ -74,18 +74,40 @@ export default {
       activeFileIndex: -1,
       taskInfo: null,
       studyList: [],
-      pdf
+      pdf,
+      BodyPart: {}
     }
   },
-  mounted() {
+  async mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
     this.studyList = this.visitTaskInfo.StudyList
     if (this.studyList.length === 0) return
     this.$nextTick(() => {
       this.activeStudy(this.studyList[0].Id)
     })
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
   },
   methods: {
+    getBodyPart(bodyPart, other) {
+      if (!bodyPart && !other) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
+      }
+      var arr = bodyPart.split(separator)
+      var newArr = arr.map((i) => {
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
+      })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
+      return newArr.join(' | ')
+    },
     // 设置初始化激活文件
     setInitActiveFile() {
       if (this.studyList.length === 0) return

From 0b2cdd12a70f0e617020469c77f0e2c8c4c08b4f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 16 Jan 2026 10:29:37 +0800
Subject: [PATCH 255/333] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BD=B1=E5=83=8F=E7=BC=BA=E5=A4=B1=E5=83=8F?=
 =?UTF-8?q?=E7=B4=A0=E9=97=B4=E7=9A=84=E8=B7=9D=E7=A6=BBtag=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=B5=8B=E9=87=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/imagePixelSpacingMetaDataProvider.js   | 193 ++++++++++++++++++
 .../components/Fusion/js/initProviders.js     |   6 +-
 2 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/imagePixelSpacingMetaDataProvider.js

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/imagePixelSpacingMetaDataProvider.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/imagePixelSpacingMetaDataProvider.js
new file mode 100644
index 00000000..6a2f283d
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/imagePixelSpacingMetaDataProvider.js
@@ -0,0 +1,193 @@
+import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader'
+function parseImageId(imageId) {
+  // build a url by parsing out the url scheme and frame index from the imageId
+  const firstColonIndex = imageId.indexOf(':');
+
+  let url = imageId.substring(firstColonIndex + 1);
+  const frameIndex = url.indexOf('frame=');
+
+  let frame;
+
+  if (frameIndex !== -1) {
+    const frameStr = url.substr(frameIndex + 6);
+
+    frame = parseInt(frameStr, 10);
+    url = url.substr(0, frameIndex - 1);
+  }
+
+  return {
+    scheme: imageId.substr(0, firstColonIndex),
+    url,
+    frame,
+  };
+}
+function getNumberValues(dataSet, tag, minimumLength) {
+  const values = [];
+  const valueAsString = dataSet.string(tag);
+
+  if (!valueAsString) {
+    return;
+  }
+  const split = valueAsString.split('\\');
+
+  if (minimumLength && split.length < minimumLength) {
+    return;
+  }
+  for (let i = 0; i < split.length; i++) {
+    values.push(parseFloat(split[i]));
+  }
+
+  return values;
+}
+function getImageTypeSubItemFromDataset(dataSet, index) {
+  const imageType = dataSet.string('x00080008');
+  if (imageType) {
+      const subTypes = imageType.split('\\');
+      if (subTypes.length > index) {
+          return subTypes[index];
+      }
+  }
+  return undefined;
+}
+function isNMReconstructable(imageSubType) {
+  return imageSubType === 'RECON TOMO' || imageSubType === 'RECON GATED TOMO';
+}
+function extractOrientationFromNMMultiframeDataset(dataSet) {
+  let imageOrientationPatient;
+  const modality = dataSet.string('x00080060');
+  if (modality?.includes('NM')) {
+      const imageSubType = getImageTypeSubItemFromDataset(dataSet, 2);
+      if (imageSubType && isNMReconstructable(imageSubType)) {
+          if (dataSet.elements.x00540022) {
+              imageOrientationPatient = getNumberValues(dataSet.elements.x00540022.items[0].dataSet, 'x00200037', 6);
+          }
+      }
+  }
+  return imageOrientationPatient;
+}
+function extractOrientationFromDataset(dataSet) {
+  let imageOrientationPatient = getNumberValues(dataSet, 'x00200037', 6);
+  if (!imageOrientationPatient && dataSet.elements.x00209116) {
+      imageOrientationPatient = getNumberValues(dataSet.elements.x00209116.items[0].dataSet, 'x00200037', 6);
+  }
+  if (!imageOrientationPatient) {
+      imageOrientationPatient =
+          extractOrientationFromNMMultiframeDataset(dataSet);
+  }
+  return imageOrientationPatient;
+}
+function extractPositionFromNMMultiframeDataset(dataSet) {
+  let imagePositionPatient;
+  const modality = dataSet.string('x00080060');
+  if (modality?.includes('NM')) {
+      const imageSubType = getImageTypeSubItemFromDataset(dataSet, 2);
+      if (imageSubType && isNMReconstructable(imageSubType)) {
+          if (dataSet.elements.x00540022) {
+              imagePositionPatient = getNumberValues(dataSet.elements.x00540022.items[0].dataSet, 'x00200032', 3);
+          }
+      }
+  }
+  return imagePositionPatient;
+}
+function extractPositionFromDataset(dataSet) {
+  let imagePositionPatient = getNumberValues(dataSet, 'x00200032', 3);
+  if (!imagePositionPatient && dataSet.elements.x00209113) {
+      imagePositionPatient = getNumberValues(dataSet.elements.x00209113.items[0].dataSet, 'x00200032', 3);
+  }
+  if (!imagePositionPatient) {
+      imagePositionPatient = extractPositionFromNMMultiframeDataset(dataSet);
+  }
+  return imagePositionPatient;
+}
+function extractSliceThicknessFromDataset(dataSet) {
+  let sliceThickness;
+  if (dataSet.elements.x00180050) {
+      sliceThickness = dataSet.floatString('x00180050');
+  }
+  else if (dataSet.elements.x00289110 &&
+      dataSet.elements.x00289110.items.length &&
+      dataSet.elements.x00289110.items[0].dataSet.elements.x00180050) {
+      sliceThickness =
+          dataSet.elements.x00289110.items[0].dataSet.floatString('x00180050');
+  }
+  return sliceThickness;
+}
+function extractSpacingFromDataset(dataSet) {
+  let rowPixelSpacing = null
+  let columnPixelSpacing = null
+  let pixelSpacing = getNumberValues(dataSet, 'x00280030', 2);
+  const imagePixelSpacing = getNumberValues(dataSet, 'x00181164', 2);
+  const estimatedRadiographicMagnificationFactor = getNumberValues(dataSet, 'x00181114', 2);
+  if (pixelSpacing) {
+      rowPixelSpacing = pixelSpacing[0]
+      columnPixelSpacing = pixelSpacing[1]
+    } else if (imagePixelSpacing && estimatedRadiographicMagnificationFactor) {
+      rowPixelSpacing = imagePixelSpacing[0] / estimatedRadiographicMagnificationFactor[0];
+      columnPixelSpacing = imagePixelSpacing[1] / estimatedRadiographicMagnificationFactor[1];
+    } else if (imagePixelSpacing && !estimatedRadiographicMagnificationFactor) {
+      rowPixelSpacing = imagePixelSpacing[0];
+      columnPixelSpacing = imagePixelSpacing[1];
+    }
+  return rowPixelSpacing !== null ? [rowPixelSpacing, columnPixelSpacing] : undefined
+}
+function metaDataProvider(type, imageId) {
+  const parsedImageId = parseImageId(imageId);
+  const dataSet = cornerstoneDICOMImageLoader.wadouri.dataSetCacheManager.get(parsedImageId.url)
+  
+  
+  if (!dataSet) {
+    return;
+  }
+  if (type === 'imagePlaneModule') {
+    const imageOrientationPatient = getNumberValues(dataSet, 'x00200037', 6);
+    const imagePositionPatient = getNumberValues(dataSet, 'x00200032', 3);
+    const pixelSpacing = extractSpacingFromDataset(dataSet);
+
+    let rowCosines = null;
+
+    let columnCosines = null;
+
+    if (imageOrientationPatient) {
+      rowCosines = [
+        parseFloat(imageOrientationPatient[0]),
+        parseFloat(imageOrientationPatient[1]),
+        parseFloat(imageOrientationPatient[2]),
+      ];
+      columnCosines = [
+        parseFloat(imageOrientationPatient[3]),
+        parseFloat(imageOrientationPatient[4]),
+        parseFloat(imageOrientationPatient[5]),
+      ];
+    }
+    return {
+      frameOfReferenceUID: dataSet.string('x00200052'),
+      rows: dataSet.uint16('x00280010'),
+      columns: dataSet.uint16('x00280011'),
+      imageOrientationPatient,
+      rowCosines,
+      columnCosines,
+      imagePositionPatient,
+      sliceThickness: dataSet.floatString('x00180050'),
+      sliceLocation: dataSet.floatString('x00201041'),
+      pixelSpacing: pixelSpacing,
+      rowPixelSpacing: pixelSpacing ? pixelSpacing[0] : null,
+      columnPixelSpacing: pixelSpacing ? pixelSpacing[1] : null,
+    };
+  }
+  if (type === 'nmMultiframeGeometryModule') {
+    const modality = dataSet.string('x00080060');
+      const imageSubType = getImageTypeSubItemFromDataset(dataSet, 2);
+      return {
+          modality,
+          imageType: dataSet.string('x00080008'),
+          imageSubType,
+          imageOrientationPatient: extractOrientationFromDataset(dataSet),
+          imagePositionPatient: extractPositionFromDataset(dataSet),
+          sliceThickness: extractSliceThicknessFromDataset(dataSet),
+          pixelSpacing: extractSpacingFromDataset(dataSet),
+          numberOfFrames: dataSet.uint16('x00280008'),
+          isNMReconstructable: isNMReconstructable(imageSubType) && modality.includes('NM'),
+      };
+  }
+}
+export default metaDataProvider;
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js
index 06beeca1..43133125 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js
@@ -1,6 +1,6 @@
 import * as cornerstone3D from '@cornerstonejs/core'
 import ptScalingMetaDataProvider from './ptScalingMetaDataProvider'
-
+import imagePixelSpacingMetaDataProvider from './imagePixelSpacingMetaDataProvider'
 const { calibratedPixelSpacingMetadataProvider } = cornerstone3D.utilities
 
 export default function initProviders() {
@@ -14,4 +14,8 @@ export default function initProviders() {
     ),
     11000
   )
+  cornerstone3D.metaData.addProvider(
+    imagePixelSpacingMetaDataProvider,
+    11000
+  )
 }

From 0f845df8dd1b5b08784cdf07460c9f51cde4c006 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 16 Jan 2026 10:29:57 +0800
Subject: [PATCH 256/333] =?UTF-8?q?CRC=E5=9C=A8=E5=BD=B1=E5=83=8F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=97=B6=E5=BD=95=E5=85=A5=E7=9A=84=E6=98=AF=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E7=9A=84=E9=83=A8=E4=BD=8D=EF=BC=8C=E4=BD=86=E6=98=AF?=
 =?UTF-8?q?=E5=9C=A8Study=E9=A1=B5=E9=9D=A2=E5=92=8CReading=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E7=9A=84=E9=83=A8=E4=BD=8D=E5=8D=B4?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/study/index.vue | 273 ++++++------------
 1 file changed, 95 insertions(+), 178 deletions(-)

diff --git a/src/views/trials/trials-panel/study/index.vue b/src/views/trials/trials-panel/study/index.vue
index 65d26fad..da4ca5bd 100644
--- a/src/views/trials/trials-panel/study/index.vue
+++ b/src/views/trials/trials-panel/study/index.vue
@@ -5,18 +5,9 @@
       <el-form :inline="true">
         <!-- Site -->
         <el-form-item :label="$t('trials:studyList:table:site')">
-          <el-select
-            v-model="searchData.SiteId"
-            clearable
-            filterable
-            style="width: 150px"
-          >
-            <el-option
-              v-for="item of siteOptions"
-              :key="item.SiteId"
-              :label="item.TrialSiteCode"
-              :value="item.SiteId"
-            />
+          <el-select v-model="searchData.SiteId" clearable filterable style="width: 150px">
+            <el-option v-for="item of siteOptions" :key="item.SiteId" :label="item.TrialSiteCode"
+              :value="item.SiteId" />
           </el-select>
         </el-form-item>
         <!-- Subject -->
@@ -25,19 +16,9 @@
         </el-form-item>
         <!-- Visit -->
         <el-form-item :label="$t('trials:studyList:table:visit')">
-          <el-select
-            v-model="searchData.VisitPlanArray"
-            clearable
-            filterable
-            multiple
-            collapse-tags
-          >
-            <el-option
-              v-for="(item, index) of visitPlanOptions"
-              :key="index"
-              :label="item.VisitName"
-              :value="item.VisitNum"
-            >
+          <el-select v-model="searchData.VisitPlanArray" clearable filterable multiple collapse-tags>
+            <el-option v-for="(item, index) of visitPlanOptions" :key="index" :label="item.VisitName"
+              :value="item.VisitNum">
               <span style="float: left">{{ item.VisitName }}</span>
             </el-option>
             <el-option key="Other" label="Out of Plan" value="1.11" />
@@ -45,12 +26,7 @@
         </el-form-item>
         <el-form-item :label="$t('trials:studyList:table:isFromPacs')">
           <el-select v-model="searchData.IsFromPACS" clearable>
-            <el-option
-              v-for="item of $d.UploadType"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            >
+            <el-option v-for="item of $d.UploadType" :key="item.id" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
@@ -60,11 +36,7 @@
             {{ $t("common:button:search") }}
           </el-button>
           <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t("common:button:reset") }}
           </el-button>
         </el-form-item>
@@ -73,42 +45,22 @@
 
     <!-- 检查列表 -->
     <template slot="main-container">
-      <el-table
-        v-loading="loading"
-        v-adaptive="{ bottomOffset: 60 }"
-        :data="list"
-        stripe
-        height="100"
-        @sort-change="handleSortByColumn"
-      >
+      <el-table v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe height="100"
+        @sort-change="handleSortByColumn">
         <el-table-column type="index" width="40" />
         <!-- Study ID -->
-        <el-table-column
-          prop="StudyCode"
-          :label="$t('trials:studyList:table:studyId')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        />
+        <el-table-column prop="StudyCode" :label="$t('trials:studyList:table:studyId')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
         <!-- Image Type -->
-        <el-table-column
-          prop="IsDicom"
-          :label="$t('trials:studyList:table:imageType')"
-          sortable="custom"
-          min-width="100"
-        >
+        <el-table-column prop="IsDicom" :label="$t('trials:studyList:table:imageType')" sortable="custom"
+          min-width="100">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsDicom" type="primary">DICOM</el-tag>
             <el-tag v-else type="danger">Non-DICOM</el-tag>
           </template>
         </el-table-column>
 
-        <el-table-column
-          prop="StudyTime"
-          sortable="custom"
-          min-width="150"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="StudyTime" sortable="custom" min-width="150" show-overflow-tooltip>
           <template slot="header">
             <el-tooltip placement="top">
               <!-- Modality,Body Part Examined,Count,Study Date -->
@@ -132,7 +84,7 @@
               </div>
               <div v-else style="color: #f44336">N/A,</div>
               <div v-if="scope.row.Bodypart" style="margin: 0 3px">
-                {{ scope.row.Bodypart }},
+                {{ getBodyPart(scope.row.Bodypart, scope.row.BodyPartForEditOther) }},
               </div>
               <div v-else style="color: #f44336; margin: 0 3px">N/A,</div>
               <div v-if="scope.row.StudyTime">
@@ -179,21 +131,18 @@
                           {{ $t('trials:studyList:button:view') }}
                         </router-link>
                       </template>
-                    </el-table-column>
-                  </el-table>
-                  <div slot="reference" class="name-wrapper">
-                    <span style="color:#428bca;cursor:pointer;" @click="handleGetseriesList(scope.row)">
-                      {{ `${scope.row.Count}` }}
-                    </span>
-                  </div>
-                </el-popover>
-                <el-button
-                  v-else-if="scope.row.Count && !scope.row.IsDicom"
-                  type="text"
-                  @click.native.prevent="handlePreviewNonDicom(scope.row)"
-                >
-                  {{ scope.row.Count }}
-                </el-button> -->
+</el-table-column>
+</el-table>
+<div slot="reference" class="name-wrapper">
+  <span style="color:#428bca;cursor:pointer;" @click="handleGetseriesList(scope.row)">
+    {{ `${scope.row.Count}` }}
+  </span>
+</div>
+</el-popover>
+<el-button v-else-if="scope.row.Count && !scope.row.IsDicom" type="text"
+  @click.native.prevent="handlePreviewNonDicom(scope.row)">
+  {{ scope.row.Count }}
+</el-button> -->
                 <!-- <span>({{ scope.row.Count }})</span> -->
                 <!-- <span v-else style="color:#f44336;">N/A</span> -->
               </div>
@@ -214,8 +163,7 @@
             </el-tooltip>
           </template>
           <template slot-scope="scope">
-            <span v-if="scope.row.TrialSiteCode"
-              >{{ scope.row.TrialSiteCode }},
+            <span v-if="scope.row.TrialSiteCode">{{ scope.row.TrialSiteCode }},
             </span>
             <span v-else style="color: #f44336">N/A, </span>
             <span v-if="scope.row.TrialSiteAliasName">{{
@@ -224,12 +172,8 @@
             <span v-else style="color: #f44336">N/A</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="SubjectCode"
-          :label="$t('trials:studyList:table:subject')"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="SubjectCode" :label="$t('trials:studyList:table:subject')" sortable="custom"
+          show-overflow-tooltip />
         <el-table-column min-width="90" show-overflow-tooltip>
           <template slot="header">
             <el-tooltip placement="top">
@@ -249,68 +193,34 @@
             <span>{{ scope.row.VisitNum }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="Uploader"
-          :label="$t('trials:studyList:table:uploader')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="80"
-        />
-        <el-table-column
-          prop="UploadTime"
-          :label="$t('trials:studyList:table:uploadTime')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="120"
-        />
-        <el-table-column
-          prop="IsFromPACS"
-          :label="$t('trials:studyList:table:isFromPacs')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="120"
-        >
+        <el-table-column prop="Uploader" :label="$t('trials:studyList:table:uploader')" show-overflow-tooltip
+          sortable="custom" min-width="80" />
+        <el-table-column prop="UploadTime" :label="$t('trials:studyList:table:uploadTime')" show-overflow-tooltip
+          sortable="custom" min-width="120" />
+        <el-table-column prop="IsFromPACS" :label="$t('trials:studyList:table:isFromPacs')" show-overflow-tooltip
+          sortable="custom" min-width="120">
           <template slot-scope="scope">
             <el-tag :type="scope.row.IsFromPACS ? 'warning' : ''">
               {{ $fd("UploadType", scope.row.IsFromPACS) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          :label="$t('common:action:action')"
-          min-width="100"
-          fixed="right"
-        >
+        <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
           <template slot-scope="scope">
             <!-- 查看 -->
-            <el-button
-              :disabled="!scope.row.Count"
-              circle
-              :title="$t('trials:studyList:button:view')"
-              icon="el-icon-view"
-              @click="handleViewStudy(scope.row)"
-            />
+            <el-button :disabled="!scope.row.Count" circle :title="$t('trials:studyList:button:view')"
+              icon="el-icon-view" @click="handleViewStudy(scope.row)" />
             <!-- 分享检查 -->
-            <el-button
-              v-hasPermi="['trials:trials-panel:study:share']"
-              :disabled="!(scope.row.Count > 0 && scope.row.IsDicom)"
-              circle
-              :title="$t('trials:studyList:action:share')"
-              icon="el-icon-share"
-              @click="handleShareImage(scope.row)"
-            />
+            <el-button v-hasPermi="['trials:trials-panel:study:share']"
+              :disabled="!(scope.row.Count > 0 && scope.row.IsDicom)" circle
+              :title="$t('trials:studyList:action:share')" icon="el-icon-share" @click="handleShareImage(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
     </template>
 
     <base-model :config="share_model">
@@ -327,30 +237,17 @@
           <el-input v-model="extractionCode" style="width: 100px" readonly />
         </div>
         <div>
-          <el-button type="primary" round @click="copyCode"
-            >复制链接及提取码</el-button
-          >
+          <el-button type="primary" round @click="copyCode">复制链接及提取码</el-button>
         </div>
       </template>
     </base-model>
 
     <!-- 预览非Dicom影像 -->
-    <el-dialog
-      v-if="previewNonDicomVisible"
-      :visible.sync="previewNonDicomVisible"
-      :title="$t('trials:studyList:dialogTitle:view')"
-      :fullscreen="true"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <div
-        class="base-modal-body"
-        style="border: 2px solid #ccc; padding: 10px"
-      >
-        <NonDicomPreview
-          v-if="previewNonDicomVisible"
-          :none-dicom-id="rowData.Id"
-        />
+    <el-dialog v-if="previewNonDicomVisible" :visible.sync="previewNonDicomVisible"
+      :title="$t('trials:studyList:dialogTitle:view')" :fullscreen="true" append-to-body
+      custom-class="base-dialog-wrapper">
+      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+        <NonDicomPreview v-if="previewNonDicomVisible" :none-dicom-id="rowData.Id" />
       </div>
     </el-dialog>
   </BaseContainer>
@@ -411,16 +308,36 @@ export default {
       trialId: this.$route.query.trialId,
       tokenKey: getToken(),
       openWindow: null,
-      bp: [],
+      BodyPart: {}
     };
   },
   async mounted() {
-    this.bp = await this.$getBodyPart(this.$route.query.trialId);
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getSite();
     this.getVisitPlanOptions();
     this.getList();
   },
   methods: {
+    getBodyPart(bodyPart, other) {
+      if (!bodyPart && !other) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
+      }
+      var arr = bodyPart.split(separator)
+      var newArr = arr.map((i) => {
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
+      })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
+      return newArr.join(' | ')
+    },
     // 获取检查列表数据
     getList() {
       this.loading = true;
@@ -550,28 +467,28 @@ export default {
           this.loading = false;
         });
     },
-    getBodyPart(bodyPart) {
-      if (!bodyPart) return "";
-      var separator = ",";
-      if (bodyPart.indexOf("|") > -1) {
-        separator = "|";
-      } else if (bodyPart.indexOf(",") > -1) {
-        separator = ",";
-      } else if (bodyPart.indexOf("，") > -1) {
-        separator = "，";
-      }
-      var arr = bodyPart.split(separator);
-      var newArr = arr.map((i) => {
-        return this.$fd(
-          "Bodypart",
-          i.trim(),
-          "Code",
-          { Bodypart: this.bp },
-          "Name"
-        );
-      });
-      return newArr.join(" | ");
-    },
+    // getBodyPart(bodyPart) {
+    //   if (!bodyPart) return "";
+    //   var separator = ",";
+    //   if (bodyPart.indexOf("|") > -1) {
+    //     separator = "|";
+    //   } else if (bodyPart.indexOf(",") > -1) {
+    //     separator = ",";
+    //   } else if (bodyPart.indexOf("，") > -1) {
+    //     separator = "，";
+    //   }
+    //   var arr = bodyPart.split(separator);
+    //   var newArr = arr.map((i) => {
+    //     return this.$fd(
+    //       "Bodypart",
+    //       i.trim(),
+    //       "Code",
+    //       { Bodypart: this.bp },
+    //       "Name"
+    //     );
+    //   });
+    //   return newArr.join(" | ");
+    // },
     // 复制
     copyCode() {
       this.$copyText(`链接: ${this.shareLink} 提取码: ${this.extractionCode}`)

From 6900cc8a25b0ea436bde667a62d803b270fbb2f9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 16 Jan 2026 11:36:10 +0800
Subject: [PATCH 257/333] =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E6=8C=87?=
 =?UTF-8?q?=E7=BA=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js    |  39 +++++++-
 src/utils/systemInfo.js | 211 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 247 insertions(+), 3 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index dba4f357..ff1a4c02 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,7 +5,7 @@ import router from '@/router'
 import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
 import { encryptConfig } from "@/utils/encrypt"
-import { customAgent } from './fingerprint'
+import SystemInfo from "@/utils/systemInfo";
 const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
@@ -27,8 +27,41 @@ service.interceptors.request.use(
     var language = zzSessionStorage.getItem('lang')
     config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
     config.headers['TimeZoneId'] = moment.tz.guess()
-    let fingerprint = await customAgent()
-    config.headers['BrowserFingerprint'] = fingerprint.visitorId
+    const systemInfo = new SystemInfo();
+    const allInfo = systemInfo.getAllInfo();
+    let obj = {
+      browser: {
+        name: allInfo.browser.name,
+        version: allInfo.browser.version,
+      },
+      platform: allInfo.platform,
+      os: {
+        name: allInfo.os.name,
+        version: allInfo.os.version
+      },
+      hardware: {
+        logicalCores: allInfo.hardware.logicalCores,
+        deviceMemory: allInfo.hardware.deviceMemory
+      },
+      webgl: {
+        version: allInfo.webgl.version,
+        renderer: allInfo.webgl.renderer,
+        vendor: allInfo.webgl.vendor,
+        shadingLanguage: allInfo.webgl.shadingLanguage,
+        gpuType: {
+          type: allInfo.webgl.gpuType.type,
+          discrete: allInfo.webgl.gpuType.discrete,
+        },
+        performance: {
+          tier: allInfo.webgl.performance.tier,
+        },
+        extensions: {
+          length: allInfo.webgl.extensions.length,
+        }
+      }
+    }
+    let guid = await systemInfo.generateGuid(obj)
+    config.headers['BrowserFingerprint'] = guid
     if (config.ENCRYPT) {
       try {
         config = await encryptConfig(config)
diff --git a/src/utils/systemInfo.js b/src/utils/systemInfo.js
index fe1fe00a..f039bc1e 100644
--- a/src/utils/systemInfo.js
+++ b/src/utils/systemInfo.js
@@ -466,6 +466,217 @@ class SystemInfo {
 
         return html;
     }
+    deepSortObject(obj) {
+        if (obj === null || typeof obj !== 'object') {
+            return obj;
+        }
+
+        if (Array.isArray(obj)) {
+            return obj.map(deepSortObject);
+        }
+
+        const sorted = {};
+        Object.keys(obj).sort().forEach(key => {
+            sorted[key] = this.deepSortObject(obj[key]);
+        });
+
+        return sorted;
+    }
+
+    getCanonicalString(obj) {
+        if (typeof obj !== 'object' || obj === null) {
+            return JSON.stringify(obj);
+        }
+
+        const sorted = this.deepSortObject(obj);
+        return JSON.stringify(sorted);
+    }
+
+    // 简单哈希函数
+    simpleHash(str) {
+        let hash = 0;
+        for (let i = 0; i < str.length; i++) {
+            const char = str.charCodeAt(i);
+            hash = ((hash << 5) - hash) + char;
+            hash = hash & hash;
+        }
+        return hash;
+    }
+
+    // 简单SHA-256模拟
+    simpleSHA256(str) {
+        let hash = 0;
+        for (let i = 0; i < str.length; i++) {
+            const char = str.charCodeAt(i);
+            hash = ((hash << 5) - hash) + char;
+            hash = hash & hash;
+        }
+
+        const hashArray = [];
+        for (let i = 0; i < 8; i++) {
+            hashArray[i] = (hash + i * 2654435761) >>> 0;
+        }
+
+        return hashArray;
+    }
+
+    // 格式化哈希为GUID
+    formatHashAsGuid(hashArray) {
+        const hexParts = hashArray.map(h => h.toString(16).padStart(8, '0'));
+        return `${hexParts[0]}${hexParts[1].substring(0, 4)}-${hexParts[1].substring(4)}-${hexParts[2].substring(0, 4)}-${hexParts[3].substring(0, 4)}-${hexParts[3].substring(4)}${hexParts[4]}${hexParts[5]}`;
+    }
+
+    // 1. 确定性哈希算法
+    objectToGuidDeterministic(obj) {
+        const canonicalString = this.getCanonicalString(obj);
+        const hash = this.simpleSHA256(canonicalString);
+        return this.formatHashAsGuid(hash).toUpperCase();
+    }
+
+    // 2. 伪随机算法
+    getSeedFromObject(obj) {
+        const str = JSON.stringify(obj);
+        return this.simpleHash(str);
+    }
+
+    createSeededRandom(seed) {
+        let state = seed;
+        return function () {
+            state = (state * 1664525 + 1013904223) >>> 0;
+            return (state & 0x3FFFFFFF) / 0x3FFFFFFF;
+        };
+    }
+
+    generateVersion4Guid(randomFn) {
+        let guid = '';
+
+        for (let i = 0; i < 32; i++) {
+            if (i === 8 || i === 12 || i === 16 || i === 20) {
+                guid += '-';
+            }
+
+            if (i === 12) {
+                guid += '4';
+            } else if (i === 16) {
+                const variant = Math.floor(randomFn() * 4);
+                guid += (8 + variant).toString(16).toUpperCase();
+            } else {
+                const randomHex = Math.floor(randomFn() * 16).toString(16);
+                guid += randomHex;
+            }
+        }
+
+        return guid.toUpperCase();
+    }
+
+    objectToGuidPseudorandom(obj) {
+        const seed = this.getSeedFromObject(obj);
+        const prng = this.createSeededRandom(seed);
+        return this.generateVersion4Guid(prng);
+    }
+
+    // 3. Crypto API算法（同步版本）
+    objectToGuidCryptoSync(obj) {
+        try {
+            const str = this.getCanonicalString(obj);
+            let hash = 0;
+            for (let i = 0; i < str.length; i++) {
+                const char = str.charCodeAt(i);
+                hash = ((hash << 5) - hash) + char;
+                hash = hash & hash;
+            }
+
+            const bytes = new Array(16);
+            for (let i = 0; i < 16; i++) {
+                bytes[i] = (hash + i * 2654435761) & 0xFF;
+            }
+
+            bytes[6] = (bytes[6] & 0x0F) | 0x40;
+            bytes[8] = (bytes[8] & 0x3F) | 0x80;
+
+            return bytes.map(b => b.toString(16).padStart(2, '0'))
+                .join('')
+                .replace(/(.{8})(.{4})(.{4})(.{4})(.{12})/, '$1-$2-$3-$4-$5')
+                .toUpperCase();
+        } catch (error) {
+            return this.objectToGuidDeterministic(obj);
+        }
+    }
+
+    // 4. 组合算法
+    combineComponents(deterministicHash, namespaceHash, timestamp, randomComponent) {
+        const hashDigits = deterministicHash.replace(/-/g, '');
+        const bytes = new Array(16);
+
+        for (let i = 0; i < 16; i++) {
+            const hashByte = parseInt(hashDigits.substr(i * 2, 2), 16) || 0;
+            const nsByte = (namespaceHash >> (i * 2)) & 0xFF;
+            const timeByte = (timestamp >> (i * 2)) & 0xFF;
+            const randomByte = parseInt(randomComponent.substr(i % 8, 1), 16) || 0;
+
+            bytes[i] = (hashByte ^ nsByte ^ timeByte ^ randomByte) & 0xFF;
+        }
+
+        bytes[6] = (bytes[6] & 0x0F) | 0x40;
+        bytes[8] = (bytes[8] & 0x3F) | 0x80;
+
+        return bytes.map(b => b.toString(16).padStart(2, '0'))
+            .join('')
+            .replace(/(.{8})(.{4})(.{4})(.{4})(.{12})/, '$1-$2-$3-$4-$5')
+            .toUpperCase();
+    }
+
+    objectToGuidCombined(obj, namespace = '') {
+        const deterministicHash = this.objectToGuidDeterministic(obj);
+        const namespaceHash = namespace ? this.simpleHash(namespace) : 0;
+        const timestamp = Date.now();
+        const randomComponent = Math.random().toString(16).substr(2, 8);
+
+        return this.combineComponents(deterministicHash, namespaceHash, timestamp, randomComponent);
+    }
+
+    // 主生成函数
+    async generateGuid(inputText, inputType, algorithmType = 'deterministic') {
+        let obj;
+        try {
+            if (inputType === 'json') {
+                obj = JSON.parse(inputText);
+            } else {
+                obj = inputText
+            }
+        } catch (error) {
+            return error;
+        }
+
+        let guid;
+        let algorithmName;
+        try {
+            switch (algorithmType) {
+                case 'deterministic':
+                    guid = this.objectToGuidDeterministic(obj);
+                    algorithmName = '确定性哈希算法';
+                    break;
+                case 'pseudorandom':
+                    guid = this.objectToGuidPseudorandom(obj);
+                    algorithmName = '伪随机算法';
+                    break;
+                case 'crypto':
+                    guid = this.objectToGuidCryptoSync(obj);
+                    algorithmName = 'Crypto API算法';
+                    break;
+                case 'combined':
+                    guid = this.objectToGuidCombined(obj, 'example-namespace');
+                    algorithmName = '组合算法';
+                    break;
+                default:
+                    guid = '未知算法';
+                    algorithmName = '未知';
+            }
+            return guid;
+        } catch (error) {
+            return error
+        }
+    }
 }
 
 if (typeof module !== 'undefined' && module.exports) {

From ecf4c7425960dc377807aad4210de04df3f07aab Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 16 Jan 2026 15:40:00 +0800
Subject: [PATCH 258/333] =?UTF-8?q?=E9=9D=9EDICOM=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=9B=BE=E5=83=8F?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit-review/components/FileViewer.vue    |  7 +++++--
 .../visit-review/components/StudyList.vue     | 19 +++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 1ddbf378..c5ac8186 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -146,7 +146,7 @@
               <h2 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo" class="subject-info">
                 {{ `${taskInfo.SubjectCode} ${v.taskInfo.TaskBlindName} ` }}
               </h2>
-              <!-- <div v-if="v.currentFileName">{{ v.currentFileName }}</div> -->
+              <div v-if="v.currentFileName">{{ v.currentFileName }}</div>
             </div>
             <div v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo" class="top-center-tool">
               <div class="toggle-visit-container">
@@ -183,7 +183,7 @@
                 <h2 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo" class="subject-info">
                   {{ `${taskInfo.SubjectCode} ${v.taskInfo.TaskBlindName} ` }}
                 </h2>
-                <!-- <div v-if="v.currentFileName">{{ v.currentFileName }}</div> -->
+                <div v-if="v.currentFileName">{{ v.currentFileName }}</div>
               </div>
               <div v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo" class="top-center-tool">
                 <div class="toggle-visit-container">
@@ -495,6 +495,9 @@ export default {
     window.removeEventListener('message', this.handleIframeMessage)
   },
   methods: {
+    abc(v) {
+      console.log(v)
+    },
     async handleSubmitKeyDoc() {
       try {
         let data = {
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
index 0ee5ef3e..38561a57 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
@@ -8,7 +8,7 @@
         {{ visitTaskInfo.TaskBlindName }}
       </div>
     </div>
-    <div class="ps">
+    <div class="ps" ref="studyBox_ps">
       <el-collapse v-model="activeNames" @change="handleChange">
         <el-collapse-item v-for="(study, index) in studyList" :key="`${study.Id}`" :name="`${study.Id}`">
           <template slot="title">
@@ -31,7 +31,7 @@
           </template>
           <div class="file-list-container">
             <div v-for="(k, i) in study.NoneDicomStudyFileList" :key="i" style="position:relative;margin-top:1px;"
-              @click="selectFile(study, index, i, k)">
+              @click="selectFile(study, index, i, k)" :ref="`noneDicomRef_${i}`">
               <div :class="{ 'file-active': index === activeStudyIndex && i === activeFileIndex }" class="file-wrapper">
                 <div class="file-image">
                   <el-image
@@ -87,7 +87,22 @@ export default {
     })
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
   },
+  watch: {
+    activeFileIndex() {
+      this.scrollElementToTop(this.$refs[`noneDicomRef_${this.activeFileIndex}`][0], {
+        offset: 50
+      })
+    },
+  },
   methods: {
+    scrollElementToTop(element, options = {}) {
+      const absoluteTop = element.offsetTop;
+      const targetPosition = absoluteTop - (options.offset || 0);
+      this.$refs['studyBox_ps'].scrollTo({
+        top: targetPosition,
+        behavior: options.behavior || 'smooth'
+      });
+    },
     getBodyPart(bodyPart, other) {
       if (!bodyPart && !other) return ''
       var separator = ','

From a13ddf70b415bba2b73ee353d1fe3f117c90b20d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 16 Jan 2026 17:47:20 +0800
Subject: [PATCH 259/333] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B0=83=E7=A0=94=E8=A1=A8=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B0=83=E7=A0=94=E8=A1=A8=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/login.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/research/login.vue b/src/views/research/login.vue
index 9981902b..96a4e056 100644
--- a/src/views/research/login.vue
+++ b/src/views/research/login.vue
@@ -39,11 +39,11 @@
           </el-form-item>
           <el-form-item v-if="form.TrialSiteId && isHaveSiteSurveyRecord" label="" style="text-align:right;">
             <!-- 更新调研表 -->
-            <el-link v-if="!form.IsUpdate" type="primary" @click="form.IsUpdate = true">
+            <el-link v-if="!form.IsUpdate && isNeedUpload" type="primary" @click="form.IsUpdate = true">
               {{ $t('trials:researchForm:button:updateQsForm') }}
             </el-link>
             <!-- 取消更新调研表  form.ReplaceUserEmailOrPhone = '' -->
-            <el-link v-else type="primary" @click="form.IsUpdate = false;">
+            <el-link v-if="form.IsUpdate && isNeedUpload" type="primary" @click="form.IsUpdate = false;">
               {{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
             </el-link>
           </el-form-item>
@@ -190,7 +190,8 @@ export default {
       msg: '',
       lang: 'zh',
       isHaveSiteSurveyRecord: false,
-      isUpload: false
+      isUpload: false,
+      isNeedUpload: true
     }
   },
   computed: {
@@ -219,6 +220,9 @@ export default {
       } else {
         this.form.EmailOrPhone = oldEMail
       }
+      if ((email && email !== 'null') || (oldEMail && oldEMail !== 'null')) {
+        this.isNeedUpload = false
+      }
     }
   },
   methods: {

From f0a7090ab485d96e7545b24d1bb71f6579276ce5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-775TN7O\\wxs" <825034831@qq.com>
Date: Sat, 17 Jan 2026 00:10:31 +0800
Subject: [PATCH 260/333] =?UTF-8?q?=E9=98=85=E7=89=87=E4=B8=B4=E5=BA=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1af9c593..f7bcd157 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -286,7 +286,7 @@
             </div>
             <!-- 临床数据 -->
             <div class="tool-item" :title="$t('trials:reading:button:clinicalData')"
-              v-if="taskInfo && taskInfo.IsExistsClinicalData" @click.prevent="previewCD">
+              v-if="taskInfo && taskInfo.IsExistsClinicalData" @click.prevent="previewCD(taskInfo.VisitTaskId)">
               <svg-icon icon-class="documentation" class="svg-icon" />
             </div>
             <!-- 个性化配置 -->

From 416f8f82d6842d94d752b98cdeb931c4e8401228 Mon Sep 17 00:00:00 2001
From: "DESKTOP-775TN7O\\wxs" <825034831@qq.com>
Date: Sat, 17 Jan 2026 11:24:04 +0800
Subject: [PATCH 261/333] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BD=B1=E5=83=8F=E7=BC=BA=E5=A4=B1=E5=83=8F?=
 =?UTF-8?q?=E7=B4=A0=E9=97=B4=E7=9A=84=E8=B7=9D=E7=A6=BBtag=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=B5=8B=E9=87=8F=E5=BC=82=E5=B8=B8=EF=BC=88=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E9=80=80=E5=9B=9E=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/js/initProviders.js       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js
index 43133125..8186a375 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js
@@ -1,6 +1,6 @@
 import * as cornerstone3D from '@cornerstonejs/core'
 import ptScalingMetaDataProvider from './ptScalingMetaDataProvider'
-import imagePixelSpacingMetaDataProvider from './imagePixelSpacingMetaDataProvider'
+// import imagePixelSpacingMetaDataProvider from './imagePixelSpacingMetaDataProvider'
 const { calibratedPixelSpacingMetadataProvider } = cornerstone3D.utilities
 
 export default function initProviders() {
@@ -14,8 +14,8 @@ export default function initProviders() {
     ),
     11000
   )
-  cornerstone3D.metaData.addProvider(
-    imagePixelSpacingMetaDataProvider,
-    11000
-  )
+  // cornerstone3D.metaData.addProvider(
+  //   imagePixelSpacingMetaDataProvider,
+  //   11000
+  // )
 }

From a5824cecac09934cfe98fe9c62d4ae135f828256 Mon Sep 17 00:00:00 2001
From: "DESKTOP-775TN7O\\wxs" <825034831@qq.com>
Date: Sat, 17 Jan 2026 12:21:44 +0800
Subject: [PATCH 262/333] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                   |  2 +-
 .../dicoms/components/Fusion/js/initProviders.js       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index ff1a4c02..c16dc0a4 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,6 +8,7 @@ import { encryptConfig } from "@/utils/encrypt"
 import SystemInfo from "@/utils/systemInfo";
 const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
+const systemInfo = new SystemInfo();
 const service = axios.create({
   baseURL: '/api',
   // baseURL: process.env.NODE_ENV === 'prod' ? "https://api.irc.extimaging.com" : '/api',
@@ -27,7 +28,6 @@ service.interceptors.request.use(
     var language = zzSessionStorage.getItem('lang')
     config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
     config.headers['TimeZoneId'] = moment.tz.guess()
-    const systemInfo = new SystemInfo();
     const allInfo = systemInfo.getAllInfo();
     let obj = {
       browser: {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js
index 8186a375..43133125 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initProviders.js
@@ -1,6 +1,6 @@
 import * as cornerstone3D from '@cornerstonejs/core'
 import ptScalingMetaDataProvider from './ptScalingMetaDataProvider'
-// import imagePixelSpacingMetaDataProvider from './imagePixelSpacingMetaDataProvider'
+import imagePixelSpacingMetaDataProvider from './imagePixelSpacingMetaDataProvider'
 const { calibratedPixelSpacingMetadataProvider } = cornerstone3D.utilities
 
 export default function initProviders() {
@@ -14,8 +14,8 @@ export default function initProviders() {
     ),
     11000
   )
-  // cornerstone3D.metaData.addProvider(
-  //   imagePixelSpacingMetaDataProvider,
-  //   11000
-  // )
+  cornerstone3D.metaData.addProvider(
+    imagePixelSpacingMetaDataProvider,
+    11000
+  )
 }

From ec8360913910c5419174fd7a7638cc4040d39e1c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 19 Jan 2026 15:53:11 +0800
Subject: [PATCH 263/333] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81zip64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/stream.js     |   2 +-
 src/utils/zip-stream.js | 379 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 380 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/zip-stream.js

diff --git a/src/utils/stream.js b/src/utils/stream.js
index 4b139653..dac09607 100644
--- a/src/utils/stream.js
+++ b/src/utils/stream.js
@@ -1,5 +1,5 @@
 import streamSaver from "streamsaver";
-import "streamsaver/examples/zip-stream.js";
+import "./zip-stream.js";
 import store from '@/store'
 import dcmjs from './dcmUpload/dcmjs'
 streamSaver.mitm = `${window.location.origin}/mitm.html?version=2.0.0`
diff --git a/src/utils/zip-stream.js b/src/utils/zip-stream.js
new file mode 100644
index 00000000..4c3066b2
--- /dev/null
+++ b/src/utils/zip-stream.js
@@ -0,0 +1,379 @@
+class Crc32 {
+  constructor() {
+    this.crc = -1
+  }
+
+  append(data) {
+    var crc = this.crc | 0; var table = this.table
+    for (var offset = 0, len = data.length | 0; offset < len; offset++) {
+      crc = (crc >>> 8) ^ table[(crc ^ data[offset]) & 0xFF]
+    }
+    this.crc = crc
+  }
+
+  get() {
+    return ~this.crc
+  }
+}
+Crc32.prototype.table = (() => {
+  var i; var j; var t; var table = []
+  for (i = 0; i < 256; i++) {
+    t = i
+    for (j = 0; j < 8; j++) {
+      t = (t & 1)
+        ? (t >>> 1) ^ 0xEDB88320
+        : t >>> 1
+    }
+    table[i] = t
+  }
+  return table
+})()
+
+const getDataHelper = byteLength => {
+  var uint8 = new Uint8Array(byteLength)
+  return {
+    array: uint8,
+    view: new DataView(uint8.buffer)
+  }
+}
+
+const ZIP_SIGNATURE_LOCAL = 0x04034b50
+const ZIP_SIGNATURE_CENTRAL = 0x02014b50
+const ZIP_SIGNATURE_EOCD = 0x06054b50
+const ZIP_SIGNATURE_ZIP64_EOCD = 0x06064b50
+const ZIP_SIGNATURE_ZIP64_LOCATOR = 0x07064b50
+
+const ZIP64_MAGIC = 0xFFFFFFFF
+
+function u16(view, offset, value) { view.setUint16(offset, value, true) }
+function u32(view, offset, value) { view.setUint32(offset, value >>> 0, true) }
+
+function concatUint8(chunks, total) {
+  const out = new Uint8Array(total)
+  let off = 0
+  for (const c of chunks) {
+    out.set(c, off)
+    off += c.length
+  }
+  return out
+}
+
+function createWriter(underlyingSource) {
+  const files = Object.create(null)
+  const filenames = []
+  const encoder = new TextEncoder()
+
+  let offset = 0 // bytes written to output so far
+  let activeZipIndex = 0
+  let ctrl
+  let activeZipObject
+  let closed = false
+
+  function processNextChunk() {
+    if (!activeZipObject) return
+
+    // directory entry: just local header + immediate footer
+    if (activeZipObject.directory) {
+      if (!activeZipObject.headerWritten) {
+        activeZipObject.writeLocalHeader()
+        activeZipObject.headerWritten = true
+      }
+      if (!activeZipObject.footerWritten) {
+        activeZipObject.writeDataDescriptor() // will be zeros
+        activeZipObject.footerWritten = true
+        next()
+      }
+      return
+    }
+
+    if (!activeZipObject.reader) {
+      if (!activeZipObject.fileLike || !activeZipObject.fileLike.stream) {
+        next()
+        return
+      }
+      activeZipObject.crc = new Crc32()
+      activeZipObject.reader = activeZipObject.fileLike.stream().getReader()
+      activeZipObject.writeLocalHeader()
+      activeZipObject.headerWritten = true
+      return
+    }
+
+    return activeZipObject.reader.read().then(({ done, value }) => {
+      if (done) {
+        activeZipObject.writeDataDescriptor()
+        activeZipObject.footerWritten = true
+        next()
+        return
+      }
+      const chunk = value instanceof Uint8Array ? value : new Uint8Array(value)
+      activeZipObject.crc.append(chunk)
+      activeZipObject.uncompressedLength += chunk.length
+      activeZipObject.compressedLength += chunk.length
+      ctrl.enqueue(chunk)
+      offset += chunk.length
+    })
+  }
+
+  function next() {
+    activeZipIndex++
+    activeZipObject = files[filenames[activeZipIndex]]
+    if (activeZipObject) {
+      processNextChunk()
+    } else if (closed) {
+      closeZip()
+    }
+  }
+
+  function dosDateTime(date) {
+    const dt = new Date(date)
+    const time = ((dt.getHours() << 11) | (dt.getMinutes() << 5) | (dt.getSeconds() / 2)) & 0xFFFF
+    const d = (((dt.getFullYear() - 1980) << 9) | ((dt.getMonth() + 1) << 5) | dt.getDate()) & 0xFFFF
+    return { time, date: d }
+  }
+
+  const zipWriter = {
+    enqueue(fileLike) {
+      if (closed) throw new TypeError('Cannot enqueue after close()')
+
+      let name = String(fileLike.name || '').trim()
+      if (!name) throw new Error('Missing file name')
+
+      if (fileLike.directory && !name.endsWith('/')) name += '/'
+      if (files[name]) throw new Error('File already exists.')
+
+      const nameBuf = encoder.encode(name)
+      const commentBuf = encoder.encode(fileLike.comment || '')
+      const { time, date } = dosDateTime(typeof fileLike.lastModified === 'undefined' ? Date.now() : fileLike.lastModified)
+
+      const zipObject = (files[name] = {
+        fileLike,
+        directory: !!fileLike.directory,
+        nameBuf,
+        comment: commentBuf,
+        time,
+        date,
+
+        // tracked
+        offset: 0,
+        crc: null,
+        compressedLength: 0,
+        uncompressedLength: 0,
+        headerWritten: false,
+        footerWritten: false,
+        reader: null,
+
+        // whether sizes/offset require ZIP64
+        needsZip64() {
+          return (
+            this.uncompressedLength > ZIP64_MAGIC ||
+            this.compressedLength > ZIP64_MAGIC ||
+            this.offset > ZIP64_MAGIC
+          )
+        },
+
+        writeLocalHeader() {
+          this.offset = offset
+
+          const generalPurposeBitFlag = 0x0008 // data descriptor present
+          const compressionMethod = 0 // store
+          const versionNeeded = 20 // 2.0 (ZIP64 switches this to 45)
+
+          // We always use data descriptor; write zeros for crc/sizes in local header
+          const local = getDataHelper(30 + this.nameBuf.length)
+          u32(local.view, 0, ZIP_SIGNATURE_LOCAL)
+          u16(local.view, 4, versionNeeded)
+          u16(local.view, 6, generalPurposeBitFlag)
+          u16(local.view, 8, compressionMethod)
+          u16(local.view, 10, this.time)
+          u16(local.view, 12, this.date)
+          u32(local.view, 14, 0)
+          u32(local.view, 18, 0)
+          u32(local.view, 22, 0)
+          u16(local.view, 26, this.nameBuf.length)
+          u16(local.view, 28, 0) // extra length
+          local.array.set(this.nameBuf, 30)
+
+          ctrl.enqueue(local.array)
+          offset += local.array.length
+        },
+
+        writeDataDescriptor() {
+          // data descriptor: optional signature + crc32 + sizes (32-bit or 64-bit)
+          const crc = this.crc ? this.crc.get() >>> 0 : 0
+          const useZip64 = this.needsZip64()
+
+          if (!useZip64) {
+            const dd = getDataHelper(16)
+            u32(dd.view, 0, 0x08074b50)
+            u32(dd.view, 4, crc)
+            u32(dd.view, 8, this.compressedLength)
+            u32(dd.view, 12, this.uncompressedLength)
+            ctrl.enqueue(dd.array)
+            offset += dd.array.length
+          } else {
+            // 24 bytes: sig + crc32 + compSize(8) + uncompSize(8)
+            const dd = getDataHelper(24)
+            u32(dd.view, 0, 0x08074b50)
+            u32(dd.view, 4, crc)
+            // BigInt writes
+            dd.view.setBigUint64(8, BigInt(this.compressedLength), true)
+            dd.view.setBigUint64(16, BigInt(this.uncompressedLength), true)
+            ctrl.enqueue(dd.array)
+            offset += dd.array.length
+          }
+        }
+      })
+
+      filenames.push(name)
+
+      if (!activeZipObject) {
+        activeZipObject = zipObject
+        processNextChunk()
+      }
+    },
+
+    close() {
+      if (closed) throw new TypeError('Cannot close twice')
+      closed = true
+      if (!activeZipObject) closeZip()
+    }
+  }
+
+  function closeZip() {
+    // Build central directory in memory then enqueue once.
+    const cdChunks = []
+    let cdSize = 0
+
+    for (const name of filenames) {
+      const file = files[name]
+      const useZip64 = file.needsZip64()
+
+      const versionMadeBy = useZip64 ? 45 : 20
+      const versionNeeded = useZip64 ? 45 : 20
+      const generalPurposeBitFlag = 0x0008
+      const compressionMethod = 0
+
+      const crc = file.crc ? file.crc.get() >>> 0 : 0
+      const compressed32 = useZip64 ? ZIP64_MAGIC : file.compressedLength
+      const uncompressed32 = useZip64 ? ZIP64_MAGIC : file.uncompressedLength
+      const offset32 = useZip64 ? ZIP64_MAGIC : file.offset
+
+      // ZIP64 extra field if needed
+      let extra = new Uint8Array(0)
+      if (useZip64) {
+        // headerId(2)=0x0001, dataSize(2)=24, uncompressed(8), compressed(8), offset(8)
+        extra = new Uint8Array(4 + 24)
+        const ev = new DataView(extra.buffer)
+        u16(ev, 0, 0x0001)
+        u16(ev, 2, 24)
+        ev.setBigUint64(4, BigInt(file.uncompressedLength), true)
+        ev.setBigUint64(12, BigInt(file.compressedLength), true)
+        ev.setBigUint64(20, BigInt(file.offset), true)
+      }
+
+      const headerLen = 46 + file.nameBuf.length + extra.length + file.comment.length
+      const cd = getDataHelper(headerLen)
+
+      u32(cd.view, 0, ZIP_SIGNATURE_CENTRAL)
+      u16(cd.view, 4, versionMadeBy)
+      u16(cd.view, 6, versionNeeded)
+      u16(cd.view, 8, generalPurposeBitFlag)
+      u16(cd.view, 10, compressionMethod)
+      u16(cd.view, 12, file.time)
+      u16(cd.view, 14, file.date)
+      u32(cd.view, 16, crc)
+      u32(cd.view, 20, compressed32)
+      u32(cd.view, 24, uncompressed32)
+      u16(cd.view, 28, file.nameBuf.length)
+      u16(cd.view, 30, extra.length)
+      u16(cd.view, 32, file.comment.length)
+      u16(cd.view, 34, 0) // disk number start
+      u16(cd.view, 36, 0) // internal attrs
+
+      // external file attrs: mark directory
+      u32(cd.view, 38, file.directory ? 0x10 : 0)
+
+      u32(cd.view, 42, offset32)
+
+      cd.array.set(file.nameBuf, 46)
+      if (extra.length) cd.array.set(extra, 46 + file.nameBuf.length)
+      if (file.comment.length) cd.array.set(file.comment, 46 + file.nameBuf.length + extra.length)
+
+      cdChunks.push(cd.array)
+      cdSize += cd.array.length
+    }
+
+    const centralDirectoryOffset = offset
+    const centralDirectory = concatUint8(cdChunks, cdSize)
+    ctrl.enqueue(centralDirectory)
+    offset += centralDirectory.length
+
+    const entries = filenames.length
+
+    const needsZip64ForArchive =
+      entries > 0xFFFF ||
+      centralDirectoryOffset > ZIP64_MAGIC ||
+      cdSize > ZIP64_MAGIC ||
+      offset > ZIP64_MAGIC
+
+    const tailChunks = []
+    let tailSize = 0
+
+    if (needsZip64ForArchive) {
+      // ZIP64 EOCD
+      const zip64eocd = getDataHelper(56)
+      u32(zip64eocd.view, 0, ZIP_SIGNATURE_ZIP64_EOCD)
+      zip64eocd.view.setBigUint64(4, BigInt(44), true) // remaining size
+      u16(zip64eocd.view, 12, 45)
+      u16(zip64eocd.view, 14, 45)
+      u32(zip64eocd.view, 16, 0)
+      u32(zip64eocd.view, 20, 0)
+      zip64eocd.view.setBigUint64(24, BigInt(entries), true)
+      zip64eocd.view.setBigUint64(32, BigInt(entries), true)
+      zip64eocd.view.setBigUint64(40, BigInt(cdSize), true)
+      zip64eocd.view.setBigUint64(48, BigInt(centralDirectoryOffset), true)
+
+      // ZIP64 locator
+      const locator = getDataHelper(20)
+      u32(locator.view, 0, ZIP_SIGNATURE_ZIP64_LOCATOR)
+      u32(locator.view, 4, 0)
+      locator.view.setBigUint64(8, BigInt(centralDirectoryOffset + cdSize), true) // offset of zip64eocd
+      u32(locator.view, 16, 1)
+
+      tailChunks.push(zip64eocd.array, locator.array)
+      tailSize += zip64eocd.array.length + locator.array.length
+    }
+
+    // EOCD
+    const eocd = getDataHelper(22)
+    u32(eocd.view, 0, ZIP_SIGNATURE_EOCD)
+    u16(eocd.view, 4, 0)
+    u16(eocd.view, 6, 0)
+    u16(eocd.view, 8, Math.min(entries, 0xFFFF))
+    u16(eocd.view, 10, Math.min(entries, 0xFFFF))
+    u32(eocd.view, 12, needsZip64ForArchive ? ZIP64_MAGIC : cdSize)
+    u32(eocd.view, 16, needsZip64ForArchive ? ZIP64_MAGIC : centralDirectoryOffset)
+    u16(eocd.view, 20, 0) // comment length
+
+    tailChunks.push(eocd.array)
+    tailSize += eocd.array.length
+
+    ctrl.enqueue(concatUint8(tailChunks, tailSize))
+    ctrl.close()
+  }
+
+  return new ReadableStream({
+    start: c => {
+      ctrl = c
+      underlyingSource.start && Promise.resolve(underlyingSource.start(zipWriter))
+    },
+    pull() {
+      return processNextChunk() || (
+        underlyingSource.pull &&
+        Promise.resolve(underlyingSource.pull(zipWriter))
+      )
+    }
+  })
+}
+
+window.ZIP = createWriter

From 5d04fb869d7985f7666c191c734e654326f41e41 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 19 Jan 2026 16:00:26 +0800
Subject: [PATCH 264/333] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E5=B7=A5=E5=85=B7=E7=9A=84=E6=B5=8B=E9=87=8F?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E9=80=89=E6=8B=A9=E5=90=8E=EF=BC=8C=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=98=85=E7=89=87=E8=A7=84=E5=88=99=E3=80=82=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E5=9C=A8CRF=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E9=80=89=E6=8B=A9=E7=9A=84?=
 =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=B7=A5=E5=85=B7=EF=BC=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E5=86=85=E5=90=8E=E6=89=8D?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/reading-unit/components/ReadingRules.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index 67f90905..34d83bd3 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -854,7 +854,7 @@ export default {
                 this.$emit('setGlobalReading', this.form.IsGlobalReading)
                 this.$emit('setOncologyReading', this.form.IsOncologyReading)
                 this.$emit('setDigitPlaces', this.form.DigitPlaces)
-                this.$emit('setReadingTools', this.form.ReadingToolList)
+                this.$emit('setReadingTools', { readingTools: this.form.ReadingToolList, isNoneDicom: this.form.ReadingTool === 1 })
                 if (this.form.ReadingType === 1) {
                   this.$emit('setArbitrationReading', false)
                 }

From 463e4728d0fe5b8490165e8b284339a0ee773d32 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 19 Jan 2026 16:34:10 +0800
Subject: [PATCH 265/333] =?UTF-8?q?mpr=E5=92=8Cnm=E6=97=B6=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=AE=BF=E8=A7=86=E8=A7=86=E5=8F=A3=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA=E5=8D=95=E8=A7=86=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 f7bcd157..32c1cf88 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2553,10 +2553,11 @@ export default {
         this.isFusion = false
         this.isMPR = false
         this.fullScreenIndex = null
+        this.rows = 1
+        this.cols = 1
+        this.activeViewportIndex = 0
         this.setToolsPassive()
       }
-      this.rows = 1
-      this.cols = 1
       if (taskIndex === this.activeTaskIndex) return
       if (!this.selectArr.includes(taskInfo.VisitTaskId)) {
         this.selectArr.push(taskInfo.VisitTaskId)

From f3a4a7cd09409310ed82e80ddaa7000fee3b594a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 19 Jan 2026 16:40:43 +0800
Subject: [PATCH 266/333] =?UTF-8?q?=E5=88=86=E5=88=AB=E6=94=AF=E6=8C=81PET?=
 =?UTF-8?q?/CT=E5=92=8CPET/MR=E8=9E=8D=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomViewer.vue      | 2 +-
 .../trials-panel/reading/dicoms3D/components/FusionForm.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 5957f7b7..4e90ac5c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -2406,7 +2406,7 @@ export default {
         this.petSeries = []
       } else {
         var seriesList = this.studyList[i].SeriesList
-        var series = seriesList.filter(series => series.modality === 'CT')
+        var series = seriesList.filter(series => series.modality === 'CT' || series.modality === 'MR')
         this.ctSeries = series.sort((a, b) => b.instanceCount - a.instanceCount)
 
         series = seriesList.filter(series => series.modality === 'PT')
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue
index 07c786b6..aa298cde 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue
@@ -197,7 +197,7 @@ export default {
         this.petSeries = []
       } else {
         var seriesList = this.studyList[i].SeriesList
-        var series = seriesList.filter(series => series.Modality === 'CT')
+        var series = seriesList.filter(series => series.Modality === 'CT' || series.Modality === 'MR')
         this.ctSeries = series.sort((a, b) => b.instanceCount - a.instanceCount)
 
         series = seriesList.filter(series => series.Modality === 'PT')

From 44519c5f8ec638ea9c4654954077b3630bebc369 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 19 Jan 2026 16:59:08 +0800
Subject: [PATCH 267/333] =?UTF-8?q?=E3=80=90=E9=98=85=E7=89=87=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E3=80=91=E5=BD=93=E9=98=85=E7=89=87=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AE=8C=E5=85=A8=E9=9A=8F=E6=9C=BA=E5=92=8C?=
 =?UTF-8?q?=E5=8F=97=E8=AF=95=E8=80=85=E5=86=85=E9=9A=8F=E6=9C=BA=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=A6=81=E7=94=A8=E5=AD=98=E5=9C=A8=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=9C=9F=E3=80=81=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87=E3=80=81?=
 =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E9=98=85=E7=89=87=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=BD=AE=E4=B8=BA=E5=90=A6=EF=BC=8C=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86PCWG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-unit/components/ReadingRules.vue        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index 34d83bd3..38c53046 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -135,7 +135,7 @@
       <el-form-item :label="$t('trials:readingUnit:readingRules:title:isReadingPeriod')" prop="IsReadingPeriod">
         <el-radio-group v-model="form.IsReadingPeriod" :disabled="isConfirm ||
           IsMustGlobalReading ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) || ((form.IsReadingTaskViewInOrder === 0 || form.IsReadingTaskViewInOrder === 2) && CriterionType !== 10)
           " @change="
             (v) => {
               if (!v) {
@@ -153,7 +153,7 @@
         <el-radio-group v-model="form.IsGlobalReading" :disabled="!form.IsReadingPeriod ||
           IsMustGlobalReading ||
           isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) || ((form.IsReadingTaskViewInOrder === 0 || form.IsReadingTaskViewInOrder === 2) && CriterionType !== 10)
           ">
           <el-radio v-for="item of $d.YesOrNo" :key="`IsGlobalReading${item.value}`" :label="item.value">
             {{ item.label }}
@@ -164,7 +164,7 @@
         <el-radio-group v-model="form.IsOncologyReading" :disabled="!form.IsReadingPeriod ||
           !form.IsSystemSetOncology ||
           isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) || ((form.IsReadingTaskViewInOrder === 0 || form.IsReadingTaskViewInOrder === 2) && CriterionType !== 10)
           ">
           <el-radio v-for="item of $d.YesOrNo" :key="`IsOncologyReading${item.value}`" :label="item.value">
             {{ item.label }}
@@ -175,7 +175,7 @@
       <el-form-item :label="$t('trials:readingUnit:readingRules:title:readingTaskViewInOrder')
         " prop="IsReadingTaskViewInOrder">
         <el-radio-group v-model="form.IsReadingTaskViewInOrder" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) || CriterionType === 10
           " @change="
             (v) => {
               form.ImageDownloadEnum = 0
@@ -188,6 +188,11 @@
               } else {
                 form.ReadingTaskViewEnum = 2
               }
+              if (CriterionType !== 10 && (v === 0 || v === 2)) {
+                form.IsReadingPeriod = false
+                form.IsOncologyReading = false
+                form.IsGlobalReading = false
+              }
             }
           ">
           <el-radio v-for="item of $d.IsReadingTaskViewInOrder" :key="'IsReadingTaskViewInOrder' + item.value"

From d059d016a6b6fb3a28d5189acbe037e336638211 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 19 Jan 2026 17:51:11 +0800
Subject: [PATCH 268/333] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/zip-stream.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/utils/zip-stream.js b/src/utils/zip-stream.js
index 4c3066b2..c63c1250 100644
--- a/src/utils/zip-stream.js
+++ b/src/utils/zip-stream.js
@@ -61,7 +61,7 @@ function concatUint8(chunks, total) {
 function createWriter(underlyingSource) {
   const files = Object.create(null)
   const filenames = []
-  const encoder = new TextEncoder()
+  const encoder = new TextEncoder() // 保持UTF-8编码
 
   let offset = 0 // bytes written to output so far
   let activeZipIndex = 0
@@ -141,7 +141,7 @@ function createWriter(underlyingSource) {
       if (fileLike.directory && !name.endsWith('/')) name += '/'
       if (files[name]) throw new Error('File already exists.')
 
-      const nameBuf = encoder.encode(name)
+      const nameBuf = encoder.encode(name) // 保持UTF-8编码
       const commentBuf = encoder.encode(fileLike.comment || '')
       const { time, date } = dosDateTime(typeof fileLike.lastModified === 'undefined' ? Date.now() : fileLike.lastModified)
 
@@ -174,15 +174,17 @@ function createWriter(underlyingSource) {
         writeLocalHeader() {
           this.offset = offset
 
-          const generalPurposeBitFlag = 0x0008 // data descriptor present
+          // 关键修改：设置通用位标记，第11位（0x0800）表示文件名使用UTF-8编码
+          // 保留原0x0008（数据描述符存在），新增0x0800（UTF-8编码）
+          const generalPurposeBitFlag = 0x0808 
           const compressionMethod = 0 // store
-          const versionNeeded = 20 // 2.0 (ZIP64 switches this to 45)
+          const versionNeeded = this.needsZip64() ? 45 : 20 // 适配ZIP64
 
           // We always use data descriptor; write zeros for crc/sizes in local header
           const local = getDataHelper(30 + this.nameBuf.length)
           u32(local.view, 0, ZIP_SIGNATURE_LOCAL)
           u16(local.view, 4, versionNeeded)
-          u16(local.view, 6, generalPurposeBitFlag)
+          u16(local.view, 6, generalPurposeBitFlag) // 应用UTF-8标记
           u16(local.view, 8, compressionMethod)
           u16(local.view, 10, this.time)
           u16(local.view, 12, this.date)
@@ -250,7 +252,8 @@ function createWriter(underlyingSource) {
 
       const versionMadeBy = useZip64 ? 45 : 20
       const versionNeeded = useZip64 ? 45 : 20
-      const generalPurposeBitFlag = 0x0008
+      // 关键修改：中央目录也需要设置UTF-8标记
+      const generalPurposeBitFlag = 0x0808 
       const compressionMethod = 0
 
       const crc = file.crc ? file.crc.get() >>> 0 : 0
@@ -277,7 +280,7 @@ function createWriter(underlyingSource) {
       u32(cd.view, 0, ZIP_SIGNATURE_CENTRAL)
       u16(cd.view, 4, versionMadeBy)
       u16(cd.view, 6, versionNeeded)
-      u16(cd.view, 8, generalPurposeBitFlag)
+      u16(cd.view, 8, generalPurposeBitFlag) // 中央目录应用UTF-8标记
       u16(cd.view, 10, compressionMethod)
       u16(cd.view, 12, file.time)
       u16(cd.view, 14, file.date)
@@ -376,4 +379,4 @@ function createWriter(underlyingSource) {
   })
 }
 
-window.ZIP = createWriter
+window.ZIP = createWriter
\ No newline at end of file

From c70970a6f6f611277390917121fd5e00c2c11019 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 21 Jan 2026 10:23:03 +0800
Subject: [PATCH 269/333] =?UTF-8?q?=E9=9D=9Edicom=E9=95=BF=E7=9F=AD?=
 =?UTF-8?q?=E5=BE=84=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/visit-review/components/FileViewer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index c5ac8186..88d7a28f 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1465,7 +1465,7 @@ export default {
       } else {
         textLines.push(
           `L: ${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit || unit}`,
-          `S: ${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit}`
+          `S: ${this.reRound(csUtils.roundNumber(width), this.digitPlaces)} ${unit}`
         )
       }
 

From c6770e71a57147f00796072a3dee10b21c31d141 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 21 Jan 2026 15:44:22 +0800
Subject: [PATCH 270/333] 1

---
 .../trials-panel/reading/dicoms/components/DicomViewer.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 4e90ac5c..7c5148cd 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -963,7 +963,7 @@ export default {
           if (i < 0) return
           this.activeTaskInfo.visitTaskIndex = i
           var studyList = this.visitTaskList[i].StudyList || []
-          studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1)
+          studyList = studyList.filter(i => !i.IsCriticalSequence && (i.Modalities.indexOf('CT') !== -1 || i.Modalities.indexOf('MR') !== -1) && i.Modalities.indexOf('PT') !== -1)
           if (studyList.length === 0) return
           this.studyList = studyList
         }

From a3ca9fe4d03d48e9f2c45783e29811030d429538 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 22 Jan 2026 15:44:26 +0800
Subject: [PATCH 271/333] =?UTF-8?q?=E3=80=90=E5=AE=9E=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E3=80=91=E5=8F=97=E8=AF=95=E8=80=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=AE=9E=E6=97=B6=E6=8A=A5=E5=91=8A=EF=BC=8C?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E6=A0=87=E5=87=86=E6=9C=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=91=E9=80=81=E6=8A=A5=E5=91=8A=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject-list/components/MessageTable.vue  | 94 +++++++------------
 1 file changed, 33 insertions(+), 61 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/subject-list/components/MessageTable.vue b/src/views/trials/trials-panel/subject/subject-list/components/MessageTable.vue
index 9f83d822..3f299356 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/MessageTable.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/MessageTable.vue
@@ -1,89 +1,50 @@
 <template>
   <BaseContainer>
     <template slot="main-container">
-      <el-table
-        ref="emailList"
-        v-loading="loading"
-        :data="list"
-        stripe
-        @sort-change="handleSortChange"
-      >
+      <el-table ref="emailList" v-loading="loading" :data="list" stripe @sort-change="handleSortChange">
         <el-table-column type="index" width="40" />
-        <el-table-column
-          prop="TrialReadingCriterionId"
-          :label="$t('trials:reviewTrack:table:criterionName')"
-          show-overflow-tooltip
-          width="100"
-        >
+        <el-table-column prop="TrialReadingCriterionId" :label="$t('trials:reviewTrack:table:criterionName')"
+          show-overflow-tooltip width="100">
           <template slot-scope="scope">
-            {{ scope.row.TrialCriterionName }}
+            {{ $fd("CriterionType", scope.row.CriterionType) }}
           </template>
         </el-table-column>
         <!-- 业务场景 -->
-        <el-table-column
-          prop="BusinessScenarioEnum"
-          :label="$t('trials:emailManageCfg:title:businessScenario')"
-          show-overflow-tooltip
-          width="100"
-        >
+        <el-table-column prop="BusinessScenarioEnum" :label="$t('trials:emailManageCfg:title:businessScenario')"
+          show-overflow-tooltip width="100">
           <template slot-scope="scope">
-            {{ $fd('Common_File_BusinessScenario',scope.row.BusinessScenarioEnum) }}
+            {{ $fd('Common_File_BusinessScenario', scope.row.BusinessScenarioEnum) }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="ToUserTypeList"
-          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-          show-overflow-tooltip
-          width="100"
-        >
+        <el-table-column prop="ToUserTypeList" :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+          show-overflow-tooltip width="100">
           <template slot-scope="scope">
-            {{ scope.row.ToUserTypeNameList.length>0?scope.row.ToUserTypeNameList.join('、'):'' }}
+            {{ scope.row.ToUserTypeNameList.length > 0 ? scope.row.ToUserTypeNameList.join('、') : '' }}
           </template>
         </el-table-column>
         <!-- 抄送人 -->
-        <el-table-column
-          prop="CopyUserTypeList"
-          :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-          show-overflow-tooltip
-          width="100"
-        >
+        <el-table-column prop="CopyUserTypeList" :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
+          show-overflow-tooltip width="100">
           <template slot-scope="scope">
-            {{ scope.row.CopyUserTypeNameList.length>0?scope.row.CopyUserTypeNameList.join('、'):'' }}
+            {{ scope.row.CopyUserTypeNameList.length > 0 ? scope.row.CopyUserTypeNameList.join('、') : '' }}
           </template>
         </el-table-column>
         <!-- 附件 -->
-        <el-table-column
-          prop="FileName"
-          :label="$t('trials:subject:title:report')"
-          show-overflow-tooltip
-          min-width="120"
-        >
+        <el-table-column prop="FileName" :label="$t('trials:subject:title:report')" show-overflow-tooltip
+          min-width="120">
           <template slot-scope="scope">
-            <el-button
-              icon="el-icon-view"
-              :disabled="!scope.row.fileInfo"
-              circle
+            <el-button icon="el-icon-view" :disabled="!scope.row.fileInfo" circle
               :title="$t('trials:uploadedDicoms:action:preview')"
-              @click="handlePreview(scope.row.fileInfo.RelativePath)"
-            />
-            <el-button
-              icon="el-icon-pie-chart"
-              circle
-              :title="$t('trials:subject:title:addReport')"
-              @click="handleGenerate(scope.row)"
-            />
+              @click="handlePreview(scope.row.fileInfo.RelativePath)" />
+            <el-button icon="el-icon-pie-chart" circle :title="$t('trials:subject:title:addReport')"
+              @click="handleGenerate(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column :label="$t('common:action:action')" width="80px" fixed="right">
           <template slot-scope="scope">
             <!-- 编辑 -->
-            <el-button
-              icon="el-icon-message"
-              :disabled="!scope.row.fileInfo"
-              circle
-              :title="$t('trials:subject:title:send')"
-              @click="sendEmail(scope.row)"
-            />
+            <el-button icon="el-icon-message" :disabled="!scope.row.fileInfo" circle
+              :title="$t('trials:subject:title:send')" @click="sendEmail(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -156,6 +117,7 @@ export default {
       manualGenerateEmailFile({
         SubjectId: this.data.Id,
         TrialReadingCriterionId: row.TrialReadingCriterionId,
+        CriterionType: row.CriterionType,
         BusinessScenarioEnum: row.BusinessScenarioEnum
       }).then(res => {
         this.loading = false
@@ -182,7 +144,17 @@ export default {
           item.ToUserTypeNameList = this.getUserTypeName(item.ToUserTypeList)
           item.CopyUserTypeNameList = this.getUserTypeName(item.CopyUserTypeList)
         })
-        this.list = res.Result
+        let list = []
+        res.Result.forEach(item => {
+          if (Array.isArray(item.CriterionTypeList) && item.CriterionTypeList.length > 0) {
+            item.CriterionTypeList.forEach(CriterionType => {
+              let obj = Object.assign({}, item)
+              obj.CriterionType = CriterionType
+              list.push(obj)
+            })
+          }
+        })
+        this.list = list
       }).catch(() => {
         this.loading = false
       })

From 86a1312b60b77081286dc285e7645166121992e2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 22 Jan 2026 16:57:24 +0800
Subject: [PATCH 272/333] =?UTF-8?q?dicom=E9=98=85=E7=89=87=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A4=AD=E5=9C=86=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue  | 54 +++++++++++++++++++
 .../reading/dicoms3D/components/toolConfig.js | 11 +++-
 2 files changed, 64 insertions(+), 1 deletion(-)

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 32c1cf88..4f4cda01 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -524,6 +524,7 @@ const {
   MIPJumpToClickTool,
   VolumeRotateTool,
   CrosshairsTool,
+  EllipticalROITool,
   synchronizers
   // cursors
 } = cornerstoneTools
@@ -1187,6 +1188,7 @@ export default {
       cornerstoneTools.addTool(BidirectionalTool)
       cornerstoneTools.addTool(ScaleOverlayTool)
       cornerstoneTools.addTool(CircleROITool)
+      cornerstoneTools.addTool(EllipticalROITool)
       cornerstoneTools.addTool(AngleTool)
       cornerstoneTools.addTool(CobbAngleTool)
       cornerstoneTools.addTool(MIPJumpToClickTool)
@@ -1251,6 +1253,9 @@ export default {
         toolGroup.addTool(CircleROITool.toolName, {
           getTextLines: this.getCircleROIToolTextLines
         })
+        toolGroup.addTool(EllipticalROITool.toolName, {
+          getTextLines: this.getEllipticalROIToolTextLines
+        })
         toolGroup.addTool(AngleTool.toolName, {
           getTextLines: this.getAngleToolTextLines
         })
@@ -1310,6 +1315,7 @@ export default {
           toolGroup.setToolPassive(LengthTool.toolName)
           toolGroup.setToolPassive(BidirectionalTool.toolName)
           toolGroup.setToolPassive(CircleROITool.toolName)
+          toolGroup.setToolPassive(EllipticalROITool.toolName)
           toolGroup.setToolPassive(AngleTool.toolName)
           toolGroup.setToolPassive(CobbAngleTool.toolName)
         } else {
@@ -1319,6 +1325,7 @@ export default {
           toolGroup.setToolEnabled(LengthTool.toolName)
           toolGroup.setToolEnabled(BidirectionalTool.toolName)
           toolGroup.setToolEnabled(CircleROITool.toolName)
+          toolGroup.setToolEnabled(EllipticalROITool.toolName)
           toolGroup.setToolEnabled(AngleTool.toolName)
           toolGroup.setToolEnabled(CobbAngleTool.toolName)
         }
@@ -1991,6 +1998,53 @@ export default {
 
       return textLines
     },
+    getEllipticalROIToolTextLines(data, targetId) {
+      const cachedVolumeStats = data.cachedStats[targetId]
+      const {
+        // radius,
+        // radiusUnit,
+        area,
+        mean,
+        stdDev,
+        max,
+        isEmptyArea,
+        areaUnit,
+        modalityUnit
+      } = cachedVolumeStats
+      const textLines = []
+      if (data.label) {
+        // textLines.push(data.label)
+        textLines.push(data.label)
+      }
+
+      // if (radius) {
+      //   const radiusLine = isEmptyArea
+      //     ? `Radius: Oblique not supported`
+      //     : `Radius: ${this.reRound(radius, this.digitPlaces)} ${radiusUnit}`
+      //   textLines.push(radiusLine)
+      // }
+
+      if (area) {
+        const areaLine = isEmptyArea
+          ? `Area: Oblique not supported`
+          : `Area: ${parseFloat(area).toFixed(2)} ${areaUnit}`
+        textLines.push(areaLine)
+      }
+
+      if (mean) {
+        textLines.push(`Mean: ${this.reRound(mean, this.digitPlaces)} ${modalityUnit}`)
+      }
+
+      if (max) {
+        textLines.push(`Max: ${this.reRound(max, this.digitPlaces)} ${modalityUnit}`)
+      }
+
+      if (stdDev) {
+        textLines.push(`Std Dev: ${this.reRound(stdDev, this.digitPlaces)} ${modalityUnit}`)
+      }
+
+      return textLines
+    },
     getAngleToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]
       const { label } = data
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 9dd68cc1..67713036 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
@@ -267,7 +267,7 @@ const config = {
       'disabledReason': ''
     },
     {
-      'name': '椭圆工具',
+      'name': '圆形工具',
       'icon': 'oval',
       'toolName': 'CircleROI',
       'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
@@ -275,6 +275,15 @@ const config = {
       'isDisabled': false,
       'disabledReason': ''
     },
+    {
+      'name': '椭圆工具',
+      'icon': 'elliptical',
+      'toolName': 'EllipticalROI',
+      'props': ['area', 'mean', 'max', 'stdDev'],
+      'i18nKey': 'trials:reading:button:Elliptical',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
     {
       'name': '角度工具',
       'icon': 'angle',

From 5a0cc41d5ada7489f5a40aebc2eb7e67cb1eb657 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 22 Jan 2026 17:36:33 +0800
Subject: [PATCH 273/333] =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB=E7=9A=84CRF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=BD=B1=E5=83=8F=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E9=80=89=E3=80=82=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E7=94=BB=E4=BA=86=E6=A0=87=E8=AE=B0=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=B6=EF=BC=8C=E8=AE=BF=E8=A7=86=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=8F=90=E4=BA=A4=E3=80=82=E6=8F=90=E4=BA=A4=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=80=BC=E5=AD=98=E5=9C=A8=EF=BC=8C=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/customize/QuestionFormItem.vue |  9 +++--
 .../components/customize/QuestionList.vue     | 36 ++++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 61d76bc6..830f44b1 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -486,6 +486,11 @@ export default {
 
         }
       }
+    },
+    'addOrEdit.visible': {
+      handler() {
+        DicomEvent.$emit('opentableCol', { visible: this.addOrEdit.visible })
+      }
     }
   },
 
@@ -1077,7 +1082,7 @@ export default {
             }
           })
         }
-        
+
       }
       // this.$emit('formItemNumberChange')
     },
@@ -1336,7 +1341,7 @@ export default {
           }
         }
         const val = this.getAnnotationProp(item.MeasureData, item.ImageToolAttribute)
-        this.setFormTableItemData({key: item.TableQuestionId, val})
+        this.setFormTableItemData({ key: item.TableQuestionId, val })
         // this.$set(this.QuestionsForm, item.TableQuestionId, val)
         this.formItemTableNumberChange()
       })
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 1db2a526..0f12415a 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -26,13 +26,15 @@
 
         <el-form-item v-if="readingTaskState < 2">
           <div style="text-align:center;">
-            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" type="primary" @click="skipTask">
+            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible" type="primary"
+              @click="skipTask">
               {{ $t('trials:readingReport:button:skip') }}
             </el-button>
-            <el-button type="primary" @click="handleSave">
+            <el-button type="primary" :disabled="isTableVisible" @click="handleSave">
               {{ $t('common:button:save') }}
             </el-button>
-            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" type="primary" @click="handleSubmit">
+            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible" type="primary"
+              @click="handleSubmit">
               {{ $t('common:button:submit') }}
             </el-button>
           </div>
@@ -115,7 +117,8 @@ export default {
       questionsMarkStatus: {},
       digitPlaces: 2,
       questionImageToolAttributeInfo: {},
-      unSaveTargets: []
+      unSaveTargets: [],
+      isTableVisible: false
     }
   },
   mounted() {
@@ -129,6 +132,10 @@ export default {
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.getQuestionCalculateRelation()
     this.getQuestions(true)
+    DicomEvent.$on('opentableCol', (data) => {
+      let { visible } = data
+      this.isTableVisible = visible
+    })
   },
   methods: {
     handleReadingChart(e) {
@@ -241,6 +248,13 @@ export default {
     async handleSave(isMsg) {
       const valid = await this.$refs['questions'].validate()
       if (!valid) return
+      let isSaved = this.verifyAnnotationIsSave()
+      if (isSaved) {
+        let confirm = this.$confirm(this.$t('trials:reading:confirm:AnnotationNotSave'), this.$t('system:menu:confirm:title:warning'), {
+          type: 'warning'
+        })
+        if (!confirm) return false
+      }
       this.loading = true
       try {
         var answers = []
@@ -271,6 +285,13 @@ export default {
     async handleSubmit() {
       const valid = await this.$refs['questions'].validate()
       if (!valid) return
+      let isSaved = this.verifyAnnotationIsSave()
+      if (isSaved) {
+        let confirm = this.$confirm(this.$t('trials:reading:confirm:AnnotationNotSave'), this.$t('system:menu:confirm:title:warning'), {
+          type: 'warning'
+        })
+        if (!confirm) return false
+      }
       await this.handleSave(false)
       await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
       const { ImageAssessmentReportConfirmation } = const_.processSignature
@@ -334,6 +355,13 @@ export default {
     },
     async skipTask() {
       try {
+        let isSaved = this.verifyAnnotationIsSave()
+        if (isSaved) {
+          let confirm = this.$confirm(this.$t('trials:reading:confirm:AnnotationNotSave'), this.$t('system:menu:confirm:title:warning'), {
+            type: 'warning'
+          })
+          if (!confirm) return false
+        }
         // 是否确认跳过？
         const confirm = await this.$confirm(
           this.$t('trials:readingReport:message:skipConfirm'),

From 8c84cb510127f036ff591a76524f0c7858a15b26 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 23 Jan 2026 09:25:59 +0800
Subject: [PATCH 274/333] 1

---
 .../trials-panel/reading/dicoms3D/components/FusionForm.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue
index aa298cde..eabe977b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue
@@ -142,7 +142,7 @@ export default {
     getStudyList(obj) {
       if (obj) {
         var studyList = obj.StudyList || []
-        studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1)
+        studyList = studyList.filter(i => !i.IsCriticalSequence && (i.Modalities.indexOf('CT') !== -1 || i.Modalities.indexOf('MR') !== -1) && i.Modalities.indexOf('PT') !== -1)
         if (studyList.length === 0) return
         this.studyList = studyList
       }

From 377cdb968dea1724f629239977ca05bb6feb7fad Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 23 Jan 2026 10:15:35 +0800
Subject: [PATCH 275/333] =?UTF-8?q?=E5=AE=9E=E6=96=BD=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/subject-list/components/MessageTable.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/subject-list/components/MessageTable.vue b/src/views/trials/trials-panel/subject/subject-list/components/MessageTable.vue
index 3f299356..3ad104a0 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/MessageTable.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/MessageTable.vue
@@ -187,7 +187,7 @@ export default {
     },
     handlePreview(filePath) {
       if (filePath) {
-        window.open(this.OSSclientConfig.basePath + filePath, '_blank')
+        window.open(window.location.origin + filePath, '_blank')
       }
     },
     handleSearch() {

From dc8fb450fbc7fde44e442f6485f964627070cab8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 23 Jan 2026 15:40:50 +0800
Subject: [PATCH 276/333] =?UTF-8?q?=E9=9D=9EDICOM=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=94=AE=E5=9B=BE=E5=83=8F=E5=92=8C?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8=E5=9B=BE=E5=83=8F=E7=9A=84=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=EF=BC=8C=E9=98=85=E7=89=87=E5=B7=A5=E5=85=B7=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=9A=E5=9C=86=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue  |   7 +
 .../tools/FixedRadiusCircleROITool.js         | 226 ++++++++++++++++++
 .../visit-review/components/FileViewer.vue    |   3 +
 .../visit-review/components/ReadPage.vue      |  14 +-
 .../visit-review/components/StudyList.vue     |  38 ++-
 5 files changed, 282 insertions(+), 6 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/dicoms3D/components/tools/FixedRadiusCircleROITool.js

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 4f4cda01..bbd214b6 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -494,6 +494,7 @@ import FusionForm from './FusionForm.vue'
 import colorMap from './colorMap.vue'
 import RectangleROITool from './tools/RectangleROITool'
 import ScaleOverlayTool from './tools/ScaleOverlayTool'
+import FixedRadiusCircleROITool from './tools/FixedRadiusCircleROITool'
 import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import { getNetWorkSpeed, setNetWorkSpeedSizeAll, workSpeedclose } from "@/utils"
@@ -1188,6 +1189,7 @@ export default {
       cornerstoneTools.addTool(BidirectionalTool)
       cornerstoneTools.addTool(ScaleOverlayTool)
       cornerstoneTools.addTool(CircleROITool)
+      cornerstoneTools.addTool(FixedRadiusCircleROITool)
       cornerstoneTools.addTool(EllipticalROITool)
       cornerstoneTools.addTool(AngleTool)
       cornerstoneTools.addTool(CobbAngleTool)
@@ -1256,6 +1258,9 @@ export default {
         toolGroup.addTool(EllipticalROITool.toolName, {
           getTextLines: this.getEllipticalROIToolTextLines
         })
+        toolGroup.addTool(FixedRadiusCircleROITool.toolName), {
+          getTextLines: this.getCircleROIToolTextLines
+        }
         toolGroup.addTool(AngleTool.toolName, {
           getTextLines: this.getAngleToolTextLines
         })
@@ -1316,6 +1321,7 @@ export default {
           toolGroup.setToolPassive(BidirectionalTool.toolName)
           toolGroup.setToolPassive(CircleROITool.toolName)
           toolGroup.setToolPassive(EllipticalROITool.toolName)
+          toolGroup.setToolPassive(FixedRadiusCircleROITool.toolName)
           toolGroup.setToolPassive(AngleTool.toolName)
           toolGroup.setToolPassive(CobbAngleTool.toolName)
         } else {
@@ -1326,6 +1332,7 @@ export default {
           toolGroup.setToolEnabled(BidirectionalTool.toolName)
           toolGroup.setToolEnabled(CircleROITool.toolName)
           toolGroup.setToolEnabled(EllipticalROITool.toolName)
+          toolGroup.setToolEnabled(FixedRadiusCircleROITool.toolName)
           toolGroup.setToolEnabled(AngleTool.toolName)
           toolGroup.setToolEnabled(CobbAngleTool.toolName)
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/tools/FixedRadiusCircleROITool.js b/src/views/trials/trials-panel/reading/dicoms3D/components/tools/FixedRadiusCircleROITool.js
new file mode 100644
index 00000000..da073e7f
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/tools/FixedRadiusCircleROITool.js
@@ -0,0 +1,226 @@
+import { getEnabledElement, utilities as csUtils } from '@cornerstonejs/core';
+
+const {
+  utilities,
+  annotation,
+  cursors
+} = cornerstoneTools
+const { addAnnotation } = annotation.state
+const { triggerAnnotationCompleted } = annotation.state
+const { hideElementCursor } = cursors.elementCursor
+const { getViewportIdsWithToolToRender } = utilities.viewportFilters
+const { BasicStatsCalculator } = utilities.math.BasicStatsCalculator
+const { triggerAnnotationRenderForViewportIds } = utilities
+
+/**
+ * FixedRadiusCircleTool lets you draw annotations that measures the statistics
+ * such as area, max, mean and stdDev of a circular region of interest with a fixed radius.
+ */
+class FixedRadiusCircleROITool extends cornerstoneTools.CircleROITool {
+  static toolName = 'FixedRadiusCircleROI';
+
+  constructor(
+    toolProps = {},
+    defaultToolProps = {
+      supportedInteractionTypes: ['Mouse', 'Touch'],
+      configuration: {
+        shadow: true,
+        preventHandleOutsideImage: false,
+        storePointData: false,
+        centerPointRadius: 0,
+        radius: 10, // Default radius in mm
+        radiusUnit: 'mm',
+        statsCalculator: BasicStatsCalculator,
+        getTextLines: defaultGetTextLines,
+      },
+    }
+  ) {
+    super(toolProps, defaultToolProps);
+  }
+
+  /**
+   * Based on the current position of the mouse and the current imageId to create
+   * a CircleROI Annotation and stores it in the annotationManager
+   *
+   * @param evt -  EventTypes.NormalizedMouseEventType
+   * @returns The annotation object.
+   *
+   */
+  addNewAnnotation = (
+    evt
+  ) => {
+    const eventDetail = evt.detail;
+    const { currentPoints, element } = eventDetail;
+    const worldPos = currentPoints.world;
+
+    const enabledElement = getEnabledElement(element);
+    const { viewport } = enabledElement;
+
+    const camera = viewport.getCamera();
+    const { viewPlaneNormal, viewUp } = camera;
+
+    const referencedImageId = this.getReferencedImageId(
+      viewport,
+      worldPos,
+      viewPlaneNormal,
+      viewUp
+    );
+
+    const FrameOfReferenceUID = viewport.getFrameOfReferenceUID();
+
+    // Calculate end point based on fixed radius
+    const radius = this.configuration.radius || 10;
+    // viewUp is a normalized vector.
+    // We want a point 'radius' distance away from center.
+    // We can use viewUp or any vector in the plane.
+    const endPos = [
+      worldPos[0] + viewUp[0] * radius,
+      worldPos[1] + viewUp[1] * radius,
+      worldPos[2] + viewUp[2] * radius,
+    ];
+
+    const annotation = {
+      highlighted: true,
+      invalidated: true,
+      metadata: {
+        toolName: this.getToolName(),
+        viewPlaneNormal: [...viewPlaneNormal],
+        viewUp: [...viewUp],
+        FrameOfReferenceUID,
+        referencedImageId,
+        ...viewport.getViewReference({ points: [worldPos] }),
+      },
+      data: {
+        label: '',
+        handles: {
+          textBox: {
+            hasMoved: false,
+            worldPosition: [0, 0, 0],
+            worldBoundingBox: {
+              topLeft: [0, 0, 0],
+              topRight: [0, 0, 0],
+              bottomLeft: [0, 0, 0],
+              bottomRight: [0, 0, 0],
+            },
+          },
+          points: [[...worldPos], [...endPos]],
+          activeHandleIndex: null,
+        },
+        cachedStats: {},
+      },
+    };
+
+    addAnnotation(annotation, element);
+
+    const viewportIdsToRender = getViewportIdsWithToolToRender(
+      element,
+      this.getToolName()
+    );
+
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
+    triggerAnnotationCompleted(annotation);
+
+    return annotation;
+  };
+
+  /**
+   * Overriding handleSelectedCallback to prevent resizing if needed,
+   * or just to handle the "fixed" nature.
+   * If we want it to be truly fixed radius, we should prevent dragging the second handle.
+   */
+  handleSelectedCallback = (
+    evt,
+    annotation,
+    handle
+  ) => {
+    const eventDetail = evt.detail;
+    const { element } = eventDetail;
+    const { data } = annotation;
+
+    const { points } = data.handles;
+    let handleIndex = points.findIndex((p) => p === handle);
+
+    // If handleIndex is 1 (the rim/radius handle), ignore the drag to keep radius fixed.
+    if (handleIndex === 1) {
+      return;
+    }
+
+    // Otherwise, allow moving the circle (center handle)
+    // Implementation copied from CircleROITool because super.handleSelectedCallback is not available
+    // as it is an arrow function on the parent instance.
+
+    annotation.highlighted = true;
+
+    let movingTextBox = false;
+
+    if ((handle).worldPosition) {
+      movingTextBox = true;
+      handleIndex = undefined;
+    }
+
+    // Find viewports to render on drag.
+    const viewportIdsToRender = getViewportIdsWithToolToRender(
+      element,
+      this.getToolName()
+    );
+
+    this.editData = {
+      annotation,
+      viewportIdsToRender,
+      handleIndex,
+      movingTextBox,
+    };
+    this._activateModify(element);
+
+    hideElementCursor(element);
+
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
+
+    evt.preventDefault();
+  };
+}
+
+export default FixedRadiusCircleROITool;
+function defaultGetTextLines(data, targetId) {
+  const cachedVolumeStats = data.cachedStats[targetId];
+  const {
+    radius,
+    radiusUnit,
+    area,
+    mean,
+    stdDev,
+    max,
+    isEmptyArea,
+    areaUnit,
+    modalityUnit,
+  } = cachedVolumeStats;
+  const textLines = [];
+
+  if (radius) {
+    const radiusLine = isEmptyArea
+      ? `Radius: Oblique not supported`
+      : `Radius: ${csUtils.roundNumber(radius)} ${radiusUnit}`;
+    textLines.push(radiusLine);
+  }
+
+  if (area) {
+    const areaLine = isEmptyArea
+      ? `Area: Oblique not supported`
+      : `Area: ${csUtils.roundNumber(area)} ${areaUnit}`;
+    textLines.push(areaLine);
+  }
+
+  if (mean) {
+    textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`);
+  }
+
+  if (max) {
+    textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`);
+  }
+
+  if (stdDev) {
+    textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`);
+  }
+
+  return textLines;
+}
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 88d7a28f..931ddabc 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1057,6 +1057,7 @@ export default {
           // 临时标记
           return
         }
+        this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
         if (annotation.visitTaskId === this.taskInfo.VisitTaskId) {
           this.$emit('getEcrf', { type: "verifyAnnotationIsBound", VisitTaskId: annotation.visitTaskId, annotation })
           this.$nextTick(async () => {
@@ -1119,6 +1120,7 @@ export default {
           })
 
         }
+        
       } catch (e) {
         cornerstoneTools.annotation.state.addAnnotation(annotation)
         const renderingEngine = getRenderingEngine(renderingEngineId)
@@ -1259,6 +1261,7 @@ export default {
           // }  
         }
       })
+      this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
     },
     annotationSelectionChangeListener(e) {
       console.log('selection')
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index c4c7b33b..453387c3 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -13,7 +13,7 @@
         <div v-for="s in visitTaskList" v-show="activeTaskVisitId === s.VisitTaskId" :key="s.VisitTaskId"
           style="height:100%;">
           <study-list v-if="selectArr.includes(s.VisitTaskId) && s.StudyList.length > 0" :ref="s.VisitTaskId"
-            :visit-task-info="s" @selectFile="selectFile" />
+            :visit-task-info="s" @selectFile="selectFile" :currentMarkedFiles="currentMarkedFiles"/>
 
         </div>
       </div>
@@ -37,7 +37,7 @@
       /> -->
       <file-viewer ref="fileViewer" :related-study-info="relatedStudyInfo" :ps-arr="psArr" :ecrf="ecrf"
         @toggleTaskByViewer="toggleTaskByViewer" @toggleTask="toggleTask" @toggleImage="toggleImage"
-        @previewCD="previewCD" @setPS="setPS" @getEcrf="getEcrf" />
+        @previewCD="previewCD" @setPS="setPS" @getEcrf="getEcrf" @getMarkedFileIds="getMarkedFileIds"/>
     </div>
     <!-- 表单 -->
     <div class="right-panel">
@@ -137,7 +137,8 @@ export default {
       readingTaskState: 0,
       ecrf: {
         IsHaveBindingQuestion: false
-      }
+      },
+      currentMarkedFiles: {}
     }
   },
   computed: {
@@ -292,6 +293,9 @@ export default {
             this.relatedStudyInfo = { fileInfo, visitTaskInfo: this.visitTaskList[idx], fileList: studyList[0].NoneDicomStudyFileList, fileIndex: 0, studyId: studyList[0].Id }
           }
         }
+        if (this.readingTaskState < 2) {
+          this.$refs[res.Result[idx].VisitTaskId][0].initCurrentMaredFiles()
+        }
         this.loading = false
       } catch (e) {
         console.log(e)
@@ -357,6 +361,10 @@ export default {
         this.psArr.push(obj)
       }
     },
+    getMarkedFileIds(obj) {
+      const { visitTaskId } = obj
+      this.$refs[visitTaskId][0].getMarkedFileIds(obj)
+    },
     // 切换任务
     toggleTask(taskInfo) {
       this.setActiveTaskVisitId(taskInfo.VisitTaskId)
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
index 38561a57..65bd7541 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
@@ -45,7 +45,10 @@
                 <div class="file-text" :title="k.FileName">
                   {{ k.FileName }}
                 </div>
-
+                <div>
+                  <i v-if="taskInfo.ReadingTaskState < 2 && (currentMarkedFiles[k.Id] && currentMarkedFiles[k.Id].count > 0)" class="el-icon-star-on" style="font-size: 12px;color: #ff5722;" />
+                  <i v-else-if="taskInfo.ReadingTaskState >= 2 && k.IsBeMark" class="el-icon-star-on" style="font-size: 12px;color: #ff5722;" />
+                </div>
               </div>
             </div>
           </div>
@@ -75,7 +78,8 @@ export default {
       taskInfo: null,
       studyList: [],
       pdf,
-      BodyPart: {}
+      BodyPart: {},
+      currentMarkedFiles: {}
     }
   },
   async mounted() {
@@ -160,7 +164,35 @@ export default {
     },
     handleChange(v) {
       console.log(v)
-    }
+    },
+    getMarkedFileIds(obj) {
+      const { type, fileId, visitTaskId } = obj
+      if (this.visitTaskInfo.ReadingTaskState >= 2 || visitTaskId !== this.taskInfo.VisitTaskId) {
+        return
+      }
+      if (!fileId) return
+      if (type === 'remove') {
+        if (Object.hasOwn(this.currentMarkedFiles, fileId)) {
+          this.currentMarkedFiles[fileId].count--
+        }
+      } else if (type === 'add') {
+        if (!Object.hasOwn(this.currentMarkedFiles, fileId)) {
+          this.$set(this.currentMarkedFiles, fileId, { count: 1 })
+        } else {
+          this.currentMarkedFiles[fileId].count++
+        }
+        
+      }
+    },
+    initCurrentMaredFiles() {
+      this.visitTaskInfo.Annotations.map(i=>{
+        if (!Object.hasOwn(this.currentMarkedFiles, i.NoneDicomFileId)) {
+          this.$set(this.currentMarkedFiles, i.NoneDicomFileId, { count: 1 })
+        } else {
+          this.currentMarkedFiles[i.NoneDicomFileId].count++
+        }
+      })
+    },
   }
 }
 </script>

From 8703b284700a9be927690db918320029e28d9559 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 26 Jan 2026 11:41:11 +0800
Subject: [PATCH 277/333] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=BC=A9=E7=95=A5=E5=9B=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                    |  8 +++
 src/views/dicom-show/dicom-study.vue | 79 +++++++++++++++++++++++--
 src/views/dicom-show/dicom-visit.vue | 87 ++++++++++++++++++++++++++--
 3 files changed, 164 insertions(+), 10 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 764286a0..94baeebc 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -4422,4 +4422,12 @@ export function getTrialSubjectVisitMarkList(data) {
     method: 'post',
     data
   })
+}
+// 更新缩略图
+export function updateImageResizePath(data) {
+  return request({
+    url: `/Series/updateImageResizePath`,
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 11529201..082cdd7f 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -29,8 +29,12 @@
                           :src="item.previewImageUrl"
                           fit="fill"
                         /> -->
-                        <img class="image-preview" :src="item.previewImageUrl" crossorigin="anonymous" alt=""
-                          style="width: 72px;height:72px;" fit="fill">
+                        <div class="imageBox" style="width: 72px;height:72px;">
+                          <img class="image-preview" :src="item.previewImageUrl" crossorigin="anonymous" alt=""
+                            style="width: 72px;height:72px;" fit="fill" />
+                          <i class="el-icon-refresh" :title="$t('tip:refreshImage')"
+                            @click.stop="refreshImage(item)"></i>
+                        </div>
                         <div class="viewernavitextwrapper">
                           <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
                             <div v-if="item.keySeries" style="color:red">
@@ -136,7 +140,7 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getStudyInfo, getSeriesList } from '@/api/reading'
-import { getInstanceList, getPatientSeriesList, setSeriesStatus, setInstanceStatus } from '@/api/trials'
+import { getInstanceList, getPatientSeriesList, setSeriesStatus, setInstanceStatus, updateImageResizePath } from '@/api/trials'
 
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
@@ -247,6 +251,62 @@ export default {
     workSpeedclose(true)
   },
   methods: {
+    async updateImageResizePath(data) {
+      try {
+        let res = await updateImageResizePath(data)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("message:tip:updateImageResizePath:success"))
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async refreshImage(item) {
+      let thumbnailPath = item.previewImageUrl.split(this.OSSclientConfig.basePath)[1]
+      let blob = await this.dicomToPng(item.imageIds[0])
+      let OSSclient = this.OSSclient
+      try {
+        let seriesRes = await OSSclient.put(thumbnailPath, blob)
+        if (seriesRes && seriesRes.url) {
+          let path = this.$getObjectName(seriesRes.url)
+          item.previewImageUrl = seriesRes.url
+          let data = {
+            seriesId: item.seriesId,
+            ImageResizePath: path
+          }
+          this.updateImageResizePath(data)
+        }
+      } catch (e) {
+
+      }
+    },
+    dicomToPng(imageId) {
+      return new Promise((resolve) => {
+        cornerstone.loadImage(imageId).then(async (image) => {
+          let width = image.columns, height = image.rows;
+          let canvas = document.createElement('canvas')
+          canvas.width = (width * 60) / height
+          canvas.height = 60
+          if (image) {
+            cornerstone.renderToCanvas(canvas, image)
+            // 将 Canvas 图像对象转换为 PNG 格式
+            let blob = await this.canvasToBlob(canvas)
+            resolve(blob)
+          } else {
+            resolve()
+          }
+        })
+      }).catch((reason) => {
+        reason()
+      })
+    },
+    canvasToBlob(canvas) {
+      return new Promise((resolve) => {
+        canvas.toBlob((blob) => {
+          resolve(blob)
+        })
+      })
+    },
     async loadStudy() {
       let params = {}
       if (this.isPacs) {
@@ -905,7 +965,18 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
+.imageBox {
+  position: relative;
+
+  i {
+    position: absolute;
+    top: 0;
+    left: 0;
+    cursor: pointer;
+  }
+}
+
 .viewerContainer .el-tabs--border-card {
   background: none;
   border: none;
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 0aca21aa..f9ed51d6 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -45,8 +45,12 @@
                           style="position: relative;margin-bottom:5px;border-radius: 2px;border: 1px solid #404040;"
                           series-type="current" @click="showSeriesImage($event, index, i, series)">
                           <div class="viewernavigatorwrapper">
-                            <img class="image-preview" :src="series.previewImageUrl" crossorigin="anonymous" alt=""
-                              style="width: 85px;height:85px;" fit="fill">
+                            <div class="imageBox" style="width: 72px;height:72px;">
+                              <img class="image-preview" :src="series.previewImageUrl" crossorigin="anonymous" alt=""
+                                style="width: 72px;height:72px;" fit="fill" />
+                              <i class="el-icon-refresh" :title="$t('tip:refreshImage')"
+                                @click.stop="refreshImage(series)"></i>
+                            </div>
                             <div class="viewernavitextwrapper">
                               <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
                                 <div>#{{ series.seriesNumber }}</div>
@@ -184,8 +188,12 @@
                                   <div class="viewernavigatorwrapper"
                                     style="position: relative;border:1px solid #434343;" series-type="relation"
                                     @click="showRelationSeriesImage($event, seriesItem, studyIndex, index)">
-                                    <img class="image-preview" :src="seriesItem.previewImageUrl" crossorigin="anonymous"
-                                      alt="" style="width: 85px;height:85px;" fit="fill">
+                                    <div class="imageBox" style="width: 72px;height:72px;">
+                                      <img class="image-preview" :src="seriesItem.previewImageUrl"
+                                        crossorigin="anonymous" alt="" style="width: 72px;height:72px;" fit="fill" />
+                                      <i class="el-icon-refresh" :title="$t('tip:refreshImage')"
+                                        @click.stop="refreshImage(item)"></i>
+                                    </div>
 
                                     <div class="viewernavitextwrapper">
                                       <div
@@ -273,7 +281,7 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getVisitStudyList, getAllRelationStudyList, getSeriesList } from '@/api/reading'
-import { setSeriesStatus, setInstanceStatus } from '@/api/trials'
+import { setSeriesStatus, setInstanceStatus, updateImageResizePath } from '@/api/trials'
 import { getTaskUploadedDicomStudyList } from '@/api/reading'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
@@ -358,6 +366,62 @@ export default {
     workSpeedclose(true)
   },
   methods: {
+    async updateImageResizePath(data) {
+      try {
+        let res = await updateImageResizePath(data)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("message:tip:updateImageResizePath:success"))
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async refreshImage(item) {
+      let thumbnailPath = item.previewImageUrl.split(this.OSSclientConfig.basePath)[1]
+      let blob = await this.dicomToPng(item.imageIds[0])
+      let OSSclient = this.OSSclient
+      try {
+        let seriesRes = await OSSclient.put(thumbnailPath, blob)
+        if (seriesRes && seriesRes.url) {
+          let path = this.$getObjectName(seriesRes.url)
+          item.previewImageUrl = seriesRes.url
+          let data = {
+            seriesId: item.seriesId,
+            ImageResizePath: path
+          }
+          this.updateImageResizePath(data)
+        }
+      } catch (e) {
+
+      }
+    },
+    dicomToPng(imageId) {
+      return new Promise((resolve) => {
+        cornerstone.loadImage(imageId).then(async (image) => {
+          let width = image.columns, height = image.rows;
+          let canvas = document.createElement('canvas')
+          canvas.width = (width * 60) / height
+          canvas.height = 60
+          if (image) {
+            cornerstone.renderToCanvas(canvas, image)
+            // 将 Canvas 图像对象转换为 PNG 格式
+            let blob = await this.canvasToBlob(canvas)
+            resolve(blob)
+          } else {
+            resolve()
+          }
+        })
+      }).catch((reason) => {
+        reason()
+      })
+    },
+    canvasToBlob(canvas) {
+      return new Promise((resolve) => {
+        canvas.toBlob((blob) => {
+          resolve(blob)
+        })
+      })
+    },
     // 获取某个访视下所有的检查信息
     async getStudiesInfo() {
       this.studyList = []
@@ -947,7 +1011,18 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss">
+.imageBox {
+  position: relative;
+
+  i {
+    position: absolute;
+    top: 0;
+    left: 0;
+    cursor: pointer;
+  }
+}
+
 .viewerContainer .el-tabs--border-card {
   background: none;
   border: none;

From ba6bcebe1fea2c042f305ddac1e31095ca10843d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 26 Jan 2026 17:08:01 +0800
Subject: [PATCH 278/333] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 142 ++++++------------
 src/components/timeTag/index.vue              | 115 ++++++++++++++
 .../reading-unit/components/QuestionsList.vue |   2 +-
 3 files changed, 158 insertions(+), 101 deletions(-)
 create mode 100644 src/components/timeTag/index.vue

diff --git a/src/App.vue b/src/App.vue
index ee93660f..6831a218 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,7 @@
 <template>
   <div id="app" style="position: relative">
     <router-view />
-    <div
-      v-show="show"
-      v-if="$route.matched.length > 0"
-      v-adaptive
-      @click="openI18n"
-      style="
+    <div v-show="show" v-if="$route.matched.length > 0" v-adaptive @click="openI18n" style="
         position: fixed;
         bottom: 50px;
         left: 50px;
@@ -19,58 +14,27 @@
         color: #fff;
         border-radius: 50%;
         cursor: pointer;
-      "
-    >
+      ">
       i18n
     </div>
-    <el-drawer
-      :title="$t('il8n:title')"
-      :visible.sync="drawer"
-      direction="rtl"
-      size="80%"
-    >
+    <el-drawer :title="$t('il8n:title')" :visible.sync="drawer" direction="rtl" size="80%">
       <div style="width: 800px">
-        <el-form
-          label-width="100px"
-          @submit.native.prevent
-          size="small"
-          :inline="true"
-          class="demo-form-inline"
-        >
+        <el-form label-width="100px" @submit.native.prevent size="small" :inline="true" class="demo-form-inline">
           <el-form-item :label="$t('il8n:search:keyword')">
             <el-input v-model="key" @input="keyChange" />
           </el-form-item>
           <el-form-item :label="$t('il8n:search:state')">
-            <el-select
-              v-model="State"
-              clearable
-              filterable
-              @change="handleStateChange"
-            >
-              <el-option
-                v-for="item of $d.InternationalizationKeyState"
-                :key="'InternationalizationKeyState' + item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="State" clearable filterable @change="handleStateChange">
+              <el-option v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-form>
       </div>
-      <el-table
-        :data="tableData"
-        v-adaptive="{ bottomOffset: 50 }"
-        height="100"
-        style="width: 100%"
-        @sort-change="handleSortByColumn"
-      >
-        <el-table-column
-          prop="Code"
-          :label="$t('il8n:table:label')"
-          width="300"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+      <el-table :data="tableData" v-adaptive="{ bottomOffset: 50 }" height="100" style="width: 100%"
+        @sort-change="handleSortByColumn">
+        <el-table-column prop="Code" :label="$t('il8n:table:label')" width="300" show-overflow-tooltip
+          sortable="custom">
         </el-table-column>
         <!--        <el-table-column-->
         <!--          prop="Description"-->
@@ -81,71 +45,37 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column
-          prop="Value"
-          :label="$t('il8n:table:en')"
-          sortable="custom"
-        >
+        <el-table-column prop="Value" :label="$t('il8n:table:en')" sortable="custom">
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.Value"
-              @input="
-                (e) => {
-                  $set(scope.row, 'Value', e)
-                }
-              "
-              size="mini"
-            ></el-input>
+            <el-input v-model="scope.row.Value" @input="
+              (e) => {
+                $set(scope.row, 'Value', e)
+              }
+            " size="mini"></el-input>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="ValueCN"
-          :label="$t('il8n:table:cn')"
-          sortable="custom"
-        >
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')" sortable="custom">
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.ValueCN"
-              @input="
-                (e) => {
-                  $set(scope.row, 'ValueCN', e)
-                }
-              "
-              size="mini"
-            ></el-input>
+            <el-input v-model="scope.row.ValueCN" @input="
+              (e) => {
+                $set(scope.row, 'ValueCN', e)
+              }
+            " size="mini"></el-input>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="ValueCN"
-          :label="$t('il8n:table:state')"
-          sortable="custom"
-        >
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:state')" sortable="custom">
           <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.State"
-              clearable
-              filterable
-              size="mini"
-            >
-              <el-option
-                v-for="item of $d.InternationalizationKeyState"
-                :key="'InternationalizationKeyState' + item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="scope.row.State" clearable filterable size="mini">
+              <el-option v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value" :label="item.label" :value="item.value" />
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="Version"
-          :label="$t('il8n:table:Version')"
-          sortable="custom"
-        >
+        <el-table-column prop="Version" :label="$t('il8n:table:Version')" sortable="custom">
         </el-table-column>
       </el-table>
       <div style="text-align: right; padding-top: 10px; padding-right: 10px">
-        <el-button size="mini" @click="drawer = false"
-          >{{ $t('common:button:cancel') }}
+        <el-button size="mini" @click="drawer = false">{{ $t('common:button:cancel') }}
         </el-button>
         <el-button size="mini" type="primary" @click="handleSave">{{
           $t('common:button:save')
@@ -153,6 +83,7 @@
       </div>
     </el-drawer>
     <feedBack v-if="$route.matched.length > 0" />
+    <timeTag />
   </div>
 </template>
 
@@ -163,11 +94,12 @@ import {
 } from '@/api/dictionary/dictionary'
 import { getTrialExtralConfig } from '@/api/trials'
 import feedBack from '@/views/trials/trials-layout/components/feedBack'
+import timeTag from '@/components/timeTag'
 import Vue from 'vue'
 import i18n from './lang'
 export default {
   name: 'App',
-  components: { feedBack },
+  components: { feedBack, timeTag },
   data() {
     return {
       drawer: false,
@@ -366,13 +298,16 @@ export default {
 
 <style lang="scss">
 $light_gray: #606266;
+
 .el-tooltip__popper {
   max-width: 400px;
 }
+
 .my_multiple {
   .el-input--medium .el-input__inner {
     height: 36px !important;
   }
+
   .el-select__tags {
     flex-wrap: nowrap;
     overflow: hidden;
@@ -381,6 +316,7 @@ $light_gray: #606266;
     display: block;
   }
 }
+
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
   -webkit-appearance: none !important;
@@ -393,6 +329,7 @@ input[type='number'] {
 .viewer-fixed.viewer-container {
   z-index: 10000;
 }
+
 textarea {
   white-space: break-spaces;
   word-break: normal;
@@ -401,12 +338,15 @@ textarea {
 * {
   word-break: normal !important;
 }
+
 .box-body .el-button.is-circle:not(.is-disabled) i:before {
   color: #428bca;
 }
+
 .box-body .el-button.is-circle i.el-icon-question:before {
   color: #fff;
 }
+
 .system-title {
   font-size: 35px;
   color: $light_gray;
@@ -415,9 +355,11 @@ textarea {
   font-family: 'Times New Roman';
   text-shadow: 1px 0.5px 1.5px #666;
 }
+
 .title-logo {
   height: 40px;
 }
+
 .title-logo {
   height: 40px;
 }
diff --git a/src/components/timeTag/index.vue b/src/components/timeTag/index.vue
new file mode 100644
index 00000000..d9c39a09
--- /dev/null
+++ b/src/components/timeTag/index.vue
@@ -0,0 +1,115 @@
+<template>
+    <div id="timeTag" :style="`color:${suggestionTextColor};background-color: inherit;`">{{ time }}</div>
+</template>
+<script>
+import moment from 'moment'
+export default {
+    name: "timeTag",
+    data() {
+        return {
+            time: '',
+            timer: null,
+            suggestionTextColor: '#000'
+        }
+    },
+    created() {
+        this.getTime()
+    },
+    async mounted() {
+        this.dragDoc()
+        this.setColor()
+    },
+    methods: {
+        getTime() {
+            if (this.timer) {
+                clearInterval(this.timer)
+                this.timer = null
+            }
+            this.timer = setInterval(async () => {
+                this.time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss Z z')
+            }, 1000)
+        },
+        dragDoc() {
+            const box = document.querySelector('#timeTag')
+            const body = document.getElementsByTagName('body')[0]
+            let maxLeft = body.offsetWidth - box.offsetWidth
+            let maxTop = body.offsetHeight - box.offsetHeight - 30
+            box.style.cssText += `left:${maxLeft}px;top:0px;`
+            const sty = (function () {
+                if (window.document.currentStyle) {
+                    return (dom, attr) => dom.currentStyle[attr]
+                } else {
+                    return (dom, attr) => getComputedStyle(dom, false)[attr]
+                }
+            })()
+
+            box.onmousedown = (e) => {
+                // 鼠标按下，计算当前元素距离可视区的距离
+                const disX = e.clientX - box.offsetLeft
+                const disY = e.clientY - box.offsetTop
+
+                // 获取到的值带px 正则匹配替换
+                let styL = sty(box, 'left')
+                let styT = sty(box, 'top')
+
+                // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+                if (styL.includes('%')) {
+                    styL = +document.body.clientWidth * (+styL.replace(/\%/g, '') / 100)
+                    styT = +document.body.clientHeight * (+styT.replace(/\%/g, '') / 100)
+                } else {
+                    styL = +styL.replace(/\px/g, '')
+                    styT = +styT.replace(/\px/g, '')
+                }
+                const oldMousemove = document.onmousemove
+
+                document.onmousemove = function (e) {
+                    oldMousemove(e)
+                    // 通过事件委托，计算移动的距离
+                    let left = e.clientX - disX
+                    let top = e.clientY - disY
+                    if (left < 0) {
+                        left = 0
+                    }
+                    if (left > maxLeft) {
+                        left = maxLeft
+                    }
+                    if (top < 0) {
+                        top = 0
+                    }
+                    if (top > maxTop) {
+                        top = maxTop
+                    }
+                    // 移动当前元素
+                    box.style.cssText += `;left:${left}px;top:${top}px;`
+                }
+
+                document.onmouseup = function (e) {
+                    document.onmousemove = oldMousemove
+                    document.onmouseup = null
+                }
+            }
+        },
+        setColor() {
+            this.suggestionTextColor = "#000"
+            let pathList = ['/showvisitdicoms', '/showdicom', '/readingDicoms', '/petct', '/noneDicomReading']
+            if (pathList.includes(window.location.pathname)) {
+                this.suggestionTextColor = "#fff"
+            }
+        }
+    },
+    destroyed() {
+        if (this.timer) {
+            clearInterval(this.timer)
+            this.timer = null
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+#timeTag {
+    position: fixed;
+    z-index: 99999;
+    cursor: move;
+    width: 220px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
index 761a293b..a5d6a063 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
@@ -43,7 +43,7 @@
       />
       <!-- 分组(EN) -->
       <el-table-column
-        prop="QuestionGroupEnName"
+        prop="QuestionGroupName"
         v-if="$i18n.locale === 'en'"
         :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
         show-overflow-tooltip

From 64b8214985bbe2529921f2de03559518dbed6404 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 27 Jan 2026 13:50:14 +0800
Subject: [PATCH 279/333] 1

---
 .../reading/visit-review/components/StudyList.vue             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
index 65bd7541..8d1df5a9 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
@@ -46,8 +46,8 @@
                   {{ k.FileName }}
                 </div>
                 <div>
-                  <i v-if="taskInfo.ReadingTaskState < 2 && (currentMarkedFiles[k.Id] && currentMarkedFiles[k.Id].count > 0)" class="el-icon-star-on" style="font-size: 12px;color: #ff5722;" />
-                  <i v-else-if="taskInfo.ReadingTaskState >= 2 && k.IsBeMark" class="el-icon-star-on" style="font-size: 12px;color: #ff5722;" />
+                  <i v-if="visitTaskInfo.ReadingTaskState < 2 && (currentMarkedFiles[k.Id] && currentMarkedFiles[k.Id].count > 0)" class="el-icon-star-on" style="font-size: 12px;color: #ff5722;" />
+                  <i v-else-if="visitTaskInfo.ReadingTaskState >= 2 && k.IsBeMark" class="el-icon-star-on" style="font-size: 12px;color: #ff5722;" />
                 </div>
               </div>
             </div>

From fdc25724779615435061156224a6331b310bde68 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 27 Jan 2026 15:04:51 +0800
Subject: [PATCH 280/333] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/timeTag/index.vue                      | 9 +++++----
 src/views/trials/trials-layout/components/topLang.vue | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/timeTag/index.vue b/src/components/timeTag/index.vue
index d9c39a09..6bece77b 100644
--- a/src/components/timeTag/index.vue
+++ b/src/components/timeTag/index.vue
@@ -9,7 +9,7 @@ export default {
         return {
             time: '',
             timer: null,
-            suggestionTextColor: '#000'
+            suggestionTextColor: '#909399'
         }
     },
     created() {
@@ -34,7 +34,7 @@ export default {
             const body = document.getElementsByTagName('body')[0]
             let maxLeft = body.offsetWidth - box.offsetWidth
             let maxTop = body.offsetHeight - box.offsetHeight - 30
-            box.style.cssText += `left:${maxLeft}px;top:0px;`
+            box.style.cssText += `left:${maxLeft}px;top:7px;`
             const sty = (function () {
                 if (window.document.currentStyle) {
                     return (dom, attr) => dom.currentStyle[attr]
@@ -90,7 +90,7 @@ export default {
             }
         },
         setColor() {
-            this.suggestionTextColor = "#000"
+            this.suggestionTextColor = "#909399"
             let pathList = ['/showvisitdicoms', '/showdicom', '/readingDicoms', '/petct', '/noneDicomReading']
             if (pathList.includes(window.location.pathname)) {
                 this.suggestionTextColor = "#fff"
@@ -110,6 +110,7 @@ export default {
     position: fixed;
     z-index: 99999;
     cursor: move;
-    width: 220px;
+    width: 195px;
+    font-size: 14px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/trials/trials-layout/components/topLang.vue b/src/views/trials/trials-layout/components/topLang.vue
index c41d6a92..da8bc804 100644
--- a/src/views/trials/trials-layout/components/topLang.vue
+++ b/src/views/trials/trials-layout/components/topLang.vue
@@ -1,11 +1,11 @@
 <template>
   <el-dropdown
-    style="height:50px;line-height: 60px;"
+    style="height:50px;line-height: 65px;"
     @command="handleSetLanguage"
   >
 
     <span class="el-dropdown-link">
-      <svg-icon icon-class="language" style="font-size:25px;margin:0 10px;" />
+      <svg-icon icon-class="language" style="font-size:20px;margin:0 10px;" />
       <!-- {{ language==='zh'?'语言：中文':'Language: English' }} -->
       <!-- <i class="el-icon-arrow-down el-icon--right" /> -->
     </span>

From f6eb5b8cd5d7b3c624fde7d0c30071ad8924fa5a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 28 Jan 2026 10:58:18 +0800
Subject: [PATCH 281/333] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E9=99=A4i18?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                       | 3 ++-
 src/layout/components/Navbar.vue  | 2 +-
 src/layout/components/topLang.vue | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6831a218..b9be4bcc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -112,7 +112,8 @@ export default {
     }
   },
   mounted() {
-    this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    // this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    this.show = false
     Vue.prototype.$openI18n = this.openI18n
   },
   // watch: {
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9268d926..2d89a113 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -218,7 +218,7 @@ export default {
   .right-menu {
     // float: right;
     height: 100%;
-    line-height: 50px;
+    line-height: 65px;
     // position: relative;
     &:focus {
       outline: none;
diff --git a/src/layout/components/topLang.vue b/src/layout/components/topLang.vue
index 540e4bd1..8d020f0b 100644
--- a/src/layout/components/topLang.vue
+++ b/src/layout/components/topLang.vue
@@ -1,11 +1,11 @@
 <template>
   <el-dropdown
-    style="height:50px;line-height: 60px;"
+    style="height:50px;line-height: 65px;"
     @command="handleSetLanguage"
   >
 
     <span class="el-dropdown-link">
-      <svg-icon icon-class="language" style="font-size:25px;margin:0 10px;" />
+      <svg-icon icon-class="language" style="font-size:20px;margin:0 10px;" />
       <!-- {{ language==='zh'?'语言：中文':'Language: English' }} -->
       <!-- <i class="el-icon-arrow-down el-icon--right" /> -->
     </span>

From d44aeac36de2746101b50b3d51d2d42f7dcefa87 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 28 Jan 2026 13:22:11 +0800
Subject: [PATCH 282/333] =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E8=B7=B3=E8=BF=87=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/oncology-review/index.vue         | 209 +++++-------------
 1 file changed, 53 insertions(+), 156 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue
index 6557034a..1027cbc7 100644
--- a/src/views/trials/trials-panel/reading/oncology-review/index.vue
+++ b/src/views/trials/trials-panel/reading/oncology-review/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div v-loading="loading" class="oncologyReview_wrapper">
-    <el-card v-if="isReadingShowSubjectInfo" shadow="never" :body-style="{ padding: '10px' }" style="margin-bottom:10px">
+    <el-card v-if="isReadingShowSubjectInfo" shadow="never" :body-style="{ padding: '10px' }"
+      style="margin-bottom:10px">
       <h4>
         <!-- 受试者： -->
         {{ $t('trials:oncologyReview:title:subject') }}
@@ -18,122 +19,63 @@
       </div>
       <div style="text-align:right;margin:5px 0;">
         <!-- 临床数据 -->
-        <el-button
-          v-if="isExistsClinicalData"
-          type="primary"
-          size="small"
-          @click="previewCD"
-        >
+        <el-button v-if="isExistsClinicalData" type="primary" size="small" @click="previewCD">
           {{ $t('trials:oncologyReview:button:clinicalData') }}
         </el-button>
-        <el-button
-          type="primary"
-          size="small"
-          @click="skipTask"
-          v-if="!isView"
-        >
+        <el-button type="primary" size="small" @click="skipTask" v-if="!isView && oncologyInfo.ReadingTaskState < 2">
           <!-- 跳过 -->
           {{ $t('trials:readingReport:button:skip') }}
         </el-button>
         <!-- 保存 -->
-        <el-button
-          v-if="oncologyInfo.ReadingTaskState < 2"
-          size="small"
-          type="primary"
-          @click="handleSave(true)"
-        >
+        <el-button v-if="oncologyInfo.ReadingTaskState < 2" size="small" type="primary" @click="handleSave(true)">
           {{ $t('common:button:save') }}
         </el-button>
         <!-- 提交 -->
-        <el-button
-          v-if="oncologyInfo.ReadingTaskState < 2"
-          size="small"
-          type="primary"
-          @click="handleConfirm"
-        >
+        <el-button v-if="oncologyInfo.ReadingTaskState < 2" size="small" type="primary" @click="handleConfirm">
           {{ $t('common:button:submit') }}
         </el-button>
       </div>
-      <el-table
-        :data="oncologyInfo.OncologyVisits"
-        style="width: 100%"
-      >
+      <el-table :data="oncologyInfo.OncologyVisits" style="width: 100%">
         <!-- 访视名称 -->
-        <el-table-column
-          prop="VisitName"
-          :label="$t('trials:oncologyReview:title:visitName')"
-          show-overflow-tooltip
-          width="150"
-        />
+        <el-table-column prop="VisitName" :label="$t('trials:oncologyReview:title:visitName')" show-overflow-tooltip
+          width="150" />
         <!-- 影像学阅片结果 -->
-        <el-table-column
-          :label="$t('trials:oncologyReview:title:readingRes')"
-          align="center"
-          prop=""
-        >
+        <el-table-column :label="$t('trials:oncologyReview:title:readingRes')" align="center" prop="">
           <template>
-            <el-table-column
-              v-for="(qs,index) in questionCols"
-              :key="qs"
-              prop=""
-              :label="qs"
-              show-overflow-tooltip
-              width="150"
-            >
+            <el-table-column v-for="(qs, index) in questionCols" :key="qs" prop="" :label="qs" show-overflow-tooltip
+              width="150">
               <template slot-scope="scope">
                 <span v-if="scope.row.QuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.QuestionList[index].DictionaryCode,parseInt(scope.row.QuestionList[index].Answer)) }}
+                  {{ $fd(scope.row.QuestionList[index].DictionaryCode, parseInt(scope.row.QuestionList[index].Answer)) }}
                 </span>
                 <span v-else>
-                  {{ scope.row.QuestionList.length>index?scope.row.QuestionList[index].Answer:'' }}
+                  {{ scope.row.QuestionList.length > index ? scope.row.QuestionList[index].Answer : '' }}
                 </span>
 
               </template>
             </el-table-column>
             <!-- 全局是否有更新 -->
-            <el-table-column
-              v-if="oncologyInfo.IsShowDetail"
-              prop="IsHaveChange"
-              :label="$t('trials:oncologyReview:title:isGlobalUpdate')"
-              show-overflow-tooltip
-              width="150"
-            >
+            <el-table-column v-if="oncologyInfo.IsShowDetail" prop="IsHaveChange"
+              :label="$t('trials:oncologyReview:title:isGlobalUpdate')" show-overflow-tooltip width="150">
               <template slot-scope="scope">
-                <span>{{ $fd('YesOrNo', scope.row.IsHaveChange ) }}</span>
+                <span>{{ $fd('YesOrNo', scope.row.IsHaveChange) }}</span>
                 <!-- 查看详情 -->
-                <el-button
-                  v-if="scope.row.IsHaveChange && oncologyInfo.GlobalTaskId"
-                  type="text"
-                  style="margin-left:5px;"
-                  @click="handleViewDetail(oncologyInfo.GlobalTaskId)"
-                >
+                <el-button v-if="scope.row.IsHaveChange && oncologyInfo.GlobalTaskId" type="text"
+                  style="margin-left:5px;" @click="handleViewDetail(oncologyInfo.GlobalTaskId)">
                   {{ $t('trials:oncologyReview:title:view') }}
                 </el-button>
               </template>
             </el-table-column>
             <!-- 访视点注释 -->
-            <el-table-column
-              v-if="oncologyInfo.IsShowDetail"
-              prop="VisitRemark"
-              :label="$t('trials:oncologyReview:title:visitRemark')"
-              show-overflow-tooltip
-              width="150"
-            />
+            <el-table-column v-if="oncologyInfo.IsShowDetail" prop="VisitRemark"
+              :label="$t('trials:oncologyReview:title:visitRemark')" show-overflow-tooltip width="150" />
           </template>
         </el-table-column>
         <!-- 肿瘤学阅片结果 -->
-        <el-table-column
-          :label="$t('trials:oncologyReview:title:oReviewRes')"
-          align="center"
-          prop=""
-        >
+        <el-table-column :label="$t('trials:oncologyReview:title:oReviewRes')" align="center" prop="">
           <template>
             <!-- 结论 -->
-            <el-table-column
-              prop="EvaluationResult"
-              show-overflow-tooltip
-              width="150"
-            >
+            <el-table-column prop="EvaluationResult" show-overflow-tooltip width="150">
               <template slot="header">
                 <div>
                   <span>{{ $t('trials:oncologyReview:title:findings') }}</span>
@@ -141,27 +83,15 @@
                 </div>
               </template>
               <template slot-scope="scope">
-                <el-select
-                  v-if="oncologyInfo.ReadingTaskState < 2 && !scope.row.IsBaseLine"
-                  v-model="scope.row.EvaluationResult"
-                  :placeholder="$t('common:ruleMessage:select')"
-                >
-                  <el-option
-                    v-for="item in assessTypeList"
-                    v-show="item.Code !== '-1'"
-                    :key="item.Id"
-                    :label="item.Value"
-                    :value="item.Code"
-                  />
+                <el-select v-if="oncologyInfo.ReadingTaskState < 2 && !scope.row.IsBaseLine"
+                  v-model="scope.row.EvaluationResult" :placeholder="$t('common:ruleMessage:select')">
+                  <el-option v-for="item in assessTypeList" v-show="item.Code !== '-1'" :key="item.Id"
+                    :label="item.Value" :value="item.Code" />
                 </el-select>
                 <span v-else>{{ getAssessType(scope.row.EvaluationResult) }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="EvaluationReason"
-              show-overflow-tooltip
-              width="250"
-            >
+            <el-table-column prop="EvaluationReason" show-overflow-tooltip width="250">
               <template slot="header">
                 <el-tooltip placement="top">
 
@@ -177,29 +107,19 @@
                 </el-tooltip>
               </template>
               <template slot-scope="scope">
-                <el-input
-                  v-if="oncologyInfo.ReadingTaskState < 2 && !scope.row.IsBaseLine"
-                  v-model="scope.row.EvaluationReason"
-                />
+                <el-input v-if="oncologyInfo.ReadingTaskState < 2 && !scope.row.IsBaseLine"
+                  v-model="scope.row.EvaluationReason" />
                 <span v-else>{{ scope.row.EvaluationReason }}</span>
               </template>
             </el-table-column>
           </template>
         </el-table-column>
 
-        <el-table-column
-          v-if="oncologyInfo.IsShowDetail"
-          :label="$t('common:action:action')"
-          width="100"
-        >
+        <el-table-column v-if="oncologyInfo.IsShowDetail" :label="$t('common:action:action')" width="100">
           <template slot-scope="scope">
             <!-- 查看详情 -->
-            <el-button
-              circle
-              :title="$t('trials:oncologyReview:title:view')"
-              icon="el-icon-view"
-              @click="handleViewDetail(scope.row.VisitTaskId)"
-            />
+            <el-button circle :title="$t('trials:oncologyReview:title:view')" icon="el-icon-view"
+              @click="handleViewDetail(scope.row.VisitTaskId)" />
           </template>
         </el-table-column>
       </el-table>
@@ -210,51 +130,27 @@
         <span style="font-weight: bold;">{{ $t('trials:oncologyReview:title:previousRes') }}</span>
       </div>
 
-      <el-table
-        v-loading="priorLoading"
-        :data="priorList"
-        style="width: 100%"
-      >
+      <el-table v-loading="priorLoading" :data="priorList" style="width: 100%">
         <!-- 肿瘤学阅片 -->
-        <el-table-column
-          prop="TaskBlindName"
-          :label="$t('trials:oncologyReview:title:oncologyReview')"
-          show-overflow-tooltip
-          width="200"
-        />
-        <el-table-column
-          prop="VisitName"
-          :label="$t('trials:globalReview:table:cutOffVisitName')"
-          show-overflow-tooltip
-          width="200"
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          width="200"
-        >
+        <el-table-column prop="TaskBlindName" :label="$t('trials:oncologyReview:title:oncologyReview')"
+          show-overflow-tooltip width="200" />
+        <el-table-column prop="VisitName" :label="$t('trials:globalReview:table:cutOffVisitName')" show-overflow-tooltip
+          width="200" />
+        <el-table-column :label="$t('common:action:action')" width="200">
           <template slot-scope="scope">
             <!-- 查看详情 -->
-            <el-button
-              circle
-              :title="$t('trials:oncologyReview:title:view')"
-              icon="el-icon-view"
-              @click="handleViewDetail(scope.row.VisitTaskId)"
-            />
+            <el-button circle :title="$t('trials:oncologyReview:title:view')" icon="el-icon-view"
+              @click="handleViewDetail(scope.row.VisitTaskId)" />
           </template>
         </el-table-column>
       </el-table>
     </el-card>
     <!-- 签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
+    <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>
+        <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>
@@ -338,8 +234,8 @@ export default {
   //     }
   //   }
   // },
-  computed:{
-    isView(){
+  computed: {
+    isView() {
       return !this.hasPermi(['role:ir'])
     }
   },
@@ -389,7 +285,7 @@ export default {
       }
     },
     handleSave(isPrompt) {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         this.loading = true
         // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
         var isDiffer = this.checkDifferResult()
@@ -508,7 +404,7 @@ export default {
             // DicomEvent.$emit('getNextTask')
             window.location.reload()
           } else {
-          // '当前阅片任务已完成，是否进入下一个阅片任务？'
+            // '当前阅片任务已完成，是否进入下一个阅片任务？'
             const confirm = await this.$confirm(
               this.$t('trials:oncologyReview:title:msg2'),
               {
@@ -556,7 +452,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0 || readingTool === 2 ) {
+      if (readingTool === 0 || readingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
@@ -597,14 +493,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.oncologyReview_wrapper{
+.oncologyReview_wrapper {
   flex: 1;
   padding: 10px;
   width: 100%;
   height: 100%;
   overflow-y: auto;
-  .box-mr{
-    margin:10px 0;
+
+  .box-mr {
+    margin: 10px 0;
   }
 }
 </style>

From 4e0fbb3f31aaf7d0ccb2d5ba41d314fbafefc7d1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 28 Jan 2026 15:11:23 +0800
Subject: [PATCH 283/333] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=91=E4=BB=B6=E4=BA=BA=E7=A6=81=E6=AD=A2=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/setting/email-manage/config.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/email-manage/config.vue b/src/views/trials/trials-panel/setting/email-manage/config.vue
index 4d24e11e..05248daa 100644
--- a/src/views/trials/trials-panel/setting/email-manage/config.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/config.vue
@@ -12,7 +12,7 @@
                     </el-form-item>
                     <!-- 发件人 -->
                     <el-form-item :label="$t('trials:emailManageCfg:title:fromName')" prop="EmailFromName">
-                        <el-input v-model="form.EmailFromName" :disabled="!isEdit" />
+                        <el-input v-model="form.EmailFromName" disabled />
                     </el-form-item>
                     <!-- 密码/授权码 -->
                     <el-form-item :label="$t('trials:emailManageCfg:title:password')" prop="EmailAuthorizationCode">

From 8a4a035b2c69c3d1ff09c9662456d4a2a487f9bc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 28 Jan 2026 16:10:54 +0800
Subject: [PATCH 284/333] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BD=B1=E5=83=8F?=
 =?UTF-8?q?=E6=8C=87=E6=8E=A7=E9=A3=8E=E9=99=A9=E9=85=8D=E7=BD=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/cease.html                             |  2 +-
 public/error.html                             |  4 ++--
 public/errorEN.html                           |  2 +-
 src/lang/en.js                                |  4 ++--
 src/settings.js                               |  2 +-
 src/utils/get-page-title.js                   |  2 +-
 src/views/login/index.vue                     |  2 +-
 .../setting/email-manage/config.vue           |  4 ++--
 .../trial-config/components/processConfig.vue | 22 ++++++++++++++++++-
 .../qc-check/components/qualityAssurance.vue  |  2 +-
 vue.config.js                                 |  2 +-
 11 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/public/cease.html b/public/cease.html
index 0357ff3d..5498beee 100644
--- a/public/cease.html
+++ b/public/cease.html
@@ -10,7 +10,7 @@
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="Cache-control" content="no-store,no-cache,must-revalidate">
     <meta http-equiv="Cache" content="no-cache">
-    <title>IRC Imaging System</title>
+    <title>EIC lmaging Trial Management System</title>
 </head>
 
 <body>
diff --git a/public/error.html b/public/error.html
index 4c05b498..f069d1bf 100644
--- a/public/error.html
+++ b/public/error.html
@@ -31,7 +31,7 @@
             <div class="title-container" style="display: flex;padding-top:180px;justify-content: flex-start;height: 100%;box-sizing: border-box">
               <!-- IRC Management System -->
 <!--              <div class="title" style="text-align: center;font-size: 28px;margin-top: 100px;padding-right: 120px"></div>-->
-<!--              <div class="title" v-show="false">IRC Imaging System</div>-->
+<!--              <div class="title" v-show="false">EIC lmaging Trial Management System</div>-->
               <div style="color: #0a84ff;text-align: left;font-size: 28px">
                 {{message}}
               </div>
@@ -63,7 +63,7 @@
           <div style="margin: 0 auto;width: 600px;line-height: 28px;text-align: center" >
             <h1 style="text-align: center;margin-bottom: 20px">关于</h1>
             <p style="margin-bottom: 20px">
-              IRC Imaging System
+              EIC lmaging Trial Management System
             </p>
             <p style="margin-bottom: 20px">
               V1.3.0.001
diff --git a/public/errorEN.html b/public/errorEN.html
index b1139766..5ae08f68 100644
--- a/public/errorEN.html
+++ b/public/errorEN.html
@@ -31,7 +31,7 @@
         <div class="title-container" style="display: flex;padding-top:180px;justify-content: flex-start;height: 100%;box-sizing: border-box">
           <!-- IRC Management System -->
           <!--              <div class="title" style="text-align: center;font-size: 28px;margin-top: 100px;padding-right: 120px"></div>-->
-          <!--              <div class="title" v-show="false">IRC Imaging System</div>-->
+          <!--              <div class="title" v-show="false">EIC lmaging Trial Management System</div>-->
           <div style="color: #0a84ff;text-align: left;font-size: 28px">
             {{message}}
           </div>
diff --git a/src/lang/en.js b/src/lang/en.js
index 79a4813a..4cfed14a 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -1608,7 +1608,7 @@ Enroll: Enrolled Confirmation`,
 		'trials:notice:table:appendix': `Attachment`,
 		'trials:notice:table:isRead': `Readed`,
 		'trials:notice:action:detail': `Details`,
-		'login:title:system': `IRC Imaging System`,
+		'login:title:system': `EIC lmaging Trial Management System`,
 		'login:form:userName': `User ID`,
 		'login:form:password': `Password`,
 		'login:button:login': `Login`,
@@ -1672,7 +1672,7 @@ Enroll: Enrolled Confirmation`,
 		'trials:tab:trials': `My Trials`,
 		'trials:trials:title:back': `Return`,
 		'trials:trials:title:backTrialList': `Return to trial list`,
-		'trials:trials:title:eics': `IRC Imaging System`,
+		'trials:trials:title:eics': `EIC lmaging Trial Management System`,
 		'trials:tab:reading': `Reads`,
 		'trials:tab:pendingReadingTasks': `Pending`,
 		'trials:pendingReadingTasks:table:subjectCode': `Subject ID`,
diff --git a/src/settings.js b/src/settings.js
index b8ed0059..7ca4cdcc 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-undef
 module.exports = {
 
-  title: 'IRC Imaging System',
+  title: 'EIC lmaging Trial Management System',
 
   /**
  * @type {boolean} true | false
diff --git a/src/utils/get-page-title.js b/src/utils/get-page-title.js
index 21b4512b..2f6bb3c9 100644
--- a/src/utils/get-page-title.js
+++ b/src/utils/get-page-title.js
@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || 'IRC Imaging System'
+const title = defaultSettings.title || 'EIC lmaging Trial Management System'
 
 export default function getPageTitle(pageTitle) {
   if (pageTitle) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f7d04881..b31140e3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -710,7 +710,7 @@ $light_gray: #606266;
       .title-container {
         // margin-bottom: 50px;
         text-align: center;
-        margin-top: 20%;
+        margin-top: 17%;
 
         .title {
           font-size: 35px;
diff --git a/src/views/trials/trials-panel/setting/email-manage/config.vue b/src/views/trials/trials-panel/setting/email-manage/config.vue
index 05248daa..157852d1 100644
--- a/src/views/trials/trials-panel/setting/email-manage/config.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/config.vue
@@ -120,7 +120,7 @@ export default {
     //     if (this.VUE_APP_OSS_PATH === '/uat/dist') {
     //         this.form = {
     //             EmailFromEmail: 'uat@extimaging.com',
-    //             EmailFromName: 'Uat IRC Imaging System',
+    //             EmailFromName: 'Uat EIC lmaging Trial Management System',
     //             EmailAuthorizationCode: 'SHzyyl2021',
     //             EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
     //             EmailSMTPServerPort: 465,
@@ -130,7 +130,7 @@ export default {
     //     if (this.VUE_APP_OSS_PATH === '/test/dist') {
     //         this.form = {
     //             EmailFromEmail: 'test@extimaging.com',
-    //             EmailFromName: 'Test IRC Imaging System',
+    //             EmailFromName: 'Test EIC lmaging Trial Management System',
     //             EmailAuthorizationCode: 'SHzyyl2021',
     //             EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
     //             EmailSMTPServerPort: 465,
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index 99f22b47..8d84c17e 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -36,12 +36,22 @@
       </el-form-item>
       <!-- 影像质控流程 -->
       <el-form-item :label="$t('trials:processCfg:form:qcProcess')" prop="QCProcessEnum">
-        <el-radio-group v-model="form.QCProcessEnum" :disabled="form.IsTrialProcessConfirmed && !isEdit">
+        <el-radio-group v-model="form.QCProcessEnum" :disabled="form.IsTrialProcessConfirmed && !isEdit"
+          @input="QCProcessEnumChange">
           <el-radio v-for="item of $d.QCProcessEnum" :key="item.id" :label="item.value">
             {{ item.label }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <!--影像质控风险控制-->
+      <el-form-item :label="$t('trials:processCfg:form:IsImageQualityControl')" prop="IsImageQualityControl"
+        v-if="form.QCProcessEnum > 0">
+        <el-radio-group v-model="form.IsImageQualityControl" :disabled="form.IsTrialProcessConfirmed && !isEdit">
+          <el-radio v-for="item of $d.YesOrNo" :key="item.id" :label="item.value">
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <!-- 一致性核查流程 -->
       <el-form-item :label="$t('trials:processCfg:form:conProcess')" prop="IsImageConsistencyVerification">
         <el-radio-group v-model="form.IsImageConsistencyVerification"
@@ -719,6 +729,7 @@ export default {
         ClinicalDataTrialSetIds: [],
         ClinicalDataSetNamesStr: '',
         QCProcessEnum: null,
+        IsImageQualityControl: false,
         CollectImagesEnum: null,
         ImageFormatList: [],
         IsImageConsistencyVerification: null,
@@ -860,6 +871,10 @@ export default {
   },
   mounted() { },
   methods: {
+    QCProcessEnumChange(v) {
+      this.form.IsImageQualityControl = false
+      if (v > 0) this.form.IsImageQualityControl = true
+    },
     handlePreview(row) {
       this.rowData = { ...row }
       this.preview.visible = true
@@ -1026,6 +1041,11 @@ export default {
           NewVal: this.$fd('QCProcessEnum', this.form.QCProcessEnum),
           OldVal: this.$fd('QCProcessEnum', this.initialForm.QCProcessEnum),
         },
+        {
+          Name: this.$t('trials:processCfg:form:IsImageQualityControl'), // 影像质控风险控制
+          NewVal: this.$fd('YesOrNo', this.form.IsImageQualityControl),
+          OldVal: this.$fd('YesOrNo', this.initialForm.IsImageQualityControl),
+        },
         {
           Name: this.$t('trials:processCfg:form:conProcess'), // 一致性核查流程
           NewVal: this.$fd('YesOrNo', this.form.IsImageConsistencyVerification),
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index c327f16c..687711a1 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1316,7 +1316,7 @@ export default {
               this.SecondReviewTime = this.secondReviewList[0].SecondReviewTime
             }
           }
-          this.QCRiskControl = res.Result.QCRiskControl
+          this.QCRiskControl = this.$store.state.trials.config.IsImageQualityControl
           this.existsManual = res.Result.ExistsManual
           this.qCQuestionAnswerList = res.Result.QCQuestionAnswerList
           this.IsHaveStudyClinicalData = res.Result.IsHaveStudyClinicalData
diff --git a/vue.config.js b/vue.config.js
index 3a8a38f0..9f9456f6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -11,7 +11,7 @@ const webpack = require('webpack')
 const defaultSettings = require('./src/settings.js')
 const moment = require('moment')
 var distDate = moment(new Date()).format('YYYY-MM-DD')
-const name = process.env.NODE_ENV === 'usa' ? 'Imaging Trial Management System' : defaultSettings.title || 'IRC Imaging System' // page title
+const name = process.env.NODE_ENV === 'usa' ? 'Imaging Trial Management System' : defaultSettings.title || 'EIC lmaging Trial Management System' // page title
 // const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 // eslint-disable-next-line no-undef
 module.exports = defineConfig({

From e491265bb49018d92f2edf45a509765e0f03ba57 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 28 Jan 2026 17:48:45 +0800
Subject: [PATCH 285/333] 1

---
 .../attachments/enrollment/components/Selection.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index 7b21dec2..a39ae420 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -583,7 +583,7 @@ export default {
     },
     copyCode() {
       this.$copyText(
-        `${this.$t('reviewers-list:button:copyCode')}: ${this.shareLink}`
+        `${this.$t('reviewers-list:message:msg1')}: ${this.shareLink}`
       )
         .then((res) => {
           this.$message.success(

From b7a5015e21c99e7de718429d33c3f9233b212c77 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 29 Jan 2026 11:38:33 +0800
Subject: [PATCH 286/333] 1

---
 .../enrollment/components/Selection.vue       | 421 ++++--------------
 1 file changed, 98 insertions(+), 323 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index a39ae420..2b832849 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -4,176 +4,79 @@
       <el-form :inline="true">
         <!-- Name -->
         <el-form-item :label="$t('trials:seletctedReviews:table:name')">
-          <el-input
-            v-model="listQuery.Name"
-            size="small"
-            clearable
-            style="width: 120px"
-          />
+          <el-input v-model="listQuery.Name" size="small" clearable style="width: 120px" />
         </el-form-item>
         <!-- Modality -->
         <el-form-item :label="$t('trials:seletctedReviews:form:modality')">
-          <el-select
-            v-model="listQuery.ReadingTypeIdList"
-            class="handle-select"
-            clearable
-            multiple
-            collapse-tags
-            style="width: 160px"
-          >
-            <el-option
-              v-for="item of $d.ReadingType"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"
-            />
+          <el-select v-model="listQuery.ReadingTypeIdList" class="handle-select" clearable multiple collapse-tags
+            style="width: 160px">
+            <el-option v-for="item of $d.ReadingType" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
         </el-form-item>
         <!-- Subspeciality -->
         <el-form-item :label="$t('trials:seletctedReviews:form:subspeciality')">
-          <el-select
-            v-model="listQuery.SubspecialityIdList"
-            class="handle-select"
-            clearable
-            multiple
-            collapse-tags
-            style="width: 160px"
-          >
-            <el-option
-              v-for="item of $d.Subspeciality"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"
-            />
+          <el-select v-model="listQuery.SubspecialityIdList" class="handle-select" clearable multiple collapse-tags
+            style="width: 160px">
+            <el-option v-for="item of $d.Subspeciality" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
         </el-form-item>
         <!-- Position -->
         <el-form-item :label="$t('trials:seletctedReviews:form:position')">
-          <el-select
-            v-model="listQuery.PositionId"
-            class="handle-select"
-            clearable
-            style="width: 160px"
-          >
-            <el-option
-              v-for="item of $d.Position"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"
-            />
+          <el-select v-model="listQuery.PositionId" class="handle-select" clearable style="width: 160px">
+            <el-option v-for="item of $d.Position" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
         </el-form-item>
         <!-- Rank -->
         <el-form-item :label="$t('trials:seletctedReviews:form:rank')">
-          <el-select
-            v-model="listQuery.RankId"
-            class="handle-select"
-            style="width: 160px"
-            clearable
-          >
-            <el-option
-              v-for="item of $d.Rank"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"
-            />
+          <el-select v-model="listQuery.RankId" class="handle-select" style="width: 160px" clearable>
+            <el-option v-for="item of $d.Rank" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
         </el-form-item>
         <!-- Institution -->
         <el-form-item :label="$t('trials:seletctedReviews:form:institution')">
-          <el-select
-            v-model="listQuery.HospitalId"
-            class="handle-select mr10"
-            clearable
-            style="width: 160px"
-          >
-            <el-option
-              v-for="(item, index) in hospitalList"
-              :key="index"
-              :label="item.HospitalName"
-              :value="item.Id"
-            />
+          <el-select v-model="listQuery.HospitalId" class="handle-select mr10" clearable style="width: 160px">
+            <el-option v-for="(item, index) in hospitalList" :key="index" :label="item.HospitalName" :value="item.Id" />
           </el-select>
         </el-form-item>
         <!-- 查询 -->
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          :loading="loading"
-          @click="handleSearch"
-        >
+        <el-button type="primary" icon="el-icon-search" :loading="loading" @click="handleSearch">
           {{ $t('common:button:search') }}
         </el-button>
         <!-- 重置 -->
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-left"
-          :loading="loading"
-          @click="handleReset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-left" :loading="loading" @click="handleReset">
           {{ $t('common:button:reset') }}
         </el-button>
-        <el-button
-          v-if="hasPermi(['role:pm'])"
-          type="primary"
-          :disabled="selectIdArr.length == 0"
-          icon="el-icon-check"
-          :loading="loading"
-          @click="handleApply"
-        >
+        <el-button v-if="hasPermi(['role:pm'])" type="primary" :disabled="selectIdArr.length == 0" icon="el-icon-check"
+          :loading="loading" @click="handleApply">
           {{ $t('trials:seletctedReviews:button:select') }}
         </el-button>
         <!---简历采集-->
-        <el-button
-          type="primary"
-          @click="resumeCollection"
-          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
-        >
+        <el-button type="primary" @click="resumeCollection"
+          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']">
           {{ $t('trials:seletctedReviews:button:resumeCollection') }}
         </el-button>
         <!---添加阅片人-->
-        <el-button
-          icon="el-icon-plus"
-          type="primary"
-          @click="openViewer('add')"
-          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
-        >
+        <el-button icon="el-icon-plus" type="primary" @click="openViewer('add')"
+          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']">
           {{ $t('trials:seletctedReviews:button:addViewer') }}
         </el-button>
       </el-form>
     </template>
     <template slot="main-container">
-      <el-table
-        ref="selectionList"
-        v-loading="listLoading"
-        v-adaptive="{ bottomOffset: 65 }"
-        height="100"
-        :data="list"
-        class="table"
-        :row-class-name="handleHighLighRow"
-        @sort-change="handleSortChange"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table ref="selectionList" v-loading="listLoading" v-adaptive="{ bottomOffset: 65 }" height="100" :data="list"
+        class="table" :row-class-name="handleHighLighRow" @sort-change="handleSortChange"
+        @selection-change="handleSelectionChange">
         <el-table-column type="selection" :selectable="handleSelectTable" />
         <el-table-column type="index" width="40" />
         <!-- Name -->
-        <el-table-column
-          prop="LastName"
-          :label="$t('trials:seletctedReviews:table:name')"
-          show-overflow-tooltip
-          width="120"
-          sortable="custom"
-        >
+        <el-table-column prop="LastName" :label="$t('trials:seletctedReviews:table:name')" show-overflow-tooltip
+          width="120" sortable="custom">
           <template slot-scope="scope">
-            <span
-              style="color: #428bca; cursor: pointer"
-              @click="
-                go(
-                  `/trialsResume?doctorId=${scope.row.Id}&trialId=${$route.query.trialId}&token=${token}`
-                )
-              "
-              >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span
-            >
+            <span style="color: #428bca; cursor: pointer" @click="
+              go(
+                `/trialsResume?doctorId=${scope.row.Id}&trialId=${$route.query.trialId}&token=${token}`
+              )
+              ">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
             <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
             <!--            <router-link-->
             <!--              style="color: #428bca;"-->
@@ -186,28 +89,13 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <el-table-column
-          v-if="!isEN"
-          prop="ChineseName"
-          :label="$t('trials:seletctedReviews:table:nameCN')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="120"
-        />
+        <el-table-column v-if="!isEN" prop="ChineseName" :label="$t('trials:seletctedReviews:table:nameCN')"
+          show-overflow-tooltip sortable="custom" width="120" />
 
-        <el-table-column
-          prop="DoctorUserName"
-          :label="$t('trials:seletctedReviews:table:doctorUserName')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="120"
-        />
+        <el-table-column prop="DoctorUserName" :label="$t('trials:seletctedReviews:table:doctorUserName')"
+          show-overflow-tooltip sortable="custom" width="120" />
         <!-- Status -->
-        <el-table-column
-          prop="DoctorTrialState"
-          :label="$t('trials:seletctedReviews:table:status')"
-          width="120"
-        >
+        <el-table-column prop="DoctorTrialState" :label="$t('trials:seletctedReviews:table:status')" width="120">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.DoctorTrialState === 1" type="primary">{{
               $fd('DoctorTrialState', 16)
@@ -215,35 +103,16 @@
           </template>
         </el-table-column>
         <!-- Submitted -->
-        <el-table-column
-          prop="Submitted"
-          :label="$t('trials:seletctedReviews:table:submitted')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="140"
-        />
+        <el-table-column prop="Submitted" :label="$t('trials:seletctedReviews:table:submitted')" show-overflow-tooltip
+          sortable="custom" width="140" />
         <!-- Approved -->
-        <el-table-column
-          prop="Approved"
-          :label="$t('trials:seletctedReviews:table:approved')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="120"
-        />
+        <el-table-column prop="Approved" :label="$t('trials:seletctedReviews:table:approved')" show-overflow-tooltip
+          sortable="custom" width="120" />
         <!-- Reading -->
-        <el-table-column
-          prop="Reading"
-          :label="$t('trials:seletctedReviews:table:reading')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="120"
-        />
-        <el-table-column
-          prop="Speciality"
-          :label="$t('trials:seletctedReviews:form:modality')"
-          show-overflow-tooltip
-          min-width="120"
-        >
+        <el-table-column prop="Reading" :label="$t('trials:seletctedReviews:table:reading')" show-overflow-tooltip
+          sortable="custom" width="120" />
+        <el-table-column prop="Speciality" :label="$t('trials:seletctedReviews:form:modality')" show-overflow-tooltip
+          min-width="120">
           <template slot-scope="scope">
             {{
               scope.row.ReadingTypeIds.map((v) => {
@@ -253,12 +122,8 @@
           </template>
         </el-table-column>
         <!-- Specialty -->
-        <el-table-column
-          prop="Speciality"
-          :label="$t('trials:seletctedReviews:table:specialty')"
-          show-overflow-tooltip
-          min-width="120"
-        >
+        <el-table-column prop="Speciality" :label="$t('trials:seletctedReviews:table:specialty')" show-overflow-tooltip
+          min-width="120">
           <template slot-scope="scope">
             {{
               scope.row.SpecialityId === otherId
@@ -270,12 +135,8 @@
           </template>
         </el-table-column>
         <!-- Subspecialty -->
-        <el-table-column
-          prop="Subspeciality"
-          :label="$t('trials:seletctedReviews:table:subspecialty')"
-          show-overflow-tooltip
-          min-width="150"
-        >
+        <el-table-column prop="Subspeciality" :label="$t('trials:seletctedReviews:table:subspecialty')"
+          show-overflow-tooltip min-width="150">
           <template slot-scope="scope">
             {{
               scope.row.SubspecialityIds.map((v) => {
@@ -286,76 +147,42 @@
           </template>
         </el-table-column>
         <!-- Institution -->
-        <el-table-column
-          prop="HospitalName"
-          :label="$t('trials:seletctedReviews:table:institution')"
-          show-overflow-tooltip
-          width="150"
-        >
-        <template slot-scope="scope">
-          <span>{{ isEN?scope.row.HospitalName:scope.row.HospitalNameCN }}</span>
-        </template>
-      </el-table-column>
-        <!-- City -->
-        <el-table-column
-          prop="City"
-          :label="$t('trials:seletctedReviews:table:city')"
-          show-overflow-tooltip
-          width="150"
-        >
-        <template slot-scope="scope">
-          <span>{{ isEN?scope.row.City:scope.row.CityCN }}</span>
-        </template>
-      </el-table-column>
-        <!-- Country -->
-        <el-table-column
-          prop="Country"
-          :label="$t('trials:seletctedReviews:table:country')"
-          show-overflow-tooltip
-          width="150"
-        >
-        <template slot-scope="scope">
-          <span>{{ isEN?scope.row.Country:scope.row.CountryCN }}</span>
-        </template>
-      </el-table-column>
-        <!-- Selector -->
-        <el-table-column
-          prop="OptUserName"
-          :label="$t('trials:seletctedReviews:table:selector')"
-          width="150"
-        />
-        <!-- Selection Time -->
-        <el-table-column
-          prop="OptTimeStr"
-          :label="$t('trials:seletctedReviews:table:selectionTime')"
-          width="150"
-        />
-        <el-table-column
-          fixed="right"
-          prop="OptTimeStr"
-          :label="$t('common:action:action')"
-          width="150"
-          v-if="hasPermi(['trials:trials-panel:attachments:enrollment:viewer'])"
-        >
+        <el-table-column prop="HospitalName" :label="$t('trials:seletctedReviews:table:institution')"
+          show-overflow-tooltip width="150">
           <template slot-scope="scope">
-            <el-button
-              icon="el-icon-edit-outline"
-              :title="$t('common:button:edit')"
+            <span>{{ isEN ? scope.row.HospitalName : scope.row.HospitalNameCN }}</span>
+          </template>
+        </el-table-column>
+        <!-- City -->
+        <el-table-column prop="City" :label="$t('trials:seletctedReviews:table:city')" show-overflow-tooltip
+          width="150">
+          <template slot-scope="scope">
+            <span>{{ isEN ? scope.row.City : scope.row.CityCN }}</span>
+          </template>
+        </el-table-column>
+        <!-- Country -->
+        <el-table-column prop="Country" :label="$t('trials:seletctedReviews:table:country')" show-overflow-tooltip
+          width="150">
+          <template slot-scope="scope">
+            <span>{{ isEN ? scope.row.Country : scope.row.CountryCN }}</span>
+          </template>
+        </el-table-column>
+        <!-- Selector -->
+        <el-table-column prop="OptUserName" :label="$t('trials:seletctedReviews:table:selector')" width="150" />
+        <!-- Selection Time -->
+        <el-table-column prop="OptTimeStr" :label="$t('trials:seletctedReviews:table:selectionTime')" width="150" />
+        <el-table-column fixed="right" prop="OptTimeStr" :label="$t('common:action:action')" width="150"
+          v-if="hasPermi(['trials:trials-panel:attachments:enrollment:viewer'])">
+          <template slot-scope="scope">
+            <el-button icon="el-icon-edit-outline" :title="$t('common:button:edit')"
               @click.stop="openViewer('edit', scope.row)"
-              v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
-              :disabled="scope.row.IsEnroll"
-              circle
-            />
+              v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']" :disabled="scope.row.IsEnroll"
+              circle />
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="listQuery.PageIndex"
-        :limit.sync="listQuery.PageSize"
-        @pagination="getList"
-      />
+      <pagination class="page" :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize"
+        @pagination="getList" />
     </template>
     <!--简历采集-->
     <base-model :config="share_model">
@@ -365,14 +192,8 @@
           <span>{{ $t('reviewers-list:message:msg1') }}</span>
         </div>
         <div style="margin: 10px 0">
-          <span style="">{{ $t('reviewers-list:message:msg2') }}</span
-          ><el-input
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4 }"
-            v-model="shareLink"
-            readonly
-            style="width: 100%; margin-top: 10px"
-          />
+          <span style="">{{ $t('reviewers-list:message:msg2') }}</span><el-input type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }" v-model="shareLink" readonly style="width: 100%; margin-top: 10px" />
         </div>
         <div>
           <el-button type="primary" round @click="copyCode">{{
@@ -380,80 +201,34 @@
           }}</el-button>
         </div>
         <div class="sendEmailBox">
-          <el-input
-            v-model="email"
-            clearable
-            :placeholder="$t('reviewers-list:placeholder:sendEmail')"
-          ></el-input>
-          <el-button
-            type="primary"
-            round
-            :disabled="!email"
-            @click="sendEmail"
-            :loading="emailLoading"
-            style="margin-left: 10px"
-          >
+          <el-input v-model="email" clearable :placeholder="$t('reviewers-list:placeholder:sendEmail')"></el-input>
+          <el-button type="primary" round :disabled="!email" @click="sendEmail" :loading="emailLoading"
+            style="margin-left: 10px">
             {{ $t('reviewers-list:button:sendEmail') }}
           </el-button>
         </div>
       </template>
     </base-model>
     <!--新增或修改简历-->
-    <el-dialog
-      :title="$t('curriculumVitae:content:title')"
-      :visible.sync="visible"
-      fullscreen
-      v-if="visible"
-      appendToBody
-      :before-close="beforeClose"
-    >
+    <el-dialog :title="$t('curriculumVitae:content:title')" :visible.sync="visible" fullscreen v-if="visible"
+      appendToBody :before-close="beforeClose">
       <curriculumVitae :reviewerId="reviewerId" />
     </el-dialog>
     <!--新增阅片人输入邮箱--->
-    <el-dialog
-      :title="$t('curriculumVitae:content:title')"
-      :visible.sync="emailVisible"
-      v-if="emailVisible"
-      appendToBody
-      :close-on-click-modal="false"
-      v-dialogDrag
-      width="400px"
-    >
-      <el-form
-        v-if="emailVisible"
-        ref="emailForm"
-        :model="emailForm"
-        :rules="emailRule"
-        class="demo-form-inline"
-        label-width="80px"
-      >
-        <el-form-item
-          :label="$t('trials:trials-panel:attachments:enrollment:form:email')"
-          prop="EmailOrPhone"
-        >
-          <el-input
-            v-model="emailForm.EmailOrPhone"
-            clearable
-            :maxlength="400"
-          ></el-input>
-          <el-input
-            style="display: none"
-            v-model="emailForm.EmailOrPhone"
-            clearable
-            :maxlength="400"
-          ></el-input>
+    <el-dialog :title="$t('curriculumVitae:content:title')" :visible.sync="emailVisible" v-if="emailVisible"
+      appendToBody :close-on-click-modal="false" v-dialogDrag width="400px">
+      <el-form v-if="emailVisible" ref="emailForm" :model="emailForm" :rules="emailRule" class="demo-form-inline"
+        label-width="80px">
+        <el-form-item :label="$t('trials:trials-panel:attachments:enrollment:form:email')" prop="EmailOrPhone">
+          <el-input v-model="emailForm.EmailOrPhone" clearable :maxlength="400"></el-input>
+          <el-input style="display: none" v-model="emailForm.EmailOrPhone" clearable :maxlength="400"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" type="primary" @click="handleCancle">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button
-          size="small"
-          type="primary"
-          @click="handleSave"
-          :loading="emailLoading"
-        >
+        <el-button size="small" type="primary" @click="handleSave" :loading="emailLoading">
           {{ $t('common:button:save') }}
         </el-button>
       </span>
@@ -482,8 +257,8 @@ const getListQueryDefault = () => {
     HospitalId: '',
     Asc: false,
     SortField: '',
-    AcceptingNewTrial: true,
-    InformationConfirmed: true,
+    // AcceptingNewTrial: true,
+    // InformationConfirmed: true,
     ContractorStatus: 1,
   }
 }
@@ -707,7 +482,7 @@ export default {
       }
     },
     handleSelectTable(row) {
-      return row.DoctorTrialState !== 1
+      return row.DoctorTrialState !== 1 && row.ResumeStatus === 1 && row.AcceptingNewTrial && !row.IsVirtual && !row.IsVacation && row.CooperateStatus === 1
     },
     handleDetail(row) {
       const { href } = this.$router.resolve({
@@ -733,8 +508,8 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+
 ::v-deep .el-card__body {
   padding: 20px !important;
 }
 </style>
-

From 7dc7236c160557b52706bce262a6c1174d600940 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 29 Jan 2026 16:30:49 +0800
Subject: [PATCH 287/333] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/enrollment/components/Selection.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index 2b832849..76f10594 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -259,7 +259,7 @@ const getListQueryDefault = () => {
     SortField: '',
     // AcceptingNewTrial: true,
     // InformationConfirmed: true,
-    ContractorStatus: 1,
+    // ContractorStatus: 1, 
   }
 }
 export default {

From ae1014c70b0f1b8b0d9f2d6b653a554002726900 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 30 Jan 2026 09:38:05 +0800
Subject: [PATCH 288/333] =?UTF-8?q?crc=E4=B8=8A=E4=BC=A0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?MP4=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/mp4.png                               | Bin 0 -> 7112 bytes
 src/views/none-dicom-show/index.vue              |  12 +++++++++++-
 .../enrollment/components/Selection.vue          |   4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/mp4.png

diff --git a/src/assets/mp4.png b/src/assets/mp4.png
new file mode 100644
index 0000000000000000000000000000000000000000..40709a5da020899c3b808cc0ef0da233ae6f2ee8
GIT binary patch
literal 7112
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

literal 0
HcmV?d00001

diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index be3040c7..e567c054 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -49,6 +49,9 @@
                     <el-image v-else-if="
                       item.FileType === 'application/x-zip-compressed'
                     " style="width: 100%; height: 100%" :src="zip" fit="contain" crossorigin="anonymous" />
+                    <el-image v-else-if="
+                      !!~item.FileType.indexOf('mp4')
+                    " style="width: 100%; height: 100%" :src="mp4" fit="contain" crossorigin="anonymous" />
                   </div>
                   <div v-if="item.FileName.length < 15" class="img-text">
                     {{ `${j + 1}. ${item.FileName}` }}
@@ -102,6 +105,7 @@ import { getNoneDicomStudyList, setNodicomStudyState } from '@/api/trials'
 import store from '@/store'
 import pdf from '@/assets/pdf.png'
 import zip from '@/assets/zip.jpg'
+import mp4 from '@/assets/mp4.png'
 import { changeURLStatic } from '@/utils/history.js'
 import Preview from './components/preview'
 import PreviewFile from '@/components/PreviewFile'
@@ -118,6 +122,7 @@ export default {
     return {
       pdf,
       zip,
+      mp4,
       activeName: 'first',
       currentFileId: '',
       currentStudyIndex: 0,
@@ -341,10 +346,15 @@ export default {
         this.pdfFile.type = 'pdf'
         this.showPDF = true
         return true
+      } else if (!!~file.FileType.indexOf('mp4')) {
+        this.pdfFile.path = file.Path || file.FullFilePath
+        this.pdfFile.type = file.FileType
+        this.showPDF = true
+        return true
       } else {
         this.showPDF = false
       }
-
+      console.log(this.pdfFile)
       this.currentStudyIndex = studyIndex
       this.previewImage.imgList =
         this.studyList[studyIndex].NoneDicomStudyFileList
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index 76f10594..d490691f 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -257,9 +257,9 @@ const getListQueryDefault = () => {
     HospitalId: '',
     Asc: false,
     SortField: '',
-    // AcceptingNewTrial: true,
+    AcceptingNewTrial: true,
     // InformationConfirmed: true,
-    // ContractorStatus: 1, 
+    ContractorStatus: 1,
   }
 }
 export default {

From 98324c27e6df3e95458b50ce328e7e10e774bbac Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 30 Jan 2026 10:56:47 +0800
Subject: [PATCH 289/333] 1

---
 .../attachments/enrollment/components/Selection.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index d490691f..467e0d46 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -358,7 +358,7 @@ export default {
     },
     copyCode() {
       this.$copyText(
-        `${this.$t('reviewers-list:message:msg1')}: ${this.shareLink}`
+        `${this.$t('reviewers-list:message:msg2')}: ${this.shareLink}`
       )
         .then((res) => {
           this.$message.success(

From c89aa8bd8752e2a690dd83dac646c245313fe98b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 30 Jan 2026 13:55:05 +0800
Subject: [PATCH 290/333] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5title?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/system.png     | Bin 0 -> 327221 bytes
 src/views/login/index.vue |  10 ++++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/system.png

diff --git a/src/assets/system.png b/src/assets/system.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bbbb96c92bffcec49c469e13c83793832a5f348
GIT binary patch
literal 327221
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

literal 0
HcmV?d00001

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index b31140e3..ab81abbe 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -24,7 +24,10 @@
           <div v-if="NODE_ENV === 'usa'">
             <svg-icon icon-class="login-logo" style="width: 300px; height: 94px" />
           </div>
-          <div class="title" v-else>{{ $t('login:title:system') }}</div>
+          <div class="title" v-else>
+            <img src="@/assets/system.png" alt="" :style="{ width: isEN ? '180px' : '200px', height: isEN ? '60px' : '65px' }" />
+            <div :style="`font-size:${isEN ? '28px' : '35px'}`">{{ $t('login:title:system') }}</div>
+          </div>
         </div>
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
           label-position="left">
@@ -250,6 +253,9 @@ export default {
       // return window.location.host
       return 'elevateimaging.ai '
     },
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    }
   },
   watch: {
     '$i18n.locale': {
@@ -697,7 +703,7 @@ $light_gray: #606266;
 
       .login-form {
         position: absolute;
-        top: 55%;
+        top: 60%;
         // transform: translateY(-50%);
         left: 50%;
         transform: translate(-50%, -50%);

From d34f1f462adb476fdcbfe307e24e5c3dc1facc0c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 30 Jan 2026 14:19:49 +0800
Subject: [PATCH 291/333] =?UTF-8?q?=E9=98=85=E7=89=87=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AddOrEditTaskAllocationRule.vue           | 35 ++++++-------------
 .../reading/read-task-allocation/index.vue    |  2 +-
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/components/AddOrEditTaskAllocationRule.vue b/src/views/trials/trials-panel/reading/read-task-allocation/components/AddOrEditTaskAllocationRule.vue
index a9b2eb62..51ebf57b 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/components/AddOrEditTaskAllocationRule.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/components/AddOrEditTaskAllocationRule.vue
@@ -1,18 +1,13 @@
 /* eslint-disable */
 <template>
-  <el-form
-    ref="taskAllocationRuleDataForm"
-    v-loading="loading"
-    :model="form"
-    size="small"
-    :rules="rules"
-    label-width="130px"
-  >
+  <el-form ref="taskAllocationRuleDataForm" v-loading="loading" :model="form" size="small" :rules="rules"
+    label-width="130px">
     <div class="base-dialog-body">
       <!-- 阅片人 -->
       <el-form-item :label="$t('trials:reviewAssign:allocationRules:table:reader')" prop="DoctorUserId">
         <el-select v-model="form.DoctorUserId" :disabled="!!form.Id" clearable>
-          <el-option v-for="item of doctorUserList" :key="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" :value="item.DoctorUserId" />
+          <el-option v-for="item of doctorUserList" :key="item.DoctorUser.UserId"
+            :label="`${item.DoctorUser.UserName}(${item.DoctorUser.FullName})`" :value="item.DoctorUser.UserId" />
         </el-select>
       </el-form-item>
       <!-- 计划受试者数量 -->
@@ -22,30 +17,21 @@
         </div>
       </el-form-item>
       <!-- 状态 -->
-      <el-form-item :label="$t('trials:reviewAssign:allocationRules:table:status')" >
+      <el-form-item :label="$t('trials:reviewAssign:allocationRules:table:status')">
         <el-radio-group v-model="form.IsEnable">
-          <el-radio v-for="item of $d.IsEnable" :key="'form.IsEnable' + item.value" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.IsEnable" :key="'form.IsEnable' + item.value" :label="item.value">{{ item.label
+          }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 备注 -->
       <el-form-item :label="$t('trials:reviewAssign:allocationRules:table:remark')">
-        <el-input
-          v-model="form.Note"
-          type="textarea"
-          maxlength="100"
-          show-word-limit
-        />
+        <el-input v-model="form.Note" type="textarea" maxlength="100" show-word-limit />
       </el-form-item>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item>
         <!-- 取消 -->
-        <el-button
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="close"
-        >
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="close">
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
@@ -128,5 +114,4 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 3926ec12..d15b652f 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -317,7 +317,7 @@
             <el-dialog v-if="taskAllocationRuleVisible" :title="title" :visible.sync="taskAllocationRuleVisible"
               width="600px" :close-on-click-modal="false">
               <AddOrEditTaskAllocationRule :data="rowData" :TaskAllocationRuleList="TaskAllocationRuleList"
-                :doctor-user-list="DoctorUserList" @close="() => { taskAllocationRuleVisible = false }"
+                :doctor-user-list="TaskAllocationRuleList" @close="() => { taskAllocationRuleVisible = false }"
                 @getList="openAllocationConfigVisible" />
             </el-dialog>
             <!--分配阅片人  -->

From 147b5cadfa1755639b92557a8db682a35ce66653 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 30 Jan 2026 14:30:10 +0800
Subject: [PATCH 292/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=AE=BF=E8=A7=86ecrf=E8=A1=A8=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms3D/components/customize/QuestionFormItem.vue |  2 +-
 .../reading/visit-review/components/ReadPage.vue       | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 8b6b0740..b8232fa4 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -189,7 +189,7 @@
               @blur="questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked ? () => { } : handleMarkedQsBlur(questionForm[question.Id], questionForm, question.Id, question)"
               v-model="questionForm[question.Id]"
               :title="questionsMarkStatus[question.Id] ? questionsMarkStatus[question.Id].OrderMarkName : question.Remark"
-              :disabled="(questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked && question.ImageMarkEnum === 2) || question.ImageMarkEnum === 1"
+              :disabled="(questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked && question.ImageMarkEnum === 2) || question.ImageMarkEnum === 1 || readingTaskState === 2"
               style="width: 150px;margin-right: 5px;">
               <template v-if="question.Unit !== 0" slot="append">
                 {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index 7dcbf78f..a66173a0 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -57,8 +57,8 @@
       /> -->
       <div v-for="s in visitTaskList" v-show="lastViewportTaskId === s.VisitTaskId" :key="s.VisitTaskId"
         style="height: 100%;">
-        <customize-question-list v-if="lastViewportTaskId" :ref="`ecrf_${s.VisitTaskId}`" :isNoneDicom="true"
-          :reading-task-state="readingTaskState" :visit-info="currentVisitInfo" @resetAnnotations="resetAnnotations"
+        <customize-question-list v-if="lastViewportTaskId && lastViewportTaskIds.includes(s.VisitTaskId)" :ref="`ecrf_${s.VisitTaskId}`" :isNoneDicom="true"
+          :reading-task-state="currentVisitInfo.VisitTaskId === taskInfo.VisitTaskId ? readingTaskState : 2" :visit-info="currentVisitInfo" @resetAnnotations="resetAnnotations"
           @setReadingTaskState="setReadingTaskState" @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
           @getCustomScreenshots="getCustomScreenshots" @setReadingToolActive="setReadingToolActive"
           @setReadingToolPassive="setReadingToolPassive" @setSaved="setSaved"
@@ -138,7 +138,8 @@ export default {
       ecrf: {
         IsHaveBindingQuestion: false
       },
-      currentMarkedFiles: {}
+      currentMarkedFiles: {},
+      lastViewportTaskIds: []
     }
   },
   computed: {
@@ -153,6 +154,9 @@ export default {
         if (idx === -1) return
         this.currentVisitInfo = this.visitTaskList[idx]
         // this.activeTaskVisitId = id
+        if (!this.lastViewportTaskIds.includes(id)) {
+          this.lastViewportTaskIds.push(id)
+        }
       }
     }
   },

From 45cc7149423084b46ad99f398281a0475ecac1c8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 30 Jan 2026 15:22:55 +0800
Subject: [PATCH 293/333] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue      |  2 +-
 .../reading/visit-review/components/StudyList.vue | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

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 bbd214b6..9c0f7591 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -1042,7 +1042,7 @@ export default {
           seriesArr.push(seriesList[0], seriesList[0])
           activeStudyIndex = seriesList[0].StudyIndex
           activeSeriesIndex = seriesList[0].SeriesIndex
-        } else if (seriesArr.length > 1) {
+        } else if (seriesList.length > 1) {
           seriesArr.push(seriesList[0], seriesList[1])
           activeStudyIndex = seriesList[1].StudyIndex
           activeSeriesIndex = seriesList[1].SeriesIndex
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
index 8d1df5a9..c782c4e4 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
@@ -41,13 +41,18 @@
                     fit="contain" crossorigin="anonymous" />
                   <el-image v-else-if="k.FileType === 'application/pdf'" style="width: 100%;height: 100%;" :src="pdf"
                     fit="contain" crossorigin="anonymous" />
+                  <el-image v-else-if="
+                    !!~item.FileType.indexOf('mp4')
+                  " style="width: 100%; height: 100%" :src="mp4" fit="contain" crossorigin="anonymous" />
                 </div>
                 <div class="file-text" :title="k.FileName">
                   {{ k.FileName }}
                 </div>
                 <div>
-                  <i v-if="visitTaskInfo.ReadingTaskState < 2 && (currentMarkedFiles[k.Id] && currentMarkedFiles[k.Id].count > 0)" class="el-icon-star-on" style="font-size: 12px;color: #ff5722;" />
-                  <i v-else-if="visitTaskInfo.ReadingTaskState >= 2 && k.IsBeMark" class="el-icon-star-on" style="font-size: 12px;color: #ff5722;" />
+                  <i v-if="visitTaskInfo.ReadingTaskState < 2 && (currentMarkedFiles[k.Id] && currentMarkedFiles[k.Id].count > 0)"
+                    class="el-icon-star-on" style="font-size: 12px;color: #ff5722;" />
+                  <i v-else-if="visitTaskInfo.ReadingTaskState >= 2 && k.IsBeMark" class="el-icon-star-on"
+                    style="font-size: 12px;color: #ff5722;" />
                 </div>
               </div>
             </div>
@@ -59,6 +64,7 @@
 </template>
 <script>
 import pdf from '@/assets/pdf.png'
+import mp4 from '@/assets/mp4.png'
 export default {
   name: 'StudyList',
   props: {
@@ -78,6 +84,7 @@ export default {
       taskInfo: null,
       studyList: [],
       pdf,
+      mp4,
       BodyPart: {},
       currentMarkedFiles: {}
     }
@@ -181,11 +188,11 @@ export default {
         } else {
           this.currentMarkedFiles[fileId].count++
         }
-        
+
       }
     },
     initCurrentMaredFiles() {
-      this.visitTaskInfo.Annotations.map(i=>{
+      this.visitTaskInfo.Annotations.map(i => {
         if (!Object.hasOwn(this.currentMarkedFiles, i.NoneDicomFileId)) {
           this.$set(this.currentMarkedFiles, i.NoneDicomFileId, { count: 1 })
         } else {

From 4ed0feb1dad9d32c24f4936efcf57cc605754ed7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 30 Jan 2026 16:02:43 +0800
Subject: [PATCH 294/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/visit-review/components/FileViewer.vue     | 10 +++++-----
 .../reading/visit-review/components/StudyList.vue      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 931ddabc..16722aa3 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -248,7 +248,7 @@
         <!-- 手册 -->
         <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute;right: 20px;font-size: 20px;">
-          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+          <svg-icon :icon-class="manualsDialog.isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
             style="margin-right:10px;cursor: pointer;"
             @click="manualsDialog.isFullscreen = !manualsDialog.isFullscreen" />
           <svg-icon icon-class="close" style="cursor: pointer;" @click="manualsDialog.visible = false" />
@@ -266,7 +266,7 @@
   </div>
 </template>
 <script>
-import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo } from '@/api/trials'
+import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo, setReadKeyFile } from '@/api/trials'
 import html2canvas from 'html2canvas'
 import {
   RenderingEngine,
@@ -1057,7 +1057,7 @@ export default {
           // 临时标记
           return
         }
-        this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
+        this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
         if (annotation.visitTaskId === this.taskInfo.VisitTaskId) {
           this.$emit('getEcrf', { type: "verifyAnnotationIsBound", VisitTaskId: annotation.visitTaskId, annotation })
           this.$nextTick(async () => {
@@ -1120,7 +1120,7 @@ export default {
           })
 
         }
-        
+
       } catch (e) {
         cornerstoneTools.annotation.state.addAnnotation(annotation)
         const renderingEngine = getRenderingEngine(renderingEngineId)
@@ -1261,7 +1261,7 @@ export default {
           // }  
         }
       })
-      this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
+      this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
     },
     annotationSelectionChangeListener(e) {
       console.log('selection')
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
index c782c4e4..bba2d2cf 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
@@ -42,7 +42,7 @@
                   <el-image v-else-if="k.FileType === 'application/pdf'" style="width: 100%;height: 100%;" :src="pdf"
                     fit="contain" crossorigin="anonymous" />
                   <el-image v-else-if="
-                    !!~item.FileType.indexOf('mp4')
+                    !!~k.FileType.indexOf('mp4')
                   " style="width: 100%; height: 100%" :src="mp4" fit="contain" crossorigin="anonymous" />
                 </div>
                 <div class="file-text" :title="k.FileName">

From 6f0f7a7d3ab1f0b5a76099b3a616336950583bec Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 30 Jan 2026 16:10:42 +0800
Subject: [PATCH 295/333] =?UTF-8?q?mp4=E7=BC=A9=E7=95=A5=E5=9B=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/mp4.png | Bin 7112 -> 8164 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assets/mp4.png b/src/assets/mp4.png
index 40709a5da020899c3b808cc0ef0da233ae6f2ee8..2de94d5ee6b289f144c315e191a705ceb0492e78 100644
GIT binary patch
delta 5477
zcmV-r6`JbEH{?H%83+ad0021ks9LchoC<#x5lKWrRCwC#oq3cURh`E_zk6@h>(^VL
z$<|4;B<TP)vWY=(NdN&^jHrxy1|1JGgEKfdI5UVaqay35M{pF+(OJ~vcwEj54uJuJ
zNWkF;0wG5UAuO^corJ7(r#pFT)xGma)vLGkd)=?ouj4{)&ONVRRlQrczV*Am-}is_
zy|*gzmba|t*T2rvL=iv%VT1h&u)x`w%#xq;1}y1xIs&3eKmpu1fD!`=uz@#tG1JiI
z^8i|Flv2^HsCQy7I(1MC8ts#y7`TQV_a^RoPz=UxtJFrJP>8I?Ijpt6m!M*d#`jbH
zCqMbc!WCD1bYGisE$mXmwiYc~jPHN@W40Fx1;Q}gr;`ah)N)WCei--2qmPi!=VDhp
z?by_D|8=%X?S6+b9=_+{5K_KRU*BQ>IKQv&%S%pL0zfv~w0lf^>a>9RFJFJcWpi2P
z&Yg==8t2^jmmXiORO}I{cd*olt@2>&aDc-l=XK6TTO1YJqR(6|$H>S?vMqlI0*p4_
zU$9`o-z@I$&z^YVThZDy1#St{X&L^-ut--|7t7CIj_;=$f?CEzAp#<j)M&emsS)6n
zHTr!e)Ye+UFo>%qv;j5@32juZ4GF`LFtikl0UI{F%Iejt5v5QLLT4|2@#Pl>HV$sM
zV5R!p>({*HfmAx3-jmH{$6S9%u~-}%{ig#|i7(FC=<YjPzglbK8pc3`Nv-`}u0aJT
zF=(O1+OlPeD74mStuaPpv_Y%5Y8`(@f48-zm^W`8#u#RFcXP<BnG}MMOs;Tpz7RYv
z_bxr^>~r2dx?#fxmrkcWrJ?|Aj3J#))7{;T@B4V3SH&$`3#e3jK$m}f*87(n=PCg%
z*V6X-`@@<~8v`8ToJB-ojEB}9#u$ueqEF>vbX-jYyzl!crAVbx9P_3Dj_mIzooZuf
zc=WJbA^)poOP8K=#1TjE*iY}0RLUonN>zcVwH`y*TUwl(>hE0@h^66N+Fl8Cxt4B1
zWsQ7jWUVo<#=|RtYs!DyeLsco`{eU^I@;Sg{IJ70W?+E%^Lxqc&33*%JaYF9|9suW
zr+(;tg|B?=#tE-sT897BZ_IcAx-r088{%A4tql|FEgcuR10T=xF~*O;)P7Wzhwnv}
z8U#U12Msf3bko0ZA&dL_5z%_vj$QwL!;ROTb@dfrNPPbO1XX{v8r)h}FkUVHuG(rv
zh<%}l=S4oyGqKfr9!jY)@fXPDGH5N#nLV2$7x&ZI-sx@IzT?j8ZoKwnfWN!)vi%Bb
zdOEDOo{w#0xn)qRtv3Q!VwYg>JQIPdO&nY$i3`Rvk)L)UU0t0Ve%PUOA9Qef=gy&3
zH{5jX3E#N+TMU0b{&8K86i)}JozvwK>H%6C*s8a?m=%;Qwsf3Qy6g&!hr^AbbLsXr
zeBZ;`khZkXoZdOKceZ!EJ~X`grkk$)@?F1Kk_OJK3|i9#>W=;8Z^!esW4Ddn4w6tS
zXB|o@L?k&5prbuaS62r{Ytrd9X3w65@!P!7O!lgsyLNw$+;#UIKd<HC(*dg8AAzi%
zb=I@u@~5pE%u0+UbPiFGmHJ+a8QnAJ>g=YovzwVSXEATyJbDhAL3ei-haA#F=o}Vg
z-P7y%)TjPhe9xa=L1llkgnc{4#r70|A0-<hzV9czRclQU1O!2dwE@N$x;i?e?_o$7
z1Z4JR(0+f&JKwc*YY+y#+GxA4psMk#QEPAr4v8}XX|bp>mKVF|Y{^-Yvx;D2P*n`2
zlyn706{ulo866$r@zsyxtcwASQr!sHvP)1(k@7rjDuocTY15|JJ9cc>eSL@SGpOCb
zaJ?O#CtQEiyo*s9M4`PD+Vc==_lMnrs0uwmqKJQ9p%0XU5GWM|ZfgUIK^}z=6a!w{
z@>-H5X&tcx-%nwTMg+pplFeqxX7?f@810eE=NR0)k-ok|qxPM1=fC>nEAP&4em)YF
zry|M;6oZh#jT_NQF@Js^N=sErI-QtS=~q(LAgXd_aq+R5nP+~28ONSYkk2tZJY1!S
zdB%Uk^P+S#3Sf@Vh6KeTnM{V)w!X&Nr`ED*^Cp~i9CzFa{sqh5Uj#6_o_qM7?RVac
z3cyWeq)KUc!Q7Z(?A`igs}!2%BvmQzmIjB4i=3CugZL@Bk3R=dn%T2wN7jra0jm}a
z8-|3&Bb92Sr{@qBE?mU@tA5V<_3PPPaZ`VcxDaKaqbJS0lNO_t9}lIeT%}a)lgZwx
zdRl73E=h%KQ%BXQBlwKG`Wl<pZbFHQ6f<Wj7H#Y=E9FI9Eki1W76U{oS$kVMCoegf
z7hZUQp`oG5=r1@6URMV*=FP_Dau5_JFj-r1=T%cmy{pT%>fM}L8<UFNjm^}FL{@(|
zfrO?yyKuQ8ZtbQ>%ytfEZE_==6Ut-GC4g4SipHqeCp(PsQA!hrK{cg{l=3LL<u|-Y
zxNSS4W&Ej(lJ&TKa(oS~I<h?15>HWeRtNYV?I)a!bvEk0bBPXHN@1<Fv31&HTV;?-
zC{Uaz7;VN}m#Nk4#91V?(@26Q0@{DI{M-_s#+Ar^a@LY;=*D=A5};*^6`YeA79pq_
zEwurqlIf<Fzr!NnDsS3YbxSE#0cbst!8sMvviiw|p@Jw=;Z5pud`SX=)U}5ay{;U<
zQo5EnCob)E6WXtg8^;?&At&Wzz&V^$Ux%ym(~<-#=cpO}Q~_Q7ZV|EN6vKZ-ZC6fn
zn|jb#0T)`RS?8d%1EY|-36)ENg)LOh0K{6RFIW+zXt80Feo+AJKsSl01B-<MSQk-5
zZS1%TN2R4U49itOmv49FZ!5iksq5K_z`(mvi{FEU`KV!?B7FHl)H6RrOyi5fIe5n<
z=$=Jj1FSMIvKjl>x1ktf7cYN99d#ZO78+cng&;t3L)cxf5^h_I+BJyMjpZLH*`jq=
zFNHe&Q%KiLl(pD3-$m_sIr(ipyLT1LqSgh}T5aWbYi*JSSFXD-^@flO!StU_+p;UG
zb`_31jlypqKwNRm_!k5hI>H%!bS(cG%Iiw@g}YuL_t?KdF+?A68tH#!pKaO;hM67Y
zp7=iY{_By#9>k~^1y>c?1cxhvT6!5B=ii*{+w;mpu(brLtID|QS#3QRP!G_`8HVOX
z>R_xTd9#m)xdXVcz7KRoP)D6z1t@?kWGYZ9Oe(bK_F1$qyApHJ4+y;uBy>^cSDOG7
zAY8PB^jX&>9@|A}(D;A6RV$P#*K#mwtkYHr<JL`WIz_aP9C>bowSNw)K_7kI<Oo%e
z#pZ{x`B7|sB>F7utw|dkseun5r(B9H#?G>G@LNmR)=p~qtth{<DOx5#u~1-WXqe&Q
z>YC5z%fq`yx2>n)HbJQxXHgD?H*h}rhrWs;jMLA!(GZxq5O06svIgv+e#zc{J;9nE
zAt^5kGy<YDuA>)!**}mPxFBh(?UcVDv*x>ax#0?PaD)Nq^S*$8*eOk<#c}*skjd<2
zWaCC$F<;L4tfjZNm$tUHF?6f`@E;FU=bB<JYTk*+tfP^w>#J``5%j?MsP>tYqquvv
zqIV7=sVLB?Qs93HUZAl38NADnMIXE{>g>#;(6f((S61UxeB<)q-h3|UrJtEpGEkzC
zN-3ODRX(~Nc(vb4!K@yrs#(#*AvkBzUI+5#3vgjs$`HV6P)D7UFxm1lv5B0f0S%%B
zXQJEej6$^uYWGgU%}-YPA87B1IAuIKf`jLhe*djVOi6!SJf@oAZ1q;YL@QieQ<IO@
z+PYV$CK@KLg3^~d;}5(S>uaoww%Y(~@0;+Bct-`y(i~;4djU40M;fGSZdH$LVKh<h
ztp#uS&6uA4$OC0}k$vtyaBf@|<RbP(%J=E%>EYmm4^C=NPfs%RC!E=hXKN?nQzglN
zY)~M-dozFjAqyhontK9n&N0ZAr=k`DFayg`sTtA5<wwAQZtH3yP~~y?$hs=KXSJZ-
zektbACFNsBw;(%S1O+Y+?(Kh0>V%Ib0A~O1E0EiZ9Q~e#d6=uXm+AI)=JoXv=Cjol
zt%-yn;ndEJ8QG@lyVSE(0VU+u{S^PyOCi;bcxivko8N~Wd<vx<p|5FMd`{9t{>29{
zJ&Q2C$4zLh=A@4k_8yNI6N960UI+fne!K-s0U^Yp5OVA9grRLw!0$bh^m$)Ox?J4+
z1onZi<DdSwO((Y1Yqln@jFr^AeTx2~eAM6*1pQ0#`l1Ny9le~~gI|JTi0T`_9R9YL
z1UP@f-~2cJ8J}sYo2mY@p#QA8dB3Zm_QCK5!iR3b2!tku|G{sfJLW_emLDO%;xcru
z2+D6-F{lkx&01(PGo#Iw%ua&mf0kH=?mZ6X9t$~;#b=?s_UJ-}U&ReR0;a8@zB%@8
zQzfxf&x#7+&KJo3=ua`*U&4l<PP+oX|LlM07+YlTJ)cEA^F%~o;<P$xznI14<J7xG
zd&y+73=R&mY11YK2M5`^ckhIY&zdPs^Hfoa;HldQPyZ*B@)6U9IqE$WUU`zXf%lbD
z+2`*=h6hnvH)SoZn85|Ph&aYMxP&>v!XE7Q=Lw#@7q{+z&?DOr1@ym*wll6S5Bq=N
zEs))foO&V3hRFOAt9XZAd^U8>!)12B;3G+5AOeL#p3Kk?u9(N#koNX=Iy*b3Y^}|M
zYTA%3>#*COMbAAxT8^+_DJ-}T@9?)#62t6scgJ(=&E4_r{nuij_z{wdyW%Vo7IDQK
zWOt*AARdS(gn5Uz<YKg64uIaleVBib{-nljIK(-uK>ExtMp^eOzaaOWGsp1J%HiJ%
zD=mZC4DS~~G7vnw5>o<o{z>RFK95puSRmN-687bXQJ&vC5#PHLwQCD1Rn9(3&rCQC
z=o))hx@K-lGiFxFSwNvGBf7P9)Tt6RvQ>*ES~&bm-BOJ~)et;;7o2t_A_jlcIR|s>
zg^6>{J$pBL_ipG;H=U@8QaA(7NEJ68%R*w?4+}UK5~(^;Lz8UeMk=*QTZnoW7Ro|Z
ziBh$t>Fn*r7IHXeX>V_D39!xQ{w_*rWXoED?ayN792={cDk1Fl`IWJ2oP=6Gnc@rK
zs+-vJ=y#AhQkg9jFsEKZ`kjB5C)-9>Tn?|UMg^nM{73vGi*t}_Yh%`|SqV>VRrH_S
zvL6LxG8ER`9)l{0&=PEa4!hw|j44g?PQwh7I2hW1-qqmo*F4C;#>&ZMWaoPHhTlL6
zT$`7yq-h0DojRpThAY@-?!wt()!b+C=@qEa(Ri9@GCI{Hiw3-Ls`7uTX_-z%+jX4&
z);t+A9Yr-v<g{O<=%7rZX~@>63AaCkAgIy<Vb9-(=qT6-AbxxK_wnDA?UuiLt-Bgm
z-M-WbY&6B5Ctoby_`_cmgs-h7`}7@=oG;*ZZ;ITJ0x9MxJajYRF&~T)wUI&Cyar|B
zaA!mE>uyK7=SK~`{z`vz#TvqGYso&n0<i%ogWdT;)Mg6?plArUt|RyK3Y-h0DVC8f
z6{ZsfVktj9*Fx(ojyIbshzEA<Z3Mr*EjhI@<)f8R*fl?-_{0yR?+%nFWl9tlu(y9Y
z;jSW)!e>(op1y-%?H$R=7BLYIZN=q@2X6feichUb$c)x;zxRK`!oxDCQa^1}N<e{%
zWwgrJW5ppJ=mr7FNd&U0bt<JfbTxL~zf}t^wSs7QSIPG4tzU4{3~Jl>daA91n<TWO
z!PC*>J~i#eIa_PoYV}{XR!ObU8Kx(gDzZ?aKOZQq&8Q^FT%6m#K4`xbS2@=t(`rQJ
z++PH74!^e#*E4^s!NOVB!eP5Fzmy5uk_mn-XfK73EB~Tq6-p^7m?Ee)dO%=rj{Kgz
zD4m9m^f;ZD{byRO<d^Y!%3>j)uzMt0`fnY@Vv(>|tU6z5Va2|K>J%=7?2Zi2t$b`!
zIhHXIv9@7Yv-UZ9A|!sOE=p#dtGj)l4Y|%D?1{7Eh!KC-yu$!{Mur%D=|yZYpUgE`
zYneH7CbMVHp46LvDxdi`Jp)S_x!^Oj^68Xazg>d}%;-J{ReHd}ISR#Mv?$?s?O!{=
zIZb%@DcGP0K`}|UE8jCPC7(LyqOS_0L%1NUBTmmG-G$+b+e5x~A=%L(*T`(Na%}wG
zH`~_?oVtHEmGb$}g&!g1r@%RaFyN(^UnVFPr*!jL;#get%#|}KY*0v2?WvT?*DaZB
zHX8*cza8<%Hl9w!Wbc*_`tBB&rx;YqJf*N2Nh{j0^Q=G1gez~us#G*j<@wRVS}~YZ
z2TlhqQ`o2Kv&Gr6_8Rvo48t+6@7Txa?;5|S<MV$HDsDUjppg6D%N1vR#Ww1s6Jh<)
z3q)@Da@1iPLaeN7fx`~%`-5O#rR9{<r>DvhW!8GiRc@ll@*jO?sy}HM*#0n{FP<u;
z8sE9Kx5Et!9Y8jdfv%p$$KKG1i166pkKK5k{X?kJpr<B)O8Sd8Xn<^m&uM7#*It6>
zd2D~*?ksQc(hyX0{WWmd9=ny#3QfF{EeO9s6WIUJ7H##!J~g=PGPi5vTE*yGH@T(3
zZ%jiKSEf#l;YxQg<EVE|8X+6FHzcTmF24s*aiHu!pE_yt_dYyj&Eo*5Re&nsze+Q}
z2S9BNpzzd<e~&xhOj-k~vyO12zzf%;c>RC%*Wa*|s->X*_NoWGPh`H%st^AX-<Si4
z(t?+Lo%G~?7Q^@6rdW%+^?SJO+dmDQbO6+SE$PS8eB>7=NU-H}r`CSXp&Tn$UXJk}
zIRNS;B^>N%k&b_zA@^_oq5IGe4sso)3%Hf8b7ye%)yHu2EfJ`t_d?4bsiTelg9v{e
z!(yiZst6r(W(aL?=Jgk`>Y5(|Fzc-!17O**ck})aT*RI|d${*!E2DRexIa#wB}ypd
z^ArjN=FaIYZ_i{h`*@c;tP93Gnr)2XSC2m89)0u?@`Ze~0z0vC#!V0=gT2(YQ#1KD
zsj<=A40ppHc64;|SC@P;)z#Him=b@ejSX4wJdcn4<;VER_kRLxEANco$#BmZuW-*V
zZ|B=PcgiP>agBz|HP>9nqD6~XwQ5z>_P4+N9dhour#paq?|o42KJytl@>|AM;Un=2
z9Gg_|opTfl1w79i<F2f=Ty@nI+<E6p04}}s(q!M47WJtm58dWHvtmu&k6%$v+j3AV
zEw+&_EzJM~K``#`CloP)V7%i>OKV#yo7L-c=|SP-zxi<PKwkNKE2tbO2S7al>H$y>
b6#jnzP!blmO2=h&00000NkvXXu0mjf!ye62

delta 4417
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
Hu0mjf;DDBx


From 536fc7bbc83428cfea5a65ad33301b37b13ed32d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 30 Jan 2026 18:02:52 +0800
Subject: [PATCH 296/333] 1

---
 .../reading/visit-review/components/FileViewer.vue             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 931ddabc..9eec9d07 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1057,7 +1057,7 @@ export default {
           // 临时标记
           return
         }
-        this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
+        
         if (annotation.visitTaskId === this.taskInfo.VisitTaskId) {
           this.$emit('getEcrf', { type: "verifyAnnotationIsBound", VisitTaskId: annotation.visitTaskId, annotation })
           this.$nextTick(async () => {
@@ -1102,6 +1102,7 @@ export default {
                   viewport.render()
                 }
               }
+              this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
               // else {
               //   console.log(1234567)
               //   const errorMsg = { message: 'annotation Not allowed to operate' }

From 0d2bfa8d827ec81eb3fdec60007e9d92a2407226 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 30 Jan 2026 18:08:55 +0800
Subject: [PATCH 297/333] 1

---
 .../reading/visit-review/components/FileViewer.vue             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 931ddabc..49e7cf4d 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1057,7 +1057,7 @@ export default {
           // 临时标记
           return
         }
-        this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
+        // this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
         if (annotation.visitTaskId === this.taskInfo.VisitTaskId) {
           this.$emit('getEcrf', { type: "verifyAnnotationIsBound", VisitTaskId: annotation.visitTaskId, annotation })
           this.$nextTick(async () => {
@@ -1107,6 +1107,7 @@ export default {
               //   const errorMsg = { message: 'annotation Not allowed to operate' }
               //   throw errorMsg
               // }
+              this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
             } catch (err) {
               cornerstoneTools.annotation.state.addAnnotation(annotation)
               const renderingEngine = getRenderingEngine(renderingEngineId)

From 91d8d1797a9a20d55dd542256cd6fbea2bc55b23 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 2 Feb 2026 10:19:39 +0800
Subject: [PATCH 298/333] =?UTF-8?q?=E9=9D=9Ediocm=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/reading/none-dicoms/index.vue | 1 +
 .../reading/visit-review/components/FileViewer.vue          | 6 ++++++
 .../reading/visit-review/components/ReadPage.vue            | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/none-dicoms/index.vue b/src/views/trials/trials-panel/reading/none-dicoms/index.vue
index eb390827..fa8df0ee 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/index.vue
@@ -95,6 +95,7 @@ export default {
         localStorage.setItem('taskInfo', JSON.stringify(res.Result))
         sessionStorage.setItem('taskInfo', JSON.stringify(res.Result))
         localStorage.setItem('digitPlaces', JSON.stringify(res.Result.DigitPlaces))
+        localStorage.setItem('subjectCode', res.Result.SubjectCode)
         this.loading = false
         this.$nextTick(() => {
           if (this.taskInfo.IsExistsClinicalData && this.taskInfo.IsNeedReadClinicalData && !this.taskInfo.IsReadClinicalData) {
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 16722aa3..1c5134d0 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -219,6 +219,11 @@
     <el-dialog :title="$t('trials:noneDicom:message:msg2')" :visible.sync="dialogVisible" :close-on-click-modal="false"
       :close-on-press-escape="false" :show-close="false" width="400px">
       <el-form ref="lengthForm" :model="form" :rules="rules">
+        <el-form-item label="" prop="length" v-show="false">
+          <el-input v-model="form.length" type="number">
+            <template slot="append">mm</template>
+          </el-input>
+        </el-form-item>
         <el-form-item label="" prop="length">
           <el-input v-model="form.length" type="number">
             <template slot="append">mm</template>
@@ -773,6 +778,7 @@ export default {
       if (this.activeCanvasIndex === this.cells.length - 1) {
         store.dispatch('noneDicomReview/setLastViewportTaskId', obj.visitTaskInfo.VisitTaskId)
       }
+      this.setToolsPassive()
     },
     // 激活视图
     activeCanvas(index) {
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index 453387c3..7dcbf78f 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -13,7 +13,7 @@
         <div v-for="s in visitTaskList" v-show="activeTaskVisitId === s.VisitTaskId" :key="s.VisitTaskId"
           style="height:100%;">
           <study-list v-if="selectArr.includes(s.VisitTaskId) && s.StudyList.length > 0" :ref="s.VisitTaskId"
-            :visit-task-info="s" @selectFile="selectFile" :currentMarkedFiles="currentMarkedFiles"/>
+            :visit-task-info="s" @selectFile="selectFile" :currentMarkedFiles="currentMarkedFiles" />
 
         </div>
       </div>
@@ -37,7 +37,7 @@
       /> -->
       <file-viewer ref="fileViewer" :related-study-info="relatedStudyInfo" :ps-arr="psArr" :ecrf="ecrf"
         @toggleTaskByViewer="toggleTaskByViewer" @toggleTask="toggleTask" @toggleImage="toggleImage"
-        @previewCD="previewCD" @setPS="setPS" @getEcrf="getEcrf" @getMarkedFileIds="getMarkedFileIds"/>
+        @previewCD="previewCD" @setPS="setPS" @getEcrf="getEcrf" @getMarkedFileIds="getMarkedFileIds" />
     </div>
     <!-- 表单 -->
     <div class="right-panel">
@@ -368,6 +368,7 @@ export default {
     // 切换任务
     toggleTask(taskInfo) {
       this.setActiveTaskVisitId(taskInfo.VisitTaskId)
+      this.$refs.fileViewer.setToolsPassive()
     },
     // 视图触发任务切换
     async toggleTaskByViewer(visitTaskNum) {

From 9b9c83797a81f92f073babf437dcc543bc80a63d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 2 Feb 2026 10:26:30 +0800
Subject: [PATCH 299/333] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/visit-review/components/FileViewer.vue     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index e41bdceb..7f82910f 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -253,7 +253,7 @@
         <!-- 手册 -->
         <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute;right: 20px;font-size: 20px;">
-          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+          <svg-icon :icon-class="manualsDialog.isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
             style="margin-right:10px;cursor: pointer;"
             @click="manualsDialog.isFullscreen = !manualsDialog.isFullscreen" />
           <svg-icon icon-class="close" style="cursor: pointer;" @click="manualsDialog.visible = false" />
@@ -271,7 +271,7 @@
   </div>
 </template>
 <script>
-import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo } from '@/api/trials'
+import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo, setReadKeyFile } from '@/api/trials'
 import html2canvas from 'html2canvas'
 import {
   RenderingEngine,
@@ -1113,7 +1113,7 @@ export default {
               //   const errorMsg = { message: 'annotation Not allowed to operate' }
               //   throw errorMsg
               // }
-              this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
+              this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
             } catch (err) {
               cornerstoneTools.annotation.state.addAnnotation(annotation)
               const renderingEngine = getRenderingEngine(renderingEngineId)
@@ -1127,7 +1127,7 @@ export default {
           })
 
         }
-        
+
       } catch (e) {
         cornerstoneTools.annotation.state.addAnnotation(annotation)
         const renderingEngine = getRenderingEngine(renderingEngineId)
@@ -1268,7 +1268,7 @@ export default {
           // }  
         }
       })
-      this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
+      this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
     },
     annotationSelectionChangeListener(e) {
       console.log('selection')

From 5a8e1e5af79af9841c078ff1faf88511ffd40dcd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 2 Feb 2026 11:04:44 +0800
Subject: [PATCH 300/333] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9A=E4=BD=8D=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E5=99=A8=E7=9A=84=E5=88=86=E5=88=AB?=
 =?UTF-8?q?=E7=8E=87=E5=8F=AF=E4=BB=A5=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/timeTag/index.vue | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/timeTag/index.vue b/src/components/timeTag/index.vue
index 6bece77b..6c2bf40d 100644
--- a/src/components/timeTag/index.vue
+++ b/src/components/timeTag/index.vue
@@ -9,13 +9,28 @@ export default {
         return {
             time: '',
             timer: null,
-            suggestionTextColor: '#909399'
+            suggestionTextColor: '#909399',
+            resizeObserver: null
         }
     },
     created() {
         this.getTime()
     },
     async mounted() {
+        this.resizeObserver = new ResizeObserver(entries => {
+            entries.forEach(entry => {
+                // 获取元素的新尺寸
+                // const { width, height } = entry.contentRect;
+                // console.log(`元素宽度：${width}px, 高度：${height}px`);
+                // 在此可以将宽高值保存到 data 中
+                // this.elementWidth = width;
+                // this.elementHeight = height;
+                this.dragDoc()
+            });
+        });
+        const body = document.getElementsByTagName('body')[0]
+        // 开始监听指定元素
+        this.resizeObserver.observe(body);
         this.dragDoc()
         this.setColor()
     },
@@ -102,6 +117,9 @@ export default {
             clearInterval(this.timer)
             this.timer = null
         }
+        if (this.resizeObserver) {
+            this.resizeObserver.disconnect();
+        }
     }
 }
 </script>

From 46b532b85873f35f74c2bdf3397f190e6f32f890 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 2 Feb 2026 14:06:04 +0800
Subject: [PATCH 301/333] =?UTF-8?q?=E9=9D=9Edicom=E9=95=BF=E7=9F=AD?=
 =?UTF-8?q?=E5=BE=84=E5=B7=A5=E5=85=B7=E4=B8=8E=E9=97=AE=E9=A2=98=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E7=BB=91=E5=AE=9A=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/customize/QuestionFormItem.vue  | 2 +-
 .../reading/dicoms3D/components/customize/QuestionList.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 830f44b1..8b6b0740 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -1369,7 +1369,7 @@ export default {
         } else if (prop === 'length' || prop === 'perimeter') {
           value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
         } else {
-          value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
+          value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
         }
       } else if (this.isNoneDicom && value !== null) {
         value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 0f12415a..4ea41cab 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -1061,7 +1061,7 @@ export default {
         } else if (prop === 'length' || prop === 'perimeter') {
           value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
         } else {
-          value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
+          value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
         }
       } else if (this.isNoneDicom && value !== null) {
         value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)

From e35f6c5471e579c4c9e7faebb5228f732cb8568e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 2 Feb 2026 15:02:41 +0800
Subject: [PATCH 302/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=AF=94=E4=BE=8B=E5=B0=BA=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/visit-review/components/FileViewer.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 7f82910f..5240577f 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1417,7 +1417,12 @@ export default {
             this.saveCustomAnnotation(annotation)
           } else {
             await this.$confirm(
-              this.$t('trials:trials-list:table:allQuestionChange')
+              this.$t('trials:trials-list:table:allQuestionChange'), '', {
+              showClose: false,
+              showCancelButton: false,
+              closeOnClickModal: false,
+              closeOnPressEscape: false
+            }
             ).then(() => {
               this.saveCustomAnnotation(annotation, 1)
             })
@@ -1866,7 +1871,12 @@ export default {
               this.saveCustomAnnotation(annotation)
             } else {
               this.$confirm(
-                this.$t('trials:trials-list:table:allQuestionChange')
+                this.$t('trials:trials-list:table:allQuestionChange'), '', {
+                showClose: false,
+                showCancelButton: false,
+                closeOnClickModal: false,
+                closeOnPressEscape: false
+              }
               ).then(() => {
                 this.saveCustomAnnotation(annotation, 1)
               })

From 3137bca8f638d0fee41ea774a8065185f45316f6 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 2 Feb 2026 15:08:00 +0800
Subject: [PATCH 303/333] =?UTF-8?q?=E6=A0=87=E6=B3=A8=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/visit-review/components/FileViewer.vue         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 5240577f..92988712 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1091,6 +1091,7 @@ export default {
 
                 if (annotation.id) {
                   let res = await deleteTrialFileType(annotation.id)
+                  this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
                   if (!res.IsSuccess) throw ''
                 }
                 if (annotation.metadata.toolName === 'Lengthscale') {
@@ -1113,7 +1114,6 @@ export default {
               //   const errorMsg = { message: 'annotation Not allowed to operate' }
               //   throw errorMsg
               // }
-              this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
             } catch (err) {
               cornerstoneTools.annotation.state.addAnnotation(annotation)
               const renderingEngine = getRenderingEngine(renderingEngineId)
@@ -1123,7 +1123,7 @@ export default {
                 viewport.render()
               }
               console.log(e)
-            }
+            }addNoneDicomMark
           })
 
         }
@@ -1268,7 +1268,6 @@ export default {
           // }  
         }
       })
-      this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
     },
     annotationSelectionChangeListener(e) {
       console.log('selection')
@@ -1321,6 +1320,8 @@ export default {
           annotation.markId = params.MarkId
           annotation.id = res.Result
           if (!isNaN(parseFloat(ps))) this.$emit('getEcrf', { type: "changePlottingScaleChangeAnswer", VisitTaskId: this.taskInfo.VisitTaskId, noneDicomFileId: annotation.noneDicomFileId, path: annotation.path || '', picturePath, psArr: this.psArr, isRemovePlottingScale: ps < 0 ? true : false })
+          
+          this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
         })
 
       } catch (e) {

From 66ae27cc56727e2b9b02135b41dc8b842458eb15 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 2 Feb 2026 16:04:52 +0800
Subject: [PATCH 304/333] =?UTF-8?q?=E9=9D=9Edicom=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E9=A1=B5=E5=B1=95=E7=A4=BA=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/visit-review/components/ReportPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
index 81fc4c94..12286426 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
@@ -278,7 +278,7 @@ export default {
     }
   },
   async mounted() {
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     this.trialId = this.$route.query.trialId
     this.visitTaskId = this.taskInfo.VisitTaskId
     this.subjectId = this.taskInfo.SubjectId

From c337f9569332cb73e94d0241edf531616fcf5962 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 2 Feb 2026 16:06:47 +0800
Subject: [PATCH 305/333] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/visit-review/components/FileViewer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 92988712..e6b32352 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -1123,7 +1123,7 @@ export default {
                 viewport.render()
               }
               console.log(e)
-            }addNoneDicomMark
+            }
           })
 
         }

From 953033b768ced6f822abf615e46eaf6d7fcd25e8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 5 Feb 2026 10:17:00 +0800
Subject: [PATCH 306/333] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=BB=9A=E5=8A=A8=E7=BF=BB=E9=A1=B5=E6=97=B6?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/visit-review/components/FileViewer.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index e6b32352..1d237434 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -128,7 +128,7 @@
       </div>
     </div>
     <!-- viewports -->
-    <div class="viewports-wrapper" v-loading="loading">
+    <div class="viewports-wrapper" v-loading="loading" ref="viewports-wrapper">
       <div class="grid-container" :style="gridStyle">
         <div v-for="(v, index) in viewportInfos" v-show="index < cells.length" :key="index" :style="cellStyle"
           :class="['grid-cell', index === activeCanvasIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
@@ -495,14 +495,14 @@ export default {
     this.initLoader()
     window.addEventListener('message', this.handleIframeMessage)
     this.getTrialCriterion()
+    this.$refs['viewports-wrapper'].addEventListener('wheel', (e) => {
+      this.setToolsPassive()
+    });
   },
   beforeDestroy() {
     window.removeEventListener('message', this.handleIframeMessage)
   },
   methods: {
-    abc(v) {
-      console.log(v)
-    },
     async handleSubmitKeyDoc() {
       try {
         let data = {
@@ -757,6 +757,7 @@ export default {
       const renderingEngine = getRenderingEngine(renderingEngineId)
       const viewport = renderingEngine.getViewport(`canvas-${canvasIndex}`)
       await viewport.setStack(imageIds)
+      this.setToolsPassive()
       viewport.setImageIdIndex(sliceIndex)
       viewport.render()
       // this.updateViewportInfos()
@@ -835,6 +836,7 @@ export default {
       const viewport = renderingEngine.getViewport(
         this.viewportInfos[i].viewportId
       )
+      this.setToolsPassive()
       viewport.setImageIdIndex(index)
       viewport.render()
     },
@@ -1320,7 +1322,7 @@ export default {
           annotation.markId = params.MarkId
           annotation.id = res.Result
           if (!isNaN(parseFloat(ps))) this.$emit('getEcrf', { type: "changePlottingScaleChangeAnswer", VisitTaskId: this.taskInfo.VisitTaskId, noneDicomFileId: annotation.noneDicomFileId, path: annotation.path || '', picturePath, psArr: this.psArr, isRemovePlottingScale: ps < 0 ? true : false })
-          
+
           this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
         })
 
@@ -1811,6 +1813,7 @@ export default {
       const viewport = renderingEngine.getViewport(
         this.viewportInfos[i].viewportId
       )
+      this.setToolsPassive()
       viewport.setImageIdIndex(sliceIdx)
       viewport.render()
       // this.$emit('toggleImage', { taskId: this.viewportInfos[i].taskInfo.VisitTaskId, studyId: this.viewportInfos[i].studyId, imageIndex: sliceIdx })
@@ -1837,6 +1840,7 @@ export default {
       const viewport = renderingEngine.getViewport(
         this.viewportInfos[i].viewportId
       )
+      this.setToolsPassive()
       viewport.setImageIdIndex(sliceIdx)
       viewport.render()
       // }

From bc3e00c8b41cfb7fae7b6b67ef2f223dea07d1f2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 5 Feb 2026 10:21:06 +0800
Subject: [PATCH 307/333] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.js                             | 7 ++++---
 src/views/admin/user/components/Account.vue  | 6 +++++-
 src/views/system/user/components/Account.vue | 8 ++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/api/admin.js b/src/api/admin.js
index 9ae710d7..7e034181 100644
--- a/src/api/admin.js
+++ b/src/api/admin.js
@@ -89,10 +89,11 @@ export function UpdateUserRole(param) {
   })
 }
 
-export function resetPassword(userId) {
+export function resetPassword(data) {
   return request({
-    url: `/user/resetPassword/${userId}`,
-    method: 'get'
+    url: `/user/resetPassword`,
+    method: 'post',
+    data
   })
 }
 
diff --git a/src/views/admin/user/components/Account.vue b/src/views/admin/user/components/Account.vue
index 4ee4bfeb..f1019b0d 100644
--- a/src/views/admin/user/components/Account.vue
+++ b/src/views/admin/user/components/Account.vue
@@ -23,7 +23,11 @@ export default {
 
       })
         .then(() => {
-          resetPassword(this.userId).then(res => {
+          let data = {
+            BaseUrl: `${location.protocol}//${location.host}/login`,
+            UserId: this.userId
+          }
+          resetPassword(data).then(res => {
             if (res.IsSuccess) {
               this.$message({
                 message: 'Reset password successfully',
diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue
index 83045fcf..927498af 100644
--- a/src/views/system/user/components/Account.vue
+++ b/src/views/system/user/components/Account.vue
@@ -4,7 +4,7 @@
       <span>Security</span>
     </div> -->
     <div>
-      <el-button type="danger" @click="handleReset">{{$t('system:userlist:button:ResetPassword')}}</el-button>
+      <el-button type="danger" @click="handleReset">{{ $t('system:userlist:button:ResetPassword') }}</el-button>
     </div>
   </el-card>
 </template>
@@ -23,7 +23,11 @@ export default {
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          resetPassword(this.userId).then(res => {
+          let data = {
+            BaseUrl: `${location.protocol}//${location.host}/login`,
+            UserId: this.userId
+          }
+          resetPassword(data).then(res => {
             if (res.IsSuccess) {
               let msg = this.$t('system:userlist:message:ResetPassword2')
               msg = msg.replace('xxx', params('userName'))

From f04f0ce9296ed3c4c6473d260a473886e69aeaaf Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 5 Feb 2026 10:46:41 +0800
Subject: [PATCH 308/333] =?UTF-8?q?=E9=9D=9EDICOM=E9=98=85=E7=89=87?=
 =?UTF-8?q?=EF=BC=8C=E5=88=87=E6=8D=A2=E6=9C=80=E5=8F=B3=E8=BE=B9=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BF=E8=A7=86=E6=97=B6=EF=BC=8CCRF=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BF=E8=A7=86=E5=90=8D=E7=A7=B0=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF=E9=97=AE=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=B2=A1=E6=9C=89=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/visit-review/components/ReadPage.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index 7dcbf78f..851fc6d4 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -58,7 +58,7 @@
       <div v-for="s in visitTaskList" v-show="lastViewportTaskId === s.VisitTaskId" :key="s.VisitTaskId"
         style="height: 100%;">
         <customize-question-list v-if="lastViewportTaskId" :ref="`ecrf_${s.VisitTaskId}`" :isNoneDicom="true"
-          :reading-task-state="readingTaskState" :visit-info="currentVisitInfo" @resetAnnotations="resetAnnotations"
+          :reading-task-state="s.ReadingTaskState" :visit-info="s" @resetAnnotations="resetAnnotations"
           @setReadingTaskState="setReadingTaskState" @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
           @getCustomScreenshots="getCustomScreenshots" @setReadingToolActive="setReadingToolActive"
           @setReadingToolPassive="setReadingToolPassive" @setSaved="setSaved"

From 231a993f8b1413e0624bb9ec069e71440e9b0b0a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 30 Jan 2026 14:36:28 +0800
Subject: [PATCH 309/333] 1

---
 .../trials-panel/reading/visit-review/components/ReadPage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index 41192e8c..3d92dc22 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -57,8 +57,8 @@
       /> -->
       <div v-for="s in visitTaskList" v-show="lastViewportTaskId === s.VisitTaskId" :key="s.VisitTaskId"
         style="height: 100%;">
-        <customize-question-list v-if="lastViewportTaskId" :ref="`ecrf_${s.VisitTaskId}`" :isNoneDicom="true"
-          :reading-task-state="s.ReadingTaskState" :visit-info="s" @resetAnnotations="resetAnnotations"
+        <customize-question-list v-if="lastViewportTaskId && lastViewportTaskIds.includes(s.VisitTaskId)"  :ref="`ecrf_${s.VisitTaskId}`" :isNoneDicom="true"
+          :reading-task-state="currentVisitInfo.VisitTaskId === taskInfo.VisitTaskId ? readingTaskState : 2" :visit-info="s" @resetAnnotations="resetAnnotations"
           @setReadingTaskState="setReadingTaskState" @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
           @getCustomScreenshots="getCustomScreenshots" @setReadingToolActive="setReadingToolActive"
           @setReadingToolPassive="setReadingToolPassive" @setSaved="setSaved"

From 849142bd23f6b622173b2ef8c42f1da9c1148f31 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 5 Feb 2026 14:41:28 +0800
Subject: [PATCH 310/333] =?UTF-8?q?=E7=AE=80=E5=8E=86=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/index.vue | 59 ++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/views/reviewers/index.vue b/src/views/reviewers/index.vue
index 42c9e458..da4753e5 100644
--- a/src/views/reviewers/index.vue
+++ b/src/views/reviewers/index.vue
@@ -712,11 +712,12 @@ export default {
             this.model_cfg.visible = false
             this.model_cfg.showClose = true
             console.log(res.Result)
-            for (let i = 0; res.Result.length > i; i++) {
-              let item = res.Result[i]
-              console.log(item)
-              await this.handleBatchDown(item)
-            }
+            this.downloadAllInOneZip(res.Result)
+            // for (let i = 0; res.Result.length > i; i++) {
+            //   let item = res.Result[i]
+            //   console.log(item)
+            //   await this.handleBatchDown(item)
+            // }
           } catch (e) {
             console.log(e)
           }
@@ -736,6 +737,54 @@ export default {
       //   this.model_cfg.showClose = true
       // })
     },
+    async downloadAllInOneZip(arr) {
+      if (!arr.length) {
+        return
+      }
+      const zip = new JSZip()
+      const allTasks = []
+      arr.forEach((reviewer) => {
+        if (!reviewer?.FileList?.length) return
+        
+        reviewer.FileList.forEach((fileItem) => {
+          const fileUrl = this.OSSclientConfig.basePath + fileItem.Path
+          const zipPath = `${reviewer.Name}_${fileItem.FileName}`
+
+          const task = this.getFileData(fileUrl)
+            .then((response) => {
+              zip.file(zipPath, response.data, { binary: true })
+            })
+            .catch((err) => {
+              console.error(`文件下载失败 [${zipPath}]:`, err)
+            });
+          allTasks.push(task)
+        })
+      })
+
+      if (allTasks.length === 0) {
+        console.log('无可下载的文件')
+        return
+      }
+
+      try {
+        await Promise.all(allTasks)
+        
+        // 生成 ZIP
+        const zipBlob = await zip.generateAsync({
+          type: 'blob',
+          compression: 'DEFLATE',
+          compressionOptions: { level: 9 },
+        })
+
+        // 下载
+        saveAs(zipBlob, `CV_${new Date().getTime()}.zip`)
+        
+        console.error('ZIP 生成成功')
+      } catch (err) {
+        console.error('ZIP 生成失败:', err)
+      } finally {
+      }
+    },
     // 查询
     handleSelectSearch() {
       this.searchData.PageIndex = 1

From 0cecb919847e13c11f2e41ce04f37519a8536f5b Mon Sep 17 00:00:00 2001
From: hang <87227557@qq.com>
Date: Thu, 5 Feb 2026 19:46:01 +0800
Subject: [PATCH 311/333] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=89=93=E5=8C=85=EF=BC=8C=E5=B9=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BE=AE=E4=BF=A1=E9=80=9A=E7=9F=A5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 irc_vue_drone.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/irc_vue_drone.yml b/irc_vue_drone.yml
index 0a20aeec..95884a72 100644
--- a/irc_vue_drone.yml
+++ b/irc_vue_drone.yml
@@ -45,12 +45,16 @@ server:
     from_secret: local_pwd
 
 steps:
-- name: publish-test-irc-vue
-  commands:
-  - echo start publish test-irc-vue
-  - cd /opt/1panel/hang/vue/test-irc
-  - sh test-irc.sh v${DRONE_BUILD_NUMBER}
-  
+  - name: publish-test-irc-web
+    commands:
+      - bash /opt/1panel/xc-deploy-new/devops-center/build-vue-then-publish.sh  IRC_Web main
+  - name: notify-wecom
+    commands:
+      - bash /opt/1panel/xc-deploy-new/devops-center/drone-notify-wecom.sh "$DRONE_BUILD_STATUS" "$DRONE_REPO_NAME" "$DRONE_BRANCH" "$DRONE_BUILD_NUMBER" "4355b98e-1e72-4678-8dfb-2fc6ad0bf449" "$DRONE_COMMIT_MESSAGE" "$DRONE_COMMIT_AUTHOR" "Test_IRC_WEB" "irc.test.extimaging.com"
+    when:
+      status:
+        - success
+        - failure
 trigger:
   branch:
     - main    

From 7691fd12acb8b9530414fc6b9ed1452105816550 Mon Sep 17 00:00:00 2001
From: zhouhang <87227557@qq.com>
Date: Thu, 5 Feb 2026 19:55:40 +0800
Subject: [PATCH 312/333] =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=AE=BE=E7=BD=AEgit?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E6=B5=8B=E8=AF=95=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 irc_vue_drone.yml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/irc_vue_drone.yml b/irc_vue_drone.yml
index 95884a72..7e87dc8f 100644
--- a/irc_vue_drone.yml
+++ b/irc_vue_drone.yml
@@ -1,32 +1,4 @@
-kind: pipeline
-type: ssh
-name: ssh-linux-uat-irc-publish
 
-platform:
-  os: Linux
-  arch: 386
-  
-clone:
-  disable: true  #禁用默认克隆
-  
-server:
-  host: 47.117.164.182
-  user: root
-  password:
-    from_secret: local_pwd
-
-steps:
-- name: uat-branch-publish-irc-vue
-  commands:
-  - cd /opt/1panel/vue-devops/Uat_IRC/Uat-To-Uat
-  - sh uat-to-uat.sh v${DRONE_BUILD_NUMBER}
-  
-trigger:
-  branch:
-    - uat    
-    
----    
-    
 kind: pipeline
 type: ssh
 name: ssh-linux-test-irc-publish

From 987831ff22d0da5c6846004bf8859bf2054987b7 Mon Sep 17 00:00:00 2001
From: zhouhang <87227557@qq.com>
Date: Thu, 5 Feb 2026 20:00:13 +0800
Subject: [PATCH 313/333] =?UTF-8?q?=E4=B8=BA=E5=95=A5=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 irc_vue_drone.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/irc_vue_drone.yml b/irc_vue_drone.yml
index 7e87dc8f..f05ca030 100644
--- a/irc_vue_drone.yml
+++ b/irc_vue_drone.yml
@@ -19,9 +19,11 @@ server:
 steps:
   - name: publish-test-irc-web
     commands:
+      - echo "$DRONE_COMMIT_AUTHOR"
       - bash /opt/1panel/xc-deploy-new/devops-center/build-vue-then-publish.sh  IRC_Web main
   - name: notify-wecom
     commands:
+      - echo "$DRONE_COMMIT_AUTHOR"
       - bash /opt/1panel/xc-deploy-new/devops-center/drone-notify-wecom.sh "$DRONE_BUILD_STATUS" "$DRONE_REPO_NAME" "$DRONE_BRANCH" "$DRONE_BUILD_NUMBER" "4355b98e-1e72-4678-8dfb-2fc6ad0bf449" "$DRONE_COMMIT_MESSAGE" "$DRONE_COMMIT_AUTHOR" "Test_IRC_WEB" "irc.test.extimaging.com"
     when:
       status:

From 9b013059ba40c412837f7aa780899c4728de28e9 Mon Sep 17 00:00:00 2001
From: zhouhang <87227557@qq.com>
Date: Thu, 5 Feb 2026 20:03:43 +0800
Subject: [PATCH 314/333] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 irc_vue_drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/irc_vue_drone.yml b/irc_vue_drone.yml
index f05ca030..3cbfcb30 100644
--- a/irc_vue_drone.yml
+++ b/irc_vue_drone.yml
@@ -19,11 +19,11 @@ server:
 steps:
   - name: publish-test-irc-web
     commands:
-      - echo "$DRONE_COMMIT_AUTHOR"
+      - echo  "$DRONE_COMMIT_MESSAGE" "$DRONE_COMMIT_AUTHOR"
       - bash /opt/1panel/xc-deploy-new/devops-center/build-vue-then-publish.sh  IRC_Web main
   - name: notify-wecom
     commands:
-      - echo "$DRONE_COMMIT_AUTHOR"
+      - echo $DRONE_COMMIT_AUTHOR "$DRONE_COMMIT_MESSAGE"
       - bash /opt/1panel/xc-deploy-new/devops-center/drone-notify-wecom.sh "$DRONE_BUILD_STATUS" "$DRONE_REPO_NAME" "$DRONE_BRANCH" "$DRONE_BUILD_NUMBER" "4355b98e-1e72-4678-8dfb-2fc6ad0bf449" "$DRONE_COMMIT_MESSAGE" "$DRONE_COMMIT_AUTHOR" "Test_IRC_WEB" "irc.test.extimaging.com"
     when:
       status:

From 575840490fb6c982277ffda76c5ac7dbdffbc739 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 5 Feb 2026 20:30:50 +0800
Subject: [PATCH 315/333] =?UTF-8?q?git=20=E5=85=A8=E5=B1=80=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AEuserName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 irc_vue_drone.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/irc_vue_drone.yml b/irc_vue_drone.yml
index 3cbfcb30..da70bd16 100644
--- a/irc_vue_drone.yml
+++ b/irc_vue_drone.yml
@@ -19,7 +19,6 @@ server:
 steps:
   - name: publish-test-irc-web
     commands:
-      - echo  "$DRONE_COMMIT_MESSAGE" "$DRONE_COMMIT_AUTHOR"
       - bash /opt/1panel/xc-deploy-new/devops-center/build-vue-then-publish.sh  IRC_Web main
   - name: notify-wecom
     commands:

From 2f3eab61196f823b5b42af6c906b55b80bdfb6cb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 6 Feb 2026 09:40:45 +0800
Subject: [PATCH 316/333] =?UTF-8?q?=E3=80=90=E8=B4=A8=E6=8E=A7=E9=A3=8E?=
 =?UTF-8?q?=E9=99=A9=E6=8E=A7=E5=88=B6=E3=80=91=E6=8F=90=E4=BA=A4=E8=B4=A8?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=BB=E5=8A=A1=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=BF=9B=E5=85=A5=E4=B8=8B=E4=B8=AA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=B8=8B=E4=B8=AA?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E4=BC=9A=E8=A7=A6=E5=8F=91=E9=A3=8E?=
 =?UTF-8?q?=E9=99=A9=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/visit/qc-check/components/qualityAssurance.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 687711a1..b07a7700 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -2086,6 +2086,7 @@ export default {
               this.getQCInfo()
             }
             if (!this.$store.state.trials.config.IsIQCAutoNextTask) return this.$emit('getList')
+            localStorage.setItem("QCRiskControl", 0)
             this.$forceUpdate()
             getNextIQCQuality({
               trialId: this.trialId,

From b0ad500f7a15392f793ef5f02ac914f395fb0cb1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 6 Feb 2026 10:21:34 +0800
Subject: [PATCH 317/333] =?UTF-8?q?90=E5=A4=A9=E5=90=8E=E6=9C=AA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E6=88=B7=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=95=8C=E9=9D=A2=EF=BC=8C=E4=B8=8D=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E4=B8=BA=E5=88=9D=E5=A7=8B=E5=8C=96=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=BA=94=E4=B8=BA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/user/components/Account.vue  |  2 +-
 src/views/email-recompose/index.vue          | 83 ++++++++------------
 src/views/login/index.vue                    |  7 +-
 src/views/system/user/components/Account.vue |  2 +-
 4 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/src/views/admin/user/components/Account.vue b/src/views/admin/user/components/Account.vue
index f1019b0d..82a7ac73 100644
--- a/src/views/admin/user/components/Account.vue
+++ b/src/views/admin/user/components/Account.vue
@@ -25,7 +25,7 @@ export default {
         .then(() => {
           let data = {
             BaseUrl: `${location.protocol}//${location.host}/login`,
-            UserId: this.userId
+            IdentityUserId: this.userId
           }
           resetPassword(data).then(res => {
             if (res.IsSuccess) {
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index 9963b160..f95d1213 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -1,29 +1,18 @@
 <template>
   <div style="display: flex; justify-content: center">
-    <div
-      style="
+    <div style="
         width: 600px;
         text-align: center;
         border: 1px solid #e6e6e6;
         margin-top: 40px;
         padding: 10px;
-      "
-    >
-      <div
-        class="trial-myinfo-head"
-        style="font-size: 30px; line-height: 120px"
-      >
+      ">
+      <div class="trial-myinfo-head" style="font-size: 30px; line-height: 120px">
         <!-- 首次登录修改密码 -->
-        {{ $t('recompose:title:init') }}
+        {{ !isUpdate ? $t('recompose:title:init') : $t('recompose:title:update') }}
       </div>
-      <el-form
-        ref="passwordForm"
-        v-loading="loading"
-        label-position="right"
-        :model="password"
-        :rules="passwordFormRules"
-        :label-width="$i18n.locale == 'zh' ? '100px' : '200px'"
-      >
+      <el-form ref="passwordForm" v-loading="loading" label-position="right" :model="password"
+        :rules="passwordFormRules" :label-width="$i18n.locale == 'zh' ? '100px' : '200px'">
         <!-- 邮箱 -->
         <el-form-item :label="$t('recompose:form:email')" prop="Email">
           <el-input v-model="password.Email" disabled />
@@ -34,32 +23,15 @@
         </el-form-item> -->
         <!-- 用户名 -->
         <el-form-item :label="$t('recompose:form:userName')" prop="NewUserName">
-          <el-input v-model="password.NewUserName" />
+          <el-input v-model="password.NewUserName" :disabled="isUpdate" />
         </el-form-item>
         <!-- 新密码 -->
-        <el-form-item
-          class="my_new_pwd"
-          :label="$t('recompose:form:newPassword')"
-          prop="NewPassWord"
-        >
-          <el-input
-            v-model="password.NewPassWord"
-            type="password"
-            show-password
-            auto-complete="new-password"
-          />
+        <el-form-item class="my_new_pwd" :label="$t('recompose:form:newPassword')" prop="NewPassWord">
+          <el-input v-model="password.NewPassWord" type="password" show-password auto-complete="new-password" />
         </el-form-item>
         <!-- 确认密码 -->
-        <el-form-item
-          :label="$t('recompose:form:confirmPassword')"
-          prop="ConfirmPassWord"
-        >
-          <el-input
-            v-model="password.ConfirmPassWord"
-            type="password"
-            show-password
-            auto-complete="new-password"
-          />
+        <el-form-item :label="$t('recompose:form:confirmPassword')" prop="ConfirmPassWord">
+          <el-input v-model="password.ConfirmPassWord" type="password" show-password auto-complete="new-password" />
         </el-form-item>
         <el-form-item style="text-align: right">
           <!-- 取消 -->
@@ -105,11 +77,11 @@ export default {
                 callback(
                   lang === 'zh'
                     ? new Error(
-                        '1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
-                      )
+                      '1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
+                    )
                     : new Error(
-                        'For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
-                      )
+                      'For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
+                    )
                 )
               } else {
                 callback()
@@ -124,8 +96,8 @@ export default {
             validator: (rule, value, callback) => {
               !value
                 ? callback(
-                    new Error(this.$t('trials:researchForm:formRule:specify'))
-                  )
+                  new Error(this.$t('trials:researchForm:formRule:specify'))
+                )
                 : callback()
             },
             trigger: 'blur',
@@ -142,8 +114,8 @@ export default {
             validator: (rule, value, callback) => {
               !value
                 ? callback(
-                    new Error(this.$t('trials:researchForm:formRule:specify'))
-                  )
+                  new Error(this.$t('trials:researchForm:formRule:specify'))
+                )
                 : callback()
             },
             trigger: 'blur',
@@ -154,12 +126,12 @@ export default {
             validator: (rule, value, callback) => {
               value !== this.password.NewPassWord
                 ? callback(
-                    new Error(
-                      this.$t(
-                        'trials:researchForm:formRule:NewPassWordAndConfirmPassWord'
-                      )
+                  new Error(
+                    this.$t(
+                      'trials:researchForm:formRule:NewPassWordAndConfirmPassWord'
                     )
                   )
+                )
                 : callback()
             },
           },
@@ -175,6 +147,7 @@ export default {
       },
       userId: null,
       loading: false,
+      isUpdate: false
     }
   },
   computed: {
@@ -182,11 +155,15 @@ export default {
   },
   mounted() {
     this.password.UserId = this.$route.query.UserId
+    zzSessionStorage.setItem('identityUserId', this.$route.query.UserId)
     this.password.NewUserName = this.$route.query.UserName
     this.password.Email = this.$route.query.Email
     this.password.UserType = this.$route.query.UserType
     this.password.access_token = this.$route.query.access_token
     this.$i18n.locale = this.$route.query.lang
+    if (this.$route.query.isUpdate) {
+      this.isUpdate = true
+    }
     this.setLanguage(this.$route.query.lang)
     this.$updateDictionary()
     // if (!this.password.NewUserName) {
@@ -256,12 +233,14 @@ export default {
 .reset-wrapper {
   padding: 20px;
 }
+
 .reset-wrapper .el-page-header {
   line-height: 50px;
   border: 1px solid #ebeef5;
   border-radius: 4px;
   background-color: #fff;
 }
+
 .reset-wrapper .box-wrapper {
   width: 60%;
   margin: 20px auto;
@@ -277,10 +256,12 @@ input:-webkit-autofill {
   background-image: none;
   transition: background-color 50000s ease-in-out 0s;
 }
+
 input {
   background-color: transparent;
   caret-color: #fff;
 }
+
 ::v-deep .is-error.my_new_pwd {
   margin-bottom: 45px;
 }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ab81abbe..48a48ed3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -25,7 +25,8 @@
             <svg-icon icon-class="login-logo" style="width: 300px; height: 94px" />
           </div>
           <div class="title" v-else>
-            <img src="@/assets/system.png" alt="" :style="{ width: isEN ? '180px' : '200px', height: isEN ? '60px' : '65px' }" />
+            <img src="@/assets/system.png" alt=""
+              :style="{ width: isEN ? '180px' : '200px', height: isEN ? '60px' : '65px' }" />
             <div :style="`font-size:${isEN ? '28px' : '35px'}`">{{ $t('login:title:system') }}</div>
           </div>
         </div>
@@ -364,7 +365,7 @@ export default {
             this.$message.success(this.$t('login:message:login1'))
             setTimeout(() => {
               this.$router.push({
-                path: `/recompose?userName=${this.loginForm.username}`,
+                path: `/email-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
               })
             }, 500)
             return
@@ -376,7 +377,7 @@ export default {
               {
                 callback: (action) => {
                   this.$router.push({
-                    path: `/recompose?userName=${this.loginForm.username}`,
+                    path: `/email-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
                   })
                   return
                 },
diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue
index 927498af..e27ac19a 100644
--- a/src/views/system/user/components/Account.vue
+++ b/src/views/system/user/components/Account.vue
@@ -25,7 +25,7 @@ export default {
         .then(() => {
           let data = {
             BaseUrl: `${location.protocol}//${location.host}/login`,
-            UserId: this.userId
+            IdentityUserId: this.userId
           }
           resetPassword(data).then(res => {
             if (res.IsSuccess) {

From cb46f89ee1a2ca471bce98907816963b1fb7057b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 6 Feb 2026 10:45:19 +0800
Subject: [PATCH 318/333] =?UTF-8?q?DICOM=E9=98=85=E7=89=87=E5=92=8C?=
 =?UTF-8?q?=E9=9D=9EDICOM=E9=98=85=E7=89=87=E5=B7=A5=E5=85=B7=EF=BC=8CCRF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=B8=8E=E5=BD=B1=E5=83=8F=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=97=B6=EF=BC=8C=E4=BF=A1=E6=81=AF=E6=98=8E?=
 =?UTF-8?q?=E7=A1=AE=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms3D/components/customize/QuestionList.vue   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 4ea41cab..c0834044 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -109,6 +109,7 @@ export default {
       questionMarkInfoList: [],
       operateStateEnum: null, // 0：绑定；1：标记；2：查看；3：更改；4：移除；5：保存；6：更改数值内容；
       operateQuestionId: '',
+      operateQuestionName: '',
       operateRowId: '',
       operateParentQsId: '',
       isTableQuestion: false,
@@ -137,6 +138,11 @@ export default {
       this.isTableVisible = visible
     })
   },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
   methods: {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
@@ -430,7 +436,7 @@ export default {
         SAVE_TABLE: 7  // 保存表格标记
       }
       const { question, operateStateEnum, rowId, answer } = obj
-      const { Id, IsTableQuestion, ImageTool, ImageToolAttribute, ParentQsId, RowId } = question
+      const { Id, IsTableQuestion, ImageTool, ImageToolAttribute, ParentQsId, RowId, QuestionName, QuestionEnName } = question
 
       Object.assign(this, {
         operateStateEnum,
@@ -438,6 +444,7 @@ export default {
         imageTool: ImageTool,
         imageToolAttribute: ImageToolAttribute,
         operateQuestionId: Id,
+        operateQuestionName: this.isEN ? QuestionEnName : QuestionName,
         operateRowId: RowId,
         operateParentQsId: ParentQsId
       })
@@ -858,8 +865,9 @@ export default {
           }
           // }
           // 是否确认绑定？ 是否确认更改？
-          const message = currentState === 0 ? this.$t("dicom3D:CustomizeQuestionList:confirm:bindYesOrNo") : currentState === 3 ? this.$t("dicom3D:CustomizeQuestionList:confirm:updateYesOrNo") : null
+          let message = currentState === 0 ? this.$t("dicom3D:CustomizeQuestionList:confirm:bindYesOrNo") : currentState === 3 ? this.$t("dicom3D:CustomizeQuestionList:confirm:updateYesOrNo") : null
           if (message) {
+            message = message.replace('xxx', this.operateQuestionName).replace('yyy', annotation.data.label)
             const result = await this.$confirm(message, {
               type: 'warning',
               distinguishCancelAndClose: true

From f7d01f6ad739bdddcd75c99792fefcfb39c39ba4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 10 Feb 2026 10:31:18 +0800
Subject: [PATCH 319/333] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                                  |  6 ++++++
 src/store/modules/user.js                            |  8 ++++++++
 src/views/email-recompose/index.vue                  | 12 +++++++++---
 src/views/login/index.vue                            |  4 ++--
 .../reading-unit/components/QuestionsList.vue        |  2 +-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index a660e860..88ceabaa 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -79,6 +79,12 @@ export const constantRoutes = [
     name: 'emailRecompose',
     hidden: true
   },
+  {
+    path: '/user-recompose',
+    component: () => import('@/views/email-recompose/index'),
+    name: 'userRecompose',
+    hidden: true
+  },
   {
     path: '/joinVerify',
     component: () => import('@/views/joinVerify/index'),
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d5894a69..3ecc4eab 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -276,6 +276,14 @@ const actions = {
   async logout({ commit, state }) {
     try {
       removeToken() // must remove  token  first
+      let data = {
+        IdentityUserId: zzSessionStorage.getItem('identityUserId')
+      }
+      if (zzSessionStorage.getItem('userId') && zzSessionStorage.getItem('userId') !== 'undefined') {
+        data.UserRoleId = zzSessionStorage.getItem('userId')
+      } else {
+        data.UserRoleId = null
+      }
       await loginOut({
         UserRoleId: zzSessionStorage.getItem('userId'),
         IdentityUserId: zzSessionStorage.getItem('identityUserId'),
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index f95d1213..61a56157 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -206,9 +206,15 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 // 修改成功,请重新登录账号
-                this.$message.success(
-                  this.$t('recompose:message:updatedSuccessfully')
-                )
+                if (!this.isUpdate) {
+                  this.$message.success(
+                    this.$t('recompose:message:updatedSuccessfully')
+                  )
+                } else {
+                  this.$message.success(
+                    this.$t('recompose:message:updatedSuccess')
+                  )
+                }
                 setTimeout(() => {
                   this.logout()
                 }, 500)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 48a48ed3..4b23cc5f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -365,7 +365,7 @@ export default {
             this.$message.success(this.$t('login:message:login1'))
             setTimeout(() => {
               this.$router.push({
-                path: `/email-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
+                path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.HiddenEmail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
               })
             }, 500)
             return
@@ -377,7 +377,7 @@ export default {
               {
                 callback: (action) => {
                   this.$router.push({
-                    path: `/email-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
+                    path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.HiddenEmail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
                   })
                   return
                 },
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
index a5d6a063..761a293b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
@@ -43,7 +43,7 @@
       />
       <!-- 分组(EN) -->
       <el-table-column
-        prop="QuestionGroupName"
+        prop="QuestionGroupEnName"
         v-if="$i18n.locale === 'en'"
         :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
         show-overflow-tooltip

From eec23b9d42006caee9fc2bf6c235e5fed9a9c4fa Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 10 Feb 2026 02:40:06 -0500
Subject: [PATCH 320/333] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4b23cc5f..215c590b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -365,7 +365,7 @@ export default {
             this.$message.success(this.$t('login:message:login1'))
             setTimeout(() => {
               this.$router.push({
-                path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.HiddenEmail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
+                path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
               })
             }, 500)
             return
@@ -377,7 +377,7 @@ export default {
               {
                 callback: (action) => {
                   this.$router.push({
-                    path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.HiddenEmail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
+                    path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
                   })
                   return
                 },
@@ -389,7 +389,7 @@ export default {
             zzSessionStorage.removeItem('identityUserId')
             this.$MFA({
               UserId: res.BasicInfo.IdentityUserId,
-              EMail: res.BasicInfo.EMail,
+              EMail: res.BasicInfo.HiddenEmail,
               username: this.loginForm.username,
               callBack: this.changeRoleLogin,
               cancelBack: () => {

From 5c05a11ec4f113349de37eab1f49d2ba8ebfaefb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 10 Feb 2026 04:44:30 -0500
Subject: [PATCH 321/333] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/enrolled-reviewers/list/index.vue     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 97d4d806..a9144060 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -137,7 +137,8 @@
                   )
                 }).StatementCriterionFileList.length > 0
               ">
-                <el-button type="text" @click="preview(scope.row, ite.TrialReadingCriterionId)">View</el-button>
+                <el-button type="text"
+                  @click="preview(scope.row, ite.TrialReadingCriterionId, 'StatementCriterionFileList')">View</el-button>
                 <!-- <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList[0].FilePath)">View</el-button> -->
               </div>
               <div v-else>
@@ -167,7 +168,8 @@
                   )
                 }).AcknowledgementCriterionFileList.length > 0
               ">
-                <el-button type="text" @click="preview(scope.row, ite.TrialReadingCriterionId)">
+                <el-button type="text"
+                  @click="preview(scope.row, ite.TrialReadingCriterionId, 'AcknowledgementCriterionFileList')">
                   View
                 </el-button>
               </div>
@@ -469,10 +471,10 @@ export default {
   },
   methods: {
     // 预览
-    preview(row, TrialReadingCriterionId) {
+    preview(row, TrialReadingCriterionId, key) {
       let file = row.CriterionCategoryList.find((v) => {
         return v.TrialReadingCriterionId === TrialReadingCriterionId
-      }).StatementCriterionFileList[0]
+      })[key][0]
       let arr = file.FilePath.split('.')
 
       this.$preview({

From 4057f1893faa010d2b900bd3852c4202bd8d7a21 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 12 Feb 2026 20:50:00 -0500
Subject: [PATCH 322/333] =?UTF-8?q?=E9=9D=9Edicom=E6=B5=8B=E9=87=8F?=
 =?UTF-8?q?=E5=80=BC=E4=B8=8E=E6=AF=94=E4=BE=8B=E5=B0=BA=E8=BD=AC=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms3D/components/customize/QuestionFormItem.vue    | 4 ++--
 .../dicoms3D/components/customize/QuestionList.vue        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index b8232fa4..ea31b1bc 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -1366,10 +1366,10 @@ export default {
         let ps = annotation.ps
         if (prop === 'area') {
           value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
-        } else if (prop === 'length' || prop === 'perimeter') {
+        } else if (prop === 'length' || prop === 'perimeter' || prop === 'width') {
           value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
         } else {
-          value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
+          value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
         }
       } else if (this.isNoneDicom && value !== null) {
         value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index c0834044..15dc957f 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -1066,10 +1066,10 @@ export default {
         let ps = annotation.ps
         if (prop === 'area') {
           value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
-        } else if (prop === 'length' || prop === 'perimeter') {
+        } else if (prop === 'length' || prop === 'perimeter' || prop === 'width') {
           value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
         } else {
-          value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
+          value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
         }
       } else if (this.isNoneDicom && value !== null) {
         value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
@@ -1212,7 +1212,7 @@ export default {
           this.questionMarkInfoList.forEach(item => {
             DicomEvent.$emit('closeAddTableCol', { RowId: item.RowId })
             let prop = this.questionImageToolAttributeInfo[item.QuestionId] || this.questionImageToolAttributeInfo[item.TableQuestionId]
-            if (item.Path === path && ['length', 'perimeter', 'area'].includes(prop)) {
+            if (item.Path === path && ['length', 'perimeter', 'area', 'width'].includes(prop)) {
               const referencedImageId = item?.MeasureData?.metadata?.referencedImageId
               if (!referencedImageId) return null
               const cacheKey = `imageId:${referencedImageId}`
@@ -1228,7 +1228,7 @@ export default {
               }
               if (ps) {
                 if (prop === 'area') value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces)
-                if (prop === 'length' || prop === 'perimeter') value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
+                if (prop === 'length' || prop === 'perimeter' || prop === 'width') value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces)
               } else {
                 value = this.reRound(csUtils.roundNumber(value), this.digitPlaces)
               }

From 4ec0a178b4776f62e0b05001efb6c38779155b0f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sat, 28 Feb 2026 12:57:17 +0800
Subject: [PATCH 323/333] =?UTF-8?q?IVUS=20&=20OCT=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/IVUS/QuestionList.vue   | 174 ++++++++++++++----
 .../dicoms/components/OCT/QuestionList.vue    | 168 ++++++++++++++---
 .../reading/dicoms/components/Questions.vue   |   3 +-
 3 files changed, 290 insertions(+), 55 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 4459ce95..16deaa64 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -49,15 +49,6 @@
                   </div>
                   <el-table v-if="item.Type === 'basicTable' && item.TableQuestions" :ref="item.Id"
                     :data="item.TableQuestions.Answers">
-                    <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
-                      <template slot-scope="scope">
-                        {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
-                      </template>
-</el-table-column> -->
-                    <!-- <el-table-column
-                      type="index"
-                      width="40px"
-                    /> -->
                     <el-table-column v-for="q of item.TableQuestions.Questions" :key="q.Id" :prop="q.Id"
                       :label="q.QuestionName" show-overflow-tooltip :render-header="renderHeader">
                       <template slot-scope="scope">
@@ -98,8 +89,10 @@
                           required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
                           message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
                         },
+                        {
+                          validator: item.Type === 'number' && !item.TypeValue && (item.QuestionType === 1010 || item.QuestionType === 1011) ? validatorNumberOrNEInput : (rule, value, callback) => { callback() }, trigger: ['blur', 'change']
+                        }
                       ]">
-                      <!-- 数值类型 -->
                       <template v-if="item.Type === 'textarea'">
                         <el-input v-model="questionForm[item.Id]" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
                           :disabled="!isCurrentTask || readingTaskState >= 2"
@@ -107,9 +100,29 @@
                       </template>
                       <template v-if="item.Type === 'number'">
                         <div style="display: flex;justify-content: space-between;">
-                          <el-input-number v-model="questionForm[item.Id]"
+                          <el-input
+                            v-if="item.QuestionType === 1010 || item.QuestionType === 1011"
+                            type="text" 
+                            @change="(val) => { formItemChange(val, item) }" 
+                            @input="numberOrNEInput(item.Id)"
+                            @blur="handleNumberOrNEBlur(item)"
+                            v-model.trim="questionForm[item.Id]" :disabled="readingTaskState === 2">
+                            <template slot="append" v-if="item.Unit !== 0">{{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit) : item.CustomUnit }}</template>
+                            <template slot="append" v-else-if="item.ValueType === 2">%</template>
+                          </el-input>
+                          <el-input
+                            v-else
+                            type="text" 
+                            @change="(val) => { formItemChange(val, item) }" 
+                            @input="(val) => questionForm[item.Id] = val.replace(/[^\d.]/g, '')"
+                            @blur="handleBlur(questionForm[item.Id], questionForm, item)"
+                            v-model.trim="questionForm[item.Id]" :disabled="readingTaskState === 2">
+                            <template slot="append" v-if="item.Unit !== 0">{{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit) : item.CustomUnit }}</template>
+                            <template slot="append" v-else-if="item.ValueType === 2">%</template>
+                          </el-input>
+                          <!-- <el-input-number v-model="questionForm[item.Id]"
                             :disabled="!isCurrentTask || readingTaskState >= 2" :precision="0"
-                            @change="((val) => { formItemChange(val, item) })" />
+                            @change="((val) => { formItemChange(val, item) })" /> -->
                           <svg-icon v-if="item.ShowChartTypeEnum > 0" icon-class="readingChart"
                             class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
                               e,
@@ -120,6 +133,15 @@
                             })" />
                         </div>
                       </template>
+                      <template v-if="item.Type === 'calculation'">
+                        <el-input v-model="questionForm[item.Id]"
+                        disabled type="number" @change="((val) => { formItemChange(val, item) })">
+                        <template slot="append" v-if="item.Unit !== 0">
+                          {{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit) : item.CustomUnit }}
+                        </template>
+                        <template slot="append" v-else-if="item.ValueType === 2">%</template>
+                        </el-input>
+                      </template>
                       <template v-if="item.Type === 'select'">
                         <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
                           :multiple="item.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, item) })">
@@ -256,7 +278,10 @@ export default {
       qsForm: {},
       diffId: '',
       eemId: '',
-      lumenId: ''
+      lumenId: '',
+      sRoiStartDistanceId: '',
+      sRoiEndDistanceId: '',
+      sRoiDistanceId: ''
     }
   },
   computed: {
@@ -346,6 +371,18 @@ export default {
           const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
           this.$set(this.questionForm, item.Id, answer)
         }
+        if (item.QuestionType === 1013) {
+          // ROI起始回撤距离
+          this.sRoiStartDistanceId = item.Id
+        }
+        if (item.QuestionType === 1014) {
+          // ROI终止回撤距离
+          this.sRoiEndDistanceId = item.Id
+        }
+        if (item.QuestionType === 1015) {
+          // ROI段落总长度
+          this.sRoiDistanceId = item.Id
+        }
         if (item.Childrens.length > 0) {
           this.setQuestionForm(item.Childrens)
         }
@@ -369,6 +406,7 @@ export default {
             item.TableQuestions.Answers[idx][i] = String(obj.anwsers[i])
           }
         }
+       
         if (item.Childrens.length > 0) {
           this.setQuestions(item.Childrens, obj)
         }
@@ -460,12 +498,16 @@ export default {
     },
     formItemChange(val, item) {
       this.formChanged = true
-      if (item.Type === 'number') {
-        this.limitBlur(item.Id, item.ValueType)
-      }
+      // if (item.Type === 'number') {
+      //   this.limitBlur(item.Id, item.ValueType)
+      // }
       if (item.Childrens && item.Childrens.length > 0) {
         this.resetChild(item.Childrens)
       }
+      if ((item.QuestionType === 1013 || item.QuestionType === 1014) && !isNaN(parseFloat(this.questionForm[this.sRoiStartDistanceId])) && !isNaN(parseFloat(this.questionForm[this.sRoiEndDistanceId]))) {
+        let num = parseFloat(this.questionForm[this.sRoiEndDistanceId]) - parseFloat(this.questionForm[this.sRoiStartDistanceId])
+        this.$set(this.questionForm, this.sRoiDistanceId, parseFloat(num).toFixed(this.digitPlaces))
+      }
     },
     resetChild(obj) {
       obj.forEach(i => {
@@ -483,12 +525,78 @@ export default {
         if (valueType === 0) {
           this.$set(this.questionForm, qId, parseInt(value))
         } else if (valueType === 3) {
-          this.$set(this.questionForm, qId, parseFloat(value))
+          this.$set(this.questionForm, qId, value)
         } else {
           this.$set(this.questionForm, qId, this.numberToFixed(value))
         }
       }
     },
+    validatorNumberOrNEInput(rule, value, callback) {
+      let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
+      if (value === '') {
+        callback();
+      } else {
+        if (!reg.test(value)) {
+          callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
+        } else {
+          callback();
+        }
+      }
+    },
+    numberOrNEInput(id) {
+      // this.questionForm[id] = this.questionForm[id].toUpperCase();
+      if (!this.questionForm[id]) {
+        return
+      }
+      let value = this.questionForm[id].toUpperCase().replace(/[^0-9.NE]/g, '')
+      if (value.startsWith('N')) {
+        if (value.length > 2) {
+          value = value.substring(0, 2)
+        }
+        if (value.length === 2 && value[1] !== 'E') {
+           value = 'N'
+        }
+      } else {
+        value = value.replace(/[NE]/g, '')
+      }
+      this.questionForm[id] = value
+      this.$set(this.questionForm, id, value)
+    }, 
+    handleNumberOrNEBlur(item) {
+      if (this.questionForm[item.Id] && !this.questionForm[item.Id].startsWith('N')) {
+        if (item.ValueType === 3) {
+          // 文本
+          this.$set(this.questionForm, item.Id, value)
+        } else {
+          const num = parseFloat(this.questionForm[item.Id])
+          if (!isNaN(num)) {
+            this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+            if (item.ValueType === 0) {
+              // 整型
+              this.$set(this.questionForm, item.Id, parseInt(num))
+            }  else if (item.ValueType === 1 || item.ValueType === 2){
+              // 小数、百分比
+              this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+            }
+          }
+        }
+        
+      }
+    },
+    handleBlur(value, a, item) {
+      if (!value || item.ValueType === 3) return false
+      const num = parseFloat(this.questionForm[item.Id])
+      if (!isNaN(num)) {
+        this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+        if (item.ValueType === 0) {
+          // 整型
+          this.$set(this.questionForm, item.Id, parseInt(num))
+        }  else if (item.ValueType === 1 || item.ValueType === 2){
+          // 小数、百分比
+          this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+        }
+      }
+    },
     numberToFixed(v) {
       if (this.digitPlaces > -1) {
         return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}`
@@ -573,16 +681,16 @@ export default {
     },
     setFormItemData(obj) {
       this.qsForm[obj.key] = obj.val
-      if (obj.key === this.eemId || obj.key === this.lumenId) {
-        const eem = this.qsForm[this.eemId]
-        const lumen = this.qsForm[this.lumenId]
-        if (isNaN(parseFloat(eem)) || isNaN(parseFloat(lumen))) {
-          this.$set(this.qsForm, this.diffId, null)
-        } else {
-          const diff = parseFloat(eem) - parseFloat(lumen)
-          this.$set(this.qsForm, this.diffId, this.numberToFixed(diff))
-        }
-      }
+      // if (obj.key === this.eemId || obj.key === this.lumenId) {
+      //   const eem = this.qsForm[this.eemId]
+      //   const lumen = this.qsForm[this.lumenId]
+      //   if (isNaN(parseFloat(eem)) || isNaN(parseFloat(lumen))) {
+      //     this.$set(this.qsForm, this.diffId, null)
+      //   } else {
+      //     const diff = parseFloat(eem) - parseFloat(lumen)
+      //     this.$set(this.qsForm, this.diffId, this.numberToFixed(diff))
+      //   }
+      // }
     },
     handleAddOrEdit(type, row, index) {
       this.addOrEdit.title = row.QuestionName
@@ -645,11 +753,7 @@ export default {
         }
         const res = await submitTableQuestion(params)
         if (res.IsSuccess) {
-          // this.refreshQuestions()
-          await this.getReadingQuestionAndAnswer(this.visitTaskId)
-          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
-          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
-          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          this.refreshQuestions()
           DicomEvent.$emit('getReportInfo', true)
           // 保存成功！
           this.addOrEdit.visible = false
@@ -709,7 +813,7 @@ export default {
       }
     },
     async uploadDlgClose() {
-      await this.getReadingQuestionAndAnswer(this.visitTaskId)
+      this.refreshQuestions()
       DicomEvent.$emit('getReportInfo', true)
       this.upload.visible = false
     },
@@ -891,6 +995,10 @@ export default {
     ::v-deep.el-table--scrollable-x .el-table__body-wrapper {
       z-index: 2;
     }
+    
+  }
+  ::v-deep.el-tag.el-tag--info {
+    color: #000;
   }
 }
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 1cd270a0..01960915 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -49,15 +49,6 @@
                   </div>
                   <el-table v-if="item.Type === 'basicTable' && item.TableQuestions" :ref="item.Id"
                     :data="item.TableQuestions.Answers" max-height="600">
-                    <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
-                      <template slot-scope="scope">
-                        {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
-                      </template>
-</el-table-column> -->
-                    <!-- <el-table-column
-                      type="index"
-                      width="40px"
-                    /> -->
                     <el-table-column v-for="q of item.TableQuestions.Questions" :key="q.Id" :prop="q.Id"
                       :label="q.QuestionName" show-overflow-tooltip :render-header="renderHeader">
                       <template slot-scope="scope">
@@ -98,6 +89,9 @@
                           required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
                           message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
                         },
+                        {
+                          validator: item.Type === 'number' && !item.TypeValue && (item.QuestionType === 1010 || item.QuestionType === 1011) ? validatorNumberOrNEInput : (rule, value, callback) => { callback() }, trigger: ['blur', 'change']
+                        }
                       ]">
                       <!-- 数值类型 -->
                       <template v-if="item.Type === 'textarea'">
@@ -112,6 +106,50 @@
                             :label="dict.label" />
                         </el-select>
                       </template>
+                      <template v-if="item.Type === 'number'">
+                        <div style="display: flex;justify-content: space-between;">
+                          <el-input
+                            v-if="item.QuestionType === 1010 || item.QuestionType === 1011"
+                            type="text" 
+                            @change="(val) => { formItemChange(val, item) }" 
+                            @input="numberOrNEInput(item.Id)"
+                            @blur="handleNumberOrNEBlur(item)"
+                            v-model.trim="questionForm[item.Id]" :disabled="readingTaskState === 2">
+                            <template slot="append" v-if="item.Unit !== 0">{{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit) : item.CustomUnit }}</template>
+                            <template slot="append" v-else-if="item.ValueType === 2">%</template>
+                          </el-input>
+                          <el-input
+                            v-else
+                            type="text" 
+                            @change="(val) => { formItemChange(val, item) }" 
+                            @input="(val) => questionForm[item.Id] = val.replace(/[^\d.]/g, '')"
+                            @blur="handleBlur(questionForm[item.Id], questionForm, item)"
+                            v-model.trim="questionForm[item.Id]" :disabled="readingTaskState === 2">
+                            <template slot="append" v-if="item.Unit !== 0">{{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit) : item.CustomUnit }}</template>
+                            <template slot="append" v-else-if="item.ValueType === 2">%</template>
+                          </el-input>
+                          <!-- <el-input-number v-model="questionForm[item.Id]"
+                            :disabled="!isCurrentTask || readingTaskState >= 2" :precision="0"
+                            @change="((val) => { formItemChange(val, item) })" /> -->
+                          <svg-icon v-if="item.ShowChartTypeEnum > 0" icon-class="readingChart"
+                            class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
+                              e,
+                              data: {
+                                QuestionId: item.Id,
+                                QuestionName: item.QuestionName
+                              }
+                            })" />
+                        </div>
+                      </template>
+                      <template v-if="item.Type === 'calculation'">
+                        <el-input v-model="questionForm[item.Id]"
+                        disabled type="number" @change="((val) => { formItemChange(val, item) })">
+                        <template slot="append" v-if="item.Unit !== 0">
+                          {{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit) : item.CustomUnit }}
+                        </template>
+                        <template slot="append" v-else-if="item.ValueType === 2">%</template>
+                        </el-input>
+                      </template>
                     </el-form-item>
                     <template v-if="item.Childrens && item.Childrens.length > 0">
                       <template v-for="child in item.Childrens">
@@ -241,7 +279,10 @@ export default {
       m1Id: '',
       m2Id: '',
       m3Id: '',
-      avgId: ''
+      avgId: '',
+      sRoiStartDistanceId: '',
+      sRoiEndDistanceId: '',
+      sRoiDistanceId: ''
     }
   },
   computed: {
@@ -331,6 +372,18 @@ export default {
           const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
           this.$set(this.questionForm, item.Id, answer)
         }
+        if (item.QuestionType === 1013) {
+          // ROI起始回撤距离
+          this.sRoiStartDistanceId = item.Id
+        }
+        if (item.QuestionType === 1014) {
+          // ROI终止回撤距离
+          this.sRoiEndDistanceId = item.Id
+        }
+        if (item.QuestionType === 1015) {
+          // ROI段落总长度
+          this.sRoiDistanceId = item.Id
+        }
         if (item.Childrens.length > 0) {
           this.setQuestionForm(item.Childrens)
         }
@@ -443,13 +496,17 @@ export default {
     setMeasuredData(measureData) {
 
     },
-    formItemChange(val, question) {
+    formItemChange(val, item) {
       this.formChanged = true
-      if (question.Type === 'number') {
-        this.limitBlur(question.Id, question.ValueType)
+      // if (item.Type === 'number') {
+      //   this.limitBlur(item.Id, item.ValueType)
+      // }
+      if (item.Childrens && item.Childrens.length > 0) {
+        this.resetChild(item.Childrens)
       }
-      if (question.Childrens && question.Childrens.length > 0) {
-        this.resetChild(question.Childrens)
+      if ((item.QuestionType === 1013 || item.QuestionType === 1014) && !isNaN(parseFloat(this.questionForm[this.sRoiStartDistanceId])) && !isNaN(parseFloat(this.questionForm[this.sRoiEndDistanceId]))) {
+        let num = parseFloat(this.questionForm[this.sRoiEndDistanceId]) - parseFloat(this.questionForm[this.sRoiStartDistanceId])
+        this.$set(this.questionForm, this.sRoiDistanceId, parseFloat(num).toFixed(this.digitPlaces))
       }
     },
     resetChild(obj) {
@@ -471,6 +528,72 @@ export default {
         this.$set(this.questionForm, qId, this.numberToFixed(value))
       }
     },
+    validatorNumberOrNEInput(rule, value, callback) {
+      let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
+      if (value === '') {
+        callback();
+      } else {
+        if (!reg.test(value)) {
+          callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
+        } else {
+          callback();
+        }
+      }
+    },
+    numberOrNEInput(id) {
+      // this.questionForm[id] = this.questionForm[id].toUpperCase();
+      if (!this.questionForm[id]) {
+        return
+      }
+      let value = this.questionForm[id].toUpperCase().replace(/[^0-9.NE]/g, '')
+      if (value.startsWith('N')) {
+        if (value.length > 2) {
+          value = value.substring(0, 2)
+        }
+        if (value.length === 2 && value[1] !== 'E') {
+           value = 'N'
+        }
+      } else {
+        value = value.replace(/[NE]/g, '')
+      }
+      this.questionForm[id] = value
+      this.$set(this.questionForm, id, value)
+    }, 
+    handleNumberOrNEBlur(item) {
+      if (this.questionForm[item.Id] && !this.questionForm[item.Id].startsWith('N')) {
+        if (item.ValueType === 3) {
+          // 文本
+          this.$set(this.questionForm, item.Id, value)
+        } else {
+          const num = parseFloat(this.questionForm[item.Id])
+          if (!isNaN(num)) {
+            this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+            if (item.ValueType === 0) {
+              // 整型
+              this.$set(this.questionForm, item.Id, parseInt(num))
+            }  else if (item.ValueType === 1 || item.ValueType === 2){
+              // 小数、百分比
+              this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+            }
+          }
+        }
+        
+      }
+    },
+    handleBlur(value, a, item) {
+      if (!value || item.ValueType === 3) return false
+      const num = parseFloat(this.questionForm[item.Id])
+      if (!isNaN(num)) {
+        this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+        if (item.ValueType === 0) {
+          // 整型
+          this.$set(this.questionForm, item.Id, parseInt(num))
+        }  else if (item.ValueType === 1 || item.ValueType === 2){
+          // 小数、百分比
+          this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+        }
+      }
+    },
     numberToFixed(v) {
       if (this.digitPlaces > -1) {
         return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}`
@@ -631,11 +754,11 @@ export default {
         }
         const res = await submitTableQuestion(params)
         if (res.IsSuccess) {
-          // this.refreshQuestions()
-          await this.getReadingQuestionAndAnswer(this.visitTaskId)
-          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
-          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
-          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          this.refreshQuestions()
+          // await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          // this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          // this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          // this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
           DicomEvent.$emit('getReportInfo', true)
           // 保存成功！
           this.addOrEdit.visible = false
@@ -699,7 +822,7 @@ export default {
       }
     },
     async uploadDlgClose() {
-      await this.getReadingQuestionAndAnswer(this.visitTaskId)
+      this.refreshQuestions()
       DicomEvent.$emit('getReportInfo', true)
       this.upload.visible = false
     },
@@ -883,5 +1006,8 @@ export default {
       z-index: 2;
     }
   }
+  ::v-deep.el-tag.el-tag--info {
+    color: #000;
+  }
 }
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 80f17222..571fdccd 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -210,6 +210,7 @@ export default {
               // 脾底位置
               this.spleenBottomId = v.Id
             }
+            
           }
           if (v.Childrens.length > 0) {
             this.setChild(v.Childrens)
@@ -685,7 +686,6 @@ export default {
       this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
     },
     setQuestionStatus(obj, questionType) {
-      console.log(obj, questionType)
       for (let i = 0; i < obj.length; i++) {
         if (obj[i].QuestionType === questionType) {
           this.$set(obj[i], 'SaveEnum', 1)
@@ -785,6 +785,7 @@ export default {
       if (obj.key === this.spleenStatusId) {
         this.setSpleenCommentDisplay()
       }
+      
       this.formChanged = true
     },
     setQuestions() {

From c0ae4732fcc7b8c3e3485b389d50f4aec32cb33c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sat, 28 Feb 2026 13:16:05 +0800
Subject: [PATCH 324/333] =?UTF-8?q?=E6=95=B0=E5=80=BC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/IVUS/QuestionList.vue   |  2 +-
 .../dicoms/components/OCT/QuestionList.vue    |  2 +-
 .../dicoms/components/QuestionItem.vue        | 27 +++++++++++++++++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 16deaa64..c4ac6726 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -112,7 +112,7 @@
                           </el-input>
                           <el-input
                             v-else
-                            type="text" 
+                            type="number" 
                             @change="(val) => { formItemChange(val, item) }" 
                             @input="(val) => questionForm[item.Id] = val.replace(/[^\d.]/g, '')"
                             @blur="handleBlur(questionForm[item.Id], questionForm, item)"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 01960915..cb421719 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -120,7 +120,7 @@
                           </el-input>
                           <el-input
                             v-else
-                            type="text" 
+                            type="number" 
                             @change="(val) => { formItemChange(val, item) }" 
                             @input="(val) => questionForm[item.Id] = val.replace(/[^\d.]/g, '')"
                             @blur="handleBlur(questionForm[item.Id], questionForm, item)"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index 3a6dba11..ba60e88b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -169,7 +169,16 @@
         <div style="display: flex;justify-content: space-between;"
           v-else-if="question.Type === 'number' || question.Type === 'calculation'">
           <template v-if="question.Type === 'number'">
-            <el-input-number v-if="question.ValueType === 0" v-model="questionForm[question.Id]" :precision="0"
+            <el-input 
+              v-if="question.Unit"
+              type="number"
+              @input="(val) => questionForm[question.Id] = val.replace(/[^\d.]/g, '')"
+              @blur="handleBlur(questionForm[question.Id], questionForm, question)"
+              v-model.trim="questionForm[question.Id]" :disabled="readingTaskState === 2">
+              <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}</template>
+              <template slot="append" v-else-if="question.ValueType === 2">%</template>
+            </el-input>
+            <el-input-number v-else-if="question.ValueType === 0" v-model="questionForm[question.Id]" :precision="0"
               :disabled="readingTaskState >= 2 || isFirstChangeTask" />
             <el-input-number v-else-if="question.ValueType === 3" v-model="questionForm[question.Id]"
               :disabled="readingTaskState >= 2 || isFirstChangeTask" />
@@ -387,7 +396,21 @@ export default {
       this.fileList.splice(this.fileList.findIndex(f => f.url === file.url), 1)
       this.urls.splice(this.fileList.findIndex(f => f === file.url), 1)
       this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '' })
-    }
+    },
+    handleBlur(value, a, item) {
+      if (!value || item.ValueType === 3) return false
+      const num = parseFloat(this.questionForm[item.Id])
+      if (!isNaN(num)) {
+        this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+        if (item.ValueType === 0) {
+          // 整型
+          this.$set(this.questionForm, item.Id, parseInt(num))
+        }  else if (item.ValueType === 1 || item.ValueType === 2){
+          // 小数、百分比
+          this.$set(this.questionForm, item.Id, parseFloat(num).toFixed(this.digitPlaces))
+        }
+      }
+    },
   }
 }
 </script>

From 3fca2e76cb4b67510eaa247436126bde827f7ba1 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 2 Mar 2026 11:13:29 +0800
Subject: [PATCH 325/333] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97ROI?=
 =?UTF-8?q?=E6=B5=8B=E9=87=8F=E5=80=BC=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/IVUS/QuestionList.vue   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index c4ac6726..c6925575 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -681,16 +681,16 @@ export default {
     },
     setFormItemData(obj) {
       this.qsForm[obj.key] = obj.val
-      // if (obj.key === this.eemId || obj.key === this.lumenId) {
-      //   const eem = this.qsForm[this.eemId]
-      //   const lumen = this.qsForm[this.lumenId]
-      //   if (isNaN(parseFloat(eem)) || isNaN(parseFloat(lumen))) {
-      //     this.$set(this.qsForm, this.diffId, null)
-      //   } else {
-      //     const diff = parseFloat(eem) - parseFloat(lumen)
-      //     this.$set(this.qsForm, this.diffId, this.numberToFixed(diff))
-      //   }
-      // }
+      if (obj.key === this.eemId || obj.key === this.lumenId) {
+        const eem = this.qsForm[this.eemId]
+        const lumen = this.qsForm[this.lumenId]
+        if (isNaN(parseFloat(eem)) || isNaN(parseFloat(lumen))) {
+          this.$set(this.qsForm, this.diffId, null)
+        } else {
+          const diff = parseFloat(eem) - parseFloat(lumen)
+          this.$set(this.qsForm, this.diffId, this.numberToFixed(diff))
+        }
+      }
     },
     handleAddOrEdit(type, row, index) {
       this.addOrEdit.title = row.QuestionName

From c603d10ff569f13b8255510056f6d0a281f0fcc8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 3 Mar 2026 09:41:56 +0800
Subject: [PATCH 326/333] =?UTF-8?q?IVUS=20&=20OCT=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=B5=8B=E9=87=8F=E5=80=BC=E8=A7=A6=E5=8F=91=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IVUS/QuestionList.vue            | 3 ++-
 .../reading/dicoms/components/OCT/QuestionList.vue             | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index c6925575..2f25bdd7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -784,7 +784,8 @@ export default {
           }
           const res = await deleteReadingRowAnswer(param)
           if (res.IsSuccess) {
-            await this.getReadingQuestionAndAnswer(this.visitTaskId)
+            // await this.getReadingQuestionAndAnswer(this.visitTaskId)
+            this.refreshQuestions()
             DicomEvent.$emit('getReportInfo', true)
             // '删除成功！'
             this.$message.success(this.$t('common:message:deletedSuccessfully'))
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index cb421719..cf60ac7d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -789,7 +789,8 @@ export default {
           }
           const res = await deleteReadingRowAnswer(param)
           if (res.IsSuccess) {
-            await this.getReadingQuestionAndAnswer(this.visitTaskId)
+            this.refreshQuestions()
+            // await this.getReadingQuestionAndAnswer(this.visitTaskId)
             DicomEvent.$emit('getReportInfo', true)
             // '删除成功！'
             this.$message.success(this.$t('common:message:deletedSuccessfully'))

From 8ddfe34f723a1c49444fbe6a3034ce655cd15301 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 3 Mar 2026 10:26:02 +0800
Subject: [PATCH 327/333] =?UTF-8?q?IVUS=E6=A0=87=E5=87=86=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IVUS/QuestionList.vue           | 4 ++--
 .../reading/dicoms/components/OCT/QuestionList.vue            | 4 ++--
 .../trials-panel/reading/dicoms/components/Questions.vue      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 2f25bdd7..63215f09 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -90,7 +90,7 @@
                           message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
                         },
                         {
-                          validator: item.Type === 'number' && !item.TypeValue && (item.QuestionType === 1010 || item.QuestionType === 1011) ? validatorNumberOrNEInput : (rule, value, callback) => { callback() }, trigger: ['blur', 'change']
+                          validator: item.Type === 'number' && !item.TypeValue && (item.QuestionType === 1016 || item.QuestionType === 1017) ? validatorNumberOrNEInput : (rule, value, callback) => { callback() }, trigger: ['blur', 'change']
                         }
                       ]">
                       <template v-if="item.Type === 'textarea'">
@@ -101,7 +101,7 @@
                       <template v-if="item.Type === 'number'">
                         <div style="display: flex;justify-content: space-between;">
                           <el-input
-                            v-if="item.QuestionType === 1010 || item.QuestionType === 1011"
+                            v-if="item.QuestionType === 1016 || item.QuestionType === 1017"
                             type="text" 
                             @change="(val) => { formItemChange(val, item) }" 
                             @input="numberOrNEInput(item.Id)"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index cf60ac7d..01ea0bab 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -90,7 +90,7 @@
                           message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
                         },
                         {
-                          validator: item.Type === 'number' && !item.TypeValue && (item.QuestionType === 1010 || item.QuestionType === 1011) ? validatorNumberOrNEInput : (rule, value, callback) => { callback() }, trigger: ['blur', 'change']
+                          validator: item.Type === 'number' && !item.TypeValue && (item.QuestionType === 1016 || item.QuestionType === 1017) ? validatorNumberOrNEInput : (rule, value, callback) => { callback() }, trigger: ['blur', 'change']
                         }
                       ]">
                       <!-- 数值类型 -->
@@ -109,7 +109,7 @@
                       <template v-if="item.Type === 'number'">
                         <div style="display: flex;justify-content: space-between;">
                           <el-input
-                            v-if="item.QuestionType === 1010 || item.QuestionType === 1011"
+                            v-if="item.QuestionType === 1016 || item.QuestionType === 1017"
                             type="text" 
                             @change="(val) => { formItemChange(val, item) }" 
                             @input="numberOrNEInput(item.Id)"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 571fdccd..225a2d57 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -10,7 +10,7 @@
         <div class="ecrf-footer">
           <i v-if="groupClassify === null || groupClassify === 1" class="el-icon-warning feedback-icon"
             @click="openFeedBackTable" :style="{ color: isExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }" />
-          <el-button size="mini" :disabled="!questionFormChangeState || (!formChanged && groupClassify > 0)"
+          <el-button v-if="!(criterionType === 19 && groupClassify === 4)" size="mini"            :disabled="!questionFormChangeState || (!formChanged && groupClassify > 0)"
             :type="questionFormChangeState || (!formChanged && groupClassify > 0) ? 'primary' : null"
             @click="handleSave">{{ $t('common:button:save') }}</el-button>
         </div>

From 0eb213518575c97d752b055c2a144fce7f539d56 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 3 Mar 2026 10:50:37 +0800
Subject: [PATCH 328/333] =?UTF-8?q?IVUS=E6=95=B0=E5=80=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IVUS/QuestionList.vue             | 2 +-
 .../trials-panel/reading/dicoms/components/OCT/QuestionList.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 63215f09..64cee208 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -87,7 +87,7 @@
                       :prop="item.Id" :rules="[
                         {
                           required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
-                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : (item.QuestionType === 1016 || item.QuestionType === 1017) ? $t('trials:reading:ruleMessage:validatorNumberInput') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
                         },
                         {
                           validator: item.Type === 'number' && !item.TypeValue && (item.QuestionType === 1016 || item.QuestionType === 1017) ? validatorNumberOrNEInput : (rule, value, callback) => { callback() }, trigger: ['blur', 'change']
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 01ea0bab..a1da4203 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -87,7 +87,7 @@
                       :prop="item.Id" :rules="[
                         {
                           required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
-                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : (item.QuestionType === 1016 || item.QuestionType === 1017) ? $t('trials:reading:ruleMessage:validatorNumberInput') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
                         },
                         {
                           validator: item.Type === 'number' && !item.TypeValue && (item.QuestionType === 1016 || item.QuestionType === 1017) ? validatorNumberOrNEInput : (rule, value, callback) => { callback() }, trigger: ['blur', 'change']

From e0094c01d84d55540bb4dc18fdd910bb061bb6e5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 3 Mar 2026 10:52:59 +0800
Subject: [PATCH 329/333] 1

---
 .../trials/trials-panel/reading/dicoms/components/Questions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 225a2d57..571fdccd 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -10,7 +10,7 @@
         <div class="ecrf-footer">
           <i v-if="groupClassify === null || groupClassify === 1" class="el-icon-warning feedback-icon"
             @click="openFeedBackTable" :style="{ color: isExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }" />
-          <el-button v-if="!(criterionType === 19 && groupClassify === 4)" size="mini"            :disabled="!questionFormChangeState || (!formChanged && groupClassify > 0)"
+          <el-button size="mini" :disabled="!questionFormChangeState || (!formChanged && groupClassify > 0)"
             :type="questionFormChangeState || (!formChanged && groupClassify > 0) ? 'primary' : null"
             @click="handleSave">{{ $t('common:button:save') }}</el-button>
         </div>

From 9ad916f8604e35cd678b30f3b69dd6f64b035ec9 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 3 Mar 2026 11:04:51 +0800
Subject: [PATCH 330/333] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IVUS/QuestionList.vue         | 6 +++---
 .../reading/dicoms/components/OCT/QuestionList.vue          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 64cee208..39d63206 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -33,7 +33,7 @@
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
                     <div class="title">{{ item.QuestionName }}</div>
-                    <div v-if="item.LesionType === 102 && readingTaskState < 2">
+                    <div v-if="item.LesionType === 104 && readingTaskState < 2">
                       <div class="add-icon" @click.prevent="downloadTpl">
                         <i class="el-icon-download" />
                       </div>
@@ -67,14 +67,14 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column v-if="readingTaskState < 2 && (item.LesionType === 102 || item.LesionType === 103)"
+                    <el-table-column v-if="readingTaskState < 2 && (item.LesionType === 104)"
                       :label="$t('common:action:action')" width="90px" fixed="right">
                       <template slot-scope="scope">
                         <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
                         <el-button type="text" size="mini" @click="handleDelete(item, scope.$index)"
-                          v-if="item.LesionType === 102">
+                          v-if="item.LesionType === 104">
                           {{ $t('common:button:delete') }}
                         </el-button>
                       </template>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index a1da4203..7da08430 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -33,7 +33,7 @@
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
                     <div class="title">{{ item.QuestionName }}</div>
-                    <div v-if="(item.LesionType === 112 || item.LesionType === 111) && readingTaskState < 2">
+                    <div v-if="(item.LesionType === 104) && readingTaskState < 2">
                       <div class="add-icon" @click.prevent="downloadTpl(item.LesionType)">
                         <i class="el-icon-download" />
                       </div>

From 02d85e19a6853cf05d9a21a91327512173283377 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 3 Mar 2026 11:36:36 +0800
Subject: [PATCH 331/333] =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Questions.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 571fdccd..04f2b61d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -179,7 +179,9 @@ export default {
           v.IsBaseLineTask = this.isBaseLineTask
           if (v.Type === 'group' && v.GroupClassify !== this.groupClassify) continue
           if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && i.Id) {
-            this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
+            const answer = v.Type === 'select' && v.OptionTypeEnum === 1 && v.Answer ? JSON.parse(v.Answer) : v.Answer
+          this.$set(this.questionForm, v.Id, answer ? answer : null)
+            // this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
             if (v.QuestionType === 44) {
               // 影像质量评估
               this.imageQualityId = v.Id
@@ -232,7 +234,8 @@ export default {
       obj.forEach(i => {
         i.IsBaseLineTask = this.isBaseLineTask
         if (i.Type !== 'group' && i.Type !== 'summary' && i.Id) {
-          this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
+          const answer = i.Type === 'select' && i.OptionTypeEnum === 1 && i.Answer ? JSON.parse(i.Answer) : i.Answer
+          this.$set(this.questionForm, i.Id, answer ? answer : null)
           if (i.QuestionType === 44) {
             // 影响质量评估
             this.imageQualityId = i.Id
@@ -343,7 +346,7 @@ export default {
       var answers = []
       var imageQuality = null
       for (const k in this.questionForm) {
-        answers.push({ id: k, answer: this.questionForm[k] })
+        answers.push({ id: k, answer: Array.isArray(this.questionForm[k]) ? JSON.stringify(this.questionForm[k]) : this.questionForm[k] })
         if (k === this.imageQualityId) {
           imageQuality = this.questionForm[k]
         }

From a0abba71dd3411d90a8e9adeb52894f6e4656b8f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 3 Mar 2026 12:41:50 +0800
Subject: [PATCH 332/333] 1

---
 .../reading/dicoms/components/IVUS/QuestionList.vue         | 6 ++++--
 .../reading/dicoms/components/OCT/QuestionList.vue          | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 39d63206..811b6f98 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -357,6 +357,7 @@ export default {
         }
         this.questions = this.visitTaskList[i].ReadingQuestions
         this.setQuestionForm(this.questions)
+        
         this.$nextTick(() => {
           this.$refs['ecrf'].getQuestions(this.visitTaskId)
           this.$refs['ecrf2'].getQuestions(this.visitTaskId)
@@ -368,7 +369,7 @@ export default {
       const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
       questions.forEach(item => {
         if (type.includes(item.Type)) {
-          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
+          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : item.Answer : item.Answer
           this.$set(this.questionForm, item.Id, answer)
         }
         if (item.QuestionType === 1013) {
@@ -497,6 +498,7 @@ export default {
 
     },
     formItemChange(val, item) {
+      console.log('formItemChange: ', item.QuestionName, val)
       this.formChanged = true
       // if (item.Type === 'number') {
       //   this.limitBlur(item.Id, item.ValueType)
@@ -563,7 +565,7 @@ export default {
       this.$set(this.questionForm, id, value)
     }, 
     handleNumberOrNEBlur(item) {
-      if (this.questionForm[item.Id] && !this.questionForm[item.Id].startsWith('N')) {
+      if (this.questionForm[item.Id] && !isNaN(parseFloat(this.questionForm[item.Id]))) {
         if (item.ValueType === 3) {
           // 文本
           this.$set(this.questionForm, item.Id, value)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 7da08430..6d93ac2c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -369,7 +369,7 @@ export default {
       const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
       questions.forEach(item => {
         if (type.includes(item.Type)) {
-          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
+          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : item.Answer : item.Answer
           this.$set(this.questionForm, item.Id, answer)
         }
         if (item.QuestionType === 1013) {

From 94f3e6c75706c16dfc507494a532ce0649dcd9dc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 3 Mar 2026 14:15:04 +0800
Subject: [PATCH 333/333] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                 |   9 +-
 src/views/system/notice/components/from.vue | 104 ++++++--------------
 2 files changed, 35 insertions(+), 78 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b9be4bcc..91f9b2de 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -83,7 +83,7 @@
       </div>
     </el-drawer>
     <feedBack v-if="$route.matched.length > 0" />
-    <timeTag />
+    <!-- <timeTag /> -->
   </div>
 </template>
 
@@ -94,12 +94,15 @@ import {
 } from '@/api/dictionary/dictionary'
 import { getTrialExtralConfig } from '@/api/trials'
 import feedBack from '@/views/trials/trials-layout/components/feedBack'
-import timeTag from '@/components/timeTag'
+// import timeTag from '@/components/timeTag'
 import Vue from 'vue'
 import i18n from './lang'
 export default {
   name: 'App',
-  components: { feedBack, timeTag },
+  components: {
+    feedBack,
+    // timeTag
+  },
   data() {
     return {
       drawer: false,
diff --git a/src/views/system/notice/components/from.vue b/src/views/system/notice/components/from.vue
index cc08001e..2e90fe43 100644
--- a/src/views/system/notice/components/from.vue
+++ b/src/views/system/notice/components/from.vue
@@ -1,109 +1,63 @@
 <template>
   <base-model :config="model_cfg">
     <template slot="dialog-body">
-      <el-form
-        ref="NoticeForm"
-        :model="form"
-        :rules="rules"
-        label-width="180px"
-        size="small"
-      >
-        <el-form-item  :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">
+      <el-form ref="NoticeForm" :model="form" :rules="rules" label-width="180px" size="small">
+        <el-form-item :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">
           <el-select v-model="form.NoticeLevelEnum" clearable size="small">
-            <el-option
-              v-for="item of dict.type.NoteLevel"
-              :key="item.value"
-              :label="item.label"
-              :value="item.raw.Code * 1"
-            />
+            <el-option v-for="item of dict.type.NoteLevel" :key="item.value" :label="item.label"
+              :value="item.raw.Code * 1" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeType')" prop="NoticeTypeEnum">
           <el-select v-model="form.NoticeTypeEnum" clearable size="small">
-            <el-option
-              v-for="item of dict.type.NoteType"
-              :key="item.value"
-              :label="item.label"
-              :value="item.raw.Code * 1"
-            />
+            <el-option v-for="item of dict.type.NoteType" :key="item.value" :label="item.label"
+              :value="item.raw.Code * 1" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:ApplicableProject')" prop="ApplicableProjectEnum">
-          <el-select v-model="form.ApplicableProjectEnum"  clearable size="small">
-            <el-option
-              v-for="item of dict.type.NoticeApplicableTrial"
-              :key="item.value"
-              :label="item.label"
-              :value="item.raw.Code * 1"
-            />
+          <el-select v-model="form.ApplicableProjectEnum" clearable size="small">
+            <el-option v-for="item of dict.type.NoticeApplicableTrial" :key="item.value" :label="item.label"
+              :value="item.raw.Code * 1" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeUserTypeIdList')" prop="NoticeUserTypeIdList">
           <el-select v-model="form.NoticeUserTypeIdList" multiple clearable size="small">
-            <el-option
-              v-for="item of roleList"
-              :key="item.Id"
-              :label="item.UserTypeShortName"
-              :value="item.Id"
-            />
+            <el-option v-for="item of roleList" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeMode')" prop="NoticeModeEnum">
           <el-select v-model="form.NoticeModeEnum" clearable size="small">
-            <el-option
-              v-for="item of dict.type.NoticeMode"
-              :key="item.value"
-              :label="item.label"
-              :value="item.raw.Code * 1"
-            />
+            <el-option v-for="item of dict.type.NoticeMode" :key="item.value" :label="item.label"
+              :value="item.raw.Code * 1" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:StartDate')" prop="StartDate">
-          <el-date-picker
-            v-model="form.StartDate"
-            type="datetime"
-          />
+          <el-date-picker v-model="form.StartDate" type="datetime" />
         </el-form-item>
-        <el-form-item  :label="$t('system:notice:label:EndDate')" prop="EndDate">
-          <el-date-picker
-            v-model="form.EndDate"
-            type="datetime"
-          />
+        <el-form-item :label="$t('system:notice:label:EndDate')" prop="EndDate">
+          <el-date-picker v-model="form.EndDate" type="datetime" :default-time="'23:59:59'" />
         </el-form-item>
         <el-form-item v-if="!form.Id" :label="$t('system:notice:label:IsPush')" prop="IsPush">
-          <el-switch
-            v-model="form.IsPush"
-            :active-value="true"
-            :inactive-value="false"
-          />
+          <el-switch v-model="form.IsPush" :active-value="true" :inactive-value="false" />
         </el-form-item>
-        <el-form-item  :label="$t('system:notice:label:NoticeContent')" prop="NoticeContent">
-          <el-input
-            v-model="form.NoticeContent"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4}"
-          />
+        <el-form-item :label="$t('system:notice:label:NoticeContent')" prop="NoticeContent">
+          <el-input v-model="form.NoticeContent" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
         </el-form-item>
-        <el-form-item  :label="$t('system:notice:label:file')">
-          <el-upload
-            class="upload-demo"
-            action
-            :before-upload="beforeUpload"
-            :http-request="handleUploadFile"
-            :on-preview="handlePreview"
-            :on-remove="handleRemoveFile"
-            :show-file-list="true"
-            :limit="1"
-            :file-list="fileList"
-          >
-            <el-button size="small" type="primary" :disabled="fileList.length > 0">{{$t('common:button:upload')}}</el-button>
+        <el-form-item :label="$t('system:notice:label:file')">
+          <el-upload class="upload-demo" action :before-upload="beforeUpload" :http-request="handleUploadFile"
+            :on-preview="handlePreview" :on-remove="handleRemoveFile" :show-file-list="true" :limit="1"
+            :file-list="fileList">
+            <el-button size="small" type="primary"
+              :disabled="fileList.length > 0">{{ $t('common:button:upload') }}</el-button>
           </el-upload>
         </el-form-item>
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">{{ $t('common:button:cancel') }}</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">{{ $t('common:button:cancel')
+        }}</el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">{{ $t('common:button:save')
+        }}</el-button>
     </template>
   </base-model>
 </template>
@@ -178,7 +132,7 @@ export default {
       this.loading = true
       var file = await this.fileToBlob(param.file)
       const res = await this.OSSclient.put(`/System/NoticeAttachment/${param.file.name}`, file)
-      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), fullPath: this.$getObjectName(res.url), url:  this.$getObjectName(res.url)})
+      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), fullPath: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
       this.form.Path = this.$getObjectName(res.url)
       this.form.FileName = param.file.name
       this.loading = false