部分问题修复
continuous-integration/drone/push Build is passing Details

main
wangxiaoshuang 2025-08-04 17:39:51 +08:00
parent 9d839e46cd
commit 2c85013008
21 changed files with 42 additions and 26 deletions

View File

@ -37,7 +37,7 @@
<div class="add-icon" @click.prevent="downloadTpl">
<i class="el-icon-download" />
</div>
<div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
<div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
<i class="el-icon-upload2" />
</div>
<div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
@ -174,7 +174,7 @@
<!-- 导入 -->
<el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
:title="upload.title" width="500px">
<UploadExcel :visit-task-id="visitTaskId" @close="uploadDlgClose" />
<UploadExcel :visit-task-id="visitTaskId" :TableName="upload.TableName" @close="uploadDlgClose" />
</el-dialog>
</div>
</div>
@ -233,7 +233,7 @@ export default {
formChanged: false,
digitPlaces: 2,
addOrEdit: { visible: false, title: '' },
upload: { visible: false, title: '' },
upload: { visible: false, title: '', TableName: '' },
qsList: [],
answersList: [],
qsForm: {},
@ -668,7 +668,8 @@ export default {
console.log(e)
}
},
uploadTpl(lesionType) {
uploadTpl(lesionType, TableName) {
this.upload.TableName = TableName
this.upload.title = `导入( ${this.$fd('LesionType', lesionType)} `
this.upload.visible = true
},

View File

@ -39,6 +39,10 @@ export default {
visitTaskId: {
type: String,
required: true
},
TableName: {
type: String,
default: ''
}
},
data() {
@ -64,6 +68,7 @@ export default {
data.append('file', param.file)
data.append('visitTaskId', this.visitTaskId)
data.append('readingImportType', 0)
data.append('TableName', this.TableName)
await readingImport(data)
this.$emit('close')
this.$message.success('导入成功!')

View File

@ -37,7 +37,7 @@
<div class="add-icon" @click.prevent="downloadTpl(item.LesionType)">
<i class="el-icon-download" />
</div>
<div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
<div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
<i class="el-icon-upload2" />
</div>
<div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
@ -169,7 +169,7 @@
<!-- 导入 -->
<el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
:title="upload.title" width="500px">
<UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" @close="uploadDlgClose" />
<UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" :TableName="upload.TableName" @close="uploadDlgClose" />
</el-dialog>
</div>
</div>
@ -228,7 +228,7 @@ export default {
formChanged: false,
digitPlaces: 2,
addOrEdit: { visible: false, title: '', lesionType: null },
upload: { visible: false, title: '', lesionType: null },
upload: { visible: false, title: '', lesionType: null, TableName: '', },
qsList: [],
answersList: [],
qsForm: {},
@ -669,8 +669,9 @@ export default {
console.log(e)
}
},
uploadTpl(lesionType) {
uploadTpl(lesionType, TableName) {
this.upload.lesionType = lesionType
this.upload.TableName = TableName
this.upload.title = `导入( ${this.$fd('LesionType', lesionType)} `
this.upload.visible = true
},

View File

@ -43,6 +43,10 @@ export default {
lesionType: {
type: Number,
required: true
},
TableName: {
type: String,
default: ''
}
},
data() {
@ -67,7 +71,7 @@ export default {
var data = new FormData()
data.append('file', param.file)
data.append('visitTaskId', this.visitTaskId)
data.append('TableName', this.TableName)
if (this.lesionType === 112) {
data.append('readingImportType', 1)
await readingImport(data)

View File

@ -346,6 +346,7 @@ export default {
localStorage.setItem('digitPlaces', res.Result.DigitPlaces)
localStorage.setItem('IsExistUnprocessedFeedback', res.Result.IsExistUnprocessedFeedback)
localStorage.setItem('taskInfo', JSON.stringify(res.Result))
sessionStorage.setItem('taskInfo', JSON.stringify(res.Result))
this.readingCategory = res.Result.ReadingCategory
this.readingVersionEnum = res.Result.ReadingVersionEnum
this.questionFormChangeState = false

View File

@ -190,7 +190,7 @@ export default {
}
},
mounted() {
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
const digitPlaces = Number(localStorage.getItem('digitPlaces'))
this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
this.$nextTick(() => {

View File

@ -297,7 +297,8 @@
<i class="el-icon-arrow-down" style="color:#fff;" />
</div>
<div class="dropdown-content">
<ul v-if="readingTaskState < 2" style="width:100px;">
<!--v-if="readingTaskState < 2"-->
<ul style="width:100px;">
<li v-for="i in customizeStandards" :key="i.toolName" style="text-align:left;">
<a href="#" @click.prevent="setMoreToolActive(i.toolName)">
<svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />
@ -873,7 +874,7 @@ export default {
}
},
mounted() {
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
this.isReadingTaskViewInOrder = this.taskInfo.IsReadingTaskViewInOrder
this.criterionType = this.taskInfo.CriterionType
const digitPlaces = Number(localStorage.getItem('digitPlaces'))
@ -882,6 +883,7 @@ export default {
this.tools = getCustomizeStandardsTools(this.taskInfo.ReadingToolList)
const toolNames = this.tools.map(i => i.toolName)
this.customizeStandards = config.customizeStandards.filter(item => !toolNames.includes(item.toolName))
console.log(this.customizeStandards,'this.customizeStandards')
} else {
this.tools = getTools(this.criterionType)
}
@ -3244,7 +3246,7 @@ export default {
try {
file = this.convertBase64ToBlob(file)
const trialId = this.$route.query.trialId
const taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
const taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
const subjectId = taskInfo.SubjectId
const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
return { isSuccess: true, result: result }

View File

@ -235,7 +235,7 @@ export default {
mounted() {
this.trialId = this.$route.query.trialId
this.visitTaskId = this.visitInfo.VisitTaskId
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
this.isBaseLineTask = this.taskInfo.IsBaseLine
this.criterionType = this.taskInfo.CriterionType
const digitPlaces = Number(localStorage.getItem('digitPlaces'))

View File

@ -327,7 +327,7 @@ export default {
},
created() { this.getTableHeight() },
mounted() {
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
this.criterionType = this.taskInfo.CriterionType
this.visitTaskId = this.taskInfo.VisitTaskId
this.isBaselineTask = this.taskInfo.IsBaseLine

View File

@ -153,7 +153,7 @@ export default {
}
},
mounted() {
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
const digitPlaces = Number(localStorage.getItem('digitPlaces'))
this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
this.studyList = this.visitTaskInfo.StudyList

View File

@ -174,7 +174,7 @@ export default {
}
},
mounted() {
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
const digitPlaces = Number(localStorage.getItem('digitPlaces'))
this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
this.$nextTick(() => {

View File

@ -47,8 +47,7 @@ export default {
}
},
mounted() {
console.log(this.readingTool)
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
},
methods: {
setReadingTaskState(state) {

View File

@ -1261,7 +1261,7 @@ export default {
var suffix = fileName.substring(index + 1, fileName.length)
let file = await this.fileToBlob(param.file)
// let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Customize/${this.visitTaskId}/${fileName}`, file)
const taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
const taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
const subjectId = taskInfo.SubjectId
let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}`, file)
this.fileList.push({ name: `${this.$t('trials:emailManageCfg:title:fileName')}${this.fileList.length + 1}(${suffix})`, url: this.$getObjectName(res.url) })

View File

@ -114,7 +114,7 @@ export default {
window.addEventListener('message', this.receiveMsg)
this.trialId = this.$route.query.trialId
this.visitTaskId = this.visitInfo.VisitTaskId
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
this.isBaseLineTask = this.taskInfo.IsBaseLine
this.criterionId = this.taskInfo.TrialReadingCriterionId
const digitPlaces = Number(localStorage.getItem('digitPlaces'))

View File

@ -562,7 +562,7 @@ export default {
var suffix = fileName.substring(index + 1, fileName.length)
var file = await this.fileToBlob(param.file)
// let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Customize/${this.visitTaskId}/${fileName}`, file)
const taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
const taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
const subjectId = taskInfo.SubjectId
let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}`, file)
this.fileList.push({ name: `${this.$t('trials:emailManageCfg:title:fileName')}${this.fileList.length + 1}(${suffix})`, url: this.$getObjectName(res.url) })

View File

@ -275,7 +275,7 @@ export default {
}
},
async mounted() {
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
this.trialId = this.$route.query.trialId
this.visitTaskId = this.taskInfo.VisitTaskId
this.subjectId = this.taskInfo.SubjectId

View File

@ -263,7 +263,7 @@ export default {
}
},
mounted() {
let digitPlaces = Number(localStorage.getItem('digitPlaces'))
let digitPlaces = Number(sessionStorage.getItem('digitPlaces'))
this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
},
methods: {

View File

@ -276,7 +276,7 @@ export default {
mounted() {
this.trialId = this.$route.query.trialId
this.visitTaskId = this.visitInfo.VisitTaskId
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
this.isBaseLineTask = this.taskInfo.IsBaseLine
this.criterionType = this.taskInfo.CriterionType
const digitPlaces = Number(localStorage.getItem('digitPlaces'))

View File

@ -70,6 +70,7 @@ export default {
}
const res = await getNextTask(params)
this.taskInfo = res.Result
sessionStorage.setItem('taskInfo', JSON.stringify(res.Result))
localStorage.setItem('taskInfo', JSON.stringify(res.Result))
localStorage.setItem('digitPlaces', JSON.stringify(res.Result.DigitPlaces))
this.loading = false

View File

@ -93,6 +93,7 @@ export default {
const res = await getNextTask(params)
this.taskInfo = res.Result
localStorage.setItem('taskInfo', JSON.stringify(res.Result))
sessionStorage.setItem('taskInfo', JSON.stringify(res.Result))
localStorage.setItem('digitPlaces', JSON.stringify(res.Result.DigitPlaces))
this.loading = false
this.$nextTick(() => {

View File

@ -77,7 +77,8 @@
<i class="el-icon-arrow-down" style="color:#fff;" />
</div>
<div class="dropdown-content">
<ul v-if="readingTaskState < 2" style="width:100px;">
<!--v-if="readingTaskState < 2"-->
<ul style="width:100px;">
<li v-for="i in customizeStandardsNoneDicom" :key="i.toolName" style="text-align:left;">
<a href="#" @click.prevent="setAnnotateToolActive(i.toolName)">
<svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />