From e4f7e87cd3d8a1e33d433636a189a905fa776f35 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 14 五月 2025 16:32:15 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop --- pages/home/index.vue | 94 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 71 insertions(+), 23 deletions(-) diff --git a/pages/home/index.vue b/pages/home/index.vue index 475cebb..e2c9dd2 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -4,7 +4,7 @@ <image src="../../static/img/toux.png" class="tx" mode="widthFix"></image> <view class="text-xl margin-top-sm margin-left-lg"> <view class="text-blue text-bold text-xxl"> - 寮犵粡鐞� + {{user.username}} </view> <view class="text-gray">浠撳簱涓荤 | zy32423423</view> </view> @@ -19,37 +19,44 @@ </view> <view class="cu-list grid col-4 no-border"> - <view class="cu-item"> + <!-- <view class="cu-item"> <navigator hover-class='none' url="/pages/rece/standard" navigateTo> <view class="cuIcon-apps text-blue"> </view> <text>鏍囧噯鏀惰揣</text> </navigator> - </view> + </view> --> <view class="cu-item"> <navigator hover-class='none' url="/pages/rece/other" navigateTo> <view class="cuIcon-taoxiaopu text-blue"> </view> - <text>鍏朵粬鏀惰揣</text> + <text>鍗曟嵁鏀惰揣</text> </navigator> </view> - <view class="cu-item"> + <!-- <view class="cu-item"> <navigator hover-class='none' url="/pages/listing/disc" navigateTo> <view class="cuIcon-cardboard text-blue"> </view> <text>缁勭洏</text> </navigator> + </view> --> + <view class="cu-item"> + <navigator hover-class='none' url="/pages/listing/matnrPalletising" navigateTo> + <view class="cuIcon-cardboard text-blue"> + </view> + <text>鍗曟嵁缁勬墭</text> + </navigator> </view> - <!-- <view class="cu-item"> - <navigator hover-class='none' url="/pages/listing/untie" navigateTo> + <view class="cu-item"> + <navigator hover-class='none' url="/pages/listing/unPakin" navigateTo> <view class="cuIcon-cardboardforbid text-blue"> </view> - <text>瑙g粦</text> + <text>缁勬墭瑙g粦</text> </navigator> - </view> --> + </view> <view class="cu-item"> <navigator hover-class='none' url="/pages/inspect/report" navigateTo> @@ -71,7 +78,7 @@ <navigator hover-class='none' url="/pages/inspect/bad" navigateTo> <view class="cuIcon-appreciate text-blue"> </view> - <text>璐х墿鏍囪</text> + <text>涓嶈壇鏍囪</text> </navigator> </view> @@ -83,27 +90,63 @@ <text>浜哄伐涓婃灦</text> </navigator> </view> - + + + </view> + <view class="cu-bar bg-white solid-bottom margin-top"> + <view class="action"> + <text class="cuIcon-title text-orange "></text> AGV + </view> + </view> + + <view class="cu-list grid col-4 no-border"> <view class="cu-item"> - <navigator hover-class='none' url="/pages/listing/upper" navigateTo> + <navigator hover-class='none' url="/pages/AGV/AGVStaBind" navigateTo> <view class="cuIcon-punch text-blue"> </view> - <text>涓婃灦</text> + <text>绔欑偣缁戝畾</text> </navigator> + </view> + <view class="cu-item"> + <navigator hover-class='none' url="/pages/AGV/StartInTask" navigateTo> + <view class="cuIcon-punch text-blue"> + </view> + <text>缁戝畾鍏ュ簱</text> + </navigator> + </view> + <view class="cu-item"> + <navigator hover-class='none' url="/pages/AGV/StaUnBind" navigateTo> + <view class="cuIcon-punch text-blue"> + </view> + <text>绔欑偣瑙g粦</text> + </navigator> + </view> + <view class="cu-item"> + <navigator hover-class='none' url="/pages/AGV/BindAndInTask" navigateTo> + <view class="cuIcon-punch text-blue"> + </view> + <text>缁戝畾&鍏ュ簱</text> + </navigator> + </view> + + </view> + + <view class="cu-bar bg-white solid-bottom margin-top"> + <view class="action"> + <text class="cuIcon-title text-orange "></text> 鍑哄簱 </view> </view> - - - - <!-- <view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg radius"> - <view class="cu-item arrow"> - <navigator class="content" url="/pages/userinfo/userinfo" hover-class="none"> - <text class="cuIcon-profile text-blue"></text> - <text class="text-grey">涓汉淇℃伅</text> + <view class="cu-list grid col-4 no-border"> + <view class="cu-item"> + <navigator hover-class='none' url="/pages/outbound/fastPicking" navigateTo> + <view class="cuIcon-apps text-blue"> + </view> + <text>蹇�熸嫞璐�</text> </navigator> </view> - </view> --> + + </view> <view class="padding flex flex-direction"> <view class="cu-btn bg-red margin-tb-sm lg round" @click="equit">閫�鍑虹櫥褰�</view> @@ -116,9 +159,14 @@ export default { data() { return { - + user:{ + + } } }, + onShow() { + this.user = uni.getStorageSync('userData'); + }, methods: { equit() { uni.showToast({ -- Gitblit v1.9.1