From 788d060097cd95c734b868f34f2ccbf569888967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 12 May 2023 17:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/GPS/tyre/index.vue | 1 +
.../carMonitoring/index.vue | 35 ++++++++++---------
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/views/GPS/tyre/index.vue b/ruoyi-ui/src/views/GPS/tyre/index.vue
index d1fe99f..b49f0ad 100644
--- a/ruoyi-ui/src/views/GPS/tyre/index.vue
+++ b/ruoyi-ui/src/views/GPS/tyre/index.vue
@@ -172,6 +172,7 @@ function handleQuery() {
/** 重置按钮操作 */
const resetQuery = () => {
proxy.resetForm("queryRef");
+ dateRange.value = []
handleQuery();
}
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
index 0aaf27a..78f149b 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
@@ -42,11 +42,11 @@
style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
- {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].temperature }}
+ {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].temperature).toFixed(3) }}℃
- {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pressure }}
+ {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pressure).toFixed(3) }}Pa
@@ -60,11 +60,11 @@
style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align: top">
- {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].temperature }}
+ {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].temperature).toFixed(3) }}℃
- {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].pressure }}
+ {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].pressure) }}Pa
@@ -80,11 +80,11 @@
style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
- {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].temperature }}
+ {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].temperature).toFixed(3) }}℃
- {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].pressure }}
+ {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].pressure) }}Pa
@@ -98,11 +98,11 @@
style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
- {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].temperature }}
+ {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].temperature).toFixed(3) }}℃
- {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].pressure }}
+ {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].pressure) }}Pa
@@ -273,7 +273,10 @@ const tyreInfo = ref({})
const childrenList = ref([])
const getTyreInfo = (e) => {
+ console.log(e)
+ console.log(tyreList.value)
let id = tyreList.value.filter(val => val.tyrePositionS === e)?.[0]?.tyreId || ''
+ console.log(id)
if (!id) return
open.value = true
getTyreList(id).then(e => {
@@ -513,10 +516,10 @@ onBeforeUnmount(() => {
margin-left: 5px;
display: inline-block;
vertical-align: top;
- margin-top: 3px;
- width: 30px;
- height: 30px;
- margin-right: 6px;
+ margin-top: 13px;
+ width: 20px;
+ height: 20px;
+ margin-right: 3px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-image: url('@/assets/images/temperature.png')
@@ -526,10 +529,10 @@ onBeforeUnmount(() => {
margin-left: 5px;
display: inline-block;
vertical-align: top;
- margin-top: 3px;
- width: 30px;
- height: 30px;
- margin-right: 6px;
+ margin-top: 13px;
+ width: 20px;
+ height: 20px;
+ margin-right: 3px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-image: url('@/assets/images/pressure.png')