zhaoke 2 жил өмнө
parent
commit
a81e67109d

+ 4 - 5
src/views/baggageManagement/components/departure/index.vue

@@ -456,13 +456,13 @@ export default {
             if (Number(startTime) - Number(curTime) < 0 && Number(endTime) - Number(curTime) > 0) {
             if (Number(startTime) - Number(curTime) < 0 && Number(endTime) - Number(curTime) > 0) {
               const newItem = _.cloneDeep(item);
               const newItem = _.cloneDeep(item);
               if (p.flightNO && p.flightNO == item.flightNO) {
               if (p.flightNO && p.flightNO == item.flightNO) {
-                if (capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
+                if (p.warningDuration && capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
                   item["warning"] = item["preLoad"] - Math.max(item.loadNumber, item.boardID);
                   item["warning"] = item["preLoad"] - Math.max(item.loadNumber, item.boardID);
                   item["warningState"] = 1;
                   item["warningState"] = 1;
                   const returnedTarget = Object.assign(newItem, p);
                   const returnedTarget = Object.assign(newItem, p);
                   this.sendLog(returnedTarget);
                   this.sendLog(returnedTarget);
                 }
                 }
-                if (capTime - p.alarmDuration < 0) {
+                if (p.alarmDuration && capTime - p.alarmDuration < 0) {
                   item["warning"] = item["preLoad"] - Math.max(item.loadNumber, item.boardID);
                   item["warning"] = item["preLoad"] - Math.max(item.loadNumber, item.boardID);
                   item["warningState"] = 2;
                   item["warningState"] = 2;
                   const returnedTarget = Object.assign(newItem, p);
                   const returnedTarget = Object.assign(newItem, p);
@@ -470,18 +470,17 @@ export default {
                 }
                 }
               } else if (!p.flightNO && p.IATACode) {
               } else if (!p.flightNO && p.IATACode) {
                 if (newItem.flightNO.substring(0, 2) == p.IATACode) {
                 if (newItem.flightNO.substring(0, 2) == p.IATACode) {
-                  if (capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
+                  if (p.warningDuration && capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
                     item["warning"] = item["preLoad"] - Math.max(item.loadNumber, item.boardID);
                     item["warning"] = item["preLoad"] - Math.max(item.loadNumber, item.boardID);
                     item["warningState"] = 1;
                     item["warningState"] = 1;
                     const returnedTarget = Object.assign(newItem, p);
                     const returnedTarget = Object.assign(newItem, p);
                     this.sendLog(returnedTarget);
                     this.sendLog(returnedTarget);
                   }
                   }
-                  if (capTime - p.alarmDuration < 0) {
+                  if (p.alarmDuration && capTime - p.alarmDuration < 0) {
                     item["warning"] = item["preLoad"] - Math.max(item.loadNumber, item.boardID);
                     item["warning"] = item["preLoad"] - Math.max(item.loadNumber, item.boardID);
                     item["warningState"] = 2;
                     item["warningState"] = 2;
                     const returnedTarget = Object.assign(newItem, p);
                     const returnedTarget = Object.assign(newItem, p);
                     this.sendLog(returnedTarget);
                     this.sendLog(returnedTarget);
-                    console.log('ddd2')
                   }
                   }
                 }
                 }
               }
               }

+ 4 - 4
src/views/baggageManagement/components/transferArrival/index.vue

@@ -591,24 +591,24 @@ export default {
             if (Number(startTime) - Number(curTime) < 0 && Number(endTime) - Number(curTime) > 0) {
             if (Number(startTime) - Number(curTime) < 0 && Number(endTime) - Number(curTime) > 0) {
               const newItem = _.cloneDeep(item);
               const newItem = _.cloneDeep(item);
               if (p.flightNO != "" && p.flightNO == item.flightNO) {
               if (p.flightNO != "" && p.flightNO == item.flightNO) {
-                if (capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
+                if (p.warningDuration && capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
                   item["warningState"] = 1;
                   item["warningState"] = 1;
                   const returnedTarget = Object.assign(newItem, p);
                   const returnedTarget = Object.assign(newItem, p);
                   this.sendLog(returnedTarget);
                   this.sendLog(returnedTarget);
                 }
                 }
-                if (capTime - p.alarmDuration < 0) {
+                if (p.alarmDuration && capTime - p.alarmDuration < 0) {
                   item["warningState"] = 2;
                   item["warningState"] = 2;
                   const returnedTarget = Object.assign(newItem, p);
                   const returnedTarget = Object.assign(newItem, p);
                   this.sendLog(returnedTarget);
                   this.sendLog(returnedTarget);
                 }
                 }
               } else if (p.flightNO == "" && p.IATACode != "") {
               } else if (p.flightNO == "" && p.IATACode != "") {
                 if (item.flightNO.substring(0, 2) == p.IATACode) {
                 if (item.flightNO.substring(0, 2) == p.IATACode) {
-                  if (capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
+                  if (p.warningDuration && capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
                     item["warningState"] = 1;
                     item["warningState"] = 1;
                     const returnedTarget = Object.assign(newItem, p);
                     const returnedTarget = Object.assign(newItem, p);
                     this.sendLog(returnedTarget);
                     this.sendLog(returnedTarget);
                   }
                   }
-                  if (capTime - p.alarmDuration < 0) {
+                  if (p.alarmDuration && capTime - p.alarmDuration < 0) {
                     item["warningState"] = 2;
                     item["warningState"] = 2;
                     const returnedTarget = Object.assign(newItem, p);
                     const returnedTarget = Object.assign(newItem, p);
                     this.sendLog(returnedTarget);
                     this.sendLog(returnedTarget);

+ 4 - 4
src/views/baggageManagement/components/transferDeparture/index.vue

@@ -566,24 +566,24 @@ export default {
             if (Number(startTime) - Number(curTime) < 0 && Number(endTime) - Number(curTime) > 0) {
             if (Number(startTime) - Number(curTime) < 0 && Number(endTime) - Number(curTime) > 0) {
               const newItem = _.cloneDeep(item);
               const newItem = _.cloneDeep(item);
               if (p.flightNO != "" && p.flightNO == item.flightNO) {
               if (p.flightNO != "" && p.flightNO == item.flightNO) {
-                if (capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
+                if (p.warningDuration && capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
                   item["warningState"] = 1;
                   item["warningState"] = 1;
                   const returnedTarget = Object.assign(newItem, p);
                   const returnedTarget = Object.assign(newItem, p);
                   this.sendLog(returnedTarget);
                   this.sendLog(returnedTarget);
                 }
                 }
-                if (capTime - p.alarmDuration < 0) {
+                if (p.alarmDuration && capTime - p.alarmDuration < 0) {
                   item["warningState"] = 2;
                   item["warningState"] = 2;
                   const returnedTarget = Object.assign(newItem, p);
                   const returnedTarget = Object.assign(newItem, p);
                   this.sendLog(returnedTarget);
                   this.sendLog(returnedTarget);
                 }
                 }
               } else if (p.flightNO == "" && p.IATACode != "") {
               } else if (p.flightNO == "" && p.IATACode != "") {
                 if (item.flightNO.substring(0, 2) == p.IATACode) {
                 if (item.flightNO.substring(0, 2) == p.IATACode) {
-                  if (capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
+                  if (p.warningDuration && capTime - p.warningDuration < 0 && capTime - p.alarmDuration > 0) {
                     item["warningState"] = 1;
                     item["warningState"] = 1;
                     const returnedTarget = Object.assign(newItem, p);
                     const returnedTarget = Object.assign(newItem, p);
                     this.sendLog(returnedTarget);
                     this.sendLog(returnedTarget);
                   }
                   }
-                  if (capTime - p.alarmDuration < 0) {
+                  if (p.alarmDuration && capTime - p.alarmDuration < 0) {
                     item["warningState"] = 2;
                     item["warningState"] = 2;
                     const returnedTarget = Object.assign(newItem, p);
                     const returnedTarget = Object.assign(newItem, p);
                     this.sendLog(returnedTarget);
                     this.sendLog(returnedTarget);