Compare commits

..

No commits in common. "8ff9e3b2324d2372ef90b14a6220ddf5dfac1400" and "07b1e5d1f97161793b968feaca6a03e72868f8ca" have entirely different histories.

2 changed files with 20 additions and 54 deletions

View File

@ -17,19 +17,18 @@
<div <div
v-else v-else
class="dicom-desc" class="dicom-desc"
style="white-space: normal;" style="width: 135px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
> >
<div> <div>
<div style="text-overflow: ellipsis;overflow: hidden;"> <div style="text-overflow: ellipsis;overflow: hidden;">
<span :title="study.StudyCode">{{ study.StudyCode }}</span>
<span v-if="taskInfo && taskInfo.IsShowStudyName && study.StudyName" :title="study.StudyName"> <span v-if="taskInfo && taskInfo.IsShowStudyName && study.StudyName" :title="study.StudyName" style="margin-left: 5px;">
{{study.StudyName}} {{study.StudyName}}
</span> </span>
</div> </div>
<div> <div style="text-overflow: ellipsis;overflow: hidden;">
<span class="study-meta-line" :title="study.Modalities"> <span class="study-meta-line" :title="study.Modalities">
<span class="study-code" :title="study.StudyCode">{{ study.StudyCode }}</span> <span>{{ study.Modalities }} ({{ study.SeriesCount }})</span>
<span class="study-modality">{{ study.Modalities }}({{ study.SeriesCount }})</span>
<span class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)"> <span class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)">
<el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper"> <el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper">
<h4>{{ $t('trials:ptData:title') }}</h4> <h4>{{ $t('trials:ptData:title') }}</h4>
@ -974,29 +973,12 @@ export default {
text-align: left; text-align: left;
color: #d0d0d0; color: #d0d0d0;
padding: 2px; padding: 2px;
white-space: normal;
overflow: visible;
} }
.study-meta-line { .study-meta-line {
// display: grid; display: inline-flex;
// grid-template-columns: minmax(0, 1fr) auto; align-items: center;
// align-items: start; gap: 6px;
// gap: 6px;
vertical-align: middle; vertical-align: middle;
width: 100%;
min-width: 0;
}
.study-meta-main {
display: block;
min-width: 0;
white-space: normal;
overflow-wrap: anywhere;
flex: 1;
}
.study-code,
.study-modality {
white-space: normal;
margin: 0 2px;
} }
.study-desc-text { .study-desc-text {
min-width: 0; min-width: 0;
@ -1098,7 +1080,7 @@ export default {
background-color: #000!important; background-color: #000!important;
color: #ddd; color: #ddd;
border-bottom-color:#5a5a5a; border-bottom-color:#5a5a5a;
padding-left: 1px; padding-left: 5px;
min-height: 40px; min-height: 40px;
height: auto; height: auto;
line-height: 20px; line-height: 20px;
@ -1183,7 +1165,6 @@ export default {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
line-height: 1; line-height: 1;
flex: 0 0 auto;
} }
.patient-info-popper { .patient-info-popper {
font-size: 12px; font-size: 12px;

View File

@ -15,14 +15,14 @@
<template slot="title"> <template slot="title">
<div v-if="readingTool !== 3 || !study.IsCriticalSequence" class="dicom-desc"> <div v-if="readingTool !== 3 || !study.IsCriticalSequence" class="dicom-desc">
<div style="text-overflow: ellipsis;overflow: hidden;"> <div style="text-overflow: ellipsis;overflow: hidden;">
<span v-if="taskInfo && taskInfo.IsShowStudyName && study.StudyName" :title="study.StudyName"> <span :title="study.StudyCode">{{ study.StudyCode }}</span>
<span v-if="taskInfo && taskInfo.IsShowStudyName && study.StudyName" :title="study.StudyName" style="margin-left: 5px;">
{{ study.StudyName }} {{ study.StudyName }}
</span> </span>
</div> </div>
<div> <div style="text-overflow: ellipsis;overflow: hidden;">
<span class="study-meta-line" :title="study.Modalities"> <span class="study-meta-line" :title="study.Modalities">
<span class="study-code" :title="study.StudyCode">{{ study.StudyCode }}</span> <span>{{ `${study.Modalities} (${study.SeriesCount})` }}</span>
<span class="study-modality">{{ `${study.Modalities}(${study.SeriesCount})` }}</span>
<span class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)"> <span class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)">
<el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper"> <el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper">
<h4>{{ $t('trials:ptData:title') }}</h4> <h4>{{ $t('trials:ptData:title') }}</h4>
@ -332,35 +332,20 @@ export default {
text-align: left; text-align: left;
color: #d0d0d0; color: #d0d0d0;
padding: 2px; padding: 2px;
white-space: normal; white-space: nowrap;
overflow: visible; overflow: hidden;
text-overflow: ellipsis;
} }
.study-meta-line { .study-meta-line {
// display: grid; display: inline-flex;
// grid-template-columns: minmax(0, 1fr) auto; align-items: center;
// align-items: start; gap: 6px;
// gap: 6px;
vertical-align: middle; vertical-align: middle;
width: 100%;
min-width: 0;
}
.study-meta-main {
display: block;
min-width: 0;
white-space: normal;
overflow-wrap: anywhere;
flex: 1;
}
.study-code,
.study-modality {
white-space: normal;
margin: 0 2px;
} }
.patient-info { .patient-info {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
line-height: 1; line-height: 1;
flex: 0 0 auto;
} }
.ps { .ps {
@ -445,7 +430,7 @@ export default {
background-color: #000 !important; background-color: #000 !important;
color: #ddd; color: #ddd;
border-bottom-color: #5a5a5a; border-bottom-color: #5a5a5a;
padding-left: 1px; padding-left: 5px;
min-height: 40px; min-height: 40px;
height: auto; height: auto;
line-height: 20px; line-height: 20px;