Compare commits

..

No commits in common. "0718008904f8e181ec0794ce3f164773177529ff" and "de3ff1e64b353a9d0968a06c781443f9abd8b553" have entirely different histories.

2 changed files with 14 additions and 14 deletions

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'
} }
} }
}, },

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