chen.llin
5 天以前 9d1763a7ba3a95ba1659180f0f03fb2729ae77d6
自动换行
5个文件已修改
99 ■■■■ 已修改文件
pages/AGV/agv_back.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/agv_empty.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/agv_start.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/rfid/uhftest.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/agv_back.vue
@@ -19,7 +19,7 @@
                    <text class="label-text">暂存位</text>
                </view>
                <view class="form-input-wrap">
                    <input class="form-input" type="text" placeholder="扫码 / 输入暂存位" v-model="sourceSite" @focus="onSourceSiteFocus()" />
                    <input class="form-input" type="text" placeholder="扫码 / 输入暂存位" v-model="sourceSite" :focus="sourceSiteFocus" @focus="onSourceSiteFocus()" />
                    <uni-icons v-if="sourceSite" type="clear" size="18" color="#c0c4cc" @click="sourceSite=''"></uni-icons>
                </view>
            </view>
@@ -216,7 +216,8 @@
                    { label: '102', value: '102' }
                ],
                selectedTargetSite: { label: '101', value: '101' },
                type : 2
                type : 2,
                _previousBarcode: '' // 用于记录上一次的barcode值,判断是否是第一次输入
            }
        },
        onLoad() {
@@ -258,6 +259,7 @@
            },
            clearBarcode() {
                this.barcode = '';
                this._previousBarcode = ''; // 重置记录,下次输入时仍能识别为第一次输入
                this.barcodeFocus = false;
                setTimeout(() => {
                    this.barcodeFocus = true;
@@ -280,6 +282,10 @@
            },
            // barcode input 事件
            barcodeInput() {
                // 检测是否是第一次输入(之前barcode为空,现在有值)
                const isFirstInput = !this._previousBarcode && this.barcode && this.barcode.length > 0;
                this._previousBarcode = this.barcode;
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {
                    var len = this.barcode.length
@@ -292,7 +298,16 @@
                        this.barcodeFocuss()
                        return;
                    }
                    this.focuss()
                    // 第一次输入时,自动跳转到第二个输入框(暂存位)
                    if (isFirstInput) {
                        this.barcodeFocus = false;
                        setTimeout(() => {
                            this.sourceSiteFocus = true;
                        }, 100);
                    } else {
                        this.focuss()
                    }
                }, 200)
            },
            // 托盘码有误重置
@@ -537,6 +552,7 @@
            resetConfirm() {
                this.dataList = []
                this.barcode = ''
                this._previousBarcode = '' // 重置记录
                this.messageText = "重置完成"
                this.messageToggle('success')
            },
@@ -549,6 +565,7 @@
                // this.dataList = []
                this.barcode = ''
                this.sourceSite = ''
                this._previousBarcode = '' // 重置记录
                this.barcodeFocuss()
            },
        }
pages/AGV/agv_empty.vue
@@ -19,7 +19,7 @@
                    <text class="label-text">暂存位</text>
                </view>
                <view class="form-input-wrap">
                    <input class="form-input" type="text" placeholder="扫码 / 输入暂存位" v-model="sourceSite" @focus="onSourceSiteFocus()" />
                    <input class="form-input" type="text" placeholder="扫码 / 输入暂存位" v-model="sourceSite" :focus="sourceSiteFocus" @focus="onSourceSiteFocus()" />
                    <uni-icons v-if="sourceSite" type="clear" size="18" color="#c0c4cc" @click="sourceSite=''"></uni-icons>
                </view>
            </view>
@@ -201,7 +201,8 @@
                    { label: '102', value: '102' }
                ],
                selectedTargetSite: { label: '101', value: '101' },
                type : 3
                type : 3,
                _previousBarcode: '' // 用于记录上一次的barcode值,判断是否是第一次输入
            }
        },
        onLoad() {
@@ -286,6 +287,7 @@
            },
            clearBarcode() {
                this.barcode = '';
                this._previousBarcode = ''; // 重置记录,下次输入时仍能识别为第一次输入
                this.barcodeFocus = false;
                setTimeout(() => {
                    this.barcodeFocus = true;
@@ -322,6 +324,10 @@
                // }, 500);
                // #endif
                
                // 检测是否是第一次输入(之前barcode为空,现在有值)
                const isFirstInput = !this._previousBarcode && this.barcode && this.barcode.length > 0;
                this._previousBarcode = this.barcode;
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {
                    var len = this.barcode.length
@@ -334,7 +340,16 @@
                        this.barcodeFocuss()
                        return;
                    }
                    this.focuss()
                    // 第一次输入时,自动跳转到第二个输入框(暂存位)
                    if (isFirstInput) {
                        this.barcodeFocus = false;
                        setTimeout(() => {
                            this.sourceSiteFocus = true;
                        }, 100);
                    } else {
                        this.focuss()
                    }
                }, 200)
            },
            // 托盘码有误重置
@@ -573,6 +588,7 @@
            resetConfirm() {
                this.dataList = []
                this.barcode = ''
                this._previousBarcode = '' // 重置记录
                this.messageText = "重置完成"
                this.messageToggle('success')
            },
@@ -585,6 +601,7 @@
                // this.dataList = []
                this.barcode = ''
                this.sourceSite = ''
                this._previousBarcode = '' // 重置记录
                this.barcodeFocuss()
            },
        }
pages/AGV/agv_start.vue
@@ -19,7 +19,7 @@
                    <text class="label-text">暂存位</text>
                </view>
                <view class="form-input-wrap">
                    <input class="form-input" type="text" placeholder="扫码 / 输入暂存位" v-model="sourceSite" @focus="onSourceSiteFocus()" />
                    <input class="form-input" type="text" placeholder="扫码 / 输入暂存位" v-model="sourceSite" :focus="sourceSiteFocus" @focus="onSourceSiteFocus()" />
                    <uni-icons v-if="sourceSite" type="clear" size="18" color="#c0c4cc" @click="sourceSite=''"></uni-icons>
                </view>
            </view>
@@ -216,7 +216,8 @@
                    { label: '102', value: '102' }
                ],
                selectedTargetSite: { label: '101', value: '101' },
                type : 1
                type : 1,
                _previousBarcode: '' // 用于记录上一次的barcode值,判断是否是第一次输入
            }
        },
        onLoad() {
@@ -273,6 +274,7 @@
            },
            clearBarcode() {
                this.barcode = '';
                this._previousBarcode = ''; // 重置记录,下次输入时仍能识别为第一次输入
                this.barcodeFocus = false;
                setTimeout(() => {
                    this.barcodeFocus = true;
@@ -301,6 +303,10 @@
                //     rfidScanner.stopScan();
                // }, 500);
                
                // 检测是否是第一次输入(之前barcode为空,现在有值)
                const isFirstInput = !this._previousBarcode && this.barcode && this.barcode.length > 0;
                this._previousBarcode = this.barcode;
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {
                    var len = this.barcode.length
@@ -313,7 +319,16 @@
                        this.barcodeFocuss()
                        return;
                    }
                    this.focuss()
                    // 第一次输入时,自动跳转到第二个输入框(暂存位)
                    if (isFirstInput) {
                        this.barcodeFocus = false;
                        setTimeout(() => {
                            this.sourceSiteFocus = true;
                        }, 100);
                    } else {
                        this.focuss()
                    }
                }, 200)
            },
            // 托盘码有误重置
@@ -552,6 +567,7 @@
            resetConfirm() {
                this.dataList = []
                this.barcode = ''
                this._previousBarcode = '' // 重置记录
                this.messageText = "重置完成"
                this.messageToggle('success')
            },
@@ -564,6 +580,7 @@
                // this.dataList = []
                this.barcode = ''
                this.sourceSite = ''
                this._previousBarcode = '' // 重置记录
                this.barcodeFocuss()
            },
        }
pages/home/home.vue
@@ -164,20 +164,20 @@
                        cuIcon: '',
                        url: '/stock/stockQuery'
                    },
                    {
                        title: 'RFID设置',
                        name: 'rfidSettings',
                        color: 'mauve',
                        cuIcon: 'scan',
                        url: '/rfid/settings'
                    },
                    {
                        title: 'UHF测试',
                        name: 'uhftest',
                        color: 'red',
                        cuIcon: 'scan',
                        url: '/rfid/uhftest'
                    },
                    // {
                    //     title: 'RFID设置',
                    //     name: 'rfidSettings',
                    //     color: 'mauve',
                    //     cuIcon: 'scan',
                    //     url: '/rfid/settings'
                    // },
                    // {
                    //     title: 'UHF测试',
                    //     name: 'uhftest',
                    //     color: 'red',
                    //     cuIcon: 'scan',
                    //     url: '/rfid/uhftest'
                    // },
                    {
                        title: '退出登录',
                        name: 'logOut',
pages/rfid/uhftest.vue
@@ -230,7 +230,7 @@
                 * pwd:访问密码,默认密码为:00000000
                 * 注意:Word类型,一个长度表示标签存储4位字符
                 */
                uhfModel.readTagWithoutFilter(1, 2, 8, "00000000", (ret) => {
          uhfModel.readTagWithoutFilter(1, 2, 8, "00000000", (ret) => {
                    //
                    modal.toast({
                        message: ret,