From fa173a32fb5a98744a4f237f0a5cd24da5d08760 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 12 Mar 2025 09:30:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=9D=9Edicom=E6=96=87=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visit-review/components/FileViewer.vue | 17 +++++++++-------- vue.config.js | 8 ++++---- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue index 1b515ca7..76245c3f 100644 --- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue +++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue @@ -101,7 +101,7 @@ @mouseup="sliderMouseup($event, index)" @mousemove="sliderMousemove($event, index)" > -
+
i.index === this.activeCanvasIndex) if (i === -1) return - if (obj.studyId === this.viewportInfos[i].studyId && this.viewportInfos[i].fileType === 'image/jpeg' && obj.fileInfo.FileType === 'image/jpeg') { + if (obj.studyId === this.viewportInfos[i].studyId && this.imageType.includes(this.viewportInfos[i].fileType) && this.imageType.includes(obj.fileInfo.FileType)) { const fileIndex = this.viewportInfos[i].fileList.findIndex(i => i.Path === obj.fileInfo.Path) this.sliceIndex(fileIndex) } else { @@ -525,8 +526,8 @@ export default { this.viewportInfos[i].currentFileName = obj.fileInfo.FileName this.viewportInfos[i].studyId = obj.studyId this.viewportInfos[i].fileType = obj.fileInfo.FileType - if (obj.fileInfo.FileType === 'image/jpeg') { - const arr = obj.fileList.filter(i => i.FileType === obj.fileInfo.FileType) + if (this.imageType.includes(obj.fileInfo.FileType)) { + const arr = obj.fileList.filter(i => this.imageType.includes(i.FileType)) this.viewportInfos[i].fileList = arr const fileIndex = this.viewportInfos[i].fileList.findIndex(i => i.Path === obj.fileInfo.Path) this.viewportInfos[i].currentImageIdIndex = fileIndex @@ -648,7 +649,7 @@ export default { // 切换全屏 toggleFullScreen(e, index) { const i = this.viewportInfos.findIndex(i => i.index === index) - if (i === -1 && this.viewportInfos[i].fileType !== 'image/jpeg') return + if (i === -1 && this.imageType.includes(this.viewportInfos[i].fileType)) return this.fullScreenIndex = this.fullScreenIndex === index ? null : index this.activeCanvasIndex = index }, @@ -847,12 +848,12 @@ export default { }, sliderMouseup(e, index) { const i = this.viewportInfos.findIndex(i => i.index === index) - if (i === -1 && this.viewportInfos[i].fileType !== 'image/jpeg') return + if (i === -1 && this.imageType.includes(this.viewportInfos[i].fileType)) return this.viewportInfos[i].isMove = false }, sliderMousemove(e, index) { const i = this.viewportInfos.findIndex(i => i.index === index) - if (i === -1 && this.viewportInfos[i].fileType !== 'image/jpeg') return + if (i === -1 && this.imageType.includes(this.viewportInfos[i].fileType)) return if (!this.viewportInfos[i].isMove) return const delta = this.viewportInfos[i].oldB - (this.viewportInfos[i].oldM - e.clientY) const boxHeight = this.$refs[`sliderBox-${index}`][0].clientHeight diff --git a/vue.config.js b/vue.config.js index c63cc912..bd6b6889 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,12 +12,12 @@ const defaultSettings = require('./src/settings.js') const moment = require('moment') var distDate = moment(new Date()).format('YYYY-MM-DD') const name = process.env.NODE_ENV === 'usa' ? 'LILI' : defaultSettings.title || 'IRCIS' // page title -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; +// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin // eslint-disable-next-line no-undef module.exports = defineConfig({ // lintOnSave: false, transpileDependencies: false, - publicPath: process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? process.env.VUE_APP_BASE_PATH : `${process.env.VUE_FILE_PATH}${process.env.VUE_APP_OSS_PATH}${distDate}/`, + publicPath: process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'production' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? process.env.VUE_APP_BASE_PATH : `${process.env.VUE_FILE_PATH}${process.env.VUE_APP_OSS_PATH}${distDate}/`, // publicPath: '/', outputDir: 'dist', assetsDir: 'static', @@ -97,7 +97,7 @@ module.exports = defineConfig({ ] }), // new BundleAnalyzerPlugin(), - process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function () { } + process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function() { } : new WebpackAliyunOss({ from: ['./dist/**'], dist: process.env.VUE_APP_OSS_PATH + distDate, @@ -184,7 +184,7 @@ module.exports = defineConfig({ // 生成文件的最大体积 maxAssetSize: 3000000000, // 只给出js的性能提示 - assetFilter: function (assetFileName) { + assetFilter: function(assetFileName) { return assetFileName.endsWith('.js') } } From 9e1cd5a099561998463f316b8c378bdb1d76e3ed Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 12 Mar 2025 09:34:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index bd6b6889..54aca566 100644 --- a/vue.config.js +++ b/vue.config.js @@ -97,7 +97,7 @@ module.exports = defineConfig({ ] }), // new BundleAnalyzerPlugin(), - process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function() { } + process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'production' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function() { } : new WebpackAliyunOss({ from: ['./dist/**'], dist: process.env.VUE_APP_OSS_PATH + distDate, From 7f3da436c4b25682af14015e4e35c7ed41d7eff9 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 12 Mar 2025 10:21:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/components/AddCriterion.vue | 2 +- .../template/components/Anonymization.vue | 1 - .../components/ClinicalDataConfig.vue | 15 ++++++++++--- .../components/CriterionQuestionForm.vue | 2 +- .../template/components/CriterionsConfig.vue | 21 ++++++++++++------- .../template/components/CriterionsTmp.vue | 9 +++++--- .../components/EvaluationOfGlobalConfig.vue | 6 +++--- .../components/EvaluationOfOncologyConfig.vue | 6 +++--- .../template/components/IncreaseFields.vue | 1 - .../template/components/MedicalAudit.vue | 14 ++++++++++--- .../template/components/OrgansTbl.vue | 8 +++++-- .../template/components/QcQuestions.vue | 1 - 12 files changed, 56 insertions(+), 30 deletions(-) diff --git a/src/views/dictionary/template/components/AddCriterion.vue b/src/views/dictionary/template/components/AddCriterion.vue index a5813a0b..7ed216d1 100644 --- a/src/views/dictionary/template/components/AddCriterion.vue +++ b/src/views/dictionary/template/components/AddCriterion.vue @@ -3,7 +3,7 @@ ref="organForm" v-loading="loading" :model="form" - label-width="130px" + label-width="170px" size="small" :rules="rules" > diff --git a/src/views/dictionary/template/components/Anonymization.vue b/src/views/dictionary/template/components/Anonymization.vue index eeec9d9e..332c3054 100644 --- a/src/views/dictionary/template/components/Anonymization.vue +++ b/src/views/dictionary/template/components/Anonymization.vue @@ -42,7 +42,6 @@ v-adaptive="{bottomOffset:45}" :data="list" stripe - size="small" height="100" > diff --git a/src/views/dictionary/template/components/ClinicalDataConfig.vue b/src/views/dictionary/template/components/ClinicalDataConfig.vue index af264fda..0b6cb58d 100644 --- a/src/views/dictionary/template/components/ClinicalDataConfig.vue +++ b/src/views/dictionary/template/components/ClinicalDataConfig.vue @@ -53,27 +53,29 @@ v-adaptive="{bottomOffset:45}" :data="list" stripe - size="small" height="100" > - +