Compare commits

..

No commits in common. "c0588661ce2a2979c404d33e18e6df104c8d15e4" and "e6715a429bd6c04a7767d09e256a46c38a6cbc1a" have entirely different histories.

4 changed files with 69 additions and 83 deletions

View File

@ -743,36 +743,32 @@ export default {
},
formItemNumberChange(questionId, isTable) {
if (typeof isTable === 'object') {
this.$emit("setFormItemData", { key: isTable.Id, val: questionId, question: isTable });
if (isTable) {
this.CalculationList.forEach((v, i) => {
var find = v.CalculateQuestionList.filter(o => {
return o.QuestionId === questionId
})
// findnumber
if (find) {
var num = this.logic(v)
if (num !== false) {
this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v })
}
}
})
} else {
if (isTable) {
this.CalculationList.forEach((v, i) => {
var find = v.CalculateQuestionList.filter(o => {
return o.QuestionId === questionId
})
// findnumber
if (find) {
var num = this.logic(v)
if (num !== false) {
this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v })
}
}
this.CalculationList.forEach(v => {
var find = v.CalculateQuestionList.filter(o => {
return o.TableQuestionId === questionId
})
} else {
this.CalculationList.forEach(v => {
var find = v.CalculateQuestionList.filter(o => {
return o.TableQuestionId === questionId
})
// findnumber
if (find) {
var num = this.logic(v)
if (num !== false) {
this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v })
}
// findnumber
if (find) {
var num = this.logic(v)
if (num !== false) {
this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v })
}
})
}
}
})
}
// this.$emit('formItemNumberChange')
},

View File

@ -472,36 +472,32 @@ export default {
}
},
formItemNumberChange(questionId, isTable) {
if (typeof isTable === 'object') {
this.$emit("setFormItemData", { key: isTable.Id, val: questionId, question: isTable });
if (isTable) {
this.calculationList.forEach((v, i) => {
var find = v.CalculateQuestionList.filter(o => {
return o.QuestionId === questionId
})
// findnumber
if (find) {
var num = this.logic(v)
if (num !== false) {
this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v })
}
}
})
} else {
if (isTable) {
this.calculationList.forEach((v, i) => {
var find = v.CalculateQuestionList.filter(o => {
return o.QuestionId === questionId
})
// findnumber
if (find) {
var num = this.logic(v)
if (num !== false) {
this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v })
}
}
this.calculationList.forEach(v => {
var find = v.CalculateQuestionList.filter(o => {
return o.TableQuestionId === questionId
})
} else {
this.calculationList.forEach(v => {
var find = v.CalculateQuestionList.filter(o => {
return o.TableQuestionId === questionId
})
// findnumber
if (find) {
var num = this.logic(v)
if (num !== false) {
this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v })
}
// findnumber
if (find) {
var num = this.logic(v)
if (num !== false) {
this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v })
}
})
}
}
})
}
},
formItemChange(v, question) {

View File

@ -660,38 +660,33 @@ export default {
return num;
},
formItemNumberChange(questionId, isTable) {
if (typeof isTable === 'object') {
this.$emit("setFormItemData", { key: isTable.Id, val: questionId, question: isTable });
if (isTable) {
this.calculationList.forEach((v, i) => {
var find = v.CalculateQuestionList.filter((o) => {
return o.QuestionId === questionId;
});
if (find) {
var num = this.logic(v);
if (num !== false) {
this.$emit("setFormItemData", { key: v.QuestionId, val: num, question: v });
}
}
});
} else {
if (isTable) {
this.calculationList.forEach((v, i) => {
var find = v.CalculateQuestionList.filter((o) => {
return o.QuestionId === questionId;
});
if (find) {
var num = this.logic(v);
if (num !== false) {
this.$emit("setFormItemData", { key: v.QuestionId, val: num, question: v });
}
}
this.calculationList.forEach((v) => {
var find = v.CalculateQuestionList.filter((o) => {
return o.TableQuestionId === questionId;
});
} else {
this.calculationList.forEach((v) => {
var find = v.CalculateQuestionList.filter((o) => {
return o.TableQuestionId === questionId;
});
// findnumber
if (find) {
var num = this.logic(v);
if (num !== false) {
this.$emit("setFormItemData", { key: v.QuestionId, val: num, question: v });
}
// findnumber
if (find) {
var num = this.logic(v);
if (num !== false) {
this.$emit("setFormItemData", { key: v.QuestionId, val: num, question: v });
}
});
}
}
});
}
// this.$emit('formItemNumberChange')
},
formItemTableNumberChange() {

View File

@ -167,7 +167,6 @@ export default {
// if (i.Type === 'number') {
// this.$set(this.questionForm, i.Id, i.Answer)
// }
console.log('setChild')
if (i.Type === 'class') {
this.classArr.push({triggerId: i.ClassifyQuestionId, classId: i.Id, classifyAlgorithms: i.ClassifyAlgorithms, classifyType: i.ClassifyType})
}