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/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 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) 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-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue index 0b8f4645..9f9a9fcc 100644 --- a/src/views/trials/trials-layout/components/trialsNavbar.vue +++ b/src/views/trials/trials-layout/components/trialsNavbar.vue @@ -155,7 +155,7 @@ export default { this.logout(); break; case "4-4": - this.go("/system"); + this.go("/dashboard/list"); break; case "1": this.go("/trials/trials-workbench"); 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; 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..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 @@ -27,7 +27,7 @@ @@ -37,7 +37,7 @@ @@ -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,16 @@ export default { this.$refs.qsForm.validate(valid => { if (!valid) return this.loading = true + if(this.form.QuestionName && this.$i18n.locale === 'zh'){ + this.form.QuestionEnName = this.form.QuestionName; + }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){ + this.form.QuestionName = this.form.QuestionEnName; + } + if(this.form.GroupName && this.$i18n.locale === 'zh'){ + this.form.GroupEnName = this.form.GroupName; + }else if(this.$i18n.locale === 'en' && 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 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 @@