From 9d3f160ad34f18bff7e0e40e551e07f30a68d2a9 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 22 八月 2023 14:08:44 +0800
Subject: [PATCH] Merge branch 'standard1' of http://47.97.1.152:5880/r/wms_app into standard1
---
pages/home/home.vue | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 13 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8640219..2ad9a04 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -21,8 +21,10 @@
return {
baseUrl: '',
token: '',
+ icon: '',
elements: [],
- elements2: [{
+ elements2: [
+ {
title: '缁勬墭鍏ュ簱',
name: 'pakin',
color: 'cyan',
@@ -30,11 +32,53 @@
url: '/pakin/pakin'
},
{
- title: '璁㈠崟鍏ュ簱',
- name: 'orderPakin',
+ title: '鍐嶆鎷ｆ枡',
+ name: 'changePallet',
+ color: 'green',
+ cuIcon: 'order',
+ url: '/pakin/pickAgain'
+ },
+ {
+ 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: '鎵撳嵃',
@@ -46,21 +90,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'
},
@@ -136,11 +180,12 @@
if (res.data.length < 0) {
break;
}
+ that.getIcon(res.data[i].title)
that.elements.unshift({
title: res.data[i].name,
name: res.data[i].title,
color: that.colorList[i],
- cuIcon: 'safe',
+ cuIcon: that.icon,
url: res.data[i].action
})
}
@@ -148,7 +193,8 @@
title: '閫�鍑虹櫥褰�',
name: 'logOut',
color: 'grey',
- cuIcon: 'exit'
+ cuIcon: 'exit',
+ url: '/login/logOut'
})
} else if (res.code === 403) {
uni.showToast({
@@ -162,11 +208,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,
@@ -180,6 +227,12 @@
}
})
},
+ getIcon(e) {
+ const ways = ['pakin','orderPakin','orderPutOn']
+ if (ways.includes(e)) {
+ this.icon = 'pullup'
+ }
+ }
}
}
</script>
--
Gitblit v1.9.1