Compare commits

..

No commits in common. "43d87e612ada4d0af14d34ed289c221c265be81a" and "10283bbcebba31d2f462d3a634ee4dc79fa5a99e" have entirely different histories.

13 changed files with 23 additions and 37 deletions

View File

@ -333,8 +333,7 @@ export default {
mounted() {
console.log(cornerstoneTools)
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
document.addEventListener('mouseup', () => {
this.sliderMouseup()
})

View File

@ -237,8 +237,7 @@ export default {
}
},
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
window.addEventListener('message', this.receiveMsg)
this.criterionType = parseInt(localStorage.getItem('CriterionType'))
DicomEvent.$on('setCollapseActive', measureData => {

View File

@ -302,8 +302,7 @@ export default {
}
},
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
window.addEventListener('message', this.receiveMsg)
this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
DicomEvent.$on('setCollapseActive', measureData => {

View File

@ -184,8 +184,7 @@ export default {
}
},
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
window.addEventListener('message', this.receiveMsg)
this.criterionType = parseInt(localStorage.getItem('CriterionType'))
DicomEvent.$on('setCollapseActive', measureData => {

View File

@ -201,8 +201,7 @@ export default {
}
},
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
window.addEventListener('message', this.receiveMsg)
this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
DicomEvent.$on('setCollapseActive', measureData => {

View File

@ -197,8 +197,7 @@ export default {
}
},
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
window.addEventListener('message', this.receiveMsg)
this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
DicomEvent.$on('setCollapseActive', measureData => {

View File

@ -734,8 +734,7 @@ export default {
}
var token = getToken()
var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
// var subjectCode = this.$router.currentRoute.query.subjectCode
var subjectCode = localStorage.getItem('subjectCode')
var subjectCode = this.$router.currentRoute.query.subjectCode
var subjectId = this.$router.currentRoute.query.subjectId
var trialId = this.$router.currentRoute.query.trialId
var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder

View File

@ -253,8 +253,7 @@ export default {
// }
},
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
var digitPlaces = Number(localStorage.getItem('digitPlaces'))
this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
DicomEvent.$on('refreshStudyListMeasureData', () => {

View File

@ -332,8 +332,7 @@ export default {
mounted() {
console.log(cornerstoneTools)
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
document.addEventListener('mouseup', () => {
this.sliderMouseup()
})

View File

@ -144,8 +144,7 @@ export default {
}
},
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
this.TrialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
DicomEvent.$on('getCustomTableQuestionAnswer', (visitTaskId) => {

View File

@ -775,8 +775,7 @@ export default {
},
previewDicoms(task) {
var token = getToken()
// var subjectCode = this.$router.currentRoute.query.subjectCode
var subjectCode = localStorage.getItem('subjectCode')
var subjectCode = this.$router.currentRoute.query.subjectCode
var subjectId = this.$router.currentRoute.query.subjectId
var trialId = this.$router.currentRoute.query.trialId
var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder

View File

@ -252,8 +252,7 @@ export default {
// }
},
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
this.subjectCode = this.$router.currentRoute.query.subjectCode
var digitPlaces = Number(localStorage.getItem('digitPlaces'))
this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces

View File

@ -261,19 +261,19 @@ export default {
this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectId = this.$router.currentRoute.query.subjectId
this.visitTaskId = this.$router.currentRoute.query.visitTaskId
// this.isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
// this.criterionType = this.$router.currentRoute.query.criterionType
// this.readingTool = this.$router.currentRoute.query.readingTool
this.isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
this.criterionType = this.$router.currentRoute.query.criterionType
this.readingTool = this.$router.currentRoute.query.readingTool
this.TrialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
// this.isNewSubject = this.$router.currentRoute.query.isNewSubject
this.isNewSubject = this.$router.currentRoute.query.isNewSubject
localStorage.setItem('isReadingTaskViewInOrder', this.isReadingTaskViewInOrder)
// if (this.isNewSubject && this.isReadingTaskViewInOrder !== 0) {
// // ${this.subjectCode}
// var msg = this.$t('trials:reading:warnning:msg1')
// msg = msg.replace('xxx', this.subjectCode)
// this.$message.success(msg)
// changeURLStatic('isNewSubject', '')
// }
if (this.isNewSubject && this.isReadingTaskViewInOrder !== 0) {
// ${this.subjectCode}
var msg = this.$t('trials:reading:warnning:msg1')
msg = msg.replace('xxx', this.subjectCode)
this.$message.success(msg)
changeURLStatic('isNewSubject', '')
}
if (this.$router.currentRoute.query.TokenKey) {
store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
changeURLStatic('TokenKey', '')
@ -318,7 +318,6 @@ export default {
// }
this.subjectId = res.Result.SubjectId
this.subjectCode = res.Result.SubjectCode
localStorage.setItem('subjectCode', res.Result.SubjectCode)
this.taskBlindName = res.Result.TaskBlindName
this.isReadingShowSubjectInfo = res.Result.IsReadingShowSubjectInfo
this.isReadingShowPreviousResults = res.Result.IsReadingShowPreviousResults
@ -330,7 +329,6 @@ export default {
this.CriterionType = res.Result.CriterionType
this.digitPlaces = res.Result.DigitPlaces
this.IseCRFShowInDicomReading = res.Result.IseCRFShowInDicomReading
this.isReadingTaskViewInOrder = res.Result.IsReadingTaskViewInOrder
localStorage.setItem('CriterionType', res.Result.CriterionType)
localStorage.setItem('digitPlaces', res.Result.DigitPlaces)
this.readingCategory = res.Result.ReadingCategory