王帅

chuanyi_client2/src/utils/luckysheettool.js

@@ -252,7 +252,7 @@ function initArrays(tableItemList, type, isGenCountTime, sheData) {
     }
     let aIndex = isGenCountTime == 1 ? 1: 0;
     let array = []
-    console.log(sheData)
+    let index = -1, st = -1, et = -1;
     for (var i = 0; i < sheData.length; i++) {
         let row = sheData[i]
         for (var j = 0; j < row.length; j++) {
@@ -268,18 +268,31 @@ function initArrays(tableItemList, type, isGenCountTime, sheData) {
                     }
                 } else if (type == 5 || type == 6) {
                     if (i >= yAdd) {
-                       if (j == xAdd - 3 - aIndex) {
+						if (index == -1) {
+							if (row[j] + '' == '${index}' || row[j].v == '${index}') {
+								index = j;
+							}
+						} else if (st == -1) {
+							if (row[j] + '' == '${startTime}' || row[j].v == '${startTime}') {
+								st = j;
+							}
+						} else if (et == -1) {
+							if (row[j] + '' == '${stopTime}' || row[j].v == '${stopTime}') {
+								et = j;
+							}
+						} 
+                       if (j == index) {
                            // 序号列
                            row[j] = (i - yAdd < startTimes.length ? i - yAdd + 1 : "")
-                       } else if (j == xAdd - 2 - aIndex) {
+                       } else if (j == st) {
                            // 开始时间
                            row[j] = (i - yAdd < startTimes.length ? startTimes[i - yAdd] : "")
-                       } else if (j == xAdd - 1 - aIndex) {
-                           // 开始时间
+                       } else if (j == et) {
+                           // 停止时间
                            row[j] = (i - yAdd < endTimes.length ? endTimes[i - yAdd] : "")
-                       } else if(isGenCountTime == 1 && j == xAdd - 1 && row[j - 2] && row[j - 1]) {
+                       } else if(isGenCountTime == 1 && j == et + 1 && row[st] && row[et]) {
                            // 计算时间
-                          const time = calculateMinutes(row[j - 2], row[j - 1]);
+                          const time = calculateMinutes(row[st], row[et]);
                            row[j] = (time)
                        } else {
                            row[j] = changeValStr(row[j])