diff --git a/src/assets/mp4.png b/src/assets/mp4.png new file mode 100644 index 00000000..2de94d5e Binary files /dev/null and b/src/assets/mp4.png differ diff --git a/src/assets/system.png b/src/assets/system.png new file mode 100644 index 00000000..2bbbb96c Binary files /dev/null and b/src/assets/system.png differ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index b31140e3..ab81abbe 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -24,7 +24,10 @@
-
{{ $t('login:title:system') }}
+
+ +
{{ $t('login:title:system') }}
+
@@ -250,6 +253,9 @@ export default { // return window.location.host return 'elevateimaging.ai ' }, + isEN() { + return this.$i18n.locale !== 'zh' + } }, watch: { '$i18n.locale': { @@ -697,7 +703,7 @@ $light_gray: #606266; .login-form { position: absolute; - top: 55%; + top: 60%; // transform: translateY(-50%); left: 50%; transform: translate(-50%, -50%); diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue index be3040c7..e567c054 100644 --- a/src/views/none-dicom-show/index.vue +++ b/src/views/none-dicom-show/index.vue @@ -49,6 +49,9 @@ +
{{ `${j + 1}. ${item.FileName}` }} @@ -102,6 +105,7 @@ import { getNoneDicomStudyList, setNodicomStudyState } from '@/api/trials' import store from '@/store' import pdf from '@/assets/pdf.png' import zip from '@/assets/zip.jpg' +import mp4 from '@/assets/mp4.png' import { changeURLStatic } from '@/utils/history.js' import Preview from './components/preview' import PreviewFile from '@/components/PreviewFile' @@ -118,6 +122,7 @@ export default { return { pdf, zip, + mp4, activeName: 'first', currentFileId: '', currentStudyIndex: 0, @@ -341,10 +346,15 @@ export default { this.pdfFile.type = 'pdf' this.showPDF = true return true + } else if (!!~file.FileType.indexOf('mp4')) { + this.pdfFile.path = file.Path || file.FullFilePath + this.pdfFile.type = file.FileType + this.showPDF = true + return true } else { this.showPDF = false } - + console.log(this.pdfFile) this.currentStudyIndex = studyIndex this.previewImage.imgList = this.studyList[studyIndex].NoneDicomStudyFileList diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue index a39ae420..467e0d46 100644 --- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue +++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue @@ -4,176 +4,79 @@ - + - - + + - - + + - - + + - - + + - - + + - + {{ $t('common:button:search') }} - + {{ $t('common:button:reset') }} - + {{ $t('trials:seletctedReviews:button:select') }} - + {{ $t('trials:seletctedReviews:button:resumeCollection') }} - + {{ $t('trials:seletctedReviews:button:addViewer') }} @@ -365,14 +192,8 @@ {{ $t('reviewers-list:message:msg1') }}
- {{ $t('reviewers-list:message:msg2') }} + {{ $t('reviewers-list:message:msg2') }}
{{ @@ -380,80 +201,34 @@ }}
- - + + {{ $t('reviewers-list:button:sendEmail') }}
- + - - - - - + + + + + {{ $t('common:button:cancel') }} - + {{ $t('common:button:save') }} @@ -483,7 +258,7 @@ const getListQueryDefault = () => { Asc: false, SortField: '', AcceptingNewTrial: true, - InformationConfirmed: true, + // InformationConfirmed: true, ContractorStatus: 1, } } @@ -583,7 +358,7 @@ export default { }, copyCode() { this.$copyText( - `${this.$t('reviewers-list:message:msg1')}: ${this.shareLink}` + `${this.$t('reviewers-list:message:msg2')}: ${this.shareLink}` ) .then((res) => { this.$message.success( @@ -707,7 +482,7 @@ export default { } }, handleSelectTable(row) { - return row.DoctorTrialState !== 1 + return row.DoctorTrialState !== 1 && row.ResumeStatus === 1 && row.AcceptingNewTrial && !row.IsVirtual && !row.IsVacation && row.CooperateStatus === 1 }, handleDetail(row) { const { href } = this.$router.resolve({ @@ -733,8 +508,8 @@ export default { align-items: center; justify-content: space-between; } + ::v-deep .el-card__body { padding: 20px !important; } - diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue index bbd214b6..9c0f7591 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -1042,7 +1042,7 @@ export default { seriesArr.push(seriesList[0], seriesList[0]) activeStudyIndex = seriesList[0].StudyIndex activeSeriesIndex = seriesList[0].SeriesIndex - } else if (seriesArr.length > 1) { + } else if (seriesList.length > 1) { seriesArr.push(seriesList[0], seriesList[1]) activeStudyIndex = seriesList[1].StudyIndex activeSeriesIndex = seriesList[1].SeriesIndex diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/components/AddOrEditTaskAllocationRule.vue b/src/views/trials/trials-panel/reading/read-task-allocation/components/AddOrEditTaskAllocationRule.vue index a9b2eb62..51ebf57b 100644 --- a/src/views/trials/trials-panel/reading/read-task-allocation/components/AddOrEditTaskAllocationRule.vue +++ b/src/views/trials/trials-panel/reading/read-task-allocation/components/AddOrEditTaskAllocationRule.vue @@ -1,18 +1,13 @@ /* eslint-disable */