From d0bedefdf8f88a338304c5aa2a0263fc284a276e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Fri, 18 Feb 2022 14:39:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E8=A7=88=E7=8A=B6=E6=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=E9=BB=98=E8=AE=A410=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicleMent/journal.vue        | 2 +-
 src/views/vehicleMent/overview/index.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/vehicleMent/journal.vue b/src/views/vehicleMent/journal.vue
index 089b011..7d83ae8 100644
--- a/src/views/vehicleMent/journal.vue
+++ b/src/views/vehicleMent/journal.vue
@@ -100,7 +100,7 @@
       ></el-table-column>
       <el-table-column label="车辆状态" align="center">
         <template slot-scope="scope">
-          {{ scope.row.distance > 10 ? "离开" : "进入" }}工房
+          {{ scope.row.status == 0 ? "离开" : "进入" }}工房
         </template>
       </el-table-column>
       <el-table-column
diff --git a/src/views/vehicleMent/overview/index.vue b/src/views/vehicleMent/overview/index.vue
index 3e0bb16..8d3229a 100644
--- a/src/views/vehicleMent/overview/index.vue
+++ b/src/views/vehicleMent/overview/index.vue
@@ -125,6 +125,7 @@ import vueSeamlessScroll from "vue-seamless-scroll";
 import { mapList } from "@/api/vehicleMent/map";
 import { bigPicList } from "@/api/vehicleMent/journal";
 import { readerCardList } from "@/api/vehicleMent/reader";
+import { journalList } from "@/api/vehicleMent/journal";
 export default {
   name: "tab1",
   components: {
@@ -244,7 +245,7 @@ export default {
       //   if (data.isLocationUpdate) {
       //     this.setDataList(data.isLocationUpdate);
       //   }
-      // }, 1000);
+      // }, 5000);
     },
     close: function () {
       console.log("socket已经关闭");
@@ -290,6 +291,9 @@ export default {
         });
         this.loading = false;
         this.getUrl();
+        journalList({ pageNum: 1, pageSize: 10 }).then((response) => {
+          this.scrollList1 = response.rows;
+        });
       });
       // bigPicList().then((response) => {
       //   this.vehicleList = response.data;