熊飞 2023-12-29 10:45:45 +08:00
parent 7d00d90da1
commit 8c5d5ae56d
4 changed files with 19 additions and 20 deletions

View File

@ -3,10 +3,10 @@
"version": "1.0.0", "version": "1.0.0",
"scripts": { "scripts": {
"dev": "vue-cli-service serve --open", "dev": "vue-cli-service serve --open",
"build": "vue-cli-service build", "build": "vue-cli-service --max_old_space_size=8000 build",
"build:prod": "vue-cli-service build --mode prod", "build:prod": "vue-cli-service --max_old_space_size=8000 build --mode prod",
"build:uat": "vue-cli-service build --mode uat", "build:uat": "vue-cli-service --max_old_space_size=8000 build --mode uat",
"build:usa": "vue-cli-service build --mode usa", "build:usa": "vue-cli-service --max_old_space_size=8000 build --mode usa",
"pre": "vue-cli-service build --mode pre", "pre": "vue-cli-service build --mode pre",
"i18n": "npm run i18n:zh && npm run i18n:en", "i18n": "npm run i18n:zh && npm run i18n:en",
"i18n:zh": "node i18nGenerate.js lang=zh keyCol=5 valCol=6", "i18n:zh": "node i18nGenerate.js lang=zh keyCol=5 valCol=6",

View File

@ -264,7 +264,7 @@ export default {
this.urls = this.questionForm[this.question.Id].split('|') this.urls = this.questionForm[this.question.Id].split('|')
this.fileList = [] this.fileList = []
this.urls.map(url => { this.urls.map(url => {
this.fileList.push({ name: '', url: `/api/${url}` }) this.fileList.push({ name: '', url: `${url}` })
}) })
} }
} }
@ -353,6 +353,7 @@ export default {
var subjectId = this.$route.query.trialId var subjectId = this.$route.query.trialId
var file = await this.fileToBlob(param.file) var file = await this.fileToBlob(param.file)
const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file) const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file)
console.log(res)
this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)}) this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)})
this.urls.push(this.$getObjectName(res.url)) this.urls.push(this.$getObjectName(res.url))
this.$emit('setFormTableItemData', this.question.Id, this.urls.length > 0 ? this.urls.join('|') : '') this.$emit('setFormTableItemData', this.question.Id, this.urls.length > 0 ? this.urls.join('|') : '')

View File

@ -89,8 +89,9 @@ name: "CustomizeReportPageUpload",
this.urls = this.initUrl === '' ? [] : this.initUrl.split('|') this.urls = this.initUrl === '' ? [] : this.initUrl.split('|')
this.fileList = [] this.fileList = []
this.urls.map(url => { this.urls.map(url => {
this.fileList.push({ name: '', url: `/api/${url}` }) this.fileList.push({ name: '', url: `${url}` })
}) })
console.log(this.fileList)
}, },
methods: { methods: {
checkFileSuffix(fileName) { checkFileSuffix(fileName) {
@ -102,7 +103,7 @@ name: "CustomizeReportPageUpload",
return true return true
} }
}, },
uploadScreenshot(param) { async uploadScreenshot(param) {
if (!this.visitTaskId) return if (!this.visitTaskId) return
const loading = this.$loading({ const loading = this.$loading({
target: document.querySelector('.ecrf-wrapper'), target: document.querySelector('.ecrf-wrapper'),
@ -111,19 +112,15 @@ name: "CustomizeReportPageUpload",
text: 'Loading', text: 'Loading',
spinner: 'el-icon-loading' spinner: 'el-icon-loading'
}) })
const formData = new FormData() var trialId = this.$route.query.trialId
formData.append('file', param.file) var subjectId = this.$route.query.trialId
uploadReadingAnswerImage(this.$route.query.trialId, this.visitTaskId, formData).then(res => { var file = await this.fileToBlob(param.file)
if (res.IsSuccess) { const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file)
this.fileList.push({ url: `/api/${res.Result.Path}` }) console.log(res)
this.urls.push(res.Result.Path) this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)})
// this.questionForm[] this.urls.push(this.$getObjectName(res.url))
this.$emit('setImageUrl', this.urls.length > 0 ? this.urls.join('|') : '') this.$emit('setImageUrl', this.urls.length > 0 ? this.urls.join('|') : '')
}
loading.close() loading.close()
}).catch(() => {
loading.close()
})
}, },
handleBeforeUpload(file) { handleBeforeUpload(file) {
// //

View File

@ -16,6 +16,7 @@ const name = defaultSettings.title || 'IRCIS' // page title
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
module.exports = { module.exports = {
lintOnSave: false,
transpileDependencies: ['@cornerstonejs'], transpileDependencies: ['@cornerstonejs'],
// 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.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: '/', publicPath: '/',