Merge branch 'dev' into feat_download_zyh

.gitignore

@@ -18,6 +18,8 @@ package-lock.json
 pnpm-lock.yaml
 auto-imports.d.ts
 
+stats.html
+
 /cypress/videos/
 /cypress/screenshots/
 

src/views/Tracking/src/components/TrackingDetail/src/components/BasicInformation.vue

@@ -48,16 +48,17 @@ const allData: any = ref({
         label: 'Service Type',
         content: ''
       },
+
       {
-        label: 'CO2 Emission',
+        label: 'Load Terms',
         content: ''
       },
       {
-        label: 'Load Terms',
+        label: 'Shipment Type',
         content: ''
       },
       {
-        label: 'Shipment Type',
+        label: 'CO2 Emission',
         content: ''
       }
     ]
@@ -172,10 +173,6 @@ const convertData = (data: any) => {
           label: 'Service Type',
           content: data.basicInfo.Service_Type || '--'
         },
-        {
-          label: 'CO2 Emission',
-          content: data.basicInfo['CO2 Emission'] || '--'
-        },
         {
           label: 'Load Terms',
           content: data.basicInfo['Load Terms'] || '--'
@@ -183,6 +180,10 @@ const convertData = (data: any) => {
         {
           label: 'Shipment Type',
           content: data.basicInfo['Shipment Type'] || '--'
+        },
+        {
+          label: 'CO2 Emission',
+          content: data.basicInfo['CO2 Emission'] || '--'
         }
       ]
     },