Merge branch 'master' of http://120.26.64.82:10880/BFFE/SZYGM1.0

src/views/dashboard/hooks/usePublic.ts

@@ -7,6 +7,7 @@ export enum showTimeMsg {
   WaybillTrend, //运单趋势
   NodePeak, //节点峰值
   AirlineTraffic, //航司运量
+  AirlineAbnormal,
 }
 
 export function usePublic() {
@@ -208,12 +209,12 @@ export function usePublic() {
           {
             name: '报警',
             type: 'bar',
-            data: [11, 16, 4, 6],
+            data: [0, 0, 0, 0],
           },
           {
             name: '预警',
             type: 'bar',
-            data: [11, 15, 17, 4],
+            data: [0, 0, 0, 0],
           },
         ],
       },

src/views/dashboard/index.vue

@@ -64,7 +64,7 @@
               <div class="dashboard-content-top-right-item-top-title">
                 航班预警报警分析
               </div>
-              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker()">
+              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker(showTimeMsg.AirlineAbnormal)">
                 <el-icon color="#ffffff" size="18">
                   <Calendar />
                 </el-icon>
@@ -220,6 +220,9 @@ const submitForm = () => {
     case showTimeMsg.AirlineTraffic:
       airlineTrafficFunc();
       break;
+    case showTimeMsg.AirlineAbnormal:
+      airlineAbnormalFunc();
+      break;
     default:
       break;
   }
@@ -358,12 +361,22 @@ const airlineTrafficFunc = async () => {
   );
 };
 
+//航班预警报警分析
+const airlineAbnormalFunc = async () => {
+  const listValues = (await getPublicData(1803561, [
+    { flightDate1: form.value.startDate },
+    { flightDate2: form.value.endDate },
+  ])) as any;
+  // console.log(listValues);
+};
+
 onMounted(() => {
   hourlyPeakFunc();
   waybillTrendFunc();
   nodePeakFunc();
   numbersFunc();
   airlineTrafficFunc();
+  airlineAbnormalFunc();
 });
 </script>
 

src/views/dashboard/indexHomeOut.vue

@@ -64,7 +64,7 @@
               <div class="dashboard-content-top-right-item-top-title">
                 航班预警报警分析
               </div>
-              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker()">
+              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker(showTimeMsg.AirlineAbnormal)">
                 <el-icon color="#ffffff" size="18">
                   <Calendar />
                 </el-icon>
@@ -220,6 +220,9 @@ const submitForm = () => {
     case showTimeMsg.AirlineTraffic:
       airlineTrafficFunc();
       break;
+    case showTimeMsg.AirlineAbnormal:
+      airlineAbnormalFunc();
+      break;
     default:
       break;
   }
@@ -358,12 +361,22 @@ const airlineTrafficFunc = async () => {
   );
 };
 
+//航班预警报警分析
+const airlineAbnormalFunc = async () => {
+  const listValues = (await getPublicData(1803561, [
+    { flightDate1: form.value.startDate },
+    { flightDate2: form.value.endDate },
+  ])) as any;
+  // console.log(listValues);
+};
+
 onMounted(() => {
   hourlyPeakFunc();
   waybillTrendFunc();
   nodePeakFunc();
   numbersFunc();
   airlineTrafficFunc();
+  airlineAbnormalFunc();
 });
 </script>
 

src/views/dashboard/indexIn.vue

@@ -64,7 +64,7 @@
               <div class="dashboard-content-top-right-item-top-title">
                 航班预警报警分析
               </div>
-              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker()">
+              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker(showTimeMsg.AirlineAbnormal)">
                 <el-icon color="#ffffff" size="18">
                   <Calendar />
                 </el-icon>
@@ -220,6 +220,9 @@ const submitForm = () => {
     case showTimeMsg.AirlineTraffic:
       airlineTrafficFunc();
       break;
+    case showTimeMsg.AirlineAbnormal:
+      airlineAbnormalFunc();
+      break;
     default:
       break;
   }
@@ -358,12 +361,22 @@ const airlineTrafficFunc = async () => {
   );
 };
 
+//航班预警报警分析
+const airlineAbnormalFunc = async () => {
+  const listValues = (await getPublicData(1803561, [
+    { flightDate1: form.value.startDate },
+    { flightDate2: form.value.endDate },
+  ])) as any;
+  // console.log(listValues);
+};
+
 onMounted(() => {
   hourlyPeakFunc();
   waybillTrendFunc();
   nodePeakFunc();
   numbersFunc();
   airlineTrafficFunc();
+  airlineAbnormalFunc();
 });
 </script>
 

src/views/dashboard/indexOut.vue

@@ -64,7 +64,7 @@
               <div class="dashboard-content-top-right-item-top-title">
                 航班预警报警分析
               </div>
-              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker()">
+              <div class="dashboard-content-top-right-item-top-time" @click="showDatePicker(showTimeMsg.AirlineAbnormal)">
                 <el-icon color="#ffffff" size="18">
                   <Calendar />
                 </el-icon>
@@ -220,6 +220,9 @@ const submitForm = () => {
     case showTimeMsg.AirlineTraffic:
       airlineTrafficFunc();
       break;
+    case showTimeMsg.AirlineAbnormal:
+      airlineAbnormalFunc();
+      break;
     default:
       break;
   }
@@ -358,12 +361,22 @@ const airlineTrafficFunc = async () => {
   );
 };
 
+//航班预警报警分析
+const airlineAbnormalFunc = async () => {
+  const listValues = (await getPublicData(1803561, [
+    { flightDate1: form.value.startDate },
+    { flightDate2: form.value.endDate },
+  ])) as any;
+  // console.log(listValues);
+};
+
 onMounted(() => {
   hourlyPeakFunc();
   waybillTrendFunc();
   nodePeakFunc();
   numbersFunc();
   airlineTrafficFunc();
+  airlineAbnormalFunc();
 });
 </script>