`fix`

src/api/data.ts

@@ -4,7 +4,15 @@ import { AxiosPromise } from 'axios';
 export const getpassenger = () => {
   return request({
     url: '/statistic/passenger/flow',
-    method: 'get'
+    method: 'post'
+  });
+};
+
+export const getpassenger1 = (data: any) => {
+  return request({
+    url: '/statistic/passenger/flow',
+    method: 'post',
+    data: JSON.stringify(data)
   });
 };
 
@@ -13,7 +21,7 @@ export const getInfo = (code) => {
     url: '/system/common/cabinet/' + code + '/info',
     method: 'post'
   });
-}
+};
 
 export const getInfoWait = async (code) => {
   const res = await request({
@@ -24,29 +32,28 @@ export const getInfoWait = async (code) => {
     return res.data;
   }
   return Promise.reject(new Error(res.message));
-}
-
+};
 
 export const getBoxInfo = (code) => {
   return request({
     url: '/system/common/cabinet/' + code + '/allbox/info',
     method: 'post'
   });
-}
+};
 
 export const getLock = (code, lockAddress) => {
   return request({
     url: '/system/common/cabinet/' + code + '/openlock/' + lockAddress,
     method: 'post'
   });
-}
+};
 
 export const openall = (code) => {
   return request({
     url: '/system/common/cabinet/' + code + '/lock/openall',
     method: 'post'
   });
-}
+};
 
 // export const openall = (code) =>{
 //   return request({
@@ -61,5 +68,3 @@ export const openall = (code) => {
 //     method: 'post'
 //   });
 // }
-
-

src/components/HomeComponents/countPage.vue

@@ -38,38 +38,37 @@
 import moment from 'moment';
 import { getCountData } from '@/api/gpsData';
 import { listGoodsOrder } from "@/api/goodsOrder";
+import { getpassenger1 } from '@/api/data'
+import { cabinetboxstatic } from '@/api/gpsData';
 
 const people = ref(0)
 const goods = ref(0)
 
-const getCountDataList = () => {
-    var startDate = moment(new Date()).format('YYYY-MM-DD');
-    var dateTime = new Date()
-    dateTime = dateTime.setDate(dateTime.getDate() + 1);
-    dateTime = new Date(dateTime);
-    var endDate = moment(dateTime).format('YYYY-MM-DD')
-    var obj = {
-        params: {
-            starttime: startDate,
-            endtime: endDate
-        }
-    }
-    getCountData(obj).then(res => {
-        people.value = res.data.totalin
-    })
-}
 
-const getlistGoodsOrder = () =>{
-    var gotime =  moment(new Date()).format('YYYY-MM-DD 00:00:00')
-    listGoodsOrder({pageSize:1000,gotime:gotime}).then(res=>{
-          goods.value = res.rows.length
-    })
-}
+const getlist = () =>{
+  getpassenger1({
+    "start":moment(new Date()).format('YYYY-MM-DD'),
+    "end":moment(new Date()).format('YYYY-MM-DD')
+}).then(res=>{
+  console.log(res)
+  people.value = res.data[0].flowCount.incount;
+  // goods.value = res.data[0].goodsOrderCount.ordercount;
+})
 
+
+cabinetboxstatic().then((res) => {
+    let totalcabinet = 0;
+    let kxcabinet = 0;
+    for (let key in res) {
+      totalcabinet += res[key].total ?? 0;
+      kxcabinet += res[key].unuse ?? 0;
+    }
+    goods.value = totalcabinet-kxcabinet;
+  });
+}
 onMounted(() => {
     // getList();
-    getCountDataList();
-    getlistGoodsOrder();
+      getlist();
 });
 </script>
 <style scoped lang="scss">

src/components/HomeStatics/countPage.vue

@@ -20,41 +20,65 @@
 
 <script setup name="CarInfo" lang="ts">
 import moment from 'moment';
-import { getCountData } from '@/api/gpsData';
-import { listGoodsOrder } from "@/api/goodsOrder";
+// import { getCountData } from '@/api/gpsData';
+// import { listGoodsOrder } from "@/api/goodsOrder";
+import { getpassenger1 } from '@/api/data'
+import { cabinetboxstatic } from '@/api/gpsData';
+
 
 const people = ref(0)
 const goods = ref(0)
 
-const getCountDataList = () => {
-    var startDate = moment(new Date()).format('YYYY-MM-DD');
-    var dateTime = new Date()
-    dateTime = dateTime.setDate(dateTime.getDate() + 1);
-    dateTime = new Date(dateTime);
-    var endDate = moment(dateTime).format('YYYY-MM-DD')
-    var obj = {
-        params: {
-            starttime: startDate,
-            endtime: endDate
-        }
-    }
-    getCountData(obj).then(res=>{
-        people.value = res.data.totalin
-    })
-}
+// const getCountDataList = () => {
+//     var startDate = moment(new Date()).format('YYYY-MM-DD');
+//     var dateTime = new Date()
+//     dateTime = dateTime.setDate(dateTime.getDate() + 1);
+//     dateTime = new Date(dateTime);
+//     var endDate = moment(dateTime).format('YYYY-MM-DD')
+//     var obj = {
+//         params: {
+//             starttime: startDate,
+//             endtime: endDate
+//         }
+//     }
+//     getCountData(obj).then(res=>{
+//         people.value = res.data.totalin
+//     })
+// }
+
+// const getlistGoodsOrder = () =>{
+//     var gotime =  moment(new Date()).format('YYYY-MM-DD 00:00:00')
+//     listGoodsOrder({pageSize:1000,gotime:gotime}).then(res=>{
+//         goods.value = res.rows.length
+//     })
+// }
 
-const getlistGoodsOrder = () =>{
-    var gotime =  moment(new Date()).format('YYYY-MM-DD 00:00:00')
-    listGoodsOrder({pageSize:1000,gotime:gotime}).then(res=>{
-        goods.value = res.rows.length
-    })
+const getlist = () =>{
+  getpassenger1({
+    "start":moment(new Date()).format('YYYY-MM-DD'),
+    "end":moment(new Date()).format('YYYY-MM-DD')
+}).then(res=>{
+  console.log(res)
+  people.value = res.data[0].flowCount.incount;
+  // goods.value = res.data[0].goodsOrderCount.ordercount;
+})
+
+
+cabinetboxstatic().then((res) => {
+    let totalcabinet = 0;
+    let kxcabinet = 0;
+    for (let key in res) {
+      totalcabinet += res[key].total ?? 0;
+      kxcabinet += res[key].unuse ?? 0;
+    }
+    goods.value = totalcabinet-kxcabinet;
+  });
 }
 
 
 onMounted(() => {
-    // getList();
-    getCountDataList();
-    getlistGoodsOrder();
+    getlist();
+
 });
 </script>
 <style scoped lang="scss">

src/views/yunying/scheduling/index.vue

@@ -388,7 +388,7 @@ const getScheduleList = async () => {
         }
     })
     //测试用
-    // carScheduleList.value = res.rows;
+    carScheduleList.value = res.rows;
     reloadData.value = true
 }