Compare commits

..

No commits in common. "a3b9cb7469dfec2e9b67a8f0653779be13361b20" and "fff5a0fcf5a1064d1ec43122255bab81793da7d9" have entirely different histories.

3 changed files with 14 additions and 22 deletions

View File

@ -247,7 +247,7 @@
<svg-icon icon-class="previousframe" style="font-size:20px;" />
</button>
<!-- 播放 -->
<button class="btn-link" :title="$t('trials:dicom-show:play')" @click="clipPlay">
<button class="btn-link" :title="$t('trials:dicom-show:play')" @click="currentDicomCanvas.toggleClipPlay()">
<svg-icon
:icon-class="currentDicomCanvas.toolState.clipPlaying ? 'stop' : 'play'"
style="font-size:20px;"
@ -261,10 +261,9 @@
<button class="btn-link" :title="$t('trials:dicom-show:lastframe')" @click="currentDicomCanvas.scrollPage(9999)">
<svg-icon icon-class="lastframe" style="font-size:20px;" />
</button>
<select v-model="fps" class="sidetool-select" style="width:60px" @change="setDicomCanvasfps($event)">
<select class="sidetool-select" style="width:60px" @change="setDicomCanvasfps($event)">
<!-- 默认值 -->
<option :value="5">5</option>
<option :value="10">10</option>
<option :value="10">{{ $t('trials:dicom-show:default') }}</option>
<option :value="15">15</option>
<option :value="20">20</option>
<option :value="30">30</option>
@ -387,8 +386,7 @@ export default {
wwwcList: [],
layout: null,
seriesList: [],
customWwc: { visible: false, title: null },
fps: 15
customWwc: { visible: false, title: null }
}
},
mounted() {
@ -568,10 +566,6 @@ export default {
setDicomCanvasfps(event) {
this.currentDicomCanvas.setFps(event.target.value)
},
clipPlay() {
this.currentDicomCanvas.setFps(this.fps)
this.currentDicomCanvas.toggleClipPlay()
},
fitToType(e, type) {
const toolButtons = document.querySelectorAll('[data-tool]')
Array.from(toolButtons).forEach((toolBtn) => {

View File

@ -328,9 +328,9 @@
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('trials:dicom-show:speed')" placement="bottom">
<select v-model="fps" class="select-wrapper" :disabled="clipPlaying" @change="setDicomCanvasfps($event)">
<select class="select-wrapper" :disabled="clipPlaying" @change="setDicomCanvasfps($event)">
<!-- 默认值 -->
<!-- <option :value="5">{{ $t('trials:dicom-show:default') }}</option> -->
<option :value="5">{{ $t('trials:dicom-show:default') }}</option>
<option :value="5">5</option>
<option :value="10">10</option>
<option :value="15">15</option>
@ -838,8 +838,7 @@ export default {
activeCanvasWW: null,
activeCanvasWC: null,
activeTaskInfo: {},
clipPlaying: false,
fps: 15
clipPlaying: false
}
},
@ -903,7 +902,6 @@ export default {
this.clipPlaying = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toolState.clipPlaying
} else {
this.clipPlaying = false
this.fps = 15
}
}
}
@ -1260,7 +1258,6 @@ export default {
},
loadImageStack(dicomSeries) {
this.clipPlaying = false
this.fps = 15
this.canvasObj[this.currentDicomCanvasIndex] = dicomSeries
this.$nextTick(() => {
this.activeSeries = dicomSeries
@ -1951,7 +1948,6 @@ export default {
const isLoaded = this.getSeriesLoadStatus()
if (!isLoaded) return
this.clipPlaying = isPlay
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setFps(this.fps)
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleClipPlay(isPlay)
},
getSeriesLoadStatus() {

View File

@ -448,8 +448,9 @@
class="select-wrapper"
:disabled="clipPlaying"
@change="setDicomCanvasfps($event)"
v-model="fps"
>
<!-- 默认值 -->
<option :value="5">{{ $t("trials:dicom-show:default") }}</option>
<option :value="5">5</option>
<option :value="10">10</option>
<option :value="15">15</option>
@ -856,7 +857,7 @@ export default {
isFullscreen: false,
manualsDialog: { visible: false },
clipPlaying: false,
fps: 15,
//
uploadImageVisible: false,
trialCriterion: {},
@ -899,7 +900,6 @@ export default {
][0].toolState.clipPlaying;
} else {
this.clipPlaying = false;
this.fps = 15
}
},
},
@ -1358,7 +1358,6 @@ export default {
},
loadImageStack(dicomSeries) {
this.clipPlaying = false;
this.fps = 15
this.canvasObj[this.currentDicomCanvasIndex] = dicomSeries;
if (this.activeTool) {
if (dicomSeries.isCurrentTask && dicomSeries.readingTaskState < 2) {
@ -2054,6 +2053,7 @@ export default {
dicomSeries.readingTaskState < 2
) {
if (this.activeTool && !type) {
console.log(1111122222);
this.measuredTools.forEach((item) => {
this.$refs[
`dicomCanvas${this.currentDicomCanvasIndex}`
@ -2068,6 +2068,7 @@ export default {
`dicomCanvas${this.currentDicomCanvasIndex}`
][0].setToolActive(toolName);
} else {
console.log(222233333);
this.measuredTools.forEach((item) => {
this.$refs[
`dicomCanvas${this.currentDicomCanvasIndex}`
@ -2079,6 +2080,7 @@ export default {
][0].setToolActive(toolName);
}
} else {
console.log(3333344444);
if (!this.activeTool) return;
this.measuredTools.forEach((item) => {
this.$refs[
@ -2091,6 +2093,7 @@ export default {
this.activeTool = "";
}
} else {
console.log(44445555);
if (this.activeTool === toolName) {
this.$refs[
`dicomCanvas${this.currentDicomCanvasIndex}`
@ -2157,7 +2160,6 @@ export default {
const isLoaded = this.getSeriesLoadStatus();
if (!isLoaded) return;
this.clipPlaying = isPlay;
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setFps(this.fps)
this.$refs[
`dicomCanvas${this.currentDicomCanvasIndex}`
][0].toggleClipPlay(isPlay);