From ad1e4e950a4e961a41344e5847d47f91dabd0c29 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 08 十二月 2025 15:58:22 +0800
Subject: [PATCH] Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswms-app
---
pages/home/home.vue | 248 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 173 insertions(+), 75 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8640219..480914a 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -21,21 +21,115 @@
return {
baseUrl: '',
token: '',
+ icon: '',
elements: [],
- elements2: [{
- title: '缁勬墭鍏ュ簱',
- name: 'pakin',
+ elements2: [
+ // {
+ // title: '缁勬墭',
+ // name: 'pakin',
+ // color: 'cyan',
+ // cuIcon: 'pullup',
+ // url: '/pakin/pakin'
+ // },
+ // {
+ // title: '璁㈠崟鍏ュ簱',
+ // name: 'orderPakin',
+ // color: 'red',
+ // cuIcon: 'pullup',
+ // url: '/order/orderList'
+ // },
+ // {
+ // title: '鎷ｆ枡绔欏埌绔�',
+ // name: 'leftover',
+ // color: 'orange',
+ // cuIcon: 'pullup',
+ // url: '/pakin/leftovers'
+ // },
+
+ // {
+ // title: '骞冲簱鍏ュ簱',
+ // name: 'POrderPakin',
+ // color: 'purple',
+ // cuIcon: 'pullup',
+ // url: '/pingku/POrderList'
+ // },
+ // {
+ // title: '骞冲簱鍑哄簱',
+ // name: 'POrderPakin',
+ // color: 'cyan',
+ // cuIcon: 'pullup',
+ // url: '/pingku/POrderListOut'
+ // },
+ {
+ title: '缂撳啿鍖虹粍鎵�',
+ name: 'AgvPakin',
color: 'cyan',
- cuIcon: 'pullup',
- url: '/pakin/pakin'
+ cuIcon: 'order',
+ url: '/AGV/CachePakin'
},
{
- title: '璁㈠崟鍏ュ簱',
- name: 'orderPakin',
- color: 'blue',
+ title: '缂撳啿鍖哄叆搴�',
+ name: 'AgvIn',
+ color: 'green',
cuIcon: 'pullup',
- url: '/order/orderPakin'
+ url: '/AGV/CacheInCall'
},
+ {
+ title: '缂撳啿鍖哄嚭搴�',
+ name: 'AgvOut',
+ color: 'red',
+ cuIcon: 'pulldown',
+ url: '/AGV/AGVOutCall'
+ },
+ {
+ title: '缂撳啿鍖哄嚭搴�',
+ name: 'PakinIn',
+ color: 'red',
+ cuIcon: 'pulldown',
+ url: '/pakin/PakinBind'
+ },
+ {
+ title: '鐩樼偣',
+ name: 'Check',
+ color: 'green',
+ cuIcon: 'order',
+ url: '/check/check'
+ },
+ // {
+ // title: 'Agv鍌ㄤ綅瑙ｇ粦',
+ // name: 'AGVUnbind',
+ // color: 'orange',
+ // cuIcon: 'order',
+ // url: '/AGV/AGVUnbind'
+ // },
+ // {
+ // title: '绔欑粦瀹�',
+ // name: 'AGVStaBind',
+ // color: 'red',
+ // cuIcon: 'post',
+ // url: '/AGV/AGVStaBind'
+ // },
+ // {
+ // title: '浜х嚎鍙枡',
+ // name: 'AGVSiteList',
+ // color: 'red',
+ // cuIcon: 'post',
+ // url: '/AGV/AGVSiteList'
+ // },
+ // {
+ // title: '鎴愬搧鍛煎彨',
+ // name: 'AGVFinishedCall',
+ // color: 'orange',
+ // cuIcon: 'pullup',
+ // url: '/AGV/AGVFinishedCall'
+ // },
+ // {
+ // title: '缁勬墭涓婃灦',
+ // name: 'putOn',
+ // color: 'orange',
+ // cuIcon: 'pullup',
+ // url: '/pakin/putOn'
+ // },
// {
// title: '鎵撳嵃',
// name: 'print',
@@ -43,67 +137,62 @@
// cuIcon: 'text',
// url: '/print/print'
// },
- {
- title: '璁㈠崟涓婃灦',
- name: 'orderPutOn',
- color: 'mauve',
- cuIcon: 'pullup',
- url: '/order/orderPutOn'
- },
- {
- title: '璁㈠崟涓嬫灦',
- name: 'orderPutDown',
- color: 'pink',
- cuIcon: 'pulldown',
- url: '/order/orderPutDown'
- },
- {
- title: '搴撳瓨鏌ヨ',
- name: 'stockQuery',
- color: 'brown',
- cuIcon: 'check',
- url: '/stock/stockQuery'
- },
- {
- title: '鐩樼偣',
- name: 'stockCheck',
- color: 'red',
- cuIcon: 'post',
- url: '/stock/stockCheck'
- },
- {
- title: '鍟嗗搧鎵撳嵃',
- name: 'matList',
- color: 'orange',
- cuIcon: 'post',
- url: '/mat/matList'
- },
- {
- title: '琛ヨ揣',
- name: 'restock',
- color: 'yellow',
- cuIcon: 'punch',
- url: '/stock/restock'
- },
- {
- title: '杞叏鏉�',
- name: 'piking',
- color: 'olive',
- cuIcon: 'order',
- url: '/pakin/piking'
- },
- {
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
- },
+ // {
+ // title: '璁㈠崟涓婃灦',
+ // name: 'orderPutOn',
+ // color: 'yellow',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPutOn'
+ // },
+ // {
+ // title: '璁㈠崟涓嬫灦',
+ // name: 'orderPutDown',
+ // color: 'olive',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderPutDown'
+ // },
+ // {
+ // title: '搴撳瓨鏌ヨ',
+ // name: 'stockQuery',
+ // color: 'green',
+ // cuIcon: 'check',
+ // url: '/stock/stockQuery'
+ // },
+ // {
+
+ // {
+ // title: '鍟嗗搧鎵撳嵃',
+ // name: 'matList',
+ // color: 'orange',
+ // cuIcon: 'post',
+ // url: '/mat/matList'
+ // },
+ // {
+ // title: '琛ヨ揣',
+ // name: 'restock',
+ // color: 'yellow',
+ // cuIcon: 'punch',
+ // url: '/stock/restock'
+ // },
+ // {
+ // title: '杞叏鏉�',
+ // name: 'piking',
+ // color: 'olive',
+ // cuIcon: 'order',
+ // url: '/pakin/piking'
+ // },
+ // {
+ // title: '鎹㈡澘缁戝畾',
+ // name: 'changePallet',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/stock/changePallet'
+ // },
{
title: '閫�鍑虹櫥褰�',
- name: 'logOut',
+ name: '',
color: 'grey',
- cuIcon: 'exit',
+ cuIcon: '',
url: '/login/logOut'
},
@@ -136,19 +225,21 @@
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
})
}
that.elements.push({
title: '閫�鍑虹櫥褰�',
- name: 'logOut',
+ name: '',
color: 'grey',
- cuIcon: 'exit'
+ cuIcon: '',
+ url: '/login/logOut'
})
} else if (res.code === 403) {
uni.showToast({
@@ -162,11 +253,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 +272,12 @@
}
})
},
+ getIcon(e) {
+ const ways = ['pakin','orderPakin','orderPutOn']
+ if (ways.includes(e)) {
+ this.icon = 'pullup'
+ }
+ }
}
}
</script>
--
Gitblit v1.9.1