From c580c70bd04b0d0164a9ac646157f982e0691abd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 27 Apr 2026 16:47:59 +0800
Subject: [PATCH] 1

---
 .../components/customize/ReportPage.vue       | 36 -------------------
 1 file changed, 36 deletions(-)

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 d0470d09..5e3f91f5 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
@@ -10,22 +10,6 @@
           </el-button>
           <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="getReportInfo">
             {{
-<<<<<<< HEAD
-            $t('trials:readingReport:button:refresh') }}
-          </el-button>
-          <el-button
-            v-if="readingTaskState < 2"
-            type="primary"
-            size="small"
-            @click="handleSave(true)"
-          >
-            {{
-            $t('common:button:save') }}
-          </el-button>
-          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="handleConfirm">
-            {{
-            $t('common:button:submit') }}
-=======
               $t('trials:readingReport:button:refresh') }}
           </el-button>
           <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="handleSave(true)">
@@ -35,38 +19,18 @@
           <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="handleConfirm">
             {{
               $t('common:button:submit') }}
->>>>>>> main
           </el-button>
         </div>
       </div>
       <div style="flex: 1">
-<<<<<<< HEAD
-        <el-table
-          v-if="taskQuestions.length > 0"
-          ref="reportList"
-          v-adaptive="{ bottomOffset: 0 }"
-          :data="taskQuestions"
-          row-key="Id"
-          border
-          default-expand-all
-          height="100"
-          :tree-props="{ children: 'Childrens', hasChildren: 'hasChildren' }"
-          size="mini"
-        >
-=======
         <el-table v-if="taskQuestions.length > 0" ref="reportList" v-adaptive="{ bottomOffset: 0 }"
           :data="taskQuestions" row-key="Id" border default-expand-all height="100"
           :tree-props="{ children: 'Childrens', hasChildren: 'hasChildren' }" size="mini">
->>>>>>> main
           <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 :
-<<<<<<< HEAD
-                scope.row.QuestionName }}
-=======
                   scope.row.QuestionName }}
->>>>>>> main
                 <svg-icon
                   v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1)"
                   icon-class="readingChart"