@@ -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 @@
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..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
@@ -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.$i18n.locale === 'zh'){
+ this.form.QuestionEnName = this.form.QuestionName;
+ }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){
+ this.form.QuestionName = this.form.QuestionEnName;
+ }
var params = Object.assign({}, this.form)
params.TrialId = this.$route.query.trialId
params.ReadingQuestionId = this.readingQuestionId
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 @@