From c7eb323eaabc706c5e941b4177bcf65c6c42e2f2 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 22 Jan 2025 17:29:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E8=AF=BE=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SignatureTemplate/TemplateForm.vue | 50 +++++++++++++------ .../components/SignatureTemplate/index.vue | 2 +- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue index 725124bd..f93cf82a 100644 --- a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue +++ b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue @@ -3,13 +3,16 @@ ref="sysAttachmentFrom" v-loading="loading" :model="form" - label-width="170px" + label-width="190px" size="small" :rules="rules" class="upload-temporary-file" >
- + - +
Select{{ $t('common:button:check') }} - (must be in pdf format) + ({{ $t('trials:signature:label:mustBepdf') }})
- + Save{{ $t('common:button:save') }}
@@ -138,13 +144,25 @@ export default { }, rules: { FileTypeId: [ - { required: true, message: 'Please select', trigger: ['blur'] }, + { + required: true, + message: this.$t('common:ruleMessage:select'), + trigger: ['blur'], + }, ], SignViewMinimumMinutes: [ - { required: true, message: 'Please specify', trigger: ['change'] }, + { + required: true, + message: this.$t('common:ruleMessage:specify'), + trigger: ['change'], + }, ], NeedConfirmedUserTypeIdList: [ - { required: true, message: 'Please select', trigger: ['blur'] }, + { + required: true, + message: this.$t('common:ruleMessage:select'), + trigger: ['blur'], + }, ], }, fileList: [], @@ -211,7 +229,7 @@ export default { this.fileList = [] return true } else { - this.$alert('must be in pdf format') + this.$alert(this.$t('trials:signature:label:mustBepdf')) return false } @@ -236,7 +254,7 @@ export default { this.$refs.sysAttachmentFrom.validate((valid) => { if (!valid) return if (!this.form.Name) { - this.$alert('Please select file.') + this.$alert(this.$t('trials:signature:message:selectFile')) return } this.saveBtnLoading = true @@ -245,7 +263,7 @@ export default { this.saveBtnLoading = false this.$emit('closeDialog') this.$emit('getList') - this.$message.success('Uploaded successfully') + this.$message.success(this.$t('common:message:updatedSuccessfully')) }) .catch(() => { this.saveBtnLoading = false @@ -263,7 +281,7 @@ export default { } }, handleExceed(files, fileList) { - this.$message.warning(`Upload is currently limited to 1 file`) + this.$message.warning(this.$t('upload:rule:maxFile1')) }, checkFileSuffix(fileName) { var typeArr = ['pdf'] diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue index 29279a3c..f1b79f67 100644 --- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue +++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue @@ -34,7 +34,7 @@ From b176ab0716d0971f929432fa9eb99a7f9a0eca11 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 23 Jan 2025 09:10:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/reading.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js index e53aaa8b..d201a2f5 100644 --- a/src/store/modules/reading.js +++ b/src/store/modules/reading.js @@ -882,11 +882,17 @@ const actions = { // } series.InstanceInfoList.forEach(instance => { if (instance.NumberOfFrames && instance.NumberOfFrames > 1) { - if (study.IsCriticalSequence && instance.KeyFramesList.length > 0) { + if (study.IsCriticalSequence && instance.KeyFramesList.length > 0 && instance.KeyFramesList[0] !== null) { instance.KeyFramesList.map(i => { const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}` imageIds.push(imageId) }) + } else if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) { + console.log(111) + for (let i = 0; i < instance.NumberOfFrames; i++) { + const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}` + imageIds.push(imageId) + } } else { for (let i = 0; i < instance.NumberOfFrames; i++) { const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}` From 9eb3f2f322a83d138a107d463b3d8eb1452c3475 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 23 Jan 2025 09:22:24 +0800 Subject: [PATCH 3/5] 1 --- .../attachment/components/SignatureTemplate/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue index f1b79f67..3d052d91 100644 --- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue +++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue @@ -69,6 +69,7 @@ :label="$t('dictionary:signature:table:SignViewMinimumMinutes')" show-overflow-tooltip sortable="custom" + min-width="110" />