From f3db8393b66475bee067664917a2b451f5e9fe5c Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 15 八月 2023 14:42:05 +0800 Subject: [PATCH] Merge branch 'standard1' of http://47.97.1.152:5880/r/wms_app into standard1 --- pages/home/home.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 48 insertions(+), 11 deletions(-) diff --git a/pages/home/home.vue b/pages/home/home.vue index 6075358..b201534 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -23,7 +23,8 @@ token: '', icon: '', elements: [], - elements2: [{ + elements2: [ + { title: '缁勬墭鍏ュ簱', name: 'pakin', color: 'cyan', @@ -31,11 +32,46 @@ url: '/pakin/pakin' }, { - title: '璁㈠崟鍏ュ簱', - name: 'orderPakin', + title: 'AGV缁勬墭', + name: 'AGVPakin', color: 'blue', cuIcon: 'pullup', + url: '/AGV/AGVPakin' + }, + { + title: 'AGV涓婃灦缁戝畾', + name: 'AGVPakinBing', + color: 'mauve', + // cuIcon: 'pullup', + url: '/AGV/AGVPakinBing' + }, + { + title: 'AGV鍚姩鍏ュ簱', + name: 'AGVStart', + color: 'pink', + // cuIcon: 'pullup', + url: '/AGV/AGVStart' + }, + { + title: 'AGV涓婃灦缁勬墭', + name: 'AGVPakinOn', + color: 'brown', + // cuIcon: 'pullup', + url: '/AGV/AGVPakinOn' + }, + { + title: '璁㈠崟缁勬墭', + name: 'orderPakin', + color: 'red', + cuIcon: 'pullup', url: '/order/orderPakin' + }, + { + title: '缁勬墭涓婃灦', + name: 'putOn', + color: 'orange', + cuIcon: 'pullup', + url: '/pakin/putOn' }, // { // title: '鎵撳嵃', @@ -47,21 +83,21 @@ { title: '璁㈠崟涓婃灦', name: 'orderPutOn', - color: 'mauve', + color: 'yellow', cuIcon: 'pullup', url: '/order/orderPutOn' }, { title: '璁㈠崟涓嬫灦', name: 'orderPutDown', - color: 'pink', + color: 'olive', cuIcon: 'pulldown', url: '/order/orderPutDown' }, { title: '搴撳瓨鏌ヨ', name: 'stockQuery', - color: 'brown', + color: 'green', cuIcon: 'check', url: '/stock/stockQuery' }, @@ -165,11 +201,12 @@ }); }, 1000); } else if(res.status === 404) { - uni.showToast({ - title: '404', - icon: "none", - position: 'top' - }) + that.elements = that.elements2 + // uni.showToast({ + // title: '榛樿涓婚〉', + // icon: "none", + // position: 'top' + // }) } else { uni.showToast({ title: res.msg, -- Gitblit v1.9.1