修改时间选择条件

ruoyi-ui/src/views/GPS/tyre/index.vue

@@ -172,6 +172,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 const resetQuery = () => {
   proxy.resetForm("queryRef");
+  dateRange.value = []
   handleQuery();
 }
 

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">
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon1"/>
-                {{ 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) }}℃
               </div>
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon2"/>
-                {{ 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
               </div>
               <!--              <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">-->
               <!--                花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pattern }}-->
@@ -60,11 +60,11 @@
                  style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align: top">
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon1"/>
-                {{ 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) }}℃
               </div>
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon2"/>
-                {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].pressure }}
+                {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].pressure) }}Pa
               </div>
               <!--              <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">-->
               <!--                花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].pattern }}-->
@@ -80,11 +80,11 @@
                  style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon1"/>
-                {{ 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) }}℃
               </div>
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon2"/>
-                {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].pressure }}
+                {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].pressure) }}Pa
               </div>
               <!--              <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">-->
               <!--                花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].pattern }}-->
@@ -98,11 +98,11 @@
                  style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon1"/>
-                {{ 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) }}℃
               </div>
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon2"/>
-                {{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].pressure }}
+                {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].pressure) }}Pa
               </div>
               <!--              <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">-->
               <!--                花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].pattern }}-->
@@ -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;
+  margin-top: 13px;
-  width: 30px;
+  width: 20px;
-  height: 30px;
+  height: 20px;
-  margin-right: 6px;
+  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;
+  margin-top: 13px;
-  width: 30px;
+  width: 20px;
-  height: 30px;
+  height: 20px;
-  margin-right: 6px;
+  margin-right: 3px;
   background-repeat: no-repeat;
   background-size: 100% 100%;
   background-image: url('@/assets/images/pressure.png')