From b7213c1012963b511b8e53f2510c20c4b047677a 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 10:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=80=BB=E8=A7=88=E4=BA=A4?=
=?UTF-8?q?=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/variables.scss | 2 +-
.../components/bigScreenHead/index.vue | 2 +-
src/views/vehicleMent/overview/index.vue | 123 ++++++++++--------
src/views/vehicleMent/reader.vue | 12 ++
4 files changed, 83 insertions(+), 56 deletions(-)
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 34484d4..3539b26 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
$base-sub-menu-hover:#001528;
*/
-$base-sidebar-width: 200px;
+$base-sidebar-width: 210px;
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/src/views/vehicleMent/components/bigScreenHead/index.vue b/src/views/vehicleMent/components/bigScreenHead/index.vue
index 8ba357f..adcc1a4 100644
--- a/src/views/vehicleMent/components/bigScreenHead/index.vue
+++ b/src/views/vehicleMent/components/bigScreenHead/index.vue
@@ -1,6 +1,6 @@
diff --git a/src/views/vehicleMent/overview/index.vue b/src/views/vehicleMent/overview/index.vue
index 9bc4fac..0d9aff4 100644
--- a/src/views/vehicleMent/overview/index.vue
+++ b/src/views/vehicleMent/overview/index.vue
@@ -35,15 +35,24 @@
-
+
+
+
+
@@ -132,53 +141,39 @@ export default {
scrollList1: [],
data: [
{
- readId: 1,
- readName: "实际名称1",
- carId: "车牌号1",
- // createTime: this.parseTime(new Date(), "{h}:{i}:{s}"),
- status: 1,
+ carAbscissa: "49.969116",
+ carId: "皖A 12345",
+ carOrdinate: "59.233448",
+ cardNumber: "0000090759",
+ createTime: 1645148782783,
+ distance: 80,
+ driverName: "小王",
+ driverPhone: "13166778765",
+ lowVoltage: "0",
+ northAngle: 0,
+ readId: 254,
+ readName: "254号读卡器",
+ status: "0",
},
{
- readId: 2,
- readName: "实际名称2",
- carId: "车牌号2",
- // createTime: this.parseTime(new Date(), "{h}:{i}:{s}"),
- status: 1,
- },
- {
- readId: 3,
- readName: "实际名称3",
- carId: "车牌号3",
- // createTime: this.parseTime(new Date(), "{h}:{i}:{s}"),
- status: 0,
- },
- {
- readId: 4,
- readName: "实际名称4",
- carId: "车牌号4",
- // createTime: this.parseTime(new Date(), "{h}:{i}:{s}"),
- status: 0,
- },
- {
- readId: 5,
- readName: "实际名称5",
- carId: "车牌号5",
- // createTime: this.parseTime(new Date(), "{h}:{i}:{s}"),
- status: 1,
+ carAbscissa: "49.969116",
+ carId: "皖A 12345",
+ carOrdinate: "59.233448",
+ cardNumber: "0000090759",
+ createTime: 1645148782783,
+ distance: 80,
+ driverName: "小王",
+ driverPhone: "13166778765",
+ lowVoltage: "0",
+ northAngle: 0,
+ readId: 254,
+ readName: "254号读卡器",
+ status: "0",
},
],
};
},
methods: {
- setDataList(obj) {
- this.scrollList1.push(obj);
- this.listData = Array(this.scrollList1.length).fill(0);
- this.$refs.seamlessScroll.reset();
- setTimeout(() => {
- this.$refs.seamlessScroll.$refs.wrap.scrollTop =
- this.$refs.seamlessScroll.$refs.wrap.scrollHeight;
- }, 0);
- },
getUrl() {
this.request({
url: "/getSocketUrl",
@@ -211,6 +206,26 @@ export default {
error: function () {
console.log("连接错误");
},
+ setDataList(obj) {
+ this.scrollList1.push(obj);
+ this.listData = Array(this.scrollList1.length).fill(0);
+ this.$refs.seamlessScroll.reset();
+ setTimeout(() => {
+ this.$refs.seamlessScroll.$refs.wrap.scrollTop =
+ this.$refs.seamlessScroll.$refs.wrap.scrollHeight;
+ }, 0);
+ this.setLeftNew(obj);
+ },
+ setLeftNew(obj) {
+ this.cardList.map((item) => {
+ if (item.id == obj.readId) {
+ item.disabled = true;
+ setTimeout(() => {
+ item.disabled = false;
+ }, 3000);
+ }
+ });
+ },
getMessage(msg) {
let data = JSON.parse(msg.data);
if (data.isLocationUpdate) {
@@ -219,9 +234,8 @@ export default {
// let time = setInterval(() => {
// data.isLocationUpdate = Object.assign(
// {},
- // this.data[Math.floor(Math.random() * 5)]
+ // this.data[Math.floor(Math.random() * 2)]
// );
- // data.isLocationUpdate["createTime"] = +new Date();
// if (this.scrollList1.length > 20) {
// return clearInterval(time);
// }
@@ -268,15 +282,16 @@ export default {
type: "3",
}).then((res) => {
this.dataInfo = res.rows[0] || {};
- bigPicList().then((response) => {
- this.vehicleList = response.data;
- readerCardList().then((response) => {
- console.log(response.rows);
- this.loading = false;
- this.cardList = response.rows;
- this.getUrl();
+ readerCardList().then((response) => {
+ this.cardList = response.rows.map((item) => {
+ return { ...item, disabled: false };
});
+ this.loading = false;
+ this.getUrl();
});
+ // bigPicList().then((response) => {
+ // this.vehicleList = response.data;
+ // });
});
},
};
diff --git a/src/views/vehicleMent/reader.vue b/src/views/vehicleMent/reader.vue
index 452b0fd..430af87 100644
--- a/src/views/vehicleMent/reader.vue
+++ b/src/views/vehicleMent/reader.vue
@@ -82,6 +82,7 @@
+