- EIC lmaging Trial Management System
+ RPC lmaging Trial Management System
V1.3.0.001
diff --git a/public/errorEN.html b/public/errorEN.html
index 5ae08f68..5684705e 100644
--- a/public/errorEN.html
+++ b/public/errorEN.html
@@ -31,7 +31,7 @@
-
+
{{message}}
diff --git a/public/favicon.ico b/public/favicon.ico
index 70e9d37f..a4181519 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/assets/system.png b/src/assets/system.png
index 2bbbb96c..66bc6a77 100644
Binary files a/src/assets/system.png and b/src/assets/system.png differ
diff --git a/src/assets/zzlogo2.png b/src/assets/zzlogo2.png
index 3cbd82a6..60f58923 100644
Binary files a/src/assets/zzlogo2.png and b/src/assets/zzlogo2.png differ
diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue
index 596c4507..68d8a4c7 100644
--- a/src/components/Dicom/DicomCanvas.vue
+++ b/src/components/Dicom/DicomCanvas.vue
@@ -34,8 +34,8 @@
-
{{ series.subjectCode }}
-
{{ series.visitName }}
+
{{ series.subjectCode }}
+
{{ series.visitName }}
{{ stack.description }}
@@ -174,7 +174,8 @@ export default {
orientationMarkers: [],
originalMarkers: [],
dcmTag: { visible: false, title: this.$t('trials:dicom-tag:title') },
- tip: ''
+ tip: '',
+ IsReadingTaskViewInOrder: 2
}
},
@@ -182,6 +183,9 @@ export default {
this.type = this.$router.currentRoute.query.type
? this.$router.currentRoute.query.type
: ''
+ if (this.$router.currentRoute.query.IsReadingTaskViewInOrder) {
+ this.IsReadingTaskViewInOrder = Number(this.$router.currentRoute.query.IsReadingTaskViewInOrder)
+ }
this.canvas = this.$refs.canvas
this.canvas.addEventListener('cornerstonenewimage', this.onNewImage)
this.canvas.addEventListener(
diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 7f08671f..98c5242b 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -33,7 +33,7 @@
+ show-overflow-tooltip v-if="isReadingTaskViewInOrder !== 0" />
@@ -78,7 +78,7 @@
+ :IsImageSegment="IsImageSegment" :Criterion="Criterion" :IsReadingTaskViewInOrder="isReadingTaskViewInOrder" />
diff --git a/src/views/research-mobile/components/EquipmentForm.vue b/src/views/research-mobile/components/EquipmentForm.vue
index 80c83c8e..3b2c3d01 100644
--- a/src/views/research-mobile/components/EquipmentForm.vue
+++ b/src/views/research-mobile/components/EquipmentForm.vue
@@ -1,59 +1,107 @@
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
{{ $t("common:button:cancel") }}
-
+
{{ $t("common:button:save") }}
@@ -76,29 +124,96 @@ export default {
type: String,
default: ''
},
- isShowParameters: {
- type: Boolean,
- default: false
+ EquipmentControlFieldList: {
+ type: Array,
+ default: () => {
+ return []
+ }
}
},
data() {
return {
form: {
Id: '',
- EquipmentTypeId: '',
- Parameters: '',
- ManufacturerName: '',
- ScannerType: '',
- Note: '',
+ EquipmentTypeEnum: null,
+ OtherEquipmentType: null,
+ Parameters: null,
+ Note: null,
+ ManufacturerType: null,
+ ManufacturerName: null,
+ ScannerType: null,
+ MagneticFieldStrengthType: null,
+ BodyCoilChannelCount: null,
+ HasDedicatedPdfFatQuantificationSequence: null,
+ PdfFatQuantificationSequenceType: null,
+ OtherSequenceSpecification: null,
+ HasT2R2Correction: null,
+ CanFullyExportPdfParameterMapsAndRawDicom: null,
TrialSiteSurveyId: ''
},
rules: {
- EquipmentTypeId: [
+ EquipmentTypeEnum: [
+ { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] },
+ {
+ validator: (rule, value, callback) => {
+ if (this.form.EquipmentTypeEnum === -1 && !this.form.OtherEquipmentType) {
+ callback(this.$t('common:ruleMessage:specify'));
+ } else {
+ callback()
+ }
+ }, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+ },
+ ],
+ Parameters: [
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }
+ ],
+ // Note: [
+ // { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }
+ // ],
+ ManufacturerType: [
+ { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] },
+ {
+ validator: (rule, value, callback) => {
+ if (this.form.ManufacturerType === -1 && !this.form.ManufacturerName) {
+ callback(this.$t('common:ruleMessage:specify'));
+ } else {
+ callback()
+ }
+ }, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+ },
+ ],
+ ScannerType: [
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }
+ ],
+ MagneticFieldStrengthType: [
{ required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
- ]
+ ],
+ BodyCoilChannelCount: [
+ { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+ ],
+ HasDedicatedPdfFatQuantificationSequence: [
+ { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+ ],
+ PdfFatQuantificationSequenceType: [
+ { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] },
+ {
+ validator: (rule, value, callback) => {
+ if (this.form.PdfFatQuantificationSequenceType === -1 && !this.form.OtherSequenceSpecification) {
+ callback(this.$t('common:ruleMessage:specify'));
+ } else {
+ callback()
+ }
+ }, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+ },
+ ],
+ HasT2R2Correction: [
+ { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+ ],
+ CanFullyExportPdfParameterMapsAndRawDicom: [
+ { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+ ],
},
loading: false,
- dictionaryList: {}
}
},
mounted() {
@@ -154,13 +269,15 @@ export default {
}
diff --git a/src/views/research-mobile/detail.vue b/src/views/research-mobile/detail.vue
index 0426970a..089ee9d0 100644
--- a/src/views/research-mobile/detail.vue
+++ b/src/views/research-mobile/detail.vue
@@ -4,30 +4,22 @@