Merge branch 'uat'

# Conflicts:
#	src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
#	src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

src/views/none-dicom-show/index.vue

@@ -9,9 +9,9 @@
         <div v-for="(study, i) in studyList" :key="study.CodeView">
           <div class="study-desc">
             <span>{{ study.CodeView }}</span>
-            <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">{{
-              study.StudyName
-            }}</span>
+            <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">
+              {{ study.StudyName }}
+            </span>
             <span style="margin: 0 5px">{{ study.Modality }}</span>
             <span>{{ getBodyPart(study.BodyPart) }}</span>
           </div>

src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue

@@ -113,14 +113,14 @@
         prop="UploadedTime"
         :label="$t('trials:uploadedDicoms:table:uploadedTime')"
         sortable
-        min-width="80"
+        min-width="120"
         show-overflow-tooltip
       />
       <!-- 更新时间 -->
       <el-table-column
         prop="UpdateTime"
         :label="$t('trials:uploadedDicoms:table:UpdateTime')"
-        min-width="80"
+        min-width="120"
         show-overflow-tooltip
         sortable
       />

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -156,7 +156,7 @@
       <el-table-column
         prop="UploadedTime"
         :label="$t('trials:uploadedDicoms:table:uploadedTime')"
-        min-width="80"
+        min-width="120"
         show-overflow-tooltip
         sortable
       />
@@ -164,7 +164,7 @@
       <el-table-column
         prop="UpdateTime"
         :label="$t('trials:uploadedDicoms:table:UpdateTime')"
-        min-width="80"
+        min-width="120"
         show-overflow-tooltip
         sortable
       />

static/pdfjs/web/viewer.js

@@ -11760,7 +11760,7 @@ const DEFAULT_L10N_STRINGS = {
   rendering_error: "An error occurred while rendering the page.",
   page_scale_width: "Page Width",
   page_scale_fit: "Page Fit",
-  page_scale_auto: "Automatic Zoom",
+  page_scale_auto: "100%", //Automatic Zoom
   page_scale_actual: "Actual Size",
   page_scale_percent: "{{scale}}%",
   loading: "Loading…",