diff --git a/board/CODE/src/App.vue b/board/CODE/src/App.vue index 6f7d1a3..9b0ba6c 100644 --- a/board/CODE/src/App.vue +++ b/board/CODE/src/App.vue @@ -30,7 +30,10 @@ import { ref, onMounted, onUnmounted, computed } from 'vue'; import { useRoute } from 'vue-router'; import Inbound from './views/Inbound.vue'; import Outbound from './views/Outbound.vue'; -import Pick from './views/Pick.vue'; +import PickP1 from './views/PickP1.vue'; +import Stacker from "@/views/Stacker.vue"; +import PickP2 from "@/views/PickP2.vue"; +import PickP3 from "@/views/PickP3.vue"; const debounce = (fn, delay) => { let timer = null; @@ -56,7 +59,10 @@ export default { components: { Inbound, Outbound, - Pick + Stacker, + PickP1, + PickP2, + PickP3 }, setup() { const route = useRoute(); @@ -72,7 +78,10 @@ export default { const titleMapping = { '1': '入库', '2': '出库', - '3': '拣选' + '3': '堆垛机', + '4': 'P1 站台拣选', + '5': 'P2 站台拣选', + '6': 'P3 站台拣选', }; // 动态标题 @@ -93,8 +102,12 @@ export default { // 根据standId动态选择组件 const currentComponent = computed(() => { const standId = currentStandId.value; + if (standId === '1') return 'Inbound'; if (standId === '2') return 'Outbound'; - if (standId === '3') return 'Pick'; + if (standId === '3') return 'Stacker'; + if (standId === '4') return 'PickP1'; + if (standId === '5') return 'PickP2'; + if (standId === '6') return 'PickP3'; return 'Inbound'; // 默认显示入库组件 }); @@ -166,4 +179,28 @@ export default { + + diff --git a/board/CODE/src/assets/board-styles.css b/board/CODE/src/assets/board-styles.css index a589c90..6701b94 100644 --- a/board/CODE/src/assets/board-styles.css +++ b/board/CODE/src/assets/board-styles.css @@ -22,7 +22,7 @@ body { } .board-title { - font-size: 22px; + font-size: 40px; margin: 0 0 12px 4px; color: var(--brand); } diff --git a/board/CODE/src/components/DataTable.vue b/board/CODE/src/components/DataTable.vue index bcd9455..5f703ea 100644 --- a/board/CODE/src/components/DataTable.vue +++ b/board/CODE/src/components/DataTable.vue @@ -2,23 +2,31 @@
- - - + + + - - - - + + + +
{{ col.title }}
{{ col.title }}
暂无数据
{{ formatCell(row, col) }}
暂无数据
+ + {{ formatCell(row, col) }} + + +
diff --git a/board/CODE/src/services/api.js b/board/CODE/src/services/api.js index e2b2b01..529691a 100644 --- a/board/CODE/src/services/api.js +++ b/board/CODE/src/services/api.js @@ -5,6 +5,12 @@ const baseURL = process.env.VUE_APP_API_BASE_URL || (typeof window !== 'undefine export const http = axios.create({ baseURL, timeout: 15000 }); +// 创建专门用于堆垛机数据的axios实例 +const stackerHttp = axios.create({ + baseURL: 'http://172.18.222.253:9980', + timeout: 15000 +}); + export async function queryTasksByPage(params) { const { data } = await http.post('/wms/taskQuery/queryTasksByPage', params); return data?.data; @@ -46,7 +52,22 @@ export async function getOutsData(params = {}) { return data; } -export async function getPickTaskData(params = {}) { - const { data } = await http.get('/wms/board/getPickTaskData', { params }); +export async function getPickTaskDataP1(params = {}) { + const { data } = await http.get('/wms/board/getPickTaskDataP1', { params }); + return data; +} + +export async function getPickTaskDataP2(params = {}) { + const { data } = await http.get('/wms/board/getPickTaskDataP2', { params }); + return data; +} + +export async function getPickTaskDataP3(params = {}) { + const { data } = await http.get('/wms/board/getPickTaskDataP3', { params }); + return data; +} + +export async function getStackerData(params = {}) { + const { data } = await stackerHttp.get('/api/upper/pub/queryStackerInfo', params); return data; } diff --git a/board/CODE/src/views/Inbound.vue b/board/CODE/src/views/Inbound.vue index ed492ea..519c2be 100644 --- a/board/CODE/src/views/Inbound.vue +++ b/board/CODE/src/views/Inbound.vue @@ -76,4 +76,18 @@ onUnmounted(() => { .title-center { text-align: center; } + +/* 增大表格整体字体 */ +:deep(.table-wrapper) { + font-size: 40px; +} + +:deep(thead th) { + font-size: 40px; /* 表头字体稍大 */ +} + +:deep(tbody td) { + font-size: 40px; /* 表格内容字体 */ + padding: 16px 12px; /* 同时增加内边距使布局更舒适 */ +} diff --git a/board/CODE/src/views/Outbound.vue b/board/CODE/src/views/Outbound.vue index 5022071..3996d1f 100644 --- a/board/CODE/src/views/Outbound.vue +++ b/board/CODE/src/views/Outbound.vue @@ -7,7 +7,7 @@ + + diff --git a/board/CODE/src/views/PickP2.vue b/board/CODE/src/views/PickP2.vue new file mode 100644 index 0000000..46d2a2d --- /dev/null +++ b/board/CODE/src/views/PickP2.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/board/CODE/src/views/Pick.vue b/board/CODE/src/views/PickP3.vue similarity index 77% rename from board/CODE/src/views/Pick.vue rename to board/CODE/src/views/PickP3.vue index acf073a..f66a6db 100644 --- a/board/CODE/src/views/Pick.vue +++ b/board/CODE/src/views/PickP3.vue @@ -7,7 +7,7 @@ + +