|
@@ -309,7 +309,7 @@ export default {
|
|
for (var j = 0; j < questionList.length; j++) {
|
|
for (var j = 0; j < questionList.length; j++) {
|
|
if (value[1] == questionList[j].questionId) {
|
|
if (value[1] == questionList[j].questionId) {
|
|
if (this.oldValue.length >= index + 1) {
|
|
if (this.oldValue.length >= index + 1) {
|
|
- console.log("XXXXXXXXXXXXX");
|
|
|
|
|
|
+ // console.log("XXXXXXXXXXXXX");
|
|
this.setOptionsDisabled(this.oldValue[index], false);
|
|
this.setOptionsDisabled(this.oldValue[index], false);
|
|
}
|
|
}
|
|
this.questionListSel[index] = questionList[j];
|
|
this.questionListSel[index] = questionList[j];
|
|
@@ -371,20 +371,22 @@ export default {
|
|
},
|
|
},
|
|
setOptionsDisabledXY(value, disabled, type = 0) {
|
|
setOptionsDisabledXY(value, disabled, type = 0) {
|
|
var newOptions = [];
|
|
var newOptions = [];
|
|
- console.log("XXXXXXX", value)
|
|
|
|
|
|
+ // console.log("setOptionsDisabledXY--0", value, disabled, type);
|
|
var options = type == 0 ? this.optionsX : this.optionsY;
|
|
var options = type == 0 ? this.optionsX : this.optionsY;
|
|
for (var i = 0; i < options.length; i++) {
|
|
for (var i = 0; i < options.length; i++) {
|
|
var item = options[i];
|
|
var item = options[i];
|
|
- if (item.value == value[0]) {
|
|
|
|
- for (var j = 0; j < options[i].children.length; j++) {
|
|
|
|
- var children = []
|
|
|
|
- var element = options[i].children[j];
|
|
|
|
- if (element.value == value[1]) {
|
|
|
|
- element.disabled = disabled
|
|
|
|
- }
|
|
|
|
- children.push(element)
|
|
|
|
|
|
+ // console.log("setOptionsDisabledXY--1", value, disabled, type, item);
|
|
|
|
+ // if (item.value == value[0]) {
|
|
|
|
+ for (var j = 0; j < options[i].children.length; j++) {
|
|
|
|
+ var children = []
|
|
|
|
+ var element = options[i].children[j];
|
|
|
|
+ // console.log("setOptionsDisabledXY--2", value, disabled, type, item, element.value, value[1]);
|
|
|
|
+ if (element.value == value[1]) {
|
|
|
|
+ element.disabled = disabled
|
|
}
|
|
}
|
|
|
|
+ children.push(element)
|
|
}
|
|
}
|
|
|
|
+ // }
|
|
newOptions.push(item)
|
|
newOptions.push(item)
|
|
}
|
|
}
|
|
if (type == 0) {
|
|
if (type == 0) {
|
|
@@ -396,19 +398,22 @@ export default {
|
|
},
|
|
},
|
|
setOptionsDisabled(value, disabled) {
|
|
setOptionsDisabled(value, disabled) {
|
|
var newOptions = [];
|
|
var newOptions = [];
|
|
- console.log("XXXXXXX", value)
|
|
|
|
|
|
+ // console.log("setOptionsDisabled--0", value, disabled);
|
|
for (var i = 0; i < this.options.length; i++) {
|
|
for (var i = 0; i < this.options.length; i++) {
|
|
var item = this.options[i];
|
|
var item = this.options[i];
|
|
- if (item.value == value[0]) {
|
|
|
|
- for (var j = 0; j < this.options[i].children.length; j++) {
|
|
|
|
- var children = []
|
|
|
|
- var element = this.options[i].children[j];
|
|
|
|
- if (element.value == value[1]) {
|
|
|
|
- element.disabled = disabled
|
|
|
|
- }
|
|
|
|
- children.push(element)
|
|
|
|
|
|
+ // console.log("setOptionsDisabledXY--1", value, disabled, item);
|
|
|
|
+ // if (item.value == value[0]) {
|
|
|
|
+ for (var j = 0; j < this.options[i].children.length; j++) {
|
|
|
|
+ var children = []
|
|
|
|
+ var element = this.options[i].children[j];
|
|
|
|
+ // console.log("setOptionsDisabledXY--2", value, disabled, item, element.value, value[1]);
|
|
|
|
+ if (element.value == value[1]) {
|
|
|
|
+ element.disabled = disabled
|
|
}
|
|
}
|
|
|
|
+ children.push(element)
|
|
}
|
|
}
|
|
|
|
+ // }
|
|
|
|
+ // console.log("XXXXXXX", item);
|
|
newOptions.push(item)
|
|
newOptions.push(item)
|
|
}
|
|
}
|
|
this.options = newOptions;
|
|
this.options = newOptions;
|
|
@@ -630,13 +635,19 @@ export default {
|
|
for (var m = 0; m < this.optionsXValue.length; m++) {
|
|
for (var m = 0; m < this.optionsXValue.length; m++) {
|
|
var element = this.optionsXValue[m];
|
|
var element = this.optionsXValue[m];
|
|
if (item[j].questionId == element[1]) {
|
|
if (item[j].questionId == element[1]) {
|
|
- xlist.push(item[j]);
|
|
|
|
|
|
+ const found = xlist.find(element => element.questionId == item[j].questionId);
|
|
|
|
+ if (found === undefined) {
|
|
|
|
+ xlist.push(item[j]);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
for (var n = 0; n < this.optionsYValue.length; n++) {
|
|
for (var n = 0; n < this.optionsYValue.length; n++) {
|
|
var element = this.optionsYValue[n];
|
|
var element = this.optionsYValue[n];
|
|
if (item[j].questionId == element[1]) {
|
|
if (item[j].questionId == element[1]) {
|
|
- ylist.push(item[j]);
|
|
|
|
|
|
+ const found = ylist.find(element => element.questionId == item[j].questionId);
|
|
|
|
+ if (found === undefined) {
|
|
|
|
+ ylist.push(item[j]);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|