Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
commit
c3a0d3e361
|
@ -41,7 +41,8 @@
|
||||||
v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume))"
|
v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume))"
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
style="margin-left: -5px;padding: 7px 5px;"
|
style="padding: '7px 5px'"
|
||||||
|
:style="{marginLeft: readingTaskState!== 2?'-5px':'5px'}"
|
||||||
@click="locateAnnotation(question)"
|
@click="locateAnnotation(question)"
|
||||||
>{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
|
>{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -315,7 +315,7 @@ export default {
|
||||||
async getSplenicState() {
|
async getSplenicState() {
|
||||||
try {
|
try {
|
||||||
var spleenLength = this.questionForm[this.spleenLengthId]
|
var spleenLength = this.questionForm[this.spleenLengthId]
|
||||||
spleenLength = isNaN(parseFloat(spleenLength)) ? 0 : parseFloat(spleenLength)
|
spleenLength = isNaN(parseFloat(spleenLength)) ? -1 : parseFloat(spleenLength)
|
||||||
const result = await getSplenicState(this.visitTaskId, spleenLength)
|
const result = await getSplenicState(this.visitTaskId, spleenLength)
|
||||||
return { isSuccess: true, result: result.Result }
|
return { isSuccess: true, result: result.Result }
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
|
@ -730,13 +730,14 @@ export default {
|
||||||
this.openWindow.close()
|
this.openWindow.close()
|
||||||
}
|
}
|
||||||
var token = getToken()
|
var token = getToken()
|
||||||
|
var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
|
||||||
var subjectCode = this.$router.currentRoute.query.subjectCode
|
var subjectCode = this.$router.currentRoute.query.subjectCode
|
||||||
var subjectId = this.$router.currentRoute.query.subjectId
|
var subjectId = this.$router.currentRoute.query.subjectId
|
||||||
var trialId = this.$router.currentRoute.query.trialId
|
var trialId = this.$router.currentRoute.query.trialId
|
||||||
var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
|
var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
|
||||||
var criterionType = this.$router.currentRoute.query.criterionType
|
var criterionType = this.$router.currentRoute.query.criterionType
|
||||||
var readingTool = this.$router.currentRoute.query.readingTool
|
var readingTool = this.$router.currentRoute.query.readingTool
|
||||||
var path = `/readingDicoms?trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
|
var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
|
||||||
const routeData = this.$router.resolve({ path })
|
const routeData = this.$router.resolve({ path })
|
||||||
this.openWindow = window.open(routeData.href, '_blank')
|
this.openWindow = window.open(routeData.href, '_blank')
|
||||||
},
|
},
|
||||||
|
|
|
@ -718,7 +718,9 @@ export default {
|
||||||
// requestPoolManager.startTaskTimer()
|
// requestPoolManager.startTaskTimer()
|
||||||
this.imageList.map(image => {
|
this.imageList.map(image => {
|
||||||
requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).then(res => {
|
requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).then(res => {
|
||||||
this.imageLoaded(image, res.data.string('x0020000e'))
|
if(res){
|
||||||
|
this.imageLoaded(image, res.data.string('x0020000e'))
|
||||||
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
requestPoolManager.sortTaskPool()
|
requestPoolManager.sortTaskPool()
|
||||||
|
|
Loading…
Reference in New Issue