XCKJ/irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'uat'
continuous-integration/drone/push Build is passing
Details

Browse Source 
# Conflicts:
#	src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
#	src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
This commit is contained in:
wangxiaoshuang
2025-03-05 10:12:21 +08:00
parent a0594cab96 ba26476c52
commit ecebeb2271
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/none-dicom-show/index.vue
+3 -3
View File
@@ -9,9 +9,9 @@
<div v-for="(study, i) in studyList" :key="study.CodeView"> <div v-for="(study, i) in studyList" :key="study.CodeView">
<div class="study-desc"> <div class="study-desc">
<span>{{ study.CodeView }}</span> <span>{{ study.CodeView }}</span>
<span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">{{ <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">
study.StudyName {{ study.StudyName }}
}}</span> </span>
<span style="margin: 0 5px">{{ study.Modality }}</span> <span style="margin: 0 5px">{{ study.Modality }}</span>
<span>{{ getBodyPart(study.BodyPart) }}</span> <span>{{ getBodyPart(study.BodyPart) }}</span>
</div> </div>
src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
+2 -2
View File
@@ -113,14 +113,14 @@
prop="UploadedTime" prop="UploadedTime"
:label="$t('trials:uploadedDicoms:table:uploadedTime')" :label="$t('trials:uploadedDicoms:table:uploadedTime')"
sortable sortable
min-width="80" min-width="120"
show-overflow-tooltip show-overflow-tooltip
/> />
<!-- 更新时间 --> <!-- 更新时间 -->
<el-table-column <el-table-column
prop="UpdateTime" prop="UpdateTime"
:label="$t('trials:uploadedDicoms:table:UpdateTime')" :label="$t('trials:uploadedDicoms:table:UpdateTime')"
min-width="80" min-width="120"
show-overflow-tooltip show-overflow-tooltip
sortable sortable
/> />
src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+2 -2
View File
@@ -156,7 +156,7 @@
<el-table-column <el-table-column
prop="UploadedTime" prop="UploadedTime"
:label="$t('trials:uploadedDicoms:table:uploadedTime')" :label="$t('trials:uploadedDicoms:table:uploadedTime')"
min-width="80" min-width="120"
show-overflow-tooltip show-overflow-tooltip
sortable sortable
/> />
@@ -164,7 +164,7 @@
<el-table-column <el-table-column
prop="UpdateTime" prop="UpdateTime"
:label="$t('trials:uploadedDicoms:table:UpdateTime')" :label="$t('trials:uploadedDicoms:table:UpdateTime')"
min-width="80" min-width="120"
show-overflow-tooltip show-overflow-tooltip
sortable sortable
/> />
static/pdfjs/web/viewer.js
+1 -1
View File
@@ -11760,7 +11760,7 @@ const DEFAULT_L10N_STRINGS = {
rendering_error: "An error occurred while rendering the page.", rendering_error: "An error occurred while rendering the page.",
page_scale_width: "Page Width", page_scale_width: "Page Width",
page_scale_fit: "Page Fit", page_scale_fit: "Page Fit",
page_scale_auto: "Automatic Zoom", page_scale_auto: "100%", //Automatic Zoom
page_scale_actual: "Actual Size", page_scale_actual: "Actual Size",
page_scale_percent: "{{scale}}%", page_scale_percent: "{{scale}}%",
loading: "Loading…", loading: "Loading…",