ソースを参照

feat:修改monitoring setting相关bug

AmandaG 7 ヶ月 前
コミット
90a83869b5

+ 3 - 3
src/components/AddRules/src/AddRules.vue

@@ -432,8 +432,8 @@ const Savesubscribe = () => {
       ConMethodsList.value == undefined ||
       ConMethodsList.value.length == 0
     ) {
-      if (ContainerOceanList.value == undefined || ContainerOceanList.value.length == 0) {
-        missingmessage.value += 'Ocean Shipments, '
+      if (ContainerOceanList.value.length == 0) {
+        missingmessage.value += 'Container Stutus, '
       }
       if (ConFrequencyList.value.length == 0) {
         missingmessage.value += 'Notification Frequency, '
@@ -498,7 +498,7 @@ const Savesubscribe = () => {
       ETDMethodsList.value == undefined ||
       ETDMethodsList.value.length == 0
     ) {
-      if (ETDOceanList.value.length == 0 && ETDAirList.value.length) {
+      if (ETDOceanList.value.length == 0 && ETDAirList.value.length == 0) {
         missingmessage.value += 'Select Time Type, '
       }
       if (ETDFrequencyList.value.length == 0) {

+ 2 - 2
src/components/CreateAddRules/src/CreateAddRules.vue

@@ -684,7 +684,7 @@ const Savesubscribe = () => {
         missingmessage.value += 'Time, '
       }
       if (ContainerOceanList.value.length == 0) {
-        missingmessage.value += 'Ocean Shipments, '
+        missingmessage.value += 'Container Stutus, '
       }
       if (ConFrequencyList.value.length == 0) {
         missingmessage.value += 'Notification Frequency, '
@@ -765,7 +765,7 @@ const Savesubscribe = () => {
       if (createObj.Timestr == '') {
         missingmessage.value += 'Time, '
       }
-      if (ETDOceanList.value.length == 0 && ETDAirList.value.length) {
+      if (ETDOceanList.value.length == 0 && ETDAirList.value.length == 0) {
         missingmessage.value += 'Select Time Type, '
       }
       if (ETDFrequencyList.value.length == 0) {

+ 1 - 1
src/components/CreateAddRules/src/components/NotiFrequency.vue

@@ -196,7 +196,7 @@ const ChangeFrequency = (val: any) => {
     isWeekly.value = false
     WeeklyDay.value = ''
     WeeklyTime.value = ''
-    TimeZoneDailySelect.value  = defaultDailyTimeZone
+    TimeZoneWeeklySelect.value  = defaultWeeklyTimeZone
     str = 'Daily, ' + DailyTime.value + ', ' + TimeZoneDailySelect.value
     if (DailyTime.value != '' && DailyTime.value != undefined && TimeZoneDailySelect.value !== '') {
       FrequencyList.value.push(str)

+ 3 - 3
src/components/CreateAddRules/src/components/ShipmentRange.vue

@@ -159,7 +159,7 @@ const changeTime = (val: any) => {
       if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 0) {
         Timestr = ''
       } else {
-        Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
+        Timestr = 'ETD: minus ' + clampedETDValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
       }
     } else{
       Timestr = ''
@@ -187,7 +187,7 @@ const changeTime = (val: any) => {
       if(clampedETAValueStart.value == 0 && clampedETAValueEnd.value == 0) {
         Timestr = ''
       } else {
-        Timestr = 'ETA: minus ' + clampedETAValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
+        Timestr = 'ETA: minus ' + clampedETAValueStart.value + ' Day(s) to Plus '+ clampedETAValueEnd.value + ' Day(s)'
       }
     } else{
       Timestr = ''
@@ -219,7 +219,7 @@ const changedefaultradio = (val:any) => {
   if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 0) {
     Timestr = ''
   } else {
-    Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
+    Timestr = 'ETD: minus ' + clampedETDValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
   }
   emit('ChangeCheckTimeRules', Timestr, clampedETDValueStart.value,clampedETDValueEnd.value)
 }