Compare commits
No commits in common. "041c23daf61ed549b5e5cda3c501932489886cbb" and "ff97099c3f287b555deadd5d1b8a168aff15b3a7" have entirely different histories.
041c23daf6
...
ff97099c3f
|
@ -414,9 +414,6 @@ export default {
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e, v)
|
console.log(e, v)
|
||||||
}
|
}
|
||||||
if (this.question.Type === 'class') {
|
|
||||||
this.$emit("setFormItemData", { key: this.question.Id, val: v[this.question.Id], question: v })
|
|
||||||
}
|
|
||||||
this.formItemNumberChange(this.question.Id, false)
|
this.formItemNumberChange(this.question.Id, false)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -714,6 +711,8 @@ export default {
|
||||||
case 13:
|
case 13:
|
||||||
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
||||||
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
|
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
|
||||||
|
} else {
|
||||||
|
dataArr.push(0)
|
||||||
}
|
}
|
||||||
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
|
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -467,12 +467,7 @@ export default {
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e, v);
|
console.log(e, v);
|
||||||
}
|
}
|
||||||
if (this.question.Type === 'class') {
|
|
||||||
this.$emit("setFormItemData", { key: this.question.Id, val: v[this.question.Id], question: v })
|
|
||||||
}
|
|
||||||
|
|
||||||
this.formItemNumberChange(this.question.Id, false);
|
this.formItemNumberChange(this.question.Id, false);
|
||||||
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -641,8 +636,9 @@ export default {
|
||||||
case 13:
|
case 13:
|
||||||
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
||||||
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
|
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
|
||||||
|
} else {
|
||||||
|
dataArr.push(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
|
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
|
||||||
break;
|
break;
|
||||||
case 14:
|
case 14:
|
||||||
|
|
Loading…
Reference in New Issue