wuyouming666
2023-12-05 c3204d686fbf8a64dd7fa4dcbb48c0a075df06e0
CanadaMes-ui/src/views/home/index.vue
@@ -795,7 +795,7 @@
                console.log("您的浏览器不支持WebSocket");
            } else {
                //console.log("您的浏览器支持WebSocket");
                let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
                let socketUrl = "ws://" + this.$t('ip')+":8888" + "/springboot-vue3/api/talk/" + viewname;
                if (socket != null) {
                    socket.close();
                    socket = null;
@@ -853,7 +853,6 @@
                    }
                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
                        this.form3 = obj.form3[0];
                    } else {
                        this.form3 = {};
                    }
@@ -1561,19 +1560,22 @@
        //判断玻璃是否超出范围
        Sizerange(Glass) {
            if ((Glass.glassheight < 380 || Glass.glasswidth < 390 || Glass.glassheight > 1810 || Glass.glasswidth > 2760) || (Glass.glassheight < 390 || Glass.glasswidth < 380 || Glass.glassheight > 2760 || Glass.glasswidth > 1810)) {
                if (this.disabled == false) {
                // if (this.disabled == false) {
                    this.disabled = true;
                    this.$message.error(this.$t('The glass size is not within the range'));
                    // this.$message.error(this.$t('The glass size is not within the range'));
                    this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {
                        confirmButtonText: this.$t('Yes'),
                        type:'info',
                        callback: action => {
                            this.$message({
                                type: 'info',
                                message: `action: ${action}`
                            });
                                action: action
                            }).then(
                                this.DeleteBarcodeGlass()
                            );
                        }
                    });
                }
                // }
                // this.$message(this.$t('The glass size is not within the range'), this.$t('confirm'), {
                //     // confirmwidth: 7000,
                //     // height: 8000,
@@ -1592,6 +1594,9 @@
        } else {
            this.disabled1 = false;
        }
    },
    DeleteBarcodeGlass(){
        this.form5={};
    }
}
}