From ec96011d4b327320e903a8b2a16d8269a967917d Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 30 Jul 2024 18:57:07 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A4=9A=E5=B8=A7=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dicom/DicomCanvas.vue | 7 ++- src/views/dicom-show/dicom-study.vue | 46 ++++++++------- src/views/dicom-show/dicom-visit.vue | 46 ++++++++------- .../reading/dicoms/components/StudyList.vue | 26 +++++---- .../dicoms/customize/CustomizeStudyList.vue | 56 ++++++++++++------- 5 files changed, 105 insertions(+), 76 deletions(-) diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue index b8ec4a50..a7ce70cc 100644 --- a/src/components/Dicom/DicomCanvas.vue +++ b/src/components/Dicom/DicomCanvas.vue @@ -873,7 +873,10 @@ export default { synchronizer.remove(this.$refs.canvas) this.setAllToolsPassive() }, - onContextmenu(event) { + onContextmenu(e) { + e.stopImmediatePropagation() + e.stopPropagation() + e.preventDefault() // const colormapsList = cornerstone.colors.getColormapsList() // const colorItems = [] // colorItems.push({ @@ -1060,7 +1063,7 @@ export default { // zIndex: 3, // minWidth: 100 // }) - return false + // return false }, getToolSate() { const toolROITypes = [ diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue index 68c31dbc..d87d4806 100644 --- a/src/views/dicom-show/dicom-study.vue +++ b/src/views/dicom-show/dicom-study.vue @@ -56,28 +56,20 @@ trigger="hover" popper-class="instance_frame_wrapper" > -
- -
-
{{ instance.InstanceNumber }}
-
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
-
+
+
+
+
{{ instance.InstanceNumber }}
+
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+
+
@@ -885,6 +877,18 @@ export default { border: 1px solid #2c2c2c; padding: 5px; } +.frame_list{ + max-height: 500px; + overflow-y: auto; +} +.instance_frame_wrapper ::-webkit-scrollbar { + width: 7px; + height: 7px; +} +.instance_frame_wrapper ::-webkit-scrollbar-thumb { + border-radius: 10px; + background: #d0d0d0; +} .frame_content{ height: 50px; padding: 5px; diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue index 05b0a943..34a204a8 100644 --- a/src/views/dicom-show/dicom-visit.vue +++ b/src/views/dicom-show/dicom-visit.vue @@ -200,28 +200,20 @@ trigger="hover" popper-class="instance_frame_wrapper" > -
- -
-
{{ instance.InstanceNumber }}
-
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
-
+
+
+
+
{{ instance.InstanceNumber }}
+
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+
+
@@ -901,6 +893,18 @@ export default { border: 1px solid #2c2c2c; padding: 5px; } +.frame_list{ + max-height: 500px; + overflow-y: auto; +} +.instance_frame_wrapper ::-webkit-scrollbar { + width: 7px; + height: 7px; +} +.instance_frame_wrapper ::-webkit-scrollbar-thumb { + border-radius: 10px; + background: #d0d0d0; +} .frame_content{ height: 50px; padding: 5px; diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue index 44d8db0f..23d98a76 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -67,28 +67,20 @@ trigger="hover" popper-class="instance_frame_wrapper" > -
+
-
{{ instance.InstanceNumber }}
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+
@@ -1022,6 +1014,18 @@ export default { border: 1px solid #2c2c2c; padding: 5px; } +.frame_list{ + max-height: 500px; + overflow-y: auto; +} +.instance_frame_wrapper ::-webkit-scrollbar { + width: 7px; + height: 7px; +} +.instance_frame_wrapper ::-webkit-scrollbar-thumb { + border-radius: 10px; + background: #d0d0d0; +} .frame_content{ height: 50px; padding: 5px; diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue index f00cabf5..411bca95 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue @@ -67,28 +67,30 @@ trigger="hover" popper-class="instance_frame_wrapper" > -
- -
-
{{ instance.InstanceNumber }}
-
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
-
+
+
+ +
+
{{ instance.InstanceNumber }}
+
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+
+
@@ -954,6 +956,18 @@ export default { border: 1px solid #2c2c2c; padding: 5px; } +.frame_list{ + max-height: 500px; + overflow-y: auto; +} +.instance_frame_wrapper ::-webkit-scrollbar { + width: 7px; + height: 7px; +} +.instance_frame_wrapper ::-webkit-scrollbar-thumb { + border-radius: 10px; + background: #d0d0d0; +} .frame_content{ height: 50px; padding: 5px; From 73a6935fb8e5676765291cfaa84cbbf43b69ef54 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 31 Jul 2024 10:06:19 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BF=E9=97=AE=E9=A1=B5=E9=9D=A2=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/trials/trials-layout/components/trialsNavbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue index bc036840..5d6720fb 100644 --- a/src/views/trials/trials-layout/components/trialsNavbar.vue +++ b/src/views/trials/trials-layout/components/trialsNavbar.vue @@ -162,7 +162,7 @@ export default { this.logout(); break; case "4-4": - this.go("/system"); + this.go("/dashboard/list"); break; case "1": this.go("/trials/trials-workbench"); From 4b6c5898815078a499a28e5f4d1a9399b7123aee Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 31 Jul 2024 10:06:54 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=94=81=E5=AE=9AMFA=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E9=82=AE=E7=AE=B1=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index a9e2f218..762ef18e 100644 --- a/src/main.js +++ b/src/main.js @@ -446,7 +446,7 @@ async function VueInit() { Vue.prototype.$MFA({ status: "lock", UserId: my_userid, - EMail: my_EMail, + EMail: res.Result, username: my_username, callBack: () => { closeLock(_vm) From ab65a9f1c7e9f991101d11896fa93ff24522cd3a Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 31 Jul 2024 11:17:32 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=AD=E8=8B=B1=E6=96=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading-unit/components/QuestionsForm.vue | 11 +++++++++-- .../setting/reading-unit/components/TableQsForm.vue | 12 +++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue index f77b165b..e6d93f1d 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue @@ -47,7 +47,7 @@ @@ -57,7 +57,7 @@ @@ -791,6 +791,8 @@ export default { ], QuestionName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']}, {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}], + QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']}, + {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}], TypeValue: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']}, {validator: validateTypeVal, trigger: ['blur', 'change']}, {max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}], @@ -974,6 +976,11 @@ export default { this.$refs.qsForm.validate(valid => { if (!valid) return this.loading = true + if(this.form.QuestionName && !this.form.QuestionEnName){ + this.form.QuestionEnName = this.form.QuestionName; + }else if(!this.form.QuestionName && this.form.QuestionEnName){ + this.form.QuestionName = this.form.QuestionEnName; + } var params = Object.assign({}, this.form) params.TrialId = this.$route.query.trialId params.ReadingCriterionPageId = this.data.ReadingCriterionPageId diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue index 63c35d12..28cde8a4 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue @@ -35,7 +35,7 @@ /> @@ -44,7 +44,7 @@ /> @@ -553,7 +553,8 @@ export default { ], QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }], - + QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']}, + {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}], TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, { validator: validateTypeVal, trigger: 'blur' }, { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }], @@ -695,6 +696,11 @@ export default { this.$refs.tableQsForm.validate(valid => { if (!valid) return this.loading = true + if(this.form.QuestionName && !this.form.QuestionEnName){ + this.form.QuestionEnName = this.form.QuestionName; + }else if(!this.form.QuestionName && this.form.QuestionEnName){ + this.form.QuestionName = this.form.QuestionEnName; + } var params = Object.assign({}, this.form) params.TrialId = this.$route.query.trialId params.ReadingQuestionId = this.readingQuestionId From e81b7897e7104c4af4399958e828059ddd42dddb Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 31 Jul 2024 11:17:56 +0800 Subject: [PATCH 5/9] =?UTF-8?q?mfa=E6=A0=87=E9=A2=98=E5=8A=A0=E7=B2=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/MFA/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue index fd8771a3..4642b0a8 100644 --- a/src/components/MFA/index.vue +++ b/src/components/MFA/index.vue @@ -201,4 +201,7 @@ export default { margin-right: 5px; } } +::v-deep .el-dialog__header{ + font-weight: bold; +} \ No newline at end of file From 65e4bf94ad35da9bbf5349a15b755bb06ea23388 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 31 Jul 2024 13:11:13 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=AD=E8=8B=B1=E6=96=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/reading-unit/components/QuestionsForm.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue index e6d93f1d..18e0459a 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue @@ -27,7 +27,7 @@ @@ -37,7 +37,7 @@ @@ -981,6 +981,11 @@ export default { }else if(!this.form.QuestionName && this.form.QuestionEnName){ this.form.QuestionName = this.form.QuestionEnName; } + if(this.form.GroupName && !this.form.GroupEnName){ + this.form.GroupEnName = this.form.GroupName; + }else if(!this.form.GroupName && this.form.GroupEnName){ + this.form.GroupName = this.form.GroupEnName; + } var params = Object.assign({}, this.form) params.TrialId = this.$route.query.trialId params.ReadingCriterionPageId = this.data.ReadingCriterionPageId From e593aedd462af51c32514545ab7a909ccab58429 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 31 Jul 2024 13:23:56 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=AD=E8=8B=B1=E6=96=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/reading-unit/components/TableQsList.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue index c341207d..e201ff32 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue @@ -29,12 +29,14 @@ From c9e99339d5fb1170ed4325fc2de5db4baad46948 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 31 Jul 2024 13:39:43 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=AD=E8=8B=B1=E6=96=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/reading-unit/components/QuestionsForm.vue | 8 ++++---- .../setting/reading-unit/components/TableQsForm.vue | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue index 18e0459a..257ec5b5 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue @@ -976,14 +976,14 @@ export default { this.$refs.qsForm.validate(valid => { if (!valid) return this.loading = true - if(this.form.QuestionName && !this.form.QuestionEnName){ + if(this.form.QuestionName && this.$i18n.locale === 'zh'){ this.form.QuestionEnName = this.form.QuestionName; - }else if(!this.form.QuestionName && this.form.QuestionEnName){ + }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){ this.form.QuestionName = this.form.QuestionEnName; } - if(this.form.GroupName && !this.form.GroupEnName){ + if(this.form.GroupName && this.$i18n.locale === 'zh'){ this.form.GroupEnName = this.form.GroupName; - }else if(!this.form.GroupName && this.form.GroupEnName){ + }else if(this.$i18n.locale === 'en' && this.form.GroupEnName){ this.form.GroupName = this.form.GroupEnName; } var params = Object.assign({}, this.form) diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue index 28cde8a4..e94cee2b 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue @@ -696,9 +696,9 @@ export default { this.$refs.tableQsForm.validate(valid => { if (!valid) return this.loading = true - if(this.form.QuestionName && !this.form.QuestionEnName){ + if(this.form.QuestionName && this.$i18n.locale === 'zh'){ this.form.QuestionEnName = this.form.QuestionName; - }else if(!this.form.QuestionName && this.form.QuestionEnName){ + }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){ this.form.QuestionName = this.form.QuestionEnName; } var params = Object.assign({}, this.form) From 8ee3847791265a57608b26bb9bafc1a145eadb7f Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 31 Jul 2024 14:04:05 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=93=8D=E4=BD=9C=E6=A0=8F=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E5=8A=A0=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/reading-unit/components/QuestionsList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue index 27faa5fb..8a9ee7c1 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue @@ -146,7 +146,7 @@