diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index 99bef713..34b5d37e 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -471,7 +471,7 @@ export default { this.loading = false if (res.IsSuccess) { this.TrialModality = res.OtherInfo.TrialModality.split('|') - this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder || 2 + this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder || res.OtherInfo.IsReadingTaskViewInOrder === 0 ? res.OtherInfo.IsReadingTaskViewInOrder : 2 this.StudyInstanceUidList = [] this.SopInstanceUidList = [] this.UploadStudyList = [] diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue index b92f1b31..ee81abb6 100644 --- a/src/views/dicom-show/dicom-visit.vue +++ b/src/views/dicom-show/dicom-visit.vue @@ -157,7 +157,7 @@ -
+
diff --git a/src/views/none-dicoms/components/file-viewer.vue b/src/views/none-dicoms/components/file-viewer.vue index c0d762aa..c3f3e459 100644 --- a/src/views/none-dicoms/components/file-viewer.vue +++ b/src/views/none-dicoms/components/file-viewer.vue @@ -11,7 +11,8 @@
{{ v.currentFileName }}
-
{{ `${ v.currentImageIdIndex + 1 } / ${ v.imageIds.length }` }}
+
{{ `${v.currentImageIdIndex + 1} / ${v.imageIds.length}` }}
+
{{ tip[index] }}
{{ `Zoom: ${v.zoomText}` }}
@@ -226,7 +227,11 @@ export default { tools: [], viewportInfos: [], activeCanvasIndex: 0, - serie: {} + serie: {}, + tip: [ + this.$t('DicomViewer:anonymous:after'), + this.$t('DicomViewer:anonymous:before') + ] } }, computed: { @@ -252,8 +257,8 @@ export default { } }, mounted() { - let type = this.$router.currentRoute.query.type ? this.$router.currentRoute.query.type : '' - this.hasAnonymous = type === 'Study' + // let type = this.$router.currentRoute.query.isQcCheck ? this.$router.currentRoute.query.type : '' + this.hasAnonymous = this.$router.currentRoute.query.isQcCheck this.tools = config.customizeStandardsNoneDicom this.trialId = this.$route.query.trialId this.viewportInfos = Array.from({ length: this.cellsMax }, (_, index) => ({ diff --git a/src/views/none-dicoms/index.vue b/src/views/none-dicoms/index.vue index 6c06135f..6ea4a375 100644 --- a/src/views/none-dicoms/index.vue +++ b/src/views/none-dicoms/index.vue @@ -10,8 +10,8 @@
- +
diff --git a/src/views/research/components/BaseInfo.vue b/src/views/research/components/BaseInfo.vue index 9be7d419..04bd5b82 100644 --- a/src/views/research/components/BaseInfo.vue +++ b/src/views/research/components/BaseInfo.vue @@ -413,7 +413,10 @@ export default { handleSave(isAutoCommit, isCheck = false) { return new Promise((resolve, reject) => { if (this.IsOnlyUploadFile && !isCheck) { - if (!this.form.CommonUploadRecordId) return this.$message.warning(this.$t("trials:researchForm:message:notCommonUploadRecordId")) + if (!this.form.CommonUploadRecordId) { + this.$message.warning(this.$t("trials:researchForm:message:notCommonUploadRecordId")) + return resolve(false) + } this.btnLoading = true const param = { id: this.form.Id, @@ -448,7 +451,7 @@ export default { this.btnLoading = false reject(false) }) - return false + return resolve(true) } this.$refs['researchBSForm'].validate(valid => { if (valid) { diff --git a/src/views/research/login.vue b/src/views/research/login.vue index d2131e8d..321af81e 100644 --- a/src/views/research/login.vue +++ b/src/views/research/login.vue @@ -357,8 +357,18 @@ export default { } verifySendCode(param).then(async res => { zzSessionStorage.clear() - this.$i18n.locale = this.$route.query.lang - this.setLanguage(this.$route.query.lang) + // this.$i18n.locale = this.$route.query.lang + // this.setLanguage(this.$route.query.lang) + let lang = this.$route.query.lang + if (!lang) { + const language = navigator.language + lang = 'en' + if (language.includes("zh")) { + lang = 'zh' + } + } + this.$i18n.locale = lang + this.setLanguage(lang) store.dispatch('user/setToken', res.Result.Token) zzSessionStorage.setItem('TokenKey', res.Result.Token) zzSessionStorage.setItem('userId', res.Result.UserRoleId);