From 2dc2383d9df15fc028cad2a26a1557583aa3254c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 8 Mar 2024 09:58:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=9E=8D=E5=90=88=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue | 185 +++++++++---------
 .../dicoms/components/Lugano/QuestionList.vue |   7 +-
 2 files changed, 96 insertions(+), 96 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 29a52afb..9de839a6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -466,7 +466,7 @@
       width="850px"
     >
 
-      <el-form ref="fusionForm" :model="fusionForm" label-width="80px">
+      <el-form ref="fusionForm" :model="fusionForm">
         <!-- 检查 -->
         <el-form-item
           :label="$t('trials:lugano:fusionDialog:label:study')"
@@ -491,105 +491,104 @@
         <!-- 融合图像 -->
         <el-form-item
           :label="$t('trials:lugano:fusionDialog:label:fusionImages')"
-        >
-          <div style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;" class="series-table">
+        />
+        <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: 340px"
-                size="mini"
-                height="300"
-                :default-sort="{prop: 'instanceCount', order: 'descending'}"
-                @selection-change="handleCTSelectionChange"
-                @select="handleCTSelect"
+          <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-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"
-                    />
-                  </template>
-                </el-table-column>
-                <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.description }}</div>
-                  </template>
-                </el-table-column>
-
-              </el-table>
-            </div>
-
-            <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: 340px"
-                size="mini"
-                height="300"
-                @selection-change="handlePTSelectionChange"
-                @select="handlePTSelect"
+                <template slot-scope="scope">
+                  <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
-                  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"
-                    />
-                  </template>
-                </el-table-column>
-                <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.description }}</div>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
+                <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.description }}</div>
+                </template>
+              </el-table-column>
+
+            </el-table>
           </div>
-        </el-form-item>
+
+          <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"
+              >
+                <template slot-scope="scope">
+                  <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
+              >
+                <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.description }}</div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
         <el-form-item style="text-align:right;">
           <!-- 取消 -->
           <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel') }}</el-button>
-           <!-- 确认 -->
+          <!-- 确认 -->
           <el-button
             type="primary"
             size="mini"
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 98a0feb3..e8edf58f 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
@@ -168,11 +168,11 @@
     >
       <div class="merge-table">
         <div class="merge-label">
-          <label>{{$t('trials:reading:lugano:label:currentLesion')}}</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>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
         <el-table
           :data="lesionData"
           style="width: 450px"
@@ -699,7 +699,8 @@ export default {
       })
     },
     confirmMerge() {
-      this.$confirm('融合后将无法撤销, 是否继续?', '提示', {
+    // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
         type: 'warning'
       }).then(() => {
         this.lesionMerge()