Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is running Details

uat_us
wangxiaoshuang 2024-11-04 11:10:49 +08:00
commit 8cbb7a8333
3 changed files with 20 additions and 12 deletions

View File

@ -229,13 +229,13 @@
<el-upload <el-upload
v-if="question.Type==='upload'" v-if="question.Type==='upload'"
:action="question.FileType" :action="question.FileType"
:limit="question.ImageCount" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
:on-preview="handlePictureCardPreview" :on-preview="handlePictureCardPreview"
:before-upload="(file) => {return handleBeforeUpload(file, question.FileType)}" :before-upload="(file) => {return handleBeforeUpload(file, question.FileType)}"
:http-request="uploadScreenshot" :http-request="uploadScreenshot"
:on-remove="handleRemove" :on-remove="handleRemove"
:file-list="fileList" :file-list="fileList"
:class="{disabled:fileList.length >= question.ImageCount}" :class="{disabled:question.ImageCount === 0 ? false : fileList.length >= question.ImageCount}"
> >
<el-button slot="default" class="el-icon-plus"> <el-button slot="default" class="el-icon-plus">
{{this.$t('common:button:upload')}} {{this.$t('common:button:upload')}}

View File

@ -167,15 +167,15 @@
<!-- 上传图像 --> <!-- 上传图像 -->
<el-upload <el-upload
v-if="question.Type==='upload'" v-if="question.Type==='upload'"
:action="accept" :action="question.FileType"
:limit="question.ImageCount" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
:on-preview="handlePictureCardPreview" :on-preview="handlePictureCardPreview"
:before-upload="handleBeforeUpload" :before-upload="handleBeforeUpload"
:http-request="uploadScreenshot" :http-request="uploadScreenshot"
list-type="picture-card" list-type="picture-card"
:on-remove="handleRemove" :on-remove="handleRemove"
:file-list="fileList" :file-list="fileList"
:class="{disabled:fileList.length >= question.ImageCount}" :class="{disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount}"
> >
<i slot="default" class="el-icon-plus" /> <i slot="default" class="el-icon-plus" />
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -331,6 +331,7 @@ export default {
this.fileList.push({ name: '', url: `${url}` }) this.fileList.push({ name: '', url: `${url}` })
}) })
} }
console.log('11')
} }
if (this.type === 'edit') return if (this.type === 'edit') return
// if (this.question.Type === 'number') { // if (this.question.Type === 'number') {
@ -524,14 +525,17 @@ export default {
// this.fileList = [] // this.fileList = []
return true return true
} else { } else {
this.$alert(`必须是 ${this.accept} 格式`) let msg = this.$t(
"trials:readingUnit:qsList:message:imageFormat"
).replace("xxx", this.question.FileType)
this.$alert(msg)
return false return false
} }
}, },
checkFileSuffix(fileName) { checkFileSuffix(fileName) {
var index = fileName.lastIndexOf('.') var index = fileName.lastIndexOf('.')
var suffix = fileName.substring(index + 1, fileName.length) var suffix = fileName.substring(index + 1, fileName.length)
if (this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) { if (this.question.FileType.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
return false return false
} else { } else {
return true return true

View File

@ -1,15 +1,15 @@
<template> <template>
<div> <div>
<el-upload <el-upload
:action="accept" :action="question.FileType"
:limit="question.ImageCount" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
:on-preview="handlePictureCardPreview" :on-preview="handlePictureCardPreview"
:before-upload="handleBeforeUpload" :before-upload="handleBeforeUpload"
:http-request="uploadScreenshot" :http-request="uploadScreenshot"
list-type="picture-card" list-type="picture-card"
:on-remove="handleRemove" :on-remove="handleRemove"
:file-list="fileList" :file-list="fileList"
:class="{disabled:readingTaskState >= 2 || (fileList.length >= question.ImageCount) || (task.VisitTaskId !== visitTaskId) || question.IsShowInDicom || ((task.IsBaseLine && question.LimitEdit === 2) || (!task.IsBaseLine && question.LimitEdit === 1))}" :class="{disabled:readingTaskState >= 2 || (question.ImageCount === 0 ? false : fileList.length >= question.ImageCount) || (task.VisitTaskId !== visitTaskId) || question.IsShowInDicom || ((task.IsBaseLine && question.LimitEdit === 2) || (!task.IsBaseLine && question.LimitEdit === 1))}"
:disabled="readingTaskState >= 2 || task.VisitTaskId !== visitTaskId || question.IsShowInDicom || ((task.IsBaseLine && question.LimitEdit === 2) || (!task.IsBaseLine && question.LimitEdit === 1))" :disabled="readingTaskState >= 2 || task.VisitTaskId !== visitTaskId || question.IsShowInDicom || ((task.IsBaseLine && question.LimitEdit === 2) || (!task.IsBaseLine && question.LimitEdit === 1))"
> >
<i slot="default" class="el-icon-plus" /> <i slot="default" class="el-icon-plus" />
@ -101,7 +101,7 @@ name: "CustomizeReportPageUpload",
checkFileSuffix(fileName) { checkFileSuffix(fileName) {
var index = fileName.lastIndexOf('.') var index = fileName.lastIndexOf('.')
var suffix = fileName.substring(index + 1, fileName.length) var suffix = fileName.substring(index + 1, fileName.length)
if (this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) { if (this.question.FileType.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
return false return false
} else { } else {
return true return true
@ -132,7 +132,11 @@ name: "CustomizeReportPageUpload",
// this.fileList = [] // this.fileList = []
return true return true
} else { } else {
this.$alert(`必须是 ${this.accept} 格式`) // this.$alert(` ${this.accept} `)
let msg = this.$t(
"trials:readingUnit:qsList:message:imageFormat"
).replace("xxx", this.question.FileType)
this.$alert(msg)
return false return false
} }
}, },