From a2019ade7b884799e639150021c3cdeef27eea72 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 09 十一月 2024 11:40:52 +0800
Subject: [PATCH] 增加工号ui修改
---
pages/project/jmAGV/floorOne.vue | 10 +++--
pages/project/jmAGV/home.vue | 60 ++++++++++++++++--------------
2 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/pages/project/jmAGV/floorOne.vue b/pages/project/jmAGV/floorOne.vue
index fed67b8..af5b6cb 100644
--- a/pages/project/jmAGV/floorOne.vue
+++ b/pages/project/jmAGV/floorOne.vue
@@ -41,13 +41,15 @@
<view>
<uni-popup ref="upPalletPopup" type="dialog">
- <view class="popup2">
+ <scroll-view scroll-y="true" style="height: 100%;background: #eee;border-radius: 10rpx;padding: 0 1vw;">
<view class="popup3-input-title">鐩樺ご涓婃灦</view>
<view class="popup3-input-box">
- <uni-data-select v-model="chooseCacheSite" :localdata="chooseCacheSiteList" placeholder="璇烽�夋嫨绔欑偣"></uni-data-select>
+ <uni-data-select v-model="chooseCacheSite" :localdata="chooseCacheSiteList"
+ placeholder="璇烽�夋嫨绔欑偣"></uni-data-select>
</view>
<view class="popup3-input-box">
- <uni-data-select v-model="chooseMat" :localdata="emptyMatList" placeholder="璇烽�夋嫨鐗╂枡"></uni-data-select>
+ <uni-data-select v-model="chooseMat" :localdata="emptyMatList"
+ placeholder="璇烽�夋嫨鐗╂枡"></uni-data-select>
</view>
<view class="popup3-input-box">
<text>璁㈠崟鍙�:</text>
@@ -69,7 +71,7 @@
</view>
<view class="button-nk" @click="goUp(2)">2涓�</view>
<view class="button-nk" @click="goUp(4)">4涓�</view>
- </view>
+ </scroll-view>
</uni-popup>
</view>
diff --git a/pages/project/jmAGV/home.vue b/pages/project/jmAGV/home.vue
index 0a8cbfb..77e5bfb 100644
--- a/pages/project/jmAGV/home.vue
+++ b/pages/project/jmAGV/home.vue
@@ -41,13 +41,15 @@
<view>
<uni-popup ref="upPalletPopup" type="dialog">
- <view class="popup2">
+ <scroll-view scroll-y="true" style="height: 100%;background: #eee;border-radius: 10rpx;padding: 0 1vw;">
<view class="popup3-input-title">鐩樺ご涓婃灦</view>
<view class="popup3-input-box">
- <uni-data-select v-model="chooseCacheSite" :localdata="chooseCacheSiteList" placeholder="璇烽�夋嫨绔欑偣"></uni-data-select>
+ <uni-data-select v-model="chooseCacheSite" :localdata="chooseCacheSiteList"
+ placeholder="璇烽�夋嫨绔欑偣"></uni-data-select>
</view>
<view class="popup3-input-box">
- <uni-data-select v-model="chooseMat" :localdata="emptyMatList" placeholder="璇烽�夋嫨鐗╂枡"></uni-data-select>
+ <uni-data-select v-model="chooseMat" :localdata="emptyMatList"
+ placeholder="璇烽�夋嫨鐗╂枡"></uni-data-select>
</view>
<view class="popup3-input-box">
<text>璁㈠崟鍙�:</text>
@@ -69,11 +71,11 @@
</view>
<view class="button-nk" @click="goUp(2)">2涓�</view>
<view class="button-nk" @click="goUp(4)">4涓�</view>
- </view>
+ </scroll-view>
</uni-popup>
</view>
-
-
+
+
</view>
</template>
@@ -229,15 +231,15 @@
let network = uni.getStorageSync('Network')
this.baseUrl = `http://${network[0].ip}:${network[0].port}/${network[0].address}`
this.token = uni.getStorageSync('token');
-
+
this.getEmptyMatList()
-
- uni.onNetworkStatusChange(function (res) {
- if(!res.isConnected) {
+
+ uni.onNetworkStatusChange(function(res) {
+ if (!res.isConnected) {
uni.showLoading({
title: '缃戠粶鏂紑...'
});
- }else {
+ } else {
uni.hideLoading();
}
});
@@ -262,7 +264,9 @@
let that = this
uni.request({
url: `${that.baseUrl}/agv/getEmptyMat`,
- header: { 'token': uni.getStorageSync('token') },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
method: 'GET',
success(res) {
res = res.data
@@ -313,8 +317,8 @@
},
goUp(num) {
let data = {}
-
- if(this.chooseCacheSite == ''){
+
+ if (this.chooseCacheSite == '') {
uni.showToast({
title: '璇烽�夋嫨绔欑偣',
icon: "none",
@@ -322,8 +326,8 @@
})
return;
}
-
- if(this.chooseMat == ''){
+
+ if (this.chooseMat == '') {
uni.showToast({
title: '璇烽�夋嫨鐗╂枡',
icon: "none",
@@ -331,8 +335,8 @@
})
return;
}
-
- if(this.code == ''){
+
+ if (this.code == '') {
uni.showToast({
title: '璇疯緭鍏ヨ鍗曞彿',
icon: "none",
@@ -340,8 +344,8 @@
})
return;
}
-
- if(this.meter == ''){
+
+ if (this.meter == '') {
uni.showToast({
title: '璇疯緭鍏ョ背鏁�',
icon: "none",
@@ -349,7 +353,7 @@
})
return;
}
-
+
data = {
originLocal: this.item.code,
targetLocal: this.chooseCacheSite,
@@ -361,18 +365,18 @@
workNumber: this.workNumber,
}
this.webServer(data)
- setTimeout(()=>{
+ setTimeout(() => {
this.$refs.upPalletPopup.close()
this.chooseMat = ''
this.code = ''
this.meter = ''
this.chooseCacheSite = ''
- },300)
+ }, 300)
},
goDown(num) {
let data = {}
-
- if(this.groundSite == ''){
+
+ if (this.groundSite == '') {
uni.showToast({
title: '璇烽�夋嫨绔欑偣',
icon: "none",
@@ -380,7 +384,7 @@
})
return;
}
-
+
data = {
originLocal: this.item.code,
targetLocal: this.groundSite,
@@ -388,9 +392,9 @@
anfme: num,
}
this.webServer(data)
- setTimeout(()=>{
+ setTimeout(() => {
this.$refs.downPalletPopup.close()
- },300)
+ }, 300)
},
// 鎵�鏈夋湇鍔�
webServer(data) {
--
Gitblit v1.9.1