From 6950883dbfcd5ea698bf7946d45b81ff73dce6ae Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 23 May 2024 14:30:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E6=A3=80=E6=9F=A5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/StudyList.vue   | 67 +++++++++---------
 .../dicoms/customize/CustomizeDicomViewer.vue | 33 ++++-----
 .../dicoms/customize/CustomizeStudyList.vue   | 69 +++++++++----------
 3 files changed, 80 insertions(+), 89 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index 28bed335..bfde4b66 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -49,22 +49,32 @@
                 />
                 <div class="image-desc">
                   <div class="flex-div">
-                    <div style="display: flex;justify-content: space-between;width:100%;">
-                      <div v-if="!study.IsCriticalSequence">#{{ series.seriesNumber }} </div>
-                      <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
-                        <el-popover
-                          placement="right"
-                          trigger="hover"
-                          popper-class="instance_frame_wrapper"
+                    <div style="width: 40px;display: flex;flex-direction: row;justify-content: space-between;">
+                      <div v-if="!study.IsCriticalSequence">#{{ series.seriesNumber }}</div>
+                      <div v-if="series.isDicom && series.prefetchInstanceCount<series.instanceCount && series.modality!== 'SR'">
+                        <!-- 下载 -->
+                        <el-tooltip v-if="!series.isLoading" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
+                          <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
+                        </el-tooltip>
+                      </div>
+                      <el-tooltip v-else-if="series.isDicom && series.prefetchInstanceCount === 0 &&series.modality!== 'SR'" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
+                        <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
+                      </el-tooltip>
+                    </div>
+                    <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
+                      <el-popover
+                        placement="right"
+                        trigger="hover"
+                        popper-class="instance_frame_wrapper"
+                      >
+                        <div
+                          v-for="(instance, idx) in series.instanceInfoList"
+                          :key="instance.Id"
+                          class="frame_content"
+                          :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
+                          @click.stop="showMultiFrames(index,series, i, instance)"
                         >
-                          <div
-                            v-for="(instance, idx) in series.instanceInfoList"
-                            :key="instance.Id"
-                            class="frame_content"
-                            :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                            @click.stop="showMultiFrames(index,series, i, instance)"
-                          >
-                            <!-- <div>
+                          <!-- <div>
                                         <img
                                           class="image-preview"
                                           :src="series.previewImageUrl"
@@ -74,30 +84,15 @@
                                           fit="fill"
                                         >
                                       </div> -->
-                            <div>
-                              <div>{{ instance.InstanceNumber }}</div>
-                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                            </div>
-
+                          <div>
+                            <div>{{ instance.InstanceNumber }}</div>
+                            <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
                           </div>
-                          <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
-                        </el-popover>
-                      </div>
-                    </div>
 
-                    <div v-if="series.isDicom && series.prefetchInstanceCount<series.instanceCount && series.modality!== 'SR'">
-                      <!-- 下载 -->
-                      <el-tooltip v-if="!series.isLoading" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
-                        <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
-                      </el-tooltip>
-                      <!-- 暂停 -->
-                      <!-- <el-tooltip v-else class="item" effect="dark" :content="$t('trials:reading:button:pause')" placement="bottom">
-                        <i class="el-icon-video-pause" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="stopLoadSeries(series,index,i)" />
-                      </el-tooltip> -->
+                        </div>
+                        <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
+                      </el-popover>
                     </div>
-                    <el-tooltip v-else-if="series.isDicom && series.prefetchInstanceCount === 0 &&series.modality!== 'SR'" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
-                      <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
-                    </el-tooltip>
                   </div>
                   <p v-show="series.description">
                     <el-tooltip class="item" effect="dark" :content="series.description" placement="right">
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 882a259d..643ebee8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -280,6 +280,21 @@
             <div class="text">{{ tool.text }}</div>
           </div> -->
         </div>
+        
+        <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)"
+            >
+              <svg-icon icon-class="clear" class="svg-icon" />
+            </div>
+            <!-- 缩放 -->
+            <div class="text">{{ $t('trials:dicom-show:Eraser') }}</div>
+          </div>
+        </el-tooltip>
         <div class="tool-frame">
           <!-- 第一帧 -->
           <el-tooltip class="item" effect="dark" :content="$t('trials:dicom-show:firstframe')" placement="bottom">
@@ -325,21 +340,7 @@
             </select>
           </el-tooltip>
         </div>
-        <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)"
-            >
-              <svg-icon icon-class="clear" class="svg-icon" />
-            </div>
-            <!-- 缩放 -->
-            <div class="text">{{ $t('trials:dicom-show:Eraser') }}</div>
-          </div>
-        </el-tooltip>
-        <!-- <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"
@@ -349,7 +350,7 @@
             </div>
             <div class="text">{{ $t('trials:reading:button:reset') }}</div>
           </div>
-        </el-tooltip> -->
+        </el-tooltip>
 
         <div style="margin-left:auto;">
           <div style="padding:5px">
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
index 0382af36..990b3e2d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -49,22 +49,32 @@
                 />
                 <div class="image-desc">
                   <div class="flex-div">
-                    <div style="display: flex;justify-content: space-between;width:100%;">
-                      <div v-if="!study.IsCriticalSequence">#{{ series.seriesNumber }} </div>
-                      <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
-                        <el-popover
-                          placement="right"
-                          trigger="hover"
-                          popper-class="instance_frame_wrapper"
-                        > 
-                          <div
-                            v-for="(instance, idx) in series.instanceInfoList"
-                            :key="instance.Id"
-                            class="frame_content"
-                            :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                            @click.stop="showMultiFrames(index,series, i, instance)"
-                          >
-                            <!-- <div>
+                    <div style="width: 40px;display: flex;flex-direction: row;justify-content: space-between;">
+                      <div v-if="!study.IsCriticalSequence">#{{ series.seriesNumber }}</div>
+                      <div v-if="series.isDicom && series.prefetchInstanceCount<series.instanceCount && series.modality!== 'SR'">
+                        <!-- 下载 -->
+                        <el-tooltip v-if="!series.isLoading" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
+                          <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
+                        </el-tooltip>
+                      </div>
+                      <el-tooltip v-else-if="series.isDicom && series.prefetchInstanceCount === 0 &&series.modality!== 'SR'" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
+                        <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
+                      </el-tooltip>
+                    </div>
+                    <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
+                      <el-popover
+                        placement="right"
+                        trigger="hover"
+                        popper-class="instance_frame_wrapper"
+                      >
+                        <div
+                          v-for="(instance, idx) in series.instanceInfoList"
+                          :key="instance.Id"
+                          class="frame_content"
+                          :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
+                          @click.stop="showMultiFrames(index,series, i, instance)"
+                        >
+                          <!-- <div>
                                         <img
                                           class="image-preview"
                                           :src="series.previewImageUrl"
@@ -74,30 +84,15 @@
                                           fit="fill"
                                         >
                                       </div> -->
-                            <div>
-                              <div>{{ instance.InstanceNumber }}</div>
-                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                            </div>
-
+                          <div>
+                            <div>{{ instance.InstanceNumber }}</div>
+                            <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
                           </div>
-                          <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
-                        </el-popover>
-                      </div>
-                    </div>
 
-                    <div v-if="series.isDicom && series.prefetchInstanceCount<series.instanceCount && series.modality!== 'SR'">
-                      <!-- 下载 -->
-                      <el-tooltip v-if="!series.isLoading" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
-                        <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
-                      </el-tooltip>
-                      <!-- 暂停 -->
-                      <!-- <el-tooltip v-else class="item" effect="dark" :content="$t('trials:reading:button:pause')" placement="bottom">
-                        <i class="el-icon-video-pause" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="stopLoadSeries(series,index,i)" />
-                      </el-tooltip> -->
+                        </div>
+                        <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
+                      </el-popover>
                     </div>
-                    <el-tooltip v-else-if="series.isDicom && series.prefetchInstanceCount === 0 &&series.modality!== 'SR'" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
-                      <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
-                    </el-tooltip>
                   </div>
                   <p v-show="series.description">
                     <el-tooltip class="item" effect="dark" :content="series.description" placement="right">