diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue index 3955faef..dc72218a 100644 --- a/src/views/dicom-show/dicom-study.vue +++ b/src/views/dicom-show/dicom-study.vue @@ -53,6 +53,7 @@
@@ -72,17 +73,17 @@
+ @click.stop="popperClick(seriesList, item)" />
-
+
{{ item.modality }}: {{ item.instanceCount }} image
-
+
T: {{ parseFloat(item.sliceThickness).toFixed(2) }}
-
{{ item.description }}
@@ -203,7 +204,8 @@ export default { isReading: null, activeSeriesId: null, isPacs: false, - isComparison: false + isComparison: false, + activeInstanceId: null } }, created: function () { @@ -536,6 +538,7 @@ export default { showSeriesImage(e, seriesIndex, series) { if (this.isComparison) return false this.activeSeriesId = series.seriesId + this.activeInstanceId = null workSpeedclose(true) // if (seriesIndex === this.currentSeriesIndex) return const element = e.currentTarget @@ -584,6 +587,7 @@ export default { }, showMultiFrames(series, seriesIndex, instanceInfo) { this.currentSeriesIndex = seriesIndex + this.activeInstanceId = instanceInfo.Id const imageIds = [] if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { @@ -1193,6 +1197,10 @@ export default { border-color: #213a54 !important; background-color: #213a54; } +.frame_content_active { + border-color: #213a54 !important; + background-color: #213a54; +} /* .viewerRightSidePanel { width: 300px; diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue index 6eeb249e..e4f303ac 100644 --- a/src/views/dicom-show/dicom-visit.vue +++ b/src/views/dicom-show/dicom-visit.vue @@ -19,25 +19,26 @@ -
+
{{ study.Description }}
-
- {{ study.Modalities }} : {{ study.SeriesCount }} Series +
+ {{ study.Modalities }} : {{ study.SeriesCount }} Series +
@@ -207,6 +210,7 @@
@@ -327,7 +331,8 @@ export default { isFromCRCUpload: false, visitTaskId: null, page: '', - activeSeriesId: null + activeSeriesId: null, + activeInstanceId: null } }, mounted() { @@ -522,6 +527,7 @@ export default { }, showSeriesImage(e, studyIndex, seriesIndex, series) { this.activeSeriesId = series.seriesId + this.activeInstanceId = null workSpeedclose(true) const element = e.currentTarget const elements = document.querySelectorAll('[series-type]') @@ -563,6 +569,7 @@ export default { }, showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) { this.currentSeriesIndex = seriesIndex + this.activeInstanceId = instanceInfo.Id const imageIds = [] if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { @@ -886,6 +893,7 @@ export default { }, showRelationSeriesImage(e, series, studyIndex, index) { this.activeSeriesId = series.seriesId + this.activeInstanceId = null workSpeedclose(true) this.currentRelationIndex = index const element = e.currentTarget @@ -1105,6 +1113,7 @@ export default { padding: 0; margin-right: 2px; color: #D0D0D0; + overflow-x: hidden; overflow-y: auto; } @@ -1113,6 +1122,8 @@ export default { word-break: break-all; display: table; width: 100%; + box-sizing: border-box; + overflow-x: hidden; border: 1px solid #3e3f3a; } @@ -1219,12 +1230,24 @@ export default { .viewerContainer .el-collapse { border: none; + width: 100%; + min-width: 0; + box-sizing: border-box; + overflow-x: hidden; } .viewerContainer .el-collapse-item { background-color: #585453 !important; color: #ddd; + width: 100%; + min-width: 0; + box-sizing: border-box; +} +.viewerContainer .el-collapse-item__wrap { + width: 100%; + min-width: 0; + box-sizing: border-box; } .viewerContainer .el-collapse-item__content { @@ -1237,9 +1260,42 @@ export default { background-color: #585453 !important; color: #ddd; border-bottom-color: #5a5a5a; + width: 100%; + min-width: 0; + box-sizing: border-box; padding-left: 5px; - height: 40px; + height: auto; + min-height: 30px; line-height: 20px; + align-items: flex-start; + padding-top: 4px; + padding-bottom: 4px; +} + +.viewerContainer .collapse-title-wrapper { + display: flex; + flex: 1; + min-width: 0; + flex-wrap: wrap; + align-items: center; + column-gap: 6px; + row-gap: 2px; + line-height: 16px; + padding-right: 8px; +} + +.viewerContainer .collapse-title-wrapper .text-desc { + flex: 0 1 auto; + min-width: 0; + max-width: 100%; + white-space: normal; + word-break: break-word; + overflow-wrap: anywhere; +} + +.viewerContainer .collapse-title-wrapper .collapse-title-extra { + flex: 0 1 auto; + text-align: left; } .instance_frame_wrapper { @@ -1282,6 +1338,10 @@ export default { border-color: #213a54 !important; background-color: #213a54; } +.frame_content_active { + border-color: #213a54 !important; + background-color: #213a54; +} /* .viewerRightSidePanel { width: 300px; diff --git a/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue b/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue index 36febec1..8827eba7 100644 --- a/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue +++ b/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue @@ -90,15 +90,69 @@ - - - - - - - - - + + + + + + + + +