#
whycq
2024-02-28 233fdc1cc07df94e54036fa421addf1e17cdff83
#
3个文件已修改
56 ■■■■ 已修改文件
pages/LoginDemo/LoginDemo.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/api/common/common.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/project/jmAGV/home.vue 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/LoginDemo/LoginDemo.vue
@@ -150,6 +150,7 @@
                this.load.btnText = '登录中';
                uni.setStorageSync('user', this.user);
                let res = await common.onLogin(this.user)
                console.log(res);
                if (res.code === 200) {
                    setTimeout(() => {
                        uni.showToast({
@@ -157,7 +158,7 @@
                        })
                        setTimeout(() => {
                            uni.reLaunch({
                                url: `/pages/home/home`,
                                url: `/pages/project/jmAGV/home`,
                            });
                        }, 300)
                        if (!this.remberPassword) {
pages/api/common/common.js
@@ -12,7 +12,7 @@
    var login = await uni.request({
        url: `${baseUrl}/login.action`,
        data: {
            username: user.username,
            mobile: user.username,
            password: md5.hex_md5(user.password)
        },
    }).then((result) => {
pages/project/jmAGV/home.vue
@@ -19,6 +19,7 @@
                    <view>{{text}}</view>
                    <view class="button-nk" @click="upTray()">{{btnTitle1}}</view>
                    <view class="button-nk" @click="downTray">{{btnTitle2}}</view>
                    <view v-show="outType" class="button-nk" @click="downTray1">{{btnTitle3}}</view>
                </view>
            </uni-popup>
        </view>
@@ -69,6 +70,8 @@
                text: '',
                btnTitle1: '',
                btnTitle2: '',
                btnTitle3: '',
                outType: '',
                stationType: 'load'
            }
        },
@@ -82,11 +85,14 @@
                this.item = item
                this.text = item.name
                if (type == 'left') {
                    this.outType = false
                    this.btnTitle1 = '地面站放置托盘(上架)'
                    this.btnTitle2 = '托盘站取置地面(下架)'
                } else {
                    this.outType = true
                    this.btnTitle1 = '托盘-仓库(入库)'
                    this.btnTitle2 = '仓库-托盘(出库)'
                    this.btnTitle2 = '仓库-空托盘(出库)'
                    this.btnTitle3 = '仓库-满托盘(出库)'
                }
                this.$refs.revise.open(type)
            },
@@ -104,7 +110,7 @@
                }
                // this.text = originLocal + targetLocal
                uni.request({
                    url: `${_this.baseUrl}/agv/inBound`,
                    url: `${_this.baseUrl}/agv/requestTask`,
                    data: {
                        originLocal: originLocal,
                        targetLocal: targetLocal,
@@ -118,7 +124,7 @@
                            this.$refs.revise.close()
                            uni.showToast({ title: '操作成功', icon: "none", position: 'top' })
                        } else {
                            uni.showToast({ title: '异常!!!', icon: "none", position: 'top' })
                            uni.showToast({ title: res.msg, icon: "none", position: 'top' })
                        }
                        
                    }
@@ -132,13 +138,13 @@
                    originLocal = this.item.traget,
                    targetLocal = this.item.code
                } else {
                    type = 'out' // 出库
                    type = 'out1' // 出库
                    originLocal = 'KW-C'
                    targetLocal = this.item.code
                }
                // this.text = originLocal + targetLocal
                uni.request({
                    url: `${_this.baseUrl}/agv/inBound`,
                    url: `${_this.baseUrl}/agv/requestTask`,
                    data: {
                        originLocal: originLocal,
                        targetLocal: targetLocal,
@@ -152,7 +158,40 @@
                            this.$refs.revise.close()
                            uni.showToast({ title: '操作成功', icon: "none", position: 'top' })
                        } else {
                            uni.showToast({ title: '异常!!!', icon: "none", position: 'top' })
                            uni.showToast({ title: res.msg, icon: "none", position: 'top' })
                        }
                    }
                })
            },
            downTray1() {
                let _this = this
                let type = '',originLocal = '',targetLocal = '';
                if (this.item.type == 'foolr') {
                    type = 'unload', // 下架
                    originLocal = this.item.traget,
                    targetLocal = this.item.code
                } else {
                    type = 'out2' // 出库
                    originLocal = 'KW-C'
                    targetLocal = this.item.code
                }
                // this.text = originLocal + targetLocal
                uni.request({
                    url: `${_this.baseUrl}/agv/requestTask`,
                    data: {
                        originLocal: originLocal,
                        targetLocal: targetLocal,
                        type: type
                    },
                    header: { 'token': uni.getStorageSync('token') },
                    method: 'POST',
                    success(res) {
                        res = res.data
                        if (res.code === 200) {
                            this.$refs.revise.close()
                            uni.showToast({ title: '操作成功', icon: "none", position: 'top' })
                        } else {
                            uni.showToast({ title: res.msg, icon: "none", position: 'top' })
                        }
                    }
                })