Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
be9e78ec73
|
@ -47,7 +47,7 @@
|
||||||
</el-input>
|
</el-input>
|
||||||
<!-- 测量 -->
|
<!-- 测量 -->
|
||||||
<el-button
|
<el-button
|
||||||
v-if="!questionForm[qs.Id] && readingTaskState!== 2"
|
v-if="questionForm[isMeasurableId] && parseInt(questionForm[isMeasurableId]) === 1 && !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,7 +271,8 @@ export default {
|
||||||
activeQuestionId: '',
|
activeQuestionId: '',
|
||||||
activeQuestionMark: '',
|
activeQuestionMark: '',
|
||||||
markList: [],
|
markList: [],
|
||||||
digitPlaces: 2
|
digitPlaces: 2,
|
||||||
|
isMeasurableId: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -323,6 +324,7 @@ 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()
|
||||||
},
|
},
|
||||||
|
@ -534,7 +536,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) {
|
if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.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 => {
|
||||||
|
|
Loading…
Reference in New Issue