Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2024-02-23 376f9a04e2c2814d210e2c5177f0e27d115e1b5d

 CanadaMes-ui/src/views/home/index.vue

@@ -1045,6 +1045,15 @@
                        }

                    }



                    //根据进片状态出发进片任务

                    if (obj.FeedState != null) {

                        if (obj.FeedState[0] == true) {

                            this.InsertQueueGlass(1);

                        }

                    }







                    // if (obj.alarmmg[0].length > 0) {

                    //     if (this.alarm.length > 0) {

                    //         if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {

@@ -1104,6 +1113,7 @@


                    //是否需要手动确认上片

                    this.isConfirm = obj.isConfirm[0];



                    //扫码位玻璃信息

                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {

                        this.form3 = obj.form3[0];