From a07cf5f4d04bf2ecee59e547f6512e29283ca9b0 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 1 Jul 2026 18:01:14 +0800 Subject: [PATCH 1/6] 1 --- src/views/dicom-show/dicom-visit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ -
+
From b7b763651fb04a5136f83e8f4009ea3245a4b93d Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 2 Jul 2026 10:01:09 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/uploadDicomAndNonedicom/dicomFile.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = [] From 2ec96a82f0371028d6ff0112349940db36172ad5 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 2 Jul 2026 10:37:28 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=83=8F=E7=B4=A0=E5=8C=BF=E5=90=8D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/none-dicoms/components/file-viewer.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/none-dicoms/components/file-viewer.vue b/src/views/none-dicoms/components/file-viewer.vue index c0d762aa..442b523f 100644 --- a/src/views/none-dicoms/components/file-viewer.vue +++ b/src/views/none-dicoms/components/file-viewer.vue @@ -252,8 +252,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) => ({ From a278b032e23f3ad5eba504aa5011c05bc90509cf Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 2 Jul 2026 10:50:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=9D=9Edicom=E5=8C=BF=E5=90=8D=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=E6=B7=BB=E5=8A=A0=E5=8C=BF=E5=90=8D=E5=89=8D=E3=80=81?= =?UTF-8?q?=E5=8C=BF=E5=90=8D=E5=90=8E=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/none-dicoms/components/file-viewer.vue | 9 +++++++-- src/views/none-dicoms/index.vue | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/views/none-dicoms/components/file-viewer.vue b/src/views/none-dicoms/components/file-viewer.vue index 442b523f..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: { 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 @@
- +
From 433cfdc123387765f8eb3ac21ab1c3f408d9544d Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 2 Jul 2026 11:50:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E4=B8=AD=E5=BF=83=E8=B0=83?= =?UTF-8?q?=E7=A0=94=E3=80=91=E4=B8=AD=E6=96=87=E7=8E=AF=E5=A2=83=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=90=8E=EF=BC=8C=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E8=A1=A8=E6=98=AF=E8=8B=B1=E6=96=87=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/login.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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); From 8f2109b4cd58864ff40ead8cd3c52533af14a895 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 2 Jul 2026 13:51:44 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E8=A1=A8=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/components/BaseInfo.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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) {