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) { formItemNumberChange(questionId, isTable) {
if (typeof isTable === 'object') { if (isTable) {
this.$emit("setFormItemData", { key: isTable.Id, val: questionId, question: 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 { } else {
if (isTable) { this.CalculationList.forEach(v => {
this.CalculationList.forEach((v, i) => { var find = v.CalculateQuestionList.filter(o => {
var find = v.CalculateQuestionList.filter(o => { return o.TableQuestionId === questionId
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 { // findnumber
this.CalculationList.forEach(v => { if (find) {
var find = v.CalculateQuestionList.filter(o => { var num = this.logic(v)
return o.TableQuestionId === questionId 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') // this.$emit('formItemNumberChange')
}, },

View File

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

View File

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

View File

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