{{ $t('common:dialogTitle:sign') }}
- {{ `(${$t('common:label:sign')}${ currentUser })` }}
+ {{ `(${$t('common:label:sign')}${currentUser})` }}
@@ -178,9 +154,9 @@ export default {
this.questionsMarkStatus = {}
this.questionMarkInfoList = res.OtherInfo.QuestionMarkInfoList.map(i => {
if (i.RowId) {
- this.$set(this.questionsMarkStatus, `${i.RowId}_${i.TableQuestionId}`, {isMarked: i.MeasureData !== '', isSaved: true})
+ this.$set(this.questionsMarkStatus, `${i.RowId}_${i.TableQuestionId}`, { isMarked: i.MeasureData !== '', isSaved: true, OrderMarkName: i.OrderMarkName })
} else if (i.QuestionId) {
- this.$set(this.questionsMarkStatus, i.QuestionId, {isMarked: i.MeasureData !== '', isSaved: true})
+ this.$set(this.questionsMarkStatus, i.QuestionId, { isMarked: i.MeasureData !== '', isSaved: true, OrderMarkName: i.OrderMarkName })
}
if (typeof i.MeasureData === 'string' && i.MeasureData) {
i.MeasureData = JSON.parse(i.MeasureData)
@@ -206,7 +182,7 @@ export default {
i.TableQuestions.Questions.forEach(o => {
if (o.Type === 'number') {
i.TableQuestions.Answers.forEach((ite, index) => {
- this.$set(i.TableQuestions.Answers[index], o.Id, isNaN(parseFloat(i.TableQuestions.Answers[index][o.Id])) ? i.TableQuestions.Answers[index][o.Id] : parseFloat(i.TableQuestions.Answers[index][o.Id]).toFixed(this.digitPlaces))
+ this.$set(i.TableQuestions.Answers[index], o.Id, isNaN(parseFloat(i.TableQuestions.Answers[index][o.Id])) ? i.TableQuestions.Answers[index][o.Id] : parseFloat(i.TableQuestions.Answers[index][o.Id]).toFixed(this.digitPlaces))
})
}
})
@@ -241,7 +217,7 @@ export default {
try {
var answers = []
for (const k in this.questionForm) {
- if (this.questionForm[k] instanceof Array) {} else {
+ if (this.questionForm[k] instanceof Array) { } else {
answers.push({ id: k, answer: this.questionForm[k] })
}
}
@@ -280,7 +256,7 @@ export default {
this.loading = true
var answers = []
for (const k in this.questionForm) {
- if (this.questionForm[k] instanceof Array) {} else {
+ if (this.questionForm[k] instanceof Array) { } else {
answers.push({ readingQuestionTrialId: k, answer: this.questionForm[k] })
}
}
@@ -353,7 +329,7 @@ export default {
const o = list.find(v => {
return (
parseFloat(obj.val) >= parseFloat(v.gt) &&
- parseFloat(obj.val) < parseFloat(v.lt)
+ parseFloat(obj.val) < parseFloat(v.lt)
)
})
answer = o ? o.label : null
@@ -367,7 +343,7 @@ export default {
}
})
},
-
+
verifyAnnotationIsBound(annotation) {
const i = this.questionMarkInfoList.findIndex(i => i.MeasureData && i.MeasureData.annotationUID === annotation.annotationUID)
return i > -1
@@ -485,7 +461,7 @@ export default {
// } else {
// this.$set(this.questionsMarkStatus, `${obj.rowId}_${item.TableQuestionId}`, {isMarked: item.MeasureData ? true : false, isSaved: false})
// }
-
+
// }
// })
// } else if (this.operateRowId && this.operateQuestionId) {
@@ -541,15 +517,15 @@ export default {
}
const { question, operateStateEnum, rowId, answer } = obj
const { Id, IsTableQuestion, ImageTool, ImageToolAttribute, ParentQsId, RowId } = question
-
+
Object.assign(this, {
- operateStateEnum,
- isTableQuestion: !!IsTableQuestion,
- imageTool: ImageTool,
- imageToolAttribute: ImageToolAttribute,
- operateQuestionId: Id,
- operateRowId: RowId,
- operateParentQsId: ParentQsId
+ operateStateEnum,
+ isTableQuestion: !!IsTableQuestion,
+ imageTool: ImageTool,
+ imageToolAttribute: ImageToolAttribute,
+ operateQuestionId: Id,
+ operateRowId: RowId,
+ operateParentQsId: ParentQsId
})
const stateHandlers = {
[STATE.BIND]: () => this.$emit('setReadingToolPassive'),
@@ -570,8 +546,8 @@ export default {
if (index === -1) return
const annotation = this.questionMarkInfoList[index].MeasureData
this.$emit('viewCustomAnnotationSeries', {
- visitTaskId: this.visitTaskId,
- annotation
+ visitTaskId: this.visitTaskId,
+ annotation
})
},
handleRemoveAnnotation(obj) {
@@ -583,12 +559,12 @@ export default {
SeriesId: '',
InstanceId: ''
})
- const key = this.operateRowId
- ? `${this.operateRowId}_${obj.question.Id}`
+ const key = this.operateRowId
+ ? `${this.operateRowId}_${obj.question.Id}`
: obj.question.Id
this.$set(this.questionsMarkStatus, key, {
isMarked: false,
- isSaved: false
+ isSaved: false,
})
},
async handleSaveOuterQuestions(obj) {
@@ -596,11 +572,11 @@ export default {
try {
const answers = [{ id: obj.question.Id, answer: this.questionForm[obj.question.Id] }]
const markInfo = []
-
+
const index = this.questionMarkInfoList.findIndex(
item => item.QuestionId === this.operateQuestionId
)
-
+
if (index > -1) {
const item = { ...this.questionMarkInfoList[index] }
item.MeasureData = item.MeasureData ? JSON.stringify(item.MeasureData) : ''
@@ -614,7 +590,8 @@ export default {
})
this.$set(this.questionsMarkStatus, obj.question.Id, {
isMarked: !!this.questionMarkInfoList[index]?.MeasureData,
- isSaved: true
+ isSaved: true,
+ OrderMarkName: this.questionMarkInfoList[index].OrderMarkName
})
} catch (e) {
console.error('保存失败:', e)
@@ -623,12 +600,12 @@ export default {
}
},
handleUpdateValue(obj) {
- const key = this.operateRowId
- ? `${this.operateRowId}_${obj.question.Id}`
+ const key = this.operateRowId
+ ? `${this.operateRowId}_${obj.question.Id}`
: obj.question.Id
this.$set(this.questionsMarkStatus, key, {
isMarked: false,
- isSaved: false
+ isSaved: false,
})
},
async handleSaveTableQuestions(obj) {
@@ -669,12 +646,12 @@ export default {
TableQuestionId: this.operateQuestionId,
RowIndex: obj.rowIndex
}, -10)
- this.$set(this.questionsMarkStatus,
- `${this.operateRowId}_${this.operateQuestionId}`,
- { isMarked: !!annotation, isSaved: true }
+ this.$set(this.questionsMarkStatus,
+ `${this.operateRowId}_${this.operateQuestionId}`,
+ { isMarked: !!annotation, isSaved: true, OrderMarkName: annotation.data.label }
)
this.resetOperateState()
- } catch(e) {
+ } catch (e) {
console.error('表格保存失败:', e)
} finally {
loading.close()
@@ -683,11 +660,11 @@ export default {
findMarkIndex(question) {
const { Id, RowId } = question
if (this.isTableQuestion) {
- return RowId
- ? this.questionMarkInfoList.findIndex(i =>
- i.TableQuestionId === Id && i.RowId === RowId)
- : this.questionMarkInfoList.findIndex(i =>
- i.TableQuestionId === Id && !i.RowId)
+ return RowId
+ ? this.questionMarkInfoList.findIndex(i =>
+ i.TableQuestionId === Id && i.RowId === RowId)
+ : this.questionMarkInfoList.findIndex(i =>
+ i.TableQuestionId === Id && !i.RowId)
}
return this.questionMarkInfoList.findIndex(i => i.QuestionId === Id)
},
@@ -697,7 +674,7 @@ export default {
item.RowId = obj.rowId
const oldKey = item.TableQuestionId
const newKey = `${obj.rowId}_${item.TableQuestionId}`
-
+
if (this.questionsMarkStatus[oldKey]) {
const status = { ...this.questionsMarkStatus[oldKey] }
delete this.questionsMarkStatus[oldKey]
@@ -730,8 +707,8 @@ export default {
}
if (currentState === 3) {
const conflictIndex = this.questionMarkInfoList.findIndex(
- item => item.MeasureData.annotationUID === annotation.annotationUID
- && item.RowId !== this.operateRowId && this.operateRowId
+ item => item.MeasureData.annotationUID === annotation.annotationUID
+ && item.RowId !== this.operateRowId && this.operateRowId
)
if (conflictIndex > -1) {
this.$alert('该标记已绑定到其他行，不能更改绑定！')
@@ -740,8 +717,8 @@ export default {
}
const message = currentState === 0 ? '是否确认绑定？' : '是否确认更改？'
const result = await this.$confirm(message, {
- type: 'warning',
- distinguishCancelAndClose: true
+ type: 'warning',
+ distinguishCancelAndClose: true
})
const isConfirmed = result === 'confirm'
if (!isConfirmed) return
@@ -751,17 +728,18 @@ export default {
this.questionMarkInfoList.push({
InstanceId: annotation.instanceId,
SeriesId: annotation.seriesId,
+ OrderMarkName: annotation.data.label,
StudyId: annotation.studyId,
MarkTool: annotation.metadata.toolName,
PicturePath: '',
NumberOfFrames: annotation.numberOfFrames,
MeasureData: annotation,
RowId: this.operateRowId || '',
- QuestionId: this.isTableQuestion
- ? this.operateParentQsId
+ QuestionId: this.isTableQuestion
+ ? this.operateParentQsId
: this.operateQuestionId,
- TableQuestionId: this.isTableQuestion
- ? this.operateQuestionId
+ TableQuestionId: this.isTableQuestion
+ ? this.operateQuestionId
: ''
})
} else {
@@ -770,6 +748,7 @@ export default {
InstanceId: annotation.instanceId,
SeriesId: annotation.seriesId,
StudyId: annotation.studyId,
+ OrderMarkName: annotation.data.label,
MarkTool: annotation.metadata.toolName,
PicturePath: '',
NumberOfFrames: annotation.numberOfFrames,
@@ -789,23 +768,23 @@ export default {
const item = markList[i];
if (item.MeasureData?.annotationUID !== annotation.annotationUID) continue
item.MeasureData = annotation
-
+
if (item.TableQuestionId) {
qsArr.push({ ...item, ImageToolAttribute: this.imageToolAttribute })
-
- const keyId = item.RowId
- ? `${item.RowId}_${item.TableQuestionId}`
- : item.TableQuestionId
-
- this.$set(this.questionsMarkStatus, keyId, {
- isMarked: true,
- isSaved: false
+
+ const keyId = item.RowId
+ ? `${item.RowId}_${item.TableQuestionId}`
+ : item.TableQuestionId
+
+ this.$set(this.questionsMarkStatus, keyId, {
+ isMarked: true,
+ isSaved: false,
})
} else {
this.setAnswerToQuestion(annotation, item.QuestionId)
this.$set(this.questionsMarkStatus, item.QuestionId, {
- isMarked: true,
- isSaved: false
+ isMarked: true,
+ isSaved: false,
})
}
}
@@ -816,13 +795,13 @@ export default {
findTargetIndex() {
if (this.isTableQuestion && this.operateRowId) {
return this.questionMarkInfoList.findIndex(
- item => item.TableQuestionId === this.operateQuestionId
- && item.RowId === this.operateRowId
- )
+ item => item.TableQuestionId === this.operateQuestionId
+ && item.RowId === this.operateRowId
+ )
} else if (this.isTableQuestion) {
return this.questionMarkInfoList.findIndex(
- item => item.TableQuestionId === this.operateQuestionId
- && !item.RowId
+ item => item.TableQuestionId === this.operateQuestionId
+ && !item.RowId
)
}
return this.questionMarkInfoList.findIndex(
@@ -836,9 +815,9 @@ export default {
const keyId = index > -1 && this.questionMarkInfoList[index].RowId
? `${this.questionMarkInfoList[index].RowId}_${this.questionMarkInfoList[index].TableQuestionId}`
: this.operateRowId
- ? `${this.operateRowId}_${this.operateQuestionId}`
- : this.operateQuestionId
-
+ ? `${this.operateRowId}_${this.operateQuestionId}`
+ : this.operateQuestionId
+
this.$set(this.questionsMarkStatus, keyId, status)
store.dispatch('dicom3d/setOperateInfo', [{
MeasureData: annotation,
@@ -895,13 +874,13 @@ export default {
if (!referencedImageId) return null
const cacheKey = `imageId:${referencedImageId}`
const cachedStats = annotation.data?.cachedStats?.[cacheKey]
- const hasProp = cachedStats
- && Object.prototype.hasOwnProperty.call(cachedStats, prop)
+ const hasProp = cachedStats
+ && Object.prototype.hasOwnProperty.call(cachedStats, prop)
if (!hasProp) return null
const value = cachedStats[prop]
- return value !== null
- ? parseFloat(value).toFixed(this.digitPlaces)
- : value
+ return value !== null
+ ? parseFloat(value).toFixed(this.digitPlaces)
+ : value
},
unBindAnnotationToQuestion(obj) {
const { markTableQuestions = [], questionId } = obj || {}
@@ -999,32 +978,38 @@ export default {
}
+// }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index ec3029b0..77df9d66 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -2,8 +2,7 @@