Compare commits

..

No commits in common. "d1f90a2525402293fcf63f81bb23922772e15eb2" and "d37c44a26866f77075661c5e8b9e74cf7dc13d86" have entirely different histories.

7 changed files with 35 additions and 68 deletions

View File

@ -1203,7 +1203,7 @@ export default {
this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId this.stack.instanceId = instanceId
this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
// this.resetWwwc() this.resetWwwc()
resolve() resolve()
}) })
}, },
@ -1941,9 +1941,6 @@ export default {
for (const [key, value] of searchParams.entries()) { for (const [key, value] of searchParams.entries()) {
params[key] = value params[key] = value
} }
if (isNaN(params.frame)){
params.frame = 0
}
return params return params
}, },
preventDefault(e) { preventDefault(e) {

View File

@ -672,7 +672,7 @@ export default {
}, },
showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) { showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
this.currentSeriesIndex = seriesIndex this.currentSeriesIndex = seriesIndex
var idx = this.visitTaskIdx var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
const imageIds = [] const imageIds = []
if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {

View File

@ -1181,7 +1181,7 @@ export default {
this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId this.stack.instanceId = instanceId
this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
// this.resetWwwc() this.resetWwwc()
resolve() resolve()
}) })
}, },
@ -1921,9 +1921,6 @@ export default {
for (const [key, value] of searchParams.entries()) { for (const [key, value] of searchParams.entries()) {
params[key] = value params[key] = value
} }
if (isNaN(params.frame)){
params.frame = 0
}
return params return params
}, },
preventDefault(e) { preventDefault(e) {

View File

@ -600,8 +600,7 @@ export default {
this.studyIndex = studyIndex this.studyIndex = studyIndex
this.seriesIndex = seriesIndex this.seriesIndex = seriesIndex
this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
// var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
this.$emit('loadImageStack', dicomStatck) this.$emit('loadImageStack', dicomStatck)
if (!series.loadStatus && series.modality !== 'SR') { if (!series.loadStatus && series.modality !== 'SR') {
this.loopLoadStatus = -1 this.loopLoadStatus = -1
@ -643,20 +642,18 @@ export default {
}, },
showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) { showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
this.currentSeriesIndex = seriesIndex this.currentSeriesIndex = seriesIndex
var idx = this.visitTaskIdx
const imageIds = [] const imageIds = []
if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`)
} }
} else { } else {
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`)
} }
this.studyIndex = studyIndex this.studyIndex = studyIndex
this.seriesIndex = seriesIndex this.seriesIndex = seriesIndex
this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
// var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
dicomStatck.imageIds = imageIds dicomStatck.imageIds = imageIds
dicomStatck.imageIdIndex = 0 dicomStatck.imageIdIndex = 0
this.$emit('loadImageStack', dicomStatck) this.$emit('loadImageStack', dicomStatck)

View File

@ -78,22 +78,11 @@
{{ $t('trials:medicalFeedback:message:msg5') }} {{ $t('trials:medicalFeedback:message:msg5') }}
<ol> <ol>
<li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;"> <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
<viewer <el-button
v-if="file.ImagePath" type="text"
:ref="file.ImagePath" size="mini"
style="margin:0 10px;" @click="previewImage(file.ImagePath)"
:images="[`${OSSclientConfig.basePath}${file.ImagePath}`]" >{{ file.FileName }}</el-button>
>
<el-button type="text" @click="previewImage(file.ImagePath)">
{{ file.FileName }}
</el-button>
<img
v-show="false"
crossorigin="anonymous"
:src="`${OSSclientConfig.basePath}${file.ImagePath}`"
alt="Image"
>
</viewer>
</li> </li>
</ol> </ol>
</div> </div>

View File

@ -138,7 +138,6 @@
> >
<i slot="default" class="el-icon-plus" /> <i slot="default" class="el-icon-plus" />
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<viewer :ref="file.url" :images="images">
<img <img
class="el-upload-list__item-thumbnail" class="el-upload-list__item-thumbnail"
:src="OSSclientConfig.basePath + file.url" :src="OSSclientConfig.basePath + file.url"
@ -153,7 +152,6 @@
<i class="el-icon-zoom-in" /> <i class="el-icon-zoom-in" />
</span> </span>
</span> </span>
</viewer>
</div> </div>
</el-upload> </el-upload>
<el-dialog <el-dialog
@ -239,8 +237,8 @@ export default {
this.visitTaskArmList = JudgeInfo.VisitTaskArmList this.visitTaskArmList = JudgeInfo.VisitTaskArmList
}, },
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url) this.imageUrl = this.OSSclientConfig.basePath + file.url
this.$refs[file.url].$viewer.show() this.imgVisible = true
}, },
handleViewDetail(visitTaskId) { handleViewDetail(visitTaskId) {
console.log(this.rowData) console.log(this.rowData)

View File

@ -78,22 +78,11 @@
{{ $t('trials:medicalFeedback:message:msg5') }} {{ $t('trials:medicalFeedback:message:msg5') }}
<ol> <ol>
<li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;"> <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
<viewer <el-button
v-if="file.ImagePath" type="text"
:ref="file.ImagePath" size="mini"
style="margin:0 10px;" @click="previewImage(file.ImagePath)"
:images="[`${OSSclientConfig.basePath}${file.ImagePath}`]" >{{ file.FileName }}</el-button>
>
<el-button type="text" @click="previewImage(file.ImagePath)">
{{ file.FileName }}
</el-button>
<img
v-show="false"
crossorigin="anonymous"
:src="`${OSSclientConfig.basePath}${file.ImagePath}`"
alt="Image"
>
</viewer>
</li> </li>
</ol> </ol>
</div> </div>