From 81b78a0a5d4d26e47286318c195e0e442bb66874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 17 Jul 2023 09:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/lang/en.js                       |  3 +-
 ruoyi-ui/src/lang/zhCn.js                     |  3 +-
 ruoyi-ui/src/views/GPS/tyre/index.vue         | 49 ++++++++++++-------
 ruoyi-ui/src/views/index.vue                  |  9 +++-
 .../carMonitoring/index.vue                   |  4 ++
 5 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js
index 4dac77a..7346047 100644
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -105,7 +105,8 @@ export default {
     confirmDeletion: 'Are you sure to delete the data item whose {key} is {value}?',
     modificationSuccessful: 'Modification Successful',
     addedSuccessfully: 'Added Successfully',
-    successfullyDeleted: 'Successfully Deleted'
+    successfullyDeleted: 'Successfully Deleted',
+    checkTheTireGPSInfo:'Check the tire GPS information'
   },
   common: {
     loadTitle: 'Loading system resources, please be patient',
diff --git a/ruoyi-ui/src/lang/zhCn.js b/ruoyi-ui/src/lang/zhCn.js
index e88ae48..5f69678 100644
--- a/ruoyi-ui/src/lang/zhCn.js
+++ b/ruoyi-ui/src/lang/zhCn.js
@@ -105,7 +105,8 @@ export default {
     confirmDeletion: '是否确认删除%{key}为%{value}的数据项？',
     modificationSuccessful: '修改成功',
     addedSuccessfully: '新增成功',
-    successfullyDeleted: '删除成功'
+    successfullyDeleted: '删除成功',
+    checkTheTireGPSInfo:'查看轮胎GPS信息'
   },
   common: {
     loadTitle: '正在加载系统资源，请耐心等待',
diff --git a/ruoyi-ui/src/views/GPS/tyre/index.vue b/ruoyi-ui/src/views/GPS/tyre/index.vue
index cd4b4bc..884197f 100644
--- a/ruoyi-ui/src/views/GPS/tyre/index.vue
+++ b/ruoyi-ui/src/views/GPS/tyre/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <!--    搜索栏-->
-    <el-form v-show="showSearch" ref="queryRef" :rules="rules" :inline="true" :label-width=" locale ? '90px':'140px'"
-             :model="queryParams">
+    <el-form v-show="showSearch" ref="queryRef" :inline="true" :label-width=" locale ? '90px':'140px'" :model="queryParams"
+             :rules="rules">
       <el-form-item :label="t('web.tireNumber')" prop="outerTireNumber">
         <el-input
             v-model="queryParams.outerTireNumber"
@@ -16,8 +16,8 @@
         <el-date-picker
             v-model="dateRange"
             :end-placeholder="t('common.endDate')"
-            range-separator="-"
             :start-placeholder="t('common.startDate')"
+            range-separator="-"
             type="datetimerange"
             value-format="YYYY-MM-DD HH:mm:ss"
         />
@@ -46,17 +46,17 @@
     <!--    表格主体-->
     <el-table v-loading="loading" :data="postList" @row-click="rowClick">
       <el-table-column align="center" fixed type="selection" width="55"/>
-      <el-table-column align="center" :label="t('web.SerialNumber')" prop="internationalization1"
+      <el-table-column :label="t('web.SerialNumber')" align="center" prop="internationalization1"
                        type='index' width="120"/>
-      <el-table-column align="center" :label="t('web.tireNumber')" prop="outerTireNumber"
+      <el-table-column :label="t('web.tireNumber')" align="center" prop="outerTireNumber"
       />
-      <el-table-column align="center" :label="t('web.SensorID')" prop="sensorid"
+      <el-table-column :label="t('web.SensorID')" align="center" prop="sensorid"
       />
-      <el-table-column align="center" :label="t('web.MeanPressure')" prop="avgpressvalue"
+      <el-table-column :label="t('web.MeanPressure')" align="center" prop="avgpressvalue"
       />
-      <el-table-column align="center" :label="t('web.MeanTemperature')" prop="avgtemperaturevalue"
+      <el-table-column :label="t('web.MeanTemperature')" align="center" prop="avgtemperaturevalue"
       />
-      <el-table-column align="center" :label="t('web.AverageVelocity')" prop="avgspeed"
+      <el-table-column :label="t('web.AverageVelocity')" align="center" prop="avgspeed"
       />
     </el-table>
 
@@ -68,7 +68,7 @@
         :total="total"
         @pagination="getList"
     />
-    <el-dialog width="1000" v-model="dialogTableVisible" @opened="dialogOpened">
+    <el-dialog v-model="dialogTableVisible" width="1000" @opened="dialogOpened">
       <temp ref="tempRef" width='900px'/>
     </el-dialog>
   </div>
@@ -80,6 +80,7 @@ import Temp from '@/views/dashboard/Temp'
 
 import {useI18n} from 'vue-i18n';
 import Cookies from "js-cookie";
+import router from "@/router";
 
 const {t} = useI18n();
 
@@ -101,14 +102,16 @@ const tempRef = ref();
 const outerTireNumberNow = ref('')
 
 const rules = {
-  outerTireNumber: { required: true, message: '请输入外胎号', trigger: 'blur' },
-  time: {validator :(rule,value,callback)=>{
-    if(dateRange.value.length !== 2){
-      callback(new Error("请选择时间"))
-    }else{
-      callback()
-    }
-    }, message: '请选择时间', trigger: 'blur' },
+  outerTireNumber: {required: true, message: '请输入外胎号', trigger: 'blur'},
+  time: {
+    validator: (rule, value, callback) => {
+      if (dateRange.value.length !== 2) {
+        callback(new Error("请选择时间"))
+      } else {
+        callback()
+      }
+    }, message: '请选择时间', trigger: 'blur'
+  },
 }
 
 // 搜索参数
@@ -163,6 +166,16 @@ function getList() {
   })
 }
 
+proxy.$nextTick(() => {
+  let id = router.options.history.location.split('?')?.[1]?.split('=')[1]
+  if(id) {
+    queryParams.value.outerTireNumber = id
+    let nowDate = new Date().getTime()
+    dateRange.value = [proxy.parseTime(nowDate - 1000 * 60 * 60), proxy.parseTime(nowDate)]
+    getList();
+  }
+})
+
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 8f72b9f..b0518c5 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -292,7 +292,8 @@ export default {
         this.toolTipData = response.data.carMap.map(e => {
           return {
             "name": '',
-            "value": [e.longitude, e.latitude, '']
+            "value": [e.longitude, e.latitude, ''],
+            id:e.id
           }
         })
         this.initChart()
@@ -449,6 +450,12 @@ export default {
           },
         ]
       })
+      this.chart.on('click', (e) => {
+        if(e.componentSubType === 'scatter'){
+          console.log(e.data)
+          this.$tab.openPage("/realTimeMonitoring/carMonitoring"+"?id="+e.data.id,"/realTimeMonitoring")
+        }
+      })
     },
     initCarChart() {
       this.carChart = echarts.init(document.getElementById('carCharts'))
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
index 3ff154c..2378ca5 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
@@ -250,6 +250,7 @@
       </el-descriptions>
       <template #footer>
         <div class="dialog-footer">
+          <el-button style="float:left;" type="primary" @click="toGPS">{{ t('option.checkTheTireGPSInfo') }}</el-button>
           <el-button type="primary" @click="submitForm">{{ t('option.ok') }}</el-button>
           <el-button @click="cancel">{{ t('option.cancel') }}</el-button>
         </div>
@@ -426,6 +427,9 @@ function handleQuery() {
 
   getList();
 }
+const toGPS = ()=>{
+  proxy.$tab.openPage("/GPS/tyre"+"?id="+tyreInfo.value.id,"/GPS")
+}
 
 /** 重置按钮操作 */
 const resetQuery = () => {