Compare commits

..

No commits in common. "5d9adab706f5679c9be08ee7e7b342a99555e696" and "5dedcbc2efecbda52590153a3f8a8f8831d8cc2b" have entirely different histories.

1 changed files with 4 additions and 6 deletions

View File

@ -47,7 +47,7 @@
</el-input> </el-input>
<!-- 测量 --> <!-- 测量 -->
<el-button <el-button
v-if="questionForm[isMeasurableId] && parseInt(questionForm[isMeasurableId]) === 1 && !questionForm[qs.Id] && readingTaskState!== 2" v-if="!questionForm[qs.Id] && readingTaskState!== 2"
size="mini" size="mini"
type="text" type="text"
@click="addAnnotation(qs)" @click="addAnnotation(qs)"
@ -72,7 +72,7 @@
@click="locateAnnotation(qs)" @click="locateAnnotation(qs)"
style="margin-left: 0px" style="margin-left: 0px"
> >
返回 定位
</el-button> </el-button>
<!-- 保存 --> <!-- 保存 -->
<el-button <el-button
@ -271,8 +271,7 @@ export default {
activeQuestionId: '', activeQuestionId: '',
activeQuestionMark: '', activeQuestionMark: '',
markList: [], markList: [],
digitPlaces: 2, digitPlaces: 2
isMeasurableId: ''
} }
}, },
mounted() { mounted() {
@ -324,7 +323,6 @@ export default {
this.markList.push({tableQuestionId: i.TableQuestionId, measureData: i, saveEnum: 1}) this.markList.push({tableQuestionId: i.TableQuestionId, measureData: i, saveEnum: 1})
}) })
} }
this.isMeasurableId = this.getQuestionId(1105)
this.isRender = true this.isRender = true
// loading.close() // loading.close()
}, },
@ -536,7 +534,7 @@ export default {
try { try {
let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id) let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
let params = {} let params = {}
if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.MeasureData) { if (i > -1 && this.markList[i].measureData) {
let measureData = this.markList[i].measureData.MeasureData let measureData = this.markList[i].measureData.MeasureData
// //
DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: measureData.OrderMarkName, lesionType: null, isMarked: !!measureData }, async val => { DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: measureData.OrderMarkName, lesionType: null, isMarked: !!measureData }, async val => {