Compare commits

..

No commits in common. "dbdd18dcf60412ac40edbc7a1cf2c6d51086851f" and "6a0a5f472473796cbeab4304d79c53ea32ae4a16" have entirely different histories.

4 changed files with 9 additions and 32 deletions

View File

@ -208,8 +208,6 @@
:question-form="questionForm"
:reading-task-state="readingTaskState"
:visitTaskId="visitTaskId"
@resetFormItemData="resetFormItemData"
@setFormItemData="setFormItemData"
/>
</div>
</template>
@ -268,7 +266,6 @@ export default {
},
methods: {
formItemChange(v, question) {
console.log('formItemChange')
if (question.Childrens.length > 0) {
this.resetChild(question.Childrens)
} else {

View File

@ -31,8 +31,6 @@
:question-form="outerForm"
:reading-task-state="readingTaskState"
:visit-task-id="visitTaskId"
@resetFormItemData="resetOuterFormItemData"
@setFormItemData="setOuterFormItemData"
/>
<el-form-item v-if="readingTaskState < 2">
<div class="outer_form-footer">
@ -339,12 +337,6 @@ export default {
}
})
return formData
},
resetOuterFormItemData(v) {
this.$set(this.outerForm, v, null)
},
setOuterFormItemData(obj) {
},
//
async getTableQuestions() {
@ -358,7 +350,6 @@ export default {
const res = await getReadingQuestionAndAnswer(params)
if (res.IsSuccess) {
this.tableQuestions = res.Result.SinglePage
this.innerFormData = {}
res.Result.SinglePage.forEach(group => {
group.Childrens.forEach(table => {
const tableKey = table.Id
@ -532,7 +523,7 @@ export default {
}
// 线<10mm<10mm
if (!this.isBaseLineTask && ((obj.toolName === 'Length' && length < 10) || (obj.toolName === 'Bidirectional' && short < 10))) {
const stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
const stateId = this.getQuestionId(7)
if (innerForm.IsLymphNodes) {
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 3)
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 3)
@ -618,7 +609,7 @@ export default {
}
// 线<10mm<10mm
if (!this.isBaseLineTask && ((toolName === 'Length' && length < 10) || (toolName === 'Bidirectional' && short < 10))) {
const stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
const stateId = this.getQuestionId(7)
if (isLymphNodes) {
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 3)
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 3)
@ -797,7 +788,7 @@ export default {
this.$emit('removeAnnotation', obj)
}
//
await this.getTableQuestions()
this.getTableQuestions()
this.$emit('getAnnotations', this.visitTaskId)
// ''
this.$message.success(this.$t('common:message:deletedSuccessfully'))

View File

@ -208,8 +208,6 @@
:question-form="questionForm"
:reading-task-state="readingTaskState"
:visitTaskId="visitTaskId"
@resetFormItemData="resetFormItemData"
@setFormItemData="setFormItemData"
/>
</div>
</template>

View File

@ -31,8 +31,6 @@
:question-form="outerForm"
:reading-task-state="readingTaskState"
:visit-task-id="visitTaskId"
@resetFormItemData="resetOuterFormItemData"
@setFormItemData="setOuterFormItemData"
/>
<el-form-item v-if="readingTaskState < 2">
<div class="outer_form-footer">
@ -339,12 +337,6 @@ export default {
}
})
return formData
},
resetOuterFormItemData(v) {
this.$set(this.outerForm, v, null)
},
setOuterFormItemData(obj) {
},
//
async getTableQuestions() {
@ -358,7 +350,6 @@ export default {
const res = await getReadingQuestionAndAnswer(params)
if (res.IsSuccess) {
this.tableQuestions = res.Result.SinglePage
this.innerFormData = {}
res.Result.SinglePage.forEach(group => {
group.Childrens.forEach(table => {
const tableKey = table.Id
@ -426,7 +417,6 @@ export default {
})
})
}
console.log(this.innerFormData)
loading.close()
} catch (e) {
console.log(e)
@ -544,7 +534,7 @@ export default {
}
// 线<10mm<10mm
if (!this.isBaseLineTask && ((obj.toolName === 'Length' && length < 10) || (obj.toolName === 'Bidirectional' && short < 10))) {
const stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
const stateId = this.getQuestionId(7)
if (innerForm.IsLymphNodes) {
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 3)
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 3)
@ -578,6 +568,7 @@ export default {
}
},
modifyAnnotation(obj) {
console.log('modifyAnnotation')
const { annotation, toolName } = obj
const formData = Object.values(this.innerFormData).find(
i => i.LesionName === annotation.data.label
@ -634,7 +625,7 @@ export default {
}
// 线<10mm<10mm
if (!this.isBaseLineTask && ((toolName === 'Length' && length < 10) || (toolName === 'Bidirectional' && short < 10))) {
const stateId = this.getQuestionId(7, targetTable.TableQuestions.Questions)
const stateId = this.getQuestionId(7)
if (isLymphNodes) {
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 3)
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 3)
@ -814,7 +805,7 @@ export default {
this.$emit('removeAnnotation', obj)
}
//
await this.getTableQuestions()
this.getTableQuestions()
this.$emit('getAnnotations', this.visitTaskId)
// ''
this.$message.success(this.$t('common:message:deletedSuccessfully'))
@ -844,9 +835,9 @@ export default {
let loading = null
try {
const innerForm = this.innerFormData[`${table.Id}_${rowIndex}`]
if (table.LesionType === 0 && this.isBaseLineTask && !innerForm.IntrahepaticLesion) {
if (table.LesionType === 0 && this.isBaseLineTask && !innerForm.IsLymphNodes && !innerForm.IntrahepaticLesion) {
const arr = Object.values(this.innerFormData).filter(
obj => obj.LesionType === 0 && obj.LesionName !== innerForm.LesionName
obj => !obj.IsLymphNodes && obj.LesionType === 0 && obj.LesionName !== innerForm.LesionName
)
if (arr.length === 0 && !innerForm.RowId) {
const confirm = await this.$confirm(