Merge branch 'feat_system_g' of United_Software/k_online_ui into feature

src/auto-imports.d.ts

@@ -3,7 +3,6 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
-// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -69,6 +68,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

src/components/AddRules/src/AddRules.vue

@@ -17,18 +17,21 @@ interface Props {
   TitleType: String
 }
 const MilestoneOceanListInit = ref<CheckboxItem[]>([])
-const MilestoneOceanListChecked = ref()
+const MilestoneOceanListChecked = ref([])
 const MilestoneAirListInit = ref<CheckboxItem[]>([])
-const MilestoneAirListChecked = ref()
+const MilestoneAirListChecked = ref([])
 const ContainerOceanListInit = ref<CheckboxItem[]>([])
-const ContainerOceanListChecked = ref()
+const ContainerOceanListChecked = ref([])
 const props = defineProps<Props>()
 let savesubscribeobj: any = {}
 const SystemList = ref(props.SystemList)
 const RulesActive = ref(['SelectMilestone', 'NotificationFrequency', 'NotificationMethod'])
 const OceanCheckList = ref()
+const OceanCheckCode = ref()
 const AirCheckList = ref()
+const AirCheckListCode = ref()
 const ContainerOceanList = ref()
+const ContainerOceanCode = ref()
 const IsFirstActive = ref(true)
 const IsTwoActive = ref(true)
 const IsThreeActive = ref(true)
@@ -71,14 +74,35 @@ watch(
 // 初始赋值
 const Initdata = (val: any) => {
   MilestoneOceanListInit.value = val.Milestone_Update.OceanCheckBoxList
+  OceanCheckList.value = []
   MilestoneOceanListChecked.value = val.Milestone_Update.OceanCheckedList
-  OceanCheckList.value = val.Milestone_Update.OceanCheckedList
+  // 遍历选中的value值，找到对应的label值
+  MilestoneOceanListChecked.value.forEach((value) => {
+    const option = MilestoneOceanListInit.value.find((item) => item.value === value)
+    if (option) {
+      OceanCheckList.value.push(option.label)
+    }
+  })
   MilestoneAirListInit.value = val.Milestone_Update.AirCheckBoxList
   MilestoneAirListChecked.value = val.Milestone_Update.AirCheckedList
-  AirCheckList.value = val.Milestone_Update.AirCheckedList
+  AirCheckList.value = []
+  // 遍历选中的value值，找到对应的label值
+  MilestoneAirListChecked.value.forEach((value) => {
+    const option = MilestoneAirListInit.value.find((item) => item.value === value)
+    if (option) {
+      AirCheckList.value.push(option.label)
+    }
+  })
   ContainerOceanListInit.value = val.Container_Status_Update.CtnrCheckBoxList
   ContainerOceanListChecked.value = val.Container_Status_Update.CtnrCheckedList
-  ContainerOceanList.value = val.Container_Status_Update.CtnrCheckedList
+  ContainerOceanList.value = []
+  // 遍历选中的value值，找到对应的label值
+  ContainerOceanListChecked.value.forEach((value) => {
+    const option = ContainerOceanListInit.value.find((item) => item.value === value)
+    if (option) {
+      ContainerOceanList.value.push(option.label)
+    }
+  })
   let OceanObj: any = {}
   OceanObj.atd_etd = val['Departure/Arrival_Delay'].ocean_atd_sub_etd
   OceanObj.atd_etd_unit = val['Departure/Arrival_Delay'].ocean_atd_sub_etd_unit
@@ -110,11 +134,13 @@ const Initdata = (val: any) => {
 }
 
 // 给tag list赋值
-const ChangeCheckOceanRules = (val: any) => {
+const ChangeCheckOceanRules = (val: any, value: any) => {
   OceanCheckList.value = val
+  OceanCheckCode.value = value
 }
-const ChangeContainerRules = (val: any) => {
+const ChangeContainerRules = (val: any, value: any) => {
   ContainerOceanList.value = val
+  ContainerOceanCode.value = value
 }
 // delayed赋值
 const ChangeDeayedRules = (val: any) => {
@@ -155,8 +181,9 @@ const ChangeAirRules = (val: any) => {
     delete savesubscribeobj.air_ata_sub_eta_unit
   }
 }
-const ChangeCheckAirRules = (val: any) => {
+const ChangeCheckAirRules = (val: any, value: any) => {
   AirCheckList.value = val
+  AirCheckListCode.value = value
 }
 
 // 更改Frequency时间
@@ -354,8 +381,8 @@ const Savesubscribe = () => {
       missingmessage.value = missingmessage.value.substring(0, missingmessage.value.length - 2)
       UnableSaveVisible.value = true
     } else {
-      savesubscribeobj.ocean_milestone = OceanCheckList.value
-      savesubscribeobj.air_milestone = AirCheckList.value
+      savesubscribeobj.ocean_milestone = OceanCheckCode.value
+      savesubscribeobj.air_milestone = AirCheckListCode.value
       str =
         'Ocean Milestones: ' +
         OceanCheckList.value.join(',') +

src/components/AddRules/src/components/RulesShipments.vue

@@ -29,9 +29,17 @@ watch(
 )
 
 const emit = defineEmits(['ChangeCheckRules'])
-const CheckChange = () => {
-  console.log(CheckedList.value)
-  emit('ChangeCheckRules', CheckedList.value)
+const selectedLables = ref([])
+const CheckChange = (val: any) => {
+  selectedLables.value = []
+  // 遍历选中的value值，找到对应的label值
+  val.forEach((value) => {
+    const option = CheckboxList.value.find((item) => item.value === value)
+    if (option) {
+      selectedLables.value.push(option.label)
+    }
+  })
+  emit('ChangeCheckRules', selectedLables.value, CheckedList.value)
 }
 </script>
 <template>
@@ -48,7 +56,9 @@ const CheckChange = () => {
               :key="item.label"
               :label="item.label"
               :value="item.value"
-            />
+            >
+              {{ item.label }}
+            </el-checkbox>
           </el-checkbox-group>
         </div>
       </el-collapse-item>

src/components/CreateAddRules/src/CreateAddRules.vue

@@ -8,6 +8,9 @@ import NotiFrequency from './components/NotiFrequency.vue'
 import ShipmentRange from './components/ShipmentRange.vue'
 import NotiMethods from './components/NotiMethods.vue'
 import submitsucessful from './images/submit_successful.png'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
 interface CheckboxItem {
   value: string
   label: string
@@ -17,11 +20,11 @@ interface Props {
   TitleType: String
 }
 const MilestoneOceanListInit = ref<CheckboxItem[]>([])
-const MilestoneOceanListChecked = ref()
+const MilestoneOceanListChecked = ref([])
 const MilestoneAirListInit = ref<CheckboxItem[]>([])
-const MilestoneAirListChecked = ref()
+const MilestoneAirListChecked = ref([])
 const ContainerOceanListInit = ref<CheckboxItem[]>([])
-const ContainerOceanListChecked = ref()
+const ContainerOceanListChecked = ref([])
 const props = defineProps<Props>()
 let savesubscribeobj: any = {}
 const RulesActive = ref([
@@ -31,8 +34,11 @@ const RulesActive = ref([
   'NotificationMethod'
 ])
 const OceanCheckList = ref()
+const OceanCheckListCode = ref()
 const AirCheckList = ref()
+const AirCheckListCode = ref()
 const ContainerOceanList = ref()
+const ContainerOceanCode = ref()
 const IsFirstActive = ref(true)
 const IsTwoActive = ref(true)
 const IsThreeActive = ref(true)
@@ -56,6 +62,9 @@ const DelayedDataInitAir = ref()
 const OceanETDInit = ref()
 const AirETDInit = ref()
 const ShipmentRangeMil = ref()
+const ShipmentRangeCon = ref()
+const ShipmentRangeDep = ref()
+const ShipmentRangeETD = ref()
 
 const MonitoringList = ref()
 const getInitMonitoring = () => {
@@ -93,11 +102,75 @@ const Initdata = () => {
             ShipmentRangeMil.value = res.data.Milestone_Update
             MilestoneOceanListInit.value = res.data.Milestone_Update.OceanCheckBoxList
             MilestoneOceanListChecked.value = res.data.Milestone_Update.OceanCheckedList
-            OceanCheckList.value = res.data.Milestone_Update.OceanCheckedList
+            OceanCheckList.value = []
+            // 遍历选中的value值，找到对应的label值
+            MilestoneOceanListChecked.value.forEach((value) => {
+              const option = MilestoneOceanListInit.value.find((item) => item.value === value)
+              if (option) {
+                OceanCheckList.value.push(option.label)
+              }
+            })
             MilestoneAirListInit.value = res.data.Milestone_Update.AirCheckBoxList
             MilestoneAirListChecked.value = res.data.Milestone_Update.AirCheckedList
-            AirCheckList.value = res.data.Milestone_Update.AirCheckedList
+            AirCheckList.value = []
+            // 遍历选中的value值，找到对应的label值
+            MilestoneAirListChecked.value.forEach((value) => {
+              const option = MilestoneAirListInit.value.find((item) => item.value === value)
+              if (option) {
+                AirCheckList.value.push(option.label)
+              }
+            })
             createListMilestone.value = res.data.Milestone_Update.shipment_details
+          } else if (editTablerules_type == 'Container_Status_Update') {
+            ContainerOceanListInit.value = res.data.Container_Status_Update.CtnrCheckBoxList
+            ContainerOceanListChecked.value = res.data.Container_Status_Update.CtnrCheckedList
+            ContainerOceanList.value = []
+            // 遍历选中的value值，找到对应的label值
+            ContainerOceanListChecked.value.forEach((value) => {
+              const option = ContainerOceanListInit.value.find((item) => item.value === value)
+              if (option) {
+                ContainerOceanList.value.push(option.label)
+              }
+            })
+            FrequencyDataCon.value = res.data.Container_Status_Update
+            MethodsDataCon.value = res.data.Container_Status_Update
+            ShipmentRangeCon.value = res.data.Container_Status_Update
+          } else if (editTablerules_type == 'Departure/Arrival_Delay') {
+            let OceanObj: any = {}
+            OceanObj.atd_etd = res.data['Departure/Arrival_Delay'].ocean_atd_sub_etd
+            OceanObj.atd_etd_unit = res.data['Departure/Arrival_Delay'].ocean_atd_sub_etd_unit
+            OceanObj.ata_eta = res.data['Departure/Arrival_Delay'].ocean_ata_sub_eta
+            OceanObj.ata_eta_unit = res.data['Departure/Arrival_Delay'].ocean_ata_sub_eta_unit
+            DelayedDataInit.value = OceanObj
+            let AirObj: any = {}
+            AirObj.atd_etd = res.data['Departure/Arrival_Delay'].air_atd_sub_etd
+            AirObj.atd_etd_unit = res.data['Departure/Arrival_Delay'].air_atd_sub_etd_unit
+            AirObj.ata_eta = res.data['Departure/Arrival_Delay'].air_ata_sub_eta
+            AirObj.ata_eta_unit = res.data['Departure/Arrival_Delay'].air_ata_sub_eta_unit
+            DelayedDataInitAir.value = AirObj
+            FrequencyDataDep.value = res.data['Departure/Arrival_Delay']
+            MethodsDataDep.value = res.data['Departure/Arrival_Delay']
+            ShipmentRangeDep.value = res.data['Departure/Arrival_Delay']
+          } else if (editTablerules_type == 'ETD/ETA_Change') {
+            let OceanChange: any = {}
+            OceanChange.ETDradio = res.data['ETD/ETA_Change'].ocean_etd_change
+            OceanChange.etd_old_sub_new = res.data['ETD/ETA_Change'].ocean_etd_old_sub_new
+            OceanChange.etd_old_sub_new_unit = res.data['ETD/ETA_Change'].ocean_etd_old_sub_new_unit
+            OceanChange.ETAradio = res.data['ETD/ETA_Change'].ocean_eta_change
+            OceanChange.eta_old_sub_new = res.data['ETD/ETA_Change'].ocean_eta_old_sub_new
+            OceanChange.eta_old_sub_new_unit = res.data['ETD/ETA_Change'].ocean_eta_old_sub_new_unit
+            OceanETDInit.value = OceanChange
+            let AirChange: any = {}
+            AirChange.ETDradio = res.data['ETD/ETA_Change'].air_etd_change
+            AirChange.etd_old_sub_new = res.data['ETD/ETA_Change'].air_etd_old_sub_new
+            AirChange.etd_old_sub_new_unit = res.data['ETD/ETA_Change'].air_etd_old_sub_new_unit
+            AirChange.ETAradio = res.data['ETD/ETA_Change'].air_eta_change
+            AirChange.eta_old_sub_new = res.data['ETD/ETA_Change'].air_eta_old_sub_new
+            AirChange.eta_old_sub_new_unit = res.data['ETD/ETA_Change'].air_eta_old_sub_new_unit
+            AirETDInit.value = AirChange
+            FrequencyDataETD.value = res.data['ETD/ETA_Change']
+            MethodsDataETD.value = res.data['ETD/ETA_Change']
+            ShipmentRangeETD.value = res.data['ETD/ETA_Change']
           }
         }
       })
@@ -106,45 +179,16 @@ const Initdata = () => {
       sessionStorage.removeItem('editTablerules_type')
     }, 1000)
   }
-  // ContainerOceanListInit.value = val.CtnrCheckBoxList
-  // ContainerOceanListChecked.value = val.CtnrCheckedList
-  // ContainerOceanList.value = val.CtnrCheckedList
-  // let OceanObj: any = {}
-  // OceanObj.atd_etd = val.ocean_atd_sub_etd
-  // OceanObj.atd_etd_unit = val.ocean_atd_sub_etd_unit
-  // OceanObj.ata_eta = val.ocean_ata_sub_eta
-  // OceanObj.ata_eta_unit = val.ocean_ata_sub_eta_unit
-  // DelayedDataInit.value = OceanObj
-  // let AirObj: any = {}
-  // AirObj.atd_etd = val.air_atd_sub_etd
-  // AirObj.atd_etd_unit = val.air_atd_sub_etd_unit
-  // AirObj.ata_eta = val.air_ata_sub_eta
-  // AirObj.ata_eta_unit = val.air_ata_sub_eta_unit
-  // DelayedDataInitAir.value = AirObj
-  // let OceanChange: any = {}
-  // OceanChange.ETDradio = val.ocean_etd_change
-  // OceanChange.etd_old_sub_new = val.ocean_etd_old_sub_new
-  // OceanChange.etd_old_sub_new_unit = val.ocean_etd_old_sub_new_unit
-  // OceanChange.ETAradio = val.ocean_eta_change
-  // OceanChange.eta_old_sub_new = val.ocean_eta_old_sub_new
-  // OceanChange.eta_old_sub_new_unit = val.ocean_eta_old_sub_new_unit
-  // OceanETDInit.value = OceanChange
-  // let AirChange: any = {}
-  // AirChange.ETDradio = val.air_etd_change
-  // AirChange.etd_old_sub_new = val.air_etd_old_sub_new
-  // AirChange.etd_old_sub_new_unit = val.air_etd_old_sub_new_unit
-  // AirChange.ETAradio = val.air_eta_change
-  // AirChange.eta_old_sub_new = val.air_eta_old_sub_new
-  // AirChange.eta_old_sub_new_unit = val.air_eta_old_sub_new_unit
-  // AirETDInit.value = AirChange
 }
 
 // 给tag list赋值
-const ChangeCheckOceanRules = (val: any) => {
+const ChangeCheckOceanRules = (val: any, value: any) => {
   OceanCheckList.value = val
+  OceanCheckListCode.value = value
 }
-const ChangeContainerRules = (val: any) => {
+const ChangeContainerRules = (val: any, value: any) => {
   ContainerOceanList.value = val
+  ContainerOceanCode.value = value
 }
 // delayed赋值
 const ChangeDeayedRules = (val: any) => {
@@ -185,8 +229,9 @@ const ChangeAirRules = (val: any) => {
     delete savesubscribeobj.air_ata_sub_eta_unit
   }
 }
-const ChangeCheckAirRules = (val: any) => {
+const ChangeCheckAirRules = (val: any, value: any) => {
   AirCheckList.value = val
+  AirCheckListCode.value = value
 }
 
 //选择create new rules
@@ -478,9 +523,6 @@ const closeAirETD = (val: any) => {
   AirETD.value.closeETD(val)
 }
 
-const emits = defineEmits(['SavedAddedRules'])
-// 不保存修改的折叠面板
-
 // 保存subscribe配置
 const missingmessage = ref('')
 // 保存成功调用接口
@@ -494,7 +536,11 @@ const SaveSuceessful = () => {
         SaveedVisible.value = true
         setTimeout(() => {
           SaveedVisible.value = false
-          emits('SavedAddedRules', res.data.addedRules, savesubscribeobj.rules_type)
+          sessionStorage.setItem('activeTab', 'Monitoring Settings')
+          router.push({
+            path: '/SystemSettings',
+            query: {}
+          })
         }, 3000)
       }
     })
@@ -512,7 +558,6 @@ const Savesubscribe = () => {
       createObj.Transportstr == '' ||
       createObj.Timestr == ''
     ) {
-      console.log(createObj)
       if (createObj.Transportstr == '') {
         missingmessage.value += 'Transport Mode, '
       }
@@ -534,8 +579,8 @@ const Savesubscribe = () => {
       missingmessage.value = missingmessage.value.substring(0, missingmessage.value.length - 2)
       UnableSaveVisible.value = true
     } else {
-      savesubscribeobj.ocean_milestone = OceanCheckList.value
-      savesubscribeobj.air_milestone = AirCheckList.value
+      savesubscribeobj.ocean_milestone = OceanCheckListCode.value
+      savesubscribeobj.air_milestone = AirCheckListCode.value
       str =
         'Ocean Milestones: ' +
         OceanCheckList.value.join(',') +
@@ -694,18 +739,21 @@ defineExpose({
               <ShipmentRange
                 ref="ShipmentRangeRef"
                 v-if="props.TitleType == 'Container'"
+                :ShipmentRangeData="ShipmentRangeCon"
                 @ChangeCheckRules="changecheckCreateRulesContainer"
                 @ChangeCheckTimeRules="ChangeCheckTimeRulesContainer"
               ></ShipmentRange>
               <ShipmentRange
                 ref="ShipmentRangeRef"
                 v-if="props.TitleType == 'Departure'"
+                :ShipmentRangeData="ShipmentRangeDep"
                 @ChangeCheckRules="changecheckCreateRulesDeparture"
                 @ChangeCheckTimeRules="ChangeCheckTimeRulesDeparture"
               ></ShipmentRange>
               <ShipmentRange
                 ref="ShipmentRangeRef"
                 v-if="props.TitleType == 'ETDChange'"
+                :ShipmentRangeData="ShipmentRangeETD"
                 @ChangeCheckRules="changecheckCreateRulesETDChange"
                 @ChangeCheckTimeRules="ChangeCheckTimeRulesETDChange"
               ></ShipmentRange>

src/components/CreateAddRules/src/components/DelayedType.vue

@@ -276,4 +276,7 @@ defineExpose({
 .oceanCheckbox {
   margin-bottom: 8px;
 }
+:deep(.el-radio) {
+  align-items: center !important;
+}
 </style>

src/components/CreateAddRules/src/components/ETDShipments.vue

@@ -333,7 +333,7 @@ const clampedETAValue = computed(() => {
   margin-right: 0;
   height: fit-content;
   line-height: 32px;
-  align-items: center;
+  align-items: center !important;
 }
 :deep(.el-radio__input.is-checked + .el-radio__label) {
   color: var(--color-neutral-1);

src/components/CreateAddRules/src/components/RulesShipments.vue

@@ -29,9 +29,17 @@ watch(
 )
 
 const emit = defineEmits(['ChangeCheckRules'])
-const CheckChange = () => {
-  console.log(CheckedList.value)
-  emit('ChangeCheckRules', CheckedList.value)
+const selectedLables = ref([])
+const CheckChange = (val: any) => {
+  selectedLables.value = []
+  // 遍历选中的value值，找到对应的label值
+  val.forEach((value) => {
+    const option = CheckboxList.value.find((item) => item.value === value)
+    if (option) {
+      selectedLables.value.push(option.label)
+    }
+  })
+  emit('ChangeCheckRules', selectedLables.value, CheckedList.value)
 }
 </script>
 <template>

src/components/CreateAddRules/src/components/ShipmentRange.vue

@@ -45,12 +45,12 @@ const ShipmentRangeInit = () => {
     TransportCheckedList.value = ShipmentRange_data.value?.shipment_transport_mode.split(';')
     CheckChange(ShipmentRange_data.value?.shipment_transport_mode)
   }
-  if (ShipmentRange_data.value?.shipment_eta_limit != undefined) {
+  if (ShipmentRange_data.value?.shipment_eta_limit != '') {
     ETATime.value = ShipmentRange_data.value?.shipment_eta_limit
     TimeChecked.value = 2
     changeTime(2)
   }
-  if (ShipmentRange_data.value?.shipment_etd_limit != undefined) {
+  if (ShipmentRange_data.value?.shipment_etd_limit != '') {
     ETDTime.value = ShipmentRange_data.value?.shipment_etd_limit
     TimeChecked.value = 1
     changeTime(1)
@@ -222,5 +222,6 @@ defineExpose({
 }
 :deep(.el-radio) {
   background-color: var(--color-drawer-body-bg);
+  align-items: center !important;
 }
 </style>

src/views/SystemSettings/src/SystemSettings.vue

@@ -133,7 +133,7 @@ const SubShipmentsColumns = ref([
 // System Settings初始数据
 const SubShipmentsTable = ref()
 const AddRulesTable = ref()
-const subscribeInit = ref()
+const subscribeInit = ref({})
 const getsubscribe = () => {
   $api.getsubscribe({}).then((res: any) => {
     if (res.code === 200) {

src/views/SystemSettings/src/components/CreateNewrule/src/CreateNewrule.vue

@@ -47,7 +47,7 @@ onMounted(() => {
     notificationvalue.value = sessionStorage.getItem('editTableoption')
     setTimeout(() => {
       sessionStorage.removeItem('editTableoption')
-    }, 3000)
+    }, 1000)
   }
 })
 </script>