From 0a28d47e7e9bcaaaa8a01711798d5cfa776af1ab Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Tue, 10 Jan 2023 14:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data.js                  |  8 +++---
 src/views/components/carMile.vue | 12 ++++++--
 src/views/components/carWarn.vue | 48 +++++++++++++++++++++-----------
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/src/api/data.js b/src/api/data.js
index 8f9a712..c458622 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -29,16 +29,16 @@ export const lunzApi = {
         data,
     }),
     //设备昨日公里数
-    getYesterdayMile: (appKey) => request({
+    getYesterdayMile: (key) => request({
         url: '/gatewayapi/ApiPlat/GetYesterdayMile',
         method: 'get',
         headers:{
-            appKey
+            appKey: key
         },
     }),
     //报警记录
-    getMessInfoByMessType: (appKey, data) => request({
-        url: '/gatewayapi/ApiPlat/GetMessInfoByMessType?appKey=' + appKey,
+    getMessInfoByMessType: (key, data) => request({
+        url: '/gatewayapi/ApiPlat/GetMessInfoByMessType?appkey=' + key,
         method: 'post',
         data,
     })
diff --git a/src/views/components/carMile.vue b/src/views/components/carMile.vue
index 09c3c15..4bb9425 100644
--- a/src/views/components/carMile.vue
+++ b/src/views/components/carMile.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mile_warp">
-    <table>
+    <table class="table">
       <thead>
         <tr>
           <th>排名</th>
@@ -38,7 +38,6 @@ export default {
     queryYesterdayMile() {
       lunzApi.getYesterdayMile(key).then(res => {
         let resData = res.Data;
-        console.log(resData)
         this.carList.map(item => {
           let idx = resData.findIndex(item2 => item2.Imei == item.deviceId);
           item.mile = idx > -1 ? res.Data[idx].Mile : 0;
@@ -58,6 +57,13 @@ export default {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  font-size: 12px;
+  .table {
+    width: 100%;
+    th,td{
+      color:#fff;
+      font-size: 0.16rem;
+      padding: 0.03rem 0.05rem;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/components/carWarn.vue b/src/views/components/carWarn.vue
index 0067124..3df6810 100644
--- a/src/views/components/carWarn.vue
+++ b/src/views/components/carWarn.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mile_warp">
-    <table>
+    <table class="table">
       <thead>
         <tr>
           <th>时间</th>
@@ -9,10 +9,10 @@
         </tr>
       </thead>
       <tbody>
-        <tr v-for="(item,index) in carMile" :key="'car'+index">
-          <td>{{item.cardNo}}</td>
-          <td>{{item.mile}}</td>
-          <td><a :href="`https://lcrm3.lunz.cn/#/Equipment/LocatMonitor/Path/${item.key}`" target="_blank">查询</a></td>
+        <tr v-for="(item, index) in carWarn" :key="'car' + index">
+          <td>{{ item.TimeStamp }}</td>
+          <td>{{ item.MESSTYPE }}</td>
+          <td>{{ item.MESSCONTENT }}</td>
         </tr>
       </tbody>
     </table>
@@ -21,29 +21,33 @@
 
 <script>
 import { lunzApi, key, carList } from "@/api/data";
+import { dateFormat } from "@/util/date";
 export default {
   data() {
     return {
       carList: carList,//车辆设备
-      carMile:[],
+      carWarn: [],
     }
   },
   mounted() {
     this.queryYesterdayMile();
   },
   methods: {
-    //昨日里程
+    //报警信息
     queryYesterdayMile() {
-      lunzApi.getYesterdayMile(key).then(res => {
+      let now = new Date();
+      let yesterDay1 = now.setDate(now.getDate() - 1);
+      let param = {
+        "StartTime": dateFormat(new Date(yesterDay1), 'yyyy-MM-dd'),
+        "EndTime": dateFormat(new Date(), 'yyyy-MM-dd')
+      }
+      lunzApi.getMessInfoByMessType(key, param).then(res => {
         let resData = res.Data;
-        console.log(resData)
-        this.carList.map(item => {
-          let idx = resData.findIndex(item2 => item2.Imei == item.deviceId);
-          item.mile = idx > -1 ? res.Data[idx].Mile : 0;
-          this.carMile.push(item);
-        })
-        this.carMile.sort((a,b) => {
-          return b.mile - a.mile;
+        resData.map(item => {
+          let idx = this.carList.findIndex(item2 => item2.deviceId == item.Imei);
+          item.carNo = idx > -1 ? this.carList[idx].cardNo : '-';
+          item.TimeStamp = dateFormat(new Date(TimeStamp), 'yyyy-MM-dd hh:mm:ss')
+          this.carWarn.push(item);
         })
       })
     },
@@ -56,6 +60,16 @@ export default {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  font-size: 12px;
+
+  .table {
+    width: 100%;
+
+    th,
+    td {
+      color: #fff;
+      font-size: 0.16rem;
+      padding: 0.03rem 0.05rem;
+    }
+  }
 }
 </style>
\ No newline at end of file