|
@@ -194,7 +194,7 @@ export default {
|
|
|
|
|
|
methods: {
|
|
methods: {
|
|
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
- if (columnIndex === 0) {
|
|
|
|
|
|
+ if (columnIndex === 0 || columnIndex === this.columnsB.length - 1) {
|
|
if (this.subIndexArr[0].includes(rowIndex)) {
|
|
if (this.subIndexArr[0].includes(rowIndex)) {
|
|
return [
|
|
return [
|
|
this.sublistNameObj[0][row.sublistName1 + rowIndex],
|
|
this.sublistNameObj[0][row.sublistName1 + rowIndex],
|
|
@@ -268,19 +268,6 @@ export default {
|
|
return [1, 1];
|
|
return [1, 1];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- } else if (columnIndex === this.columnsB.length - 1) {
|
|
|
|
- if (this.subIndexArr[6].includes(rowIndex)) {
|
|
|
|
- return [
|
|
|
|
- this.sublistNameObj[6][row.firstScore + "a" + rowIndex],
|
|
|
|
- 1,
|
|
|
|
- ];
|
|
|
|
- } else {
|
|
|
|
- if (row.firstScore) {
|
|
|
|
- return [0, 0];
|
|
|
|
- } else {
|
|
|
|
- return [1, 1];
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
},
|
|
},
|
|
arraySpanMethodA({ row, column, rowIndex, columnIndex }) {
|
|
arraySpanMethodA({ row, column, rowIndex, columnIndex }) {
|
|
@@ -375,7 +362,6 @@ export default {
|
|
let lastRowSublistName4 = "";
|
|
let lastRowSublistName4 = "";
|
|
let lastRowSublistName5 = "";
|
|
let lastRowSublistName5 = "";
|
|
let lastRowSublistName6 = "";
|
|
let lastRowSublistName6 = "";
|
|
- let lastRowSublistName7 = "";
|
|
|
|
|
|
|
|
let sublistNameObj1 = {};
|
|
let sublistNameObj1 = {};
|
|
let sublistNameObj2 = {};
|
|
let sublistNameObj2 = {};
|
|
@@ -383,7 +369,6 @@ export default {
|
|
let sublistNameObj4 = {};
|
|
let sublistNameObj4 = {};
|
|
let sublistNameObj5 = {};
|
|
let sublistNameObj5 = {};
|
|
let sublistNameObj6 = {};
|
|
let sublistNameObj6 = {};
|
|
- let sublistNameObj7 = {};
|
|
|
|
|
|
|
|
let subIndexArr1 = [];
|
|
let subIndexArr1 = [];
|
|
let subIndexArr2 = [];
|
|
let subIndexArr2 = [];
|
|
@@ -391,7 +376,6 @@ export default {
|
|
let subIndexArr4 = [];
|
|
let subIndexArr4 = [];
|
|
let subIndexArr5 = [];
|
|
let subIndexArr5 = [];
|
|
let subIndexArr6 = [];
|
|
let subIndexArr6 = [];
|
|
- let subIndexArr7 = [];
|
|
|
|
|
|
|
|
let lastI1 = 0;
|
|
let lastI1 = 0;
|
|
let lastI2 = 0;
|
|
let lastI2 = 0;
|
|
@@ -399,7 +383,6 @@ export default {
|
|
let lastI4 = 0;
|
|
let lastI4 = 0;
|
|
let lastI5 = 0;
|
|
let lastI5 = 0;
|
|
let lastI6 = 0;
|
|
let lastI6 = 0;
|
|
- let lastI7 = 0;
|
|
|
|
|
|
|
|
arr.forEach((item, i) => {
|
|
arr.forEach((item, i) => {
|
|
let sublistName1 = item.sublistName1;
|
|
let sublistName1 = item.sublistName1;
|
|
@@ -482,20 +465,6 @@ export default {
|
|
} else {
|
|
} else {
|
|
lastRowSublistName6 = "";
|
|
lastRowSublistName6 = "";
|
|
}
|
|
}
|
|
-
|
|
|
|
- if (item.firstScore) {
|
|
|
|
- let firstScore = item.firstScore;
|
|
|
|
- if (firstScore === lastRowSublistName7) {
|
|
|
|
- sublistNameObj7[firstScore + "a" + lastI7]++;
|
|
|
|
- } else {
|
|
|
|
- lastRowSublistName7 = firstScore;
|
|
|
|
- subIndexArr7.push(i);
|
|
|
|
- lastI7 = i;
|
|
|
|
- sublistNameObj7[firstScore + "a" + lastI7] = 1;
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- lastRowSublistName7 = "";
|
|
|
|
- }
|
|
|
|
});
|
|
});
|
|
|
|
|
|
let arr1 = [
|
|
let arr1 = [
|
|
@@ -517,8 +486,6 @@ export default {
|
|
];
|
|
];
|
|
|
|
|
|
if (type === 1) {
|
|
if (type === 1) {
|
|
- arr1.push(subIndexArr7);
|
|
|
|
- arr2.push(sublistNameObj7);
|
|
|
|
this.subIndexArr = arr1;
|
|
this.subIndexArr = arr1;
|
|
this.sublistNameObj = arr2;
|
|
this.sublistNameObj = arr2;
|
|
} else if (type === 2) {
|
|
} else if (type === 2) {
|