XCKJ
/
hir_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/hir_web
continuous-integration/drone/push Build is passing Details

main
wangxiaoshuang 2024-05-09 11:28:28 +08:00
parent e9a1d3e11c 0718008904
commit b42304d51c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Dicom/DicomViewer.vue
View File

@ -444,7 +444,7 @@ export default {
this.colorList[this.currentDicomCanvasIndex] = '' this.colorList[this.currentDicomCanvasIndex] = ''
} }
if (!this.wwwcList[this.currentDicomCanvasIndex]) { if (!this.wwwcList[this.currentDicomCanvasIndex]) {
this.wwwcList[this.currentDicomCanvasIndex] = '1' this.wwwcList[this.currentDicomCanvasIndex] = '-1'
} }
} }
}, },

26
src/views/trials/trials-panel/reading/dicoms/index.vue
View File

@ -304,19 +304,19 @@ export default {
this.isShow = false this.isShow = false
this.visitTaskId = res.Result.VisitTaskId this.visitTaskId = res.Result.VisitTaskId
// DicomEvent.$emit('getCustomTableQuestionAnswer', res.Result.VisitTaskId) // DicomEvent.$emit('getCustomTableQuestionAnswer', res.Result.VisitTaskId)
if (this.subjectId !== res.Result.SubjectId) { // if (this.subjectId !== res.Result.SubjectId) {
store.dispatch('reading/resetVisitTasks') // store.dispatch('reading/resetVisitTasks')
var token = getToken() // var token = getToken()
window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}&isNewSubject=1` // window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}&isNewSubject=1`
return // return
} else if (!this.isReadingTaskViewInOrder || res.Result.ReadingCategory !== 1) { // } else if (!this.isReadingTaskViewInOrder || res.Result.ReadingCategory !== 1) {
store.dispatch('reading/resetVisitTasks') // store.dispatch('reading/resetVisitTasks')
if (this.firstTaskReadingCategory) { // if (this.firstTaskReadingCategory) {
const token = getToken() // const token = getToken()
window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}` // window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
return // return
} // }
} // }
this.subjectId = res.Result.SubjectId this.subjectId = res.Result.SubjectId
this.subjectCode = res.Result.SubjectCode this.subjectCode = res.Result.SubjectCode
this.taskBlindName = res.Result.TaskBlindName this.taskBlindName = res.Result.TaskBlindName