diff --git a/ruoyi-ui/src/api/tireManagement/salesData.js b/ruoyi-ui/src/api/tireManagement/salesData.js
new file mode 100644
index 0000000..b9b9f77
--- /dev/null
+++ b/ruoyi-ui/src/api/tireManagement/salesData.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listBasetyre(query) {
+ return request({
+ url: '/basetyre/tyre/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询基础信息详细
+export function getBasetyre(id) {
+ return request({
+ url: '/basetyre/basetyre/' + id,
+ method: 'get'
+ })
+}
+
+// 新增信息
+export function addBasetyre(data) {
+ return request({
+ url: '/basetyre/basetyre',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改信息
+export function updateBasetyre(data) {
+ return request({
+ url: '/basetyre/basetyre',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除轮胎基础信息
+export function delBasetyre(id) {
+ return request({
+ url: '/basetyre/basetyre/' + id,
+ method: 'delete'
+ })
+}
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
index 65c5411..4193cf8 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
@@ -34,20 +34,39 @@
-
+
+ style="vertical-align:top;width: 12.5%;margin: 0 12px; height: 100px;display: inline-block;border: 1px solid #666;border-radius: 10%">
+
+
花纹深度:{{tyreList.filter(e=>e.tyrePositionS === (`${index+1}-1-1`))[0].currentTextureDepth}}
+
轮胎编号:{{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-2`))[0].currentTextureDepth}}
+
轮胎编号:{{tyreList.filter(e=>e.tyrePositionS === (`${index+1}-1-2`))[0].outerTireNumber}}
+
花纹:{{tyreList.filter(e=>e.tyrePositionS === (`${index+1}-1-2`))[0].pattern}}
+
+ :style="'width: 12.5%;margin: 0 12px; height: 100px;display: inline-block;border: 1px solid '+ (TireRow[index] === 2 ? '#666' :'rgba(0,0,0,0)') +';border-radius: 10%'">
+
+
花纹深度:{{tyreList.filter(e=>e.tyrePositionS === (`${index+1}-2-2`))[0].currentTextureDepth}}
+
轮胎编号:{{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-1`))[0].currentTextureDepth}}
+
轮胎编号:{{tyreList.filter(e=>e.tyrePositionS === (`${index+1}-2-1`))[0].outerTireNumber}}
+
花纹:{{tyreList.filter(e=>e.tyrePositionS === (`${index+1}-2-1`))[0].pattern}}
+
@@ -116,6 +135,9 @@ import {onBeforeUnmount} from "@vue/runtime-core";
const {proxy} = getCurrentInstance();
const $router = useRouter();
const {t} = useI18n();
+const TireRow = ref([])
+const tyreList = ref([])
+const tyreDataList = ref([])
const pageId = ref('')
const tableRef1 = ref()
let map = null
@@ -177,11 +199,24 @@ const tableChange = async (e) => {
cardInfo.value = {
carLicense: info[0].carLicense
}
- console.log(info)
+ let TireRow1 = info[0].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=>{
+ return {
+ ...e,
+ tyrePositionS : e.tyrePosition?.split('-')[0] + '-' + e.tyrePosition?.split('-')[1] + '-' + e.tyrePosition?.split('-')[2]
+ }
+ })
+ tyreList.value = tyreListData
+ tyreDataList.value = tyreListData.map(e=>e.tyrePositionS)
+ console.log(tyreList.value)
let timeOut = () => {
setTimeout(() => {
if (map) {
- console.log(111)
setMarker(info[0])
clearTimeout(timeOut)
}
diff --git a/ruoyi-ui/src/views/tireManagement/info/index.vue b/ruoyi-ui/src/views/tireManagement/info/index.vue
index 4cec79e..7586536 100644
--- a/ruoyi-ui/src/views/tireManagement/info/index.vue
+++ b/ruoyi-ui/src/views/tireManagement/info/index.vue
@@ -85,17 +85,6 @@
>{{ t('option.add') }}
-
- {{ t('option.edit') }}
-
-
-
-
-
-
-
+
+
+
+
+
@@ -164,13 +153,13 @@
v-hasPermi="['basetyre:basetyre:edit']"
>{{ t('option.edit') }}
- {{ t('option.remove') }}
-
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/tireManagement/salesData/index.vue b/ruoyi-ui/src/views/tireManagement/salesData/index.vue
new file mode 100644
index 0000000..0286d98
--- /dev/null
+++ b/ruoyi-ui/src/views/tireManagement/salesData/index.vue
@@ -0,0 +1,405 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('option.search') }}
+ {{ t('option.reset') }}
+
+
+
+
+
+
+ {{ t('option.add') }}
+
+
+
+ {{ t('option.remove') }}
+
+
+
+ {{ t('option.export') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('option.edit') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+