Compare commits

..

No commits in common. "d57c3b515721704a3368e3c9b1ae0c7eae84d095" and "f03db6f995ef7406fa23b6f52e8b294f1ee07cde" have entirely different histories.

1 changed files with 34 additions and 23 deletions

View File

@ -32,8 +32,13 @@
<svg-icon icon-class="rotate" class="svg-icon" />
</div>
<!-- 查看关键序列 -->
<el-popover v-model="keySeriesPopoverVisible" placement="bottom" trigger="click"
popper-class="key-series-popper" @show="showKeySeriesPanel">
<el-popover
v-model="keySeriesPopoverVisible"
placement="bottom"
trigger="click"
popper-class="key-series-popper"
@show="showKeySeriesPanel"
>
<ul class="key-series-list">
<li v-if="keyTaskInfo && keyTaskInfo.TaskBlindName" class="key-series-header">
<div class="key-series-header-top">
@ -51,8 +56,12 @@
<li v-else-if="keySeries.length === 0" class="key-series-empty">
{{ $t('trials:reading:keyImage:noData') }}
</li>
<li v-for="(kf, idx) in keySeries" :key="idx" class="key-series-item"
@click.stop.prevent="jumpToKeySeries(kf)">
<li
v-for="(kf, idx) in keySeries"
:key="idx"
class="key-series-item"
@click.stop.prevent="jumpToKeySeries(kf)"
>
<div class="key-series-img">
<img v-if="kf.PicturePath" :src="`${OSSclientConfig.basePath}${kf.PicturePath}`" />
<svg-icon v-else icon-class="image" class="svg-icon default-icon" />
@ -108,9 +117,13 @@
:title="$t('trials:nondicom-show:scale')" @click.prevent="setAnnotateToolActive('Lengthscale')">
<svg-icon icon-class="lengthscale" class="svg-icon" />
</div>
<!-- 截图 -->
<div class="tool-item" :title="$t('trials:reading:button:screenShot')" @click.prevent="saveImage">
<div
class="tool-item"
:title="$t('trials:reading:button:screenShot')"
@click.prevent="saveImage"
>
<svg-icon icon-class="image" class="svg-icon" />
</div>
<!-- 重置 -->
@ -118,8 +131,8 @@
<svg-icon icon-class="refresh" class="svg-icon" />
</div>
<!-- 更多:class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']" -->
<div v-if="criterionType === 0 && customizeStandardsNoneDicom.length > 0" :title="$t('trials:reading:button:more')"
:class="['tool-item']" @click.stop="showPanel($event)" @mouseleave="toolMouseout">
<div v-if="criterionType === 0" :title="$t('trials:reading:button:more')" :class="['tool-item']"
@click.stop="showPanel($event)" @mouseleave="toolMouseout">
<div class="dropdown">
<div class="icon" data-tool="more">
<svg-icon icon-class="more" class="svg-icon" />
@ -297,8 +310,8 @@
</div>
<div class="content-main" :ref="`video-content-main-${index}`" style="flex: 1;">
<video v-if="v.currentFilePath" :ref="`videovideo-${index}`"
:src="`${OSSclientConfig.basePath}${v.currentFilePath}`" crossorigin="anonymous" width="100%"
height="100%" autoplay controls controlsList="nodownload"></video>
:src="`${OSSclientConfig.basePath}${v.currentFilePath}`" crossorigin="anonymous"
width="100%" height="100%" autoplay controls controlsList="nodownload"></video>
</div>
</div>
@ -336,7 +349,7 @@
</el-tab-pane>
<!-- 其他 -->
<el-tab-pane :label="$t('trials:reading:tab:others')" name="2">
<Others v-if="activeName === '2'" :imageToolType="2" />
<Others v-if="activeName === '2'" :imageToolType="2"/>
</el-tab-pane>
</el-tabs>
</el-dialog>
@ -1435,7 +1448,7 @@ export default {
this.saveCustomAnnotationTimer = null
}
this.saveCustomAnnotation(annotation)
}
}
} else {
// if (this.isNumber(operateStateEnum)) {
// this.removeAnnotation(annotation)
@ -1930,7 +1943,7 @@ export default {
if (currentViewport.fileType && currentViewport.fileType.includes('mp4')) {
divForDownloadViewport = this.$refs[`grid-cell-${this.activeCanvasIndex}`][0]
const videoEl = this.$refs[`videovideo-${this.activeCanvasIndex}`][0]
if (videoEl) {
// canvas
const tempCanvas = document.createElement('canvas')
@ -1939,7 +1952,7 @@ export default {
const containerHeight = videoEl.clientHeight
tempCanvas.width = containerWidth
tempCanvas.height = containerHeight
const ctx = tempCanvas.getContext('2d')
//
ctx.fillStyle = '#000'
@ -1948,7 +1961,7 @@ export default {
// ( object-fit: contain)
const videoWidth = videoEl.videoWidth || containerWidth
const videoHeight = videoEl.videoHeight || containerHeight
const scale = Math.min(containerWidth / videoWidth, containerHeight / videoHeight)
const drawWidth = videoWidth * scale
const drawHeight = videoHeight * scale
@ -1957,9 +1970,9 @@ export default {
//
ctx.drawImage(videoEl, offsetX, offsetY, drawWidth, drawHeight)
const frameBase64 = tempCanvas.toDataURL('image/png')
// img video
tempImg = document.createElement('img')
tempImg.src = frameBase64
@ -1969,7 +1982,7 @@ export default {
tempImg.style.width = '100%'
tempImg.style.height = '100%'
tempImg.style.zIndex = '99'
const videoContainer = this.$refs[`video-content-main-${this.activeCanvasIndex}`][0]
videoContainer.style.position = 'relative'
videoContainer.appendChild(tempImg)
@ -1985,11 +1998,11 @@ export default {
// DOM
await this.$nextTick()
const canvas = await html2canvas(divForDownloadViewport, {
const canvas = await html2canvas(divForDownloadViewport, {
useCORS: true,
backgroundColor: '#000000' //
})
//
if (tempImg) {
tempImg.remove()
@ -1997,7 +2010,7 @@ export default {
const base64Str = canvas.toDataURL('image/png', 1)
const downloadName = `${Date.now()}.png`
const a = document.createElement('a')
a.href = base64Str
a.download = downloadName
@ -2587,13 +2600,11 @@ export default {
}
}
}
.personal_config {
::v-deep .el-tabs__content {
height: 450px;
overflow-y: auto;
}
::v-deep .hot-keys-label {
color: #dfdfdf !important;
}