diff --git a/ruoyi-ui/src/api/realTimeMonitoring/alarmSendingSettings.js b/ruoyi-ui/src/api/realTimeMonitoring/alarmSendingSettings.js index d7930c7..1c24983 100644 --- a/ruoyi-ui/src/api/realTimeMonitoring/alarmSendingSettings.js +++ b/ruoyi-ui/src/api/realTimeMonitoring/alarmSendingSettings.js @@ -1,11 +1,26 @@ - import request from '@/utils/request' // 查询轮胎基础信息列表 export function listBaseCar(query) { return request({ - url: '/basecar/car/list', + url: '/carqueue/carqueue/carQueuelist', method: 'get', params: query }) +} + +export function getInfoById(query) { + return request({ + url: '/basetyre/fireset/' + query, + method: 'get', + isNoLang:true + }) +} + +export function setAttributes(query) { + return request({ + url: '/basetyre/fireset', + method: 'post', + data: query + }) } \ No newline at end of file diff --git a/ruoyi-ui/src/api/realTimeMonitoring/historicalRoute.js b/ruoyi-ui/src/api/realTimeMonitoring/historicalRoute.js index 9ec75b0..0f78a6e 100644 --- a/ruoyi-ui/src/api/realTimeMonitoring/historicalRoute.js +++ b/ruoyi-ui/src/api/realTimeMonitoring/historicalRoute.js @@ -2,44 +2,10 @@ import request from '@/utils/request' // 查询轮胎基础信息列表 -export function listTest(query) { +export function getTrack(query) { return request({ - url: '/basetyre/CollectMachineGps/list', - method: 'get', - params: query - }) -} - -// 查询轮胎基础信息详细 -export function getTest(id) { - return request({ - url: '/test/test/' + id, - method: 'get' - }) -} - -// 新增轮胎基础信息 -export function addTest(data) { - return request({ - url: '/test/test', + url: '/basetyre/BaseCarGpsRecord/CarHistoricalLocus', method: 'post', - data: data - }) -} - -// 修改轮胎基础信息 -export function updateTest(data) { - return request({ - url: '/test/test', - method: 'put', - data: data - }) -} - -// 删除轮胎基础信息 -export function delTest(id) { - return request({ - url: '/test/test/' + id, - method: 'delete' + data: query }) } diff --git a/ruoyi-ui/src/assets/images/pressure.png b/ruoyi-ui/src/assets/images/pressure.png new file mode 100644 index 0000000..aed546b Binary files /dev/null and b/ruoyi-ui/src/assets/images/pressure.png differ diff --git a/ruoyi-ui/src/assets/images/temperature.png b/ruoyi-ui/src/assets/images/temperature.png new file mode 100644 index 0000000..731c92a Binary files /dev/null and b/ruoyi-ui/src/assets/images/temperature.png differ diff --git a/ruoyi-ui/src/views/deviceManagement/info/index.vue b/ruoyi-ui/src/views/deviceManagement/info/index.vue index d87e54f..8fb1bcc 100644 --- a/ruoyi-ui/src/views/deviceManagement/info/index.vue +++ b/ruoyi-ui/src/views/deviceManagement/info/index.vue @@ -22,7 +22,7 @@ /> - +
- + - - + + + + + - - + + - - + + - - + + - - + + - - - - - - - - 立即创建 {{ t('option.reset') }} @@ -56,7 +45,7 @@ \ No newline at end of file diff --git a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue index c308e5b..8273175 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue @@ -41,14 +41,14 @@
- 花纹深度:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].currentTextureDepth }} +
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].temperature }}
- 轮胎编号:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].outerTireNumber }} -
-
- 花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pattern }} +
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pressure }}
+ + +
- 花纹深度:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].currentTextureDepth }} -
-
- 轮胎编号:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].outerTireNumber }} +
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].temperature }}
- 花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].pattern }} +
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].pressure }}
+ + +
- 花纹深度:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].currentTextureDepth }} +
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].temperature }}
- 轮胎编号:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].outerTireNumber }} -
-
- 花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].pattern }} +
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].pressure }}
+ + +
- 花纹深度:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].currentTextureDepth }} -
-
- 轮胎编号:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].outerTireNumber }} +
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].temperature }}
- 花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].pattern }} +
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].pressure }}
+ + +
@@ -356,15 +356,15 @@ const tableChange = async (e) => { pageId.value = e.id const {data: info} = await getCarGpsList({id: pageId.value}) cardInfo.value = { - carLicense: info[0].carLicense + carLicense: info.carLicense } - let TireRow1 = info[0].cartype?.split('T')[1]?.split('|').filter(e => e !== '') || [] + let TireRow1 = info.cartype?.split('T')[1]?.split('|').filter(e => e !== '') || [] let title = [] TireRow1.forEach((res) => { title.push(parseInt(res.split('-')[1])) }) TireRow.value = title - let tyreListData = info[0].tyreList.map(e => { + let tyreListData = info.tyreList.map(e => { return { ...e, tyrePositionS: e.tyrePosition?.split('-')[0] + '-' + e.tyrePosition?.split('-')[1] + '-' + e.tyrePosition?.split('-')[2] @@ -376,7 +376,7 @@ const tableChange = async (e) => { let timeOut = () => { setTimeout(() => { if (map) { - setMarker(info[0]) + setMarker(info) clearTimeout(timeOut) } }, 1000) @@ -532,4 +532,28 @@ onBeforeUnmount(() => { .el-descriptions__label { width: 170px; } +.icon1{ + margin-left: 5px; + display: inline-block; + vertical-align: top; + margin-top: 3px; + width: 30px; + height: 30px; + margin-right: 6px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-image: url('@/assets/images/temperature.png') +} +.icon2{ + margin-left: 5px; + display: inline-block; + vertical-align: top; + margin-top: 3px; + width: 30px; + height: 30px; + margin-right: 6px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-image: url('@/assets/images/pressure.png') +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue index 7d22868..bdef943 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue @@ -12,14 +12,15 @@ @keyup.enter.native="handleQuery" /> - + + v-model="dateRange" + end-placeholder="结束日期" + range-separator="-" + start-placeholder="开始日期" + type="daterange" + value-format="YYYY-MM-DD" + > {{ t('option.search') }} @@ -32,7 +33,7 @@