Merge branch 'main' into uat
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
commit
83dc28008f
|
|
@ -699,7 +699,7 @@ const actions = {
|
||||||
var measureData = state.visitTaskList[index].MeasureData
|
var measureData = state.visitTaskList[index].MeasureData
|
||||||
// var idx = measureData.findIndex(item => item.MeasureData.uuid === obj.data.MeasureData.data.uuid)
|
// var idx = measureData.findIndex(item => item.MeasureData.uuid === obj.data.MeasureData.data.uuid)
|
||||||
|
|
||||||
if (criterionType === 21 || criterionType === 22) {
|
if (criterionType === 21) {
|
||||||
let i = measureData.findIndex(i => i.TableQuestionId === obj.data.TableQuestionId)
|
let i = measureData.findIndex(i => i.TableQuestionId === obj.data.TableQuestionId)
|
||||||
if (i > -1) {
|
if (i > -1) {
|
||||||
for (const k in state.visitTaskList[index].MeasureData[i]) {
|
for (const k in state.visitTaskList[index].MeasureData[i]) {
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,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[isMeasurableId] && parseInt(questionForm[isMeasurableId]) === 1 && !questionForm.MeasureData && readingTaskState !== 2"
|
||||||
size="mini" type="text" @click="addAnnotation(qs)">
|
size="mini" type="text" @click="addAnnotation(qs)">
|
||||||
{{ $t('trials:MRIPDFF:button:measure') }}
|
{{ $t('trials:MRIPDFF:button:measure') }}
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue