Compare commits
No commits in common. "3d0a3116e1553ed1ae1f095e3a86af2b872a0da0" and "d3a48425045f23dee0a8176e1e9a645e8899f0bc" have entirely different histories.
3d0a3116e1
...
d3a4842504
|
|
@ -1657,13 +1657,11 @@ export default {
|
|||
annotation.data.label +
|
||||
'?'
|
||||
)
|
||||
let res = null
|
||||
if (annotation.markId) {
|
||||
res = await deleteCustomTag(annotation.markId)
|
||||
deleteCustomTag(annotation.markId)
|
||||
}else if (annotation.id) {
|
||||
res = await deleteCustomTag(annotation.id)
|
||||
deleteCustomTag(annotation.id)
|
||||
}
|
||||
if (!res.isSuccess) return false
|
||||
}
|
||||
const index = this.markedSeriesIds.indexOf(annotation.seriesId)
|
||||
if (index !== -1) {
|
||||
|
|
|
|||
|
|
@ -652,8 +652,8 @@ export default {
|
|||
}
|
||||
annotation = this.getAnnotationByRow(this.operateRowId)
|
||||
// 截图上传
|
||||
let picturePath = obj.picturePath
|
||||
if (annotation && !picturePath) {
|
||||
let picturePath = ''
|
||||
if (annotation) {
|
||||
const base64Str = await this.getScreenshots({
|
||||
visitTaskId: this.visitTaskId,
|
||||
annotation
|
||||
|
|
@ -686,17 +686,6 @@ export default {
|
|||
{ isMarked: !!annotation, isSaved: true, OrderMarkName: annotation ? annotation.data.label : '' }
|
||||
)
|
||||
this.resetOperateState()
|
||||
if (annotation) {
|
||||
for (let i = 0; i < this.questionMarkInfoList.length; i++) {
|
||||
const item = this.questionMarkInfoList[i]
|
||||
if (!item.MeasureData || item.MeasureData.annotationUID !== annotation.annotationUID) continue
|
||||
const isTableMode = item.TableQuestionId
|
||||
if (isTableMode && ((this.questionsMarkStatus[`${item.RowId}_${item.TableQuestionId}`] && !this.questionsMarkStatus[`${item.RowId}_${item.TableQuestionId}`].isSaved && this.questionsMarkStatus[`${item.RowId}_${item.TableQuestionId}`].isMarked) || (this.questionsMarkStatus[`${item.TableQuestionId}`] && !this.questionsMarkStatus[`${item.TableQuestionId}`].isSaved && this.questionsMarkStatus[`${item.TableQuestionId}`].isMarked))) {
|
||||
DicomEvent.$emit('operateImageMarkerTable', { QuestionId: item.TableQuestionId, operateStateEnum: 7, picturePath })
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('表格保存失败:', e)
|
||||
} finally {
|
||||
|
|
|
|||
|
|
@ -195,7 +195,6 @@
|
|||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
|
||||
export default {
|
||||
name: 'QuestionTableFormItem',
|
||||
props: {
|
||||
|
|
@ -295,6 +294,7 @@ export default {
|
|||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
var digitPlaces = Number(localStorage.getItem('digitPlaces'))
|
||||
this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
|
||||
if (this.question.Type === 'upload') {
|
||||
|
|
@ -306,12 +306,6 @@ export default {
|
|||
})
|
||||
}
|
||||
}
|
||||
DicomEvent.$on('operateImageMarkerTable', (data) => {
|
||||
let { operateStateEnum, QuestionId, picturePath } = data
|
||||
if (this.question.Id === QuestionId) {
|
||||
this.operateImageMarker({ operateStateEnum, question: this.question, picturePath })
|
||||
}
|
||||
})
|
||||
if (this.type === 'edit') return
|
||||
},
|
||||
methods: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue