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..54aca566 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.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,
@@ -184,7 +184,7 @@ module.exports = defineConfig({
// 生成文件的最大体积
maxAssetSize: 3000000000,
// 只给出js的性能提示
- assetFilter: function (assetFileName) {
+ assetFilter: function(assetFileName) {
return assetFileName.endsWith('.js')
}
}