Compare commits

..

No commits in common. "0a3a4e3bb4e0502e61e0de0b036d6c904c459418" and "2bf9b21f40534701557cf237ba6ad97e36de0250" have entirely different histories.

3 changed files with 5 additions and 14 deletions

View File

@ -3474,10 +3474,6 @@ export default {
async toggleTaskByViewport(obj) { async toggleTaskByViewport(obj) {
const i = this.visitTaskList.findIndex(v => v.VisitTaskNum === obj.visitTaskNum) const i = this.visitTaskList.findIndex(v => v.VisitTaskNum === obj.visitTaskNum)
if (i === -1) return if (i === -1) return
if (this.readingTool === 3) {
let res = await this.changeScreenSave()
if (!res) return false
}
this.activeTaskId = this.visitTaskList[i].VisitTaskId this.activeTaskId = this.visitTaskList[i].VisitTaskId
this.activeTaskIndex = i this.activeTaskIndex = i
if (!this.selectArr.includes(this.activeTaskId)) { if (!this.selectArr.includes(this.activeTaskId)) {
@ -3513,11 +3509,6 @@ export default {
this.setToolsPassive() this.setToolsPassive()
}, },
async activeSeries(obj) { async activeSeries(obj) {
if (this.readingTool === 3) {
let res = await this.changeScreenSave()
if (!res) return false
DicomEvent.$emit('activeSeries', obj)
}
if (this.isFusion || this.isMPR) { if (this.isFusion || this.isMPR) {
if (this.isFusion && this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].verifyAnnotationIsSave()) { if (this.isFusion && this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].verifyAnnotationIsSave()) {
const confirm = await this.$confirm(this.$t('trials:reading:confirm:clearnAnnotation')) const confirm = await this.$confirm(this.$t('trials:reading:confirm:clearnAnnotation'))

View File

@ -977,7 +977,7 @@ export default {
this.selectSegment(this.segmentList[groupIndex].segments[0]) this.selectSegment(this.segmentList[groupIndex].segments[0])
} }
this.$emit('resetQuestion') this.$emit('resetQuestion')
this.saveSegmentGroup([this.segmentList[groupIndex]], true) this.saveSegmentGroup([this.segmentList[groupIndex]], false)
}, },
resetViewport(passive = true) { resetViewport(passive = true) {

View File

@ -107,7 +107,7 @@
</div> </div>
<div v-if="series.Description" class="text-desc" :title="series.Description"> <div v-if="series.Description" class="text-desc" :title="series.Description">
{{ series.Description }} {{ series.Description }}
</div> </div>
<div v-if="series.SliceThickness && !study.IsCriticalSequence" class="text-desc"> <div v-if="series.SliceThickness && !study.IsCriticalSequence" class="text-desc">
T: {{ parseFloat(series.SliceThickness).toFixed(digitPlaces) }} T: {{ parseFloat(series.SliceThickness).toFixed(digitPlaces) }}
@ -199,9 +199,10 @@ export default {
}, },
methods: { methods: {
activeSeries(series, seriesIndex, studyIndex) { activeSeries(series, seriesIndex, studyIndex) {
this.$emit('activeSeries', series)
this.activeStudyIndex = studyIndex this.activeStudyIndex = studyIndex
this.activeSeriesIndex = seriesIndex this.activeSeriesIndex = seriesIndex
this.$emit('activeSeries', series)
DicomEvent.$emit('activeSeries', series)
}, },
activeStudy(id) { activeStudy(id) {
if (this.activeNames.indexOf(id) > -1) return if (this.activeNames.indexOf(id) > -1) return
@ -266,7 +267,6 @@ export default {
// display: inline-block; // display: inline-block;
text-align: right; text-align: right;
} }
.patient-info-popper { .patient-info-popper {
font-size: 12px; font-size: 12px;
color: #ddd; color: #ddd;
@ -291,7 +291,7 @@ export default {
line-height: 18px; line-height: 18px;
} }
.patient-info-popper .patient-info-row+.patient-info-row { .patient-info-popper .patient-info-row + .patient-info-row {
margin-top: 4px; margin-top: 4px;
} }