From a7ee747fceb29f9dca920dea0c2a0865d5c8e0ed Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 三月 2024 15:56:39 +0800
Subject: [PATCH] #
---
pages/project/jmAGV/floorOne.vue | 48 ++++++++++++++++++++++++++++++++++++++++++++----
pages/project/jmAGV/home.vue | 10 ++++++----
2 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/pages/project/jmAGV/floorOne.vue b/pages/project/jmAGV/floorOne.vue
index fee0577..10817db 100644
--- a/pages/project/jmAGV/floorOne.vue
+++ b/pages/project/jmAGV/floorOne.vue
@@ -22,6 +22,16 @@
</view>
</uni-popup>
</view>
+
+ <view>
+ <uni-popup ref="numberPopup" type="dialog">
+ <view class="popup2">
+ <view class="popup3-input-title">{{tipsTitle}}</view>
+ <view class="button-nk" @click="goUp(2)">2涓�</view>
+ <view class="button-nk" @click="goUp(4)">4涓�</view>
+ </view>
+ </uni-popup>
+ </view>
</view>
</template>
@@ -44,7 +54,9 @@
outType: '',
text: '',
btnTitle: '',
- type: ''
+ type: '',
+ tipsTitle: '',
+ item: {}
}
},
@@ -57,7 +69,7 @@
},
methods: {
jump() {
- uni.navigateTo({
+ uni.redirectTo({
url: '/pages/project/jmAGV/home'
})
},
@@ -66,20 +78,32 @@
this.btns = this.onBtns
this.text = '涓婃灦'
this.type = 'load'
+ this.tipsTitle = '涓婃灦鏁伴噺'
} else {
this.btns = this.outBtns
this.type = 'unload'
this.text = '涓嬫灦'
+ this.tipsTitle = '涓嬫灦鏁伴噺'
}
this.$refs.revise.open(type)
},
option(item) {
+ this.item = item
+ this.$refs.numberPopup.open('center')
+ },
+ goUp(num) {
let _this = this
let data = {
- originLocal: item.code,
- targetLocal: item.traget,
+ originLocal: this.item.code,
+ targetLocal: this.item.traget,
type: this.type,
+ anfme: num
}
+ this.webServer(data)
+ },
+ // 鎵�鏈夋湇鍔�
+ webServer(data) {
+ let _this = this
uni.request({
url: `${_this.baseUrl}/agv/requestTask`,
data: data,
@@ -152,6 +176,22 @@
flex-direction: column;
justify-content: space-around;
}
+ .popup2 {
+ background-color: #eee;
+ width: 30vw;
+ height: 100%;
+ padding: 0 10vw;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ border-radius: 10rpx;
+ }
+ .popup3-input-title {
+ text-align: center;
+ margin: 10rpx;
+ font-size: 18px;
+ font-weight: bold;
+ }
.select {
position: absolute;
bottom: 12px;
diff --git a/pages/project/jmAGV/home.vue b/pages/project/jmAGV/home.vue
index 02e5634..5f09844 100644
--- a/pages/project/jmAGV/home.vue
+++ b/pages/project/jmAGV/home.vue
@@ -40,7 +40,7 @@
<uni-popup ref="inputPopup" type="dialog">
<view class="popup3">
<view class="popup3-input-title">{{tipsTitle}}</view>
- <view class="popup3-input-box2" :class="item.chose"
+ <view class="popup3-input-box2" :class="item.chose"
v-if="!meterShow" v-for="item in emptyMatList" @click="chose(item.matnr)">
<view>
{{item.maktx}}
@@ -122,7 +122,7 @@
},
methods: {
jump() {
- uni.navigateTo({
+ uni.redirectTo({
url: '/pages/project/jmAGV/floorOne'
})
},
@@ -148,6 +148,7 @@
} else {
k.chose = ''
}
+ this.$forceUpdate() // 寮哄埗鍒锋柊
}
this.code = matnr
},
@@ -208,6 +209,7 @@
success(res) {
res = res.data
if (res.code === 200) {
+ res.data['chose'] = ''
that.emptyMatList = res.data
}
@@ -400,8 +402,8 @@
background-color: #FFF;
}
.chosed {
- background-color: #09d174;
- color: #cecece;
+ background-color: #67C23A;
+ color: #e8e8e8;
}
.select {
position: absolute;
--
Gitblit v1.9.1