Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/QXPDA

快乐的昕的电脑

2 天以前 e1e6a650f5ece9af7ff0810161edb38d31d540a6

 H5/Js/Cpbdsj.js

@@ -32,7 +32,10 @@
            actions: [],//列表的值
            xtName: "",//线体名称
            xtNum: "",//线体编号
            AgvDw: "",//AGV点位
            agvChecked: false,//是否勾选AGV
            showAgvDw: false,//点位展示
            actionsAgvDw: [],//列表AGV点位
        }
    },
    mounted() {
@@ -43,6 +46,17 @@
        };
    },
    methods: {
        handleAgvPositions(positionStr) {
            if (!positionStr) return [];

            // 检查是否存在逗号，如果不存在则返回空数组
            if (!positionStr.includes(',')) return [];

            // 将字符串按逗号分割并转换为选项数组
            return positionStr.split(',').map(pos => ({
                name: pos.trim() // 去除可能的空格
            }));
        },
        getKbBarInfo() {
            var that = this;
            that.isLoading = true;
@@ -52,13 +66,31 @@
            }, false)
                .then(function (res) {
                    var json = res;

                    if (json.status == 0) {
                        console.log(json.data.tbBillList.kbBarInfo[0].agvPostion);
                        that.KbBarInfo = json.data.tbBillList.kbBarInfo[0];
                        that.DAA001 = that.KbBarInfo.daA001;
                        that.KbBarMxInfo = json.data.tbBillList.kbBarMxInfo;
                        that.$refs.XBar.focus();
                        that.XbarInfo = [];
                        that.XBar = "";

                        // 检查是否存在逗号
                        //const agvPosition = json.data.tbBillList.kbBarInfo[0].agvPostion;
                        //that.AgvDw = agvPosition.includes(',') ? agvPosition.split(',')[0] : '';
                        const agvPostion = json.data && json.data.tbBillList && json.data.tbBillList.kbBarInfo &&
                            json.data.tbBillList.kbBarInfo[0] && json.data.tbBillList.kbBarInfo[0].agvPostion;

                        if (agvPostion != null) {
                            const agvPostionStr = String(agvPostion);
                            that.AgvDw = agvPostionStr.split(',')[0];
                            that.actionsAgvDw = that.handleAgvPositions(agvPostionStr);
                        } else {
                            that.AgvDw = null;
                            that.actionsAgvDw = null;
                        }

                    }
                    else {
                        that.$playSound('error');
@@ -144,12 +176,14 @@
                    }
                    else {
                        that.$playSound('error');
                        that.XBar = "";
                        that.$toast.fail(json.message);
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.XBar = "";
                    that.$playSound('error');
                    that.$toast.fail("网络错误，请重试！");
                });
@@ -369,6 +403,16 @@
            this.xtName = action.name;  // 绑定name到xtName字段
            this.show = false;
        },

        onSelectAgvDw(action) {
            this.AgvDw = action.name;
            this.showAgvDw = false;
        },

        selectDW() {
            this.showAgvDw = true;
        },

        //获取可呼叫AGV的线体
        selectXt() {
            this.show = true;
@@ -433,6 +477,12 @@
                that.$toast.fail("请先扫描卡板条码");
                return;
            }

            if (!that.AgvDw) {
                that.$playSound('error');
                that.$toast.fail("请先选择AGV点位");
                return;
            }
    
            // 计算可装数和已装数
            const oldqty = +(that.KbBarInfo.quantity || 0);
@@ -447,7 +497,8 @@
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/handleAGVInspection', {
                KbBar: that.KbBar,
                userAccount: that.userInfo.loginAccount
                userAccount: that.userInfo.loginAccount,
                AgvDw: that.AgvDw
            }, false)
                .then(function (res) {
                    var json = res;