diff --git a/ruoyi-ui/src/api/realTimeMonitoring/carMonitoring.js b/ruoyi-ui/src/api/realTimeMonitoring/carMonitoring.js index e54d92f..9c2e04a 100644 --- a/ruoyi-ui/src/api/realTimeMonitoring/carMonitoring.js +++ b/ruoyi-ui/src/api/realTimeMonitoring/carMonitoring.js @@ -8,6 +8,7 @@ export function listBaseCar(query) { params: query }) } + // 查询列表 export function getCarGpsList(query) { return request({ @@ -17,3 +18,12 @@ export function getCarGpsList(query) { }) } +// 查询轮胎信息 +export function getTyreList(query) { + return request({ + url: '/basetyre/tyre/' + query, + method: 'get', + isNoLang: true, + }) +} + diff --git a/ruoyi-ui/src/api/realTimeMonitoring/electronicFence.js b/ruoyi-ui/src/api/realTimeMonitoring/electronicFence.js new file mode 100644 index 0000000..9ec75b0 --- /dev/null +++ b/ruoyi-ui/src/api/realTimeMonitoring/electronicFence.js @@ -0,0 +1,45 @@ + +import request from '@/utils/request' + +// 查询轮胎基础信息列表 +export function listTest(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', + 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' + }) +} diff --git a/ruoyi-ui/src/api/realTimeMonitoring/historicalRoute.js b/ruoyi-ui/src/api/realTimeMonitoring/historicalRoute.js new file mode 100644 index 0000000..9ec75b0 --- /dev/null +++ b/ruoyi-ui/src/api/realTimeMonitoring/historicalRoute.js @@ -0,0 +1,45 @@ + +import request from '@/utils/request' + +// 查询轮胎基础信息列表 +export function listTest(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', + 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' + }) +} diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index 539580b..50dc934 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -45,10 +45,10 @@ service.interceptors.request.use(config => { ...(config.params || {}), lang }); + url = url.slice(0, -1); } else { url = config.url } - url = url.slice(0, -1); config.params = {}; config.url = url; } diff --git a/ruoyi-ui/src/views/GPS/car/index.vue b/ruoyi-ui/src/views/GPS/car/index.vue index 0b59db8..cb4d852 100644 --- a/ruoyi-ui/src/views/GPS/car/index.vue +++ b/ruoyi-ui/src/views/GPS/car/index.vue @@ -3,9 +3,9 @@ - + - + - - - - - - - - - - - - - - - - - - - - @@ -344,6 +343,7 @@ const locale = (Cookies.get('language') || 'zhCn') === 'zhCn' const {proxy} = getCurrentInstance(); + // 表格数据 const postList = ref([]); // 模态框开关标识 @@ -367,43 +367,13 @@ const title = ref(""); const queryParams = ref({ pageNum: 1, pageSize: 10, - internationalization1: undefined, + carLicense: undefined, internationalization2: undefined, internationalization3: undefined, - internationalization4: undefined, - internationalization5: undefined, - internationalization6: undefined, - internationalization7: undefined, - internationalization8: undefined, - internationalization9: undefined, - internationalization10: undefined, - internationalization11: undefined, - internationalization12: undefined, - internationalization13: undefined, - internationalization14: undefined, - internationalization15: undefined, - internationalization16: undefined, - internationalization17: undefined, - internationalization18: undefined, - internationalization19: undefined, - internationalization20: undefined, - isDelete: undefined, - createTime: undefined, - createId: undefined, - createBy: undefined, - createName: undefined, - modifyTime: undefined, - modifyId: undefined, - modifyBy: undefined, - modifyName: undefined, }) // 表单验证规则 const rules = { - brand: [{required: true, message: "轮胎品牌不能为空", trigger: "blur"}], - type: [{required: true, message: "轮胎型号不能为空", trigger: "blur"}], - serialNumber: [{required: true, message: "轮胎编号不能为空", trigger: "blur"}], - depth: [{required: true, message: "花纹深度不能为空", trigger: "blur"}], } // 表单数据 diff --git a/ruoyi-ui/src/views/dashboard/Temp.vue b/ruoyi-ui/src/views/dashboard/Temp.vue index 062d901..7f868bc 100644 --- a/ruoyi-ui/src/views/dashboard/Temp.vue +++ b/ruoyi-ui/src/views/dashboard/Temp.vue @@ -1,190 +1,190 @@ diff --git a/ruoyi-ui/src/views/deviceManagement/info/index.vue b/ruoyi-ui/src/views/deviceManagement/info/index.vue index dd4c342..261b3b4 100644 --- a/ruoyi-ui/src/views/deviceManagement/info/index.vue +++ b/ruoyi-ui/src/views/deviceManagement/info/index.vue @@ -119,7 +119,11 @@ + > + + + \ 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 new file mode 100644 index 0000000..7d22868 --- /dev/null +++ b/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/realTimeMonitoring/vehicleMonitoring/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/vehicleMonitoring/index.vue index d3ec91f..fe2f28c 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/vehicleMonitoring/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/vehicleMonitoring/index.vue @@ -41,7 +41,7 @@ const setMarker = async (data, zoom) => { offset: new AMap.Pixel(0, 0), label: { direction: 'top', - content: `
${e.carLicense || ''} - 在线' : 'red">离线'}
监控 ${e.three || ''}
${parseTime(e.laseRuntime) || ''}
`, //设置文本标注内容 + content: `
${e.carLicense || ''} - 在线' : 'red">离线'}
监控 ${e.three || ''}
${parseTime(e.laseRuntime) || ''}
`, //设置文本标注内容 }, extData: { id: '123' diff --git a/ruoyi-ui/src/views/tireManagement/lifecycle/index.vue b/ruoyi-ui/src/views/tireManagement/lifecycle/index.vue index bb28752..83caf7d 100644 --- a/ruoyi-ui/src/views/tireManagement/lifecycle/index.vue +++ b/ruoyi-ui/src/views/tireManagement/lifecycle/index.vue @@ -11,26 +11,26 @@ -
品牌：{{ tireInfo.info1 }} 规格：{{ tireInfo.info2 }} 花纹：{{ tireInfo.info3 }}
+
品牌：{{ tireInfo.brand }} 规格：{{ tireInfo.size }} 花纹：{{ tireInfo.pattern }}
使用时间   - {{ tireInfo.info4 }}   + {{ tireInfo.userTime }}   最长连续报警时间   - {{ tireInfo.info5 }}   + {{ tireInfo.warringTime }}   历史最高胎压   - {{ tireInfo.info6 }}   + {{ tireInfo.highTemHis }}  
预计剩余里程   - {{ tireInfo.info7 }}km   + {{ tireInfo.surplusMileage }}km   最长连续工作时间   - {{ tireInfo.info8 }}   + {{ tireInfo.longestWorkTime }}   历史最高胎温   - {{ tireInfo.info9 }}   + {{ tireInfo.highPressHis }}  
报警次数   - {{ tireInfo.info10 }}   + {{ tireInfo.warringTimes }}  
{{ item.type }}   {{ item.num }}   @@ -133,8 +133,8 @@ const outerTireNumberSearchClick = async () => { const {data: info} = await getTyreLife({ outerTireNumber: tireInfo.value.title }) - console.log(info) - list.value = info + list.value = info.lifeList + tireInfo.value = info.tyresLifeInfo list.value.push({ datetime: new Date().getTime(), description: '今日' @@ -148,8 +148,7 @@ const tyrePosition = (e) => { let position = [parseFloat(arr?.[0]), parseFloat(arr?.[1]), parseFloat(arr?.[2])] let Enum1 = ['左', '右'] let Enum2 = ['外', '内'] - return `${position[0]}排${Enum1[position[1] - 1]}侧${Enum1[position[2] - 1]}胎` - console.log(position) + return `${position[0]}排${Enum1[position[1] - 1]}侧${Enum2[position[2] - 1]}胎` } const percentage = '3.33' @@ -158,16 +157,16 @@ const run = '3.33' const tireInfo = ref({ title: '1001', - info1: '品牌', - info2: '规格', - info3: '花纹', - info4: '10h', - info5: '10h', - info6: '40°C', - info7: '666', - info8: '10h', - info9: '40°C', - info10: '1', + brand: '', + size: '', + pattern: '', + userTime: '', + warringTime: '', + highTemHis: '', + surplusMileage: '', + longestWorkTime: '', + highPressHis: '', + warringTimes: '', war: [ { type: '高温',