决策驾驶舱空数据loading问题修改

src/views/dashboard/arrival.vue

@@ -567,8 +567,8 @@ const hourlyPeakFunc = async () => {
   ])) as any
   if (listValues && isValue(listValues)) {
     hourlyPeakObj.value = pubFunc(listValues, optionLeft, true)
-    loading1.value = false
   }
+  loading1.value = false
 }
 
 //运单趋势分析
@@ -582,8 +582,8 @@ const waybillTrendFunc = async () => {
       item.jobTime = parseDate(item['jobTime'])
     })
     waybillTrendObj.value = pubFunc(listValues, optionLeft, true)
-    loading2.value = false
   }
+  loading2.value = false
 }
 
 //始发站/目的站统计分析
@@ -602,8 +602,8 @@ const nodePeakFunc = async () => {
       item.jobTime = item['airport']
     })
     nodePeakObj.value = pubFunc(listValues, newObj, true)
-    loading3.value = false
   }
+  loading3.value = false
 }
 
 //航班数&运单数
@@ -619,8 +619,8 @@ const numbersFunc = async () => {
     flightNums.value = flightNum ?? 0
     stockNums.value = finishFlightNum ?? 0
     weightNums.value = weight ?? 0
-    loading4.value = false
   }
+  loading4.value = false
 }
 
 //航司运量
@@ -637,7 +637,7 @@ const airlineTrafficFunc = async () => {
   ])
   if (listValues && isValue(listValues)) {
     const newObj: any = _.cloneDeep(airCompaneBaggage.option.baseOption)
-    ;(newObj.dataZoom = [
+    newObj.dataZoom = [
       {
         id: 'dataZoomX',
         type: 'slider',
@@ -646,14 +646,13 @@ const airlineTrafficFunc = async () => {
         start: 0,
         end: 20,
       },
-    ]),
-      listValues.forEach(item => {
-        item.jobTime = item['IACACode']
-      })
-
+    ]
+    listValues.forEach(item => {
+      item.jobTime = item['IACACode']
+    })
     airlineTrafficObj.value = pubFunc(listValues, newObj, true)
-    loading6.value = false
   }
+  loading6.value = false
 }
 
 //航班表格
@@ -672,8 +671,8 @@ const airlineAbnormalFunc = async () => {
   }
   if (listValues && isValue(listValues)) {
     listData.value = listValues
-    loading5.value = false
   }
+  loading5.value = false
 }
 
 //航班动态统计
@@ -702,8 +701,8 @@ const airlineFunc = async () => {
       specialGoodsAll.value
     )
     airlineObj.value = pubFunc(result, newObj)
-    loading7.value = false
   }
+  loading7.value = false
 }
 
 //理货重量
@@ -726,8 +725,8 @@ const tallyWeightFunc = async () => {
     newObj.xAxis.data = datas
     newObj.series[0].data = weights
     tallyObj.value = newObj
-    loading8.value = false
   }
+  loading8.value = false
 }
 const handleWeightType = (type: string) => {
   weightType.value = type

src/views/dashboard/departure.vue

@@ -553,8 +553,8 @@ const hourlyPeakFunc = async () => {
   ])) as any
   if (listValues && isValue(listValues)) {
     hourlyPeakObj.value = pubFunc(listValues, optionLeft, true)
-    loading1.value = false
   }
+  loading1.value = false
 }
 
 //运单趋势分析
@@ -568,8 +568,8 @@ const waybillTrendFunc = async () => {
       item.jobTime = parseDate(item['jobTime'])
     })
     waybillTrendObj.value = pubFunc(listValues, optionLeft, true)
-    loading2.value = false
   }
+  loading2.value = false
 }
 
 //始发站/目的站统计分析
@@ -588,8 +588,8 @@ const nodePeakFunc = async () => {
       item.jobTime = item['airport']
     })
     nodePeakObj.value = pubFunc(listValues, newObj, true)
-    loading3.value = false
   }
+  loading3.value = false
 }
 
 //航班数&运单数
@@ -605,8 +605,8 @@ const numbersFunc = async () => {
     flightNums.value = flightNum ?? 0
     stockNums.value = finishFlightNum ?? 0
     weightNums.value = weight ?? 0
-    loading4.value = false
   }
+  loading4.value = false
 }
 
 //航司运量
@@ -623,7 +623,7 @@ const airlineTrafficFunc = async () => {
   ])
   if (listValues && isValue(listValues)) {
     const newObj: any = _.cloneDeep(airCompaneBaggage.option.baseOption)
-    ;(newObj.dataZoom = [
+    newObj.dataZoom = [
       {
         id: 'dataZoomX',
         type: 'slider',
@@ -632,14 +632,14 @@ const airlineTrafficFunc = async () => {
         start: 0,
         end: 20,
       },
-    ]),
-      listValues.forEach(item => {
-        item.jobTime = item['IACACode']
-      })
+    ]
+    listValues.forEach(item => {
+      item.jobTime = item['IACACode']
+    })
 
     airlineTrafficObj.value = pubFunc(listValues, newObj, true)
-    loading6.value = false
   }
+  loading6.value = false
 }
 
 //航班表格
@@ -658,8 +658,8 @@ const airlineAbnormalFunc = async () => {
   }
   if (listValues && isValue(listValues)) {
     listData.value = listValues
-    loading5.value = false
   }
+  loading5.value = false
 }
 
 //航班动态统计
@@ -724,8 +724,8 @@ const airlineFunc = async () => {
       specialGoodsAll.value
     )
     airlineObj.value = pubFunc(result, newObj)
-    loading7.value = false
   }
+  loading7.value = false
 }
 
 //拉货统计
@@ -744,8 +744,8 @@ const pickingFuncs = async () => {
       item.weight = item['flightNum']
     })
     pickingObj.value = pubFunc(listValues, newObj)
-    loading8.value = false
   }
+  loading8.value = false
 }
 
 useLoop([hourlyPeakFunc], 'dashboard', [hourlyDates])

src/views/dashboard/internationalArrival.vue

@@ -569,8 +569,8 @@ const hourlyPeakFunc = async () => {
   ])) as any
   if (listValues && isValue(listValues)) {
     hourlyPeakObj.value = pubFunc(listValues, optionLeft, true)
-    loading1.value = false
   }
+  loading1.value = false
 }
 
 //运单趋势分析
@@ -584,8 +584,8 @@ const waybillTrendFunc = async () => {
       item.jobTime = parseDate(item['jobTime'])
     })
     waybillTrendObj.value = pubFunc(listValues, optionLeft, true)
-    loading2.value = false
   }
+  loading2.value = false
 }
 
 //始发站/目的站统计分析
@@ -604,8 +604,8 @@ const nodePeakFunc = async () => {
       item.jobTime = item['airport']
     })
     nodePeakObj.value = pubFunc(listValues, newObj, true)
-    loading3.value = false
   }
+  loading3.value = false
 }
 
 //航班数&运单数
@@ -621,8 +621,8 @@ const numbersFunc = async () => {
     flightNums.value = flightNum ?? 0
     stockNums.value = finishFlightNum ?? 0
     weightNums.value = weight ?? 0
-    loading4.value = false
   }
+  loading4.value = false
 }
 
 //航司运量
@@ -639,7 +639,7 @@ const airlineTrafficFunc = async () => {
   ])
   if (listValues && isValue(listValues)) {
     const newObj: any = _.cloneDeep(airCompaneBaggage.option.baseOption)
-    ;(newObj.dataZoom = [
+    newObj.dataZoom = [
       {
         id: 'dataZoomX',
         type: 'slider',
@@ -648,14 +648,13 @@ const airlineTrafficFunc = async () => {
         start: 0,
         end: 20,
       },
-    ]),
-      listValues.forEach(item => {
-        item.jobTime = item['IACACode']
-      })
-
+    ]
+    listValues.forEach(item => {
+      item.jobTime = item['IACACode']
+    })
     airlineTrafficObj.value = pubFunc(listValues, newObj, true)
-    loading6.value = false
   }
+  loading6.value = false
 }
 
 //航班表格
@@ -674,8 +673,8 @@ const airlineAbnormalFunc = async () => {
   }
   if (listValues && isValue(listValues)) {
     listData.value = listValues
-    loading5.value = false
   }
+  loading5.value = false
 }
 
 //航班动态统计
@@ -704,8 +703,8 @@ const airlineFunc = async () => {
       specialGoodsAll.value
     )
     airlineObj.value = pubFunc(result, newObj)
-    loading7.value = false
   }
+  loading7.value = false
 }
 
 //理货重量
@@ -729,8 +728,8 @@ const tallyWeightFunc = async () => {
     newObj.xAxis.data = datas
     newObj.series[0].data = weights
     tallyObj.value = newObj
-    loading8.value = false
   }
+  loading8.value = false
 }
 const handleWeightType = (type: string) => {
   weightType.value = type

src/views/dashboard/internationalDeparture.vue

@@ -555,8 +555,8 @@ const hourlyPeakFunc = async () => {
   ])) as any
   if (listValues && isValue(listValues)) {
     hourlyPeakObj.value = pubFunc(listValues, optionLeft, true)
-    loading1.value = false
   }
+  loading1.value = false
 }
 
 //运单趋势分析
@@ -570,8 +570,8 @@ const waybillTrendFunc = async () => {
       item.jobTime = parseDate(item['jobTime'])
     })
     waybillTrendObj.value = pubFunc(listValues, optionLeft, true)
-    loading2.value = false
   }
+  loading2.value = false
 }
 
 //始发站/目的站统计分析
@@ -590,8 +590,8 @@ const nodePeakFunc = async () => {
       item.jobTime = item['airport']
     })
     nodePeakObj.value = pubFunc(listValues, newObj, true)
-    loading3.value = false
   }
+  loading3.value = false
 }
 
 //航班数&运单数
@@ -607,8 +607,8 @@ const numbersFunc = async () => {
     flightNums.value = flightNum ?? 0
     stockNums.value = finishFlightNum ?? 0
     weightNums.value = weight ?? 0
-    loading4.value = false
   }
+  loading4.value = false
 }
 
 //航司运量
@@ -625,7 +625,7 @@ const airlineTrafficFunc = async () => {
   ])
   if (listValues && isValue(listValues)) {
     const newObj: any = _.cloneDeep(airCompaneBaggage.option.baseOption)
-    ;(newObj.dataZoom = [
+    newObj.dataZoom = [
       {
         id: 'dataZoomX',
         type: 'slider',
@@ -634,14 +634,14 @@ const airlineTrafficFunc = async () => {
         start: 0,
         end: 20,
       },
-    ]),
-      listValues.forEach(item => {
-        item.jobTime = item['IACACode']
-      })
+    ]
+    listValues.forEach(item => {
+      item.jobTime = item['IACACode']
+    })
 
     airlineTrafficObj.value = pubFunc(listValues, newObj, true)
-    loading6.value = false
   }
+  loading6.value = false
 }
 
 //航班表格
@@ -660,8 +660,8 @@ const airlineAbnormalFunc = async () => {
   }
   if (listValues && isValue(listValues)) {
     listData.value = listValues
-    loading5.value = false
   }
+  loading5.value = false
 }
 
 //航班动态统计
@@ -690,8 +690,8 @@ const airlineFunc = async () => {
       specialGoodsAll.value
     )
     airlineObj.value = pubFunc(result, newObj)
-    loading7.value = false
   }
+  loading7.value = false
 }
 
 //拉货统计
@@ -710,8 +710,8 @@ const pickingFuncs = async () => {
       item.weight = item['flightNum']
     })
     pickingObj.value = pubFunc(listValues, newObj)
-    loading8.value = false
   }
+  loading8.value = false
 }
 
 useLoop([hourlyPeakFunc], 'dashboard', [hourlyDates])