|
@@ -938,7 +938,7 @@ const addNewData = () => {
|
|
switch (activeName.value) {
|
|
switch (activeName.value) {
|
|
case 'one':
|
|
case 'one':
|
|
const table0Ref = proTable.value![0]
|
|
const table0Ref = proTable.value![0]
|
|
- if (Object.keys(table0Ref.searchParam).length !== 0 && table0Ref.tableData.length !== 0) {
|
|
|
|
|
|
+ if (table0Ref.tableData.length !== 0) {
|
|
tabTwo.value = false
|
|
tabTwo.value = false
|
|
activeName.value = 'two'
|
|
activeName.value = 'two'
|
|
} else {
|
|
} else {
|
|
@@ -1062,20 +1062,43 @@ const onNext = () => {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
if (pageIndex.value === 2 || pageIndex.value === 6 || pageIndex.value === 10) {
|
|
if (pageIndex.value === 2 || pageIndex.value === 6 || pageIndex.value === 10) {
|
|
- let dataName
|
|
|
|
|
|
+ let dataName, flag
|
|
if (pageIndex.value === 2) dataName = 'trainDataSelect'
|
|
if (pageIndex.value === 2) dataName = 'trainDataSelect'
|
|
else if (pageIndex.value === 6) dataName = 'testDataSelect'
|
|
else if (pageIndex.value === 6) dataName = 'testDataSelect'
|
|
else if (pageIndex.value === 10) dataName = 'reasoningDataSelect'
|
|
else if (pageIndex.value === 10) dataName = 'reasoningDataSelect'
|
|
|
|
+ switch (activeName.value) {
|
|
|
|
+ case 'one':
|
|
|
|
+ flag = 0
|
|
|
|
+ break
|
|
|
|
+ case 'two':
|
|
|
|
+ flag = 1
|
|
|
|
+ break
|
|
|
|
+ case 'three':
|
|
|
|
+ flag = 2
|
|
|
|
+ break
|
|
|
|
+ case 'false':
|
|
|
|
+ flag = 3
|
|
|
|
+ break
|
|
|
|
+ default:
|
|
|
|
+ break
|
|
|
|
+ }
|
|
formItem[dataName] = []
|
|
formItem[dataName] = []
|
|
- for (let i = 0; i <= 3; i++) {
|
|
|
|
- if (Object.values(proTable.value![i].searchParam).some(v => v !== '')) {
|
|
|
|
- formItem[dataName].push({
|
|
|
|
- conditionSelected: true,
|
|
|
|
- condition: proTable.value![i].searchParam
|
|
|
|
- })
|
|
|
|
|
|
+ for (let i = 0; i <= flag; i++) {
|
|
|
|
+ let obj = proTable.value![i].searchParam
|
|
|
|
+ for (let key in obj) {
|
|
|
|
+ if (obj.hasOwnProperty(key) && obj[key] === '') {
|
|
|
|
+ delete obj[key]
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+ formItem[dataName].push({
|
|
|
|
+ conditionSelected: true,
|
|
|
|
+ condition: proTable.value![i].searchParam
|
|
|
|
+ })
|
|
}
|
|
}
|
|
activeName.value = 'one'
|
|
activeName.value = 'one'
|
|
|
|
+ tabTwo.value = true
|
|
|
|
+ tabThree.value = true
|
|
|
|
+ tabFour.value = true
|
|
}
|
|
}
|
|
if (pageIndex.value === formItem.selectTask[formItem.selectTask.length - 2]) {
|
|
if (pageIndex.value === formItem.selectTask[formItem.selectTask.length - 2]) {
|
|
nextBtnText.value = '提交'
|
|
nextBtnText.value = '提交'
|