加拿大MES项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wuyouming666
2024-02-23 376f9a04e2c2814d210e2c5177f0e27d115e1b5d 
 CanadaMes-ui/src/views/home/index.vue


@@ -375,78 +375,78 @@


                <div class="device" :style="'top: 262px;left: 150px;background-color: ' + ShowDeviceList(8) + ';'">D05</div>



                <div class="device" :style="'top: 339px;left: 150px;background-color: ' + ShowDeviceList(9) + ';'">D06</div>







                <div class="glass D01" style="top: 39px;left: 1055px;position: absolute;"



                    >{{ ShowGlassIdList(0) }}



                    <br/>



                <div class="device" :style="'top: 395px;left: 90px;background-color: ;'">E01</div>



                <div class="device" :style="'top: 395px;left: 243px;background-color: ;'">E02</div>



                <div class="device" :style="'top: 395px;left: 395px;background-color: ;'">E03</div>



                <div class="device" :style="'top: 345px;left: 655px;background-color: ;'">E04</div>



                <div class="device" :style="'top: 345px;left: 810px;background-color: ;'">E05</div>



                <div class="device" :style="'top: 345px;left: 960px;background-color: ;'">E06</div>







                <div class="device" :style="'top: 345px;left: 525px;background-color: ;'">J01</div>



                <div class="device" :style="'top: 345px;left: 1100px;background-color: ;'">F01</div>



                <div class="device" :style="'top: 275px;left: 1100px;background-color: ;'">G01</div>







                <div class="glass D01" style="top: 39px;left: 1055px;position: absolute;">{{ ShowGlassIdList(0) }}



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 0)">



                        {{ $t('Clear') }}</el-button>



                </div>



                <div class="glass D02" style="top: 117px;left: 1055px;position: absolute;"



                    >{{ ShowGlassIdList(1) }}



                    <br/>



                <div class="glass D02" style="top: 117px;left: 1055px;position: absolute;">{{ ShowGlassIdList(1) }}



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 1)">



                        {{ $t('Clear') }}</el-button>



                </div>



                <div class="glass B01" style="top: 270px;left: 640px;position: absolute;"



                    >



                <div class="glass B01" style="top: 270px;left: 640px;position: absolute;">



                    B01:{{ ShowGlassIdList(2) }}



                    <br/>



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.2', 2)">



                        {{ $t('Clear') }}</el-button>



                </div>



                <div class="glass B02" style="top: 290px;left: 640px;position: absolute;"



                    >B02:{{ ShowGlassIdList(3) }}



                    <br/>



                <div class="glass B02" style="top: 315px;left: 640px;position: absolute;">B02:{{ ShowGlassIdList(3) }}



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.3', 3)">



                        {{ $t('Clear') }}</el-button>



                </div>



                <div class="glass A01" style="top: 270px;left: 289px;position: absolute;"



                    >



                <div class="glass A01" style="top: 270px;left: 289px;position: absolute;">



                    A01.1:{{ ShowGlassIdList(4) }}



                    <br/>



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 4)">



                        {{ $t('Clear') }}</el-button>



                </div>







                <div class="glass A01" style="top: 315px;left: 289px;position: absolute;"



                    >A01.2:{{ ShowGlassIdList(5) }}X21942611703GV



                    <br/>



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.1,5', 5)">



                <div class="glass A01" style="top: 315px;left: 289px;position: absolute;">A01.2:{{ ShowGlassIdList(5) }}



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 5)">



                        {{ $t('Clear') }}</el-button>



                </div>







                <div class="glass A02" style="top: 360px;left: 289px;position: absolute;"



                    >A02:{{ ShowGlassIdList(6) }}



                    <br/>



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.2,6', 6)">



                <div class="glass A02" style="top: 360px;left: 289px;position: absolute;">A02:{{ ShowGlassIdList(6) }}



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.1', 6)">



                        {{ $t('Clear') }}</el-button>



                </div>







                <div class="glass D03" style="top: 122px;left: 42px;position: absolute;"



                    >



                <div class="glass D03" style="top: 122px;left: 42px;position: absolute;">



                    {{ ShowGlassIdList(7) }}



                    <br/>



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.4', 7)">



                        {{ $t('Clear') }}</el-button>



                </div>



                <div class="glass D04" style="top: 198px;left: 42px;position: absolute;"



                    >



                <div class="glass D04" style="top: 198px;left: 42px;position: absolute;">



                    {{ ShowGlassIdList(8) }}



                    <br/>



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 8)">



                        {{ $t('Clear') }}</el-button>



                </div>



                <div class="glass D05" style="top: 275px;left: 42px;position: absolute;"



                    >



                <div class="glass D05" style="top: 275px;left: 42px;position: absolute;">



                    {{ ShowGlassIdList(9) }}



                    <br/>



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.6', 9)">



                        {{ $t('Clear') }}</el-button>



                </div>



                <div class="glass D06" style="top: 352px;left: 42px;position: absolute;"



                    >



                <div class="glass D06" style="top: 352px;left: 42px;position: absolute;">



                    {{ ShowGlassIdList(10) }}



                    <br/>



                    <br />



                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 10)">



                        {{ $t('Clear') }}</el-button>



                </div>



@@ -610,19 +610,13 @@


        <el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">



            <el-form :model="form" label-width="100px" style="padding-right: 30px">



                <div style="display: flex;justify-content: center;">



                    <!-- <el-form-item>



                        <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"



                            v-model="glassid2"></el-input>



                        <el-button type="primary" @click="SelectGlassByGlassIDs(1)">{{ $t('Query')



                        }}</el-button>



                    </el-form-item> -->



                    <el-form-item>



                        {{ $t('Confirm State') }}:{{ this.isConfirm == true ? $t('Not Allow') : $t('Allow') }}



                        {{ $t('Confirm State') }}:{{ this.isConfirm == true ? $t('Allow') : $t('Not Allow') }}



                        <el-button type="primary" @click="isConfirmState()">



                            {{ this.isConfirm == true ? $t('Allow') : $t('Not Allow') }}</el-button>



                            {{ this.isConfirm == true ? $t('Not Allow') : $t('Allow') }}</el-button>



                    </el-form-item>



                    <el-form-item>



                        {{ $t('Current State') }}:{{ this.Scanningmethod == true ? $t('Automatic') : $t('Hand Movement') }}



                        {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') : $t('Hand Movement') }}



                        <el-button type="primary" @click="SwitchScanMethod()">{{ $t('Switch')



                        }}</el-button>



                    </el-form-item>



@@ -734,22 +728,11 @@


                    </el-form-item>



                </div>



                <div style="display: flex;justify-content: right;">



                    <!-- <el-button @click="DeleteQueueGlasss(2)" type="primary">{{ $t('Clear Current')



                    }}</el-button>



                    <el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled">



                        {{ $t('Confirm') }}</el-button>



                    <el-button @click="DeleteQueueGlasss(1)" type="primary">{{ $t('Clear Current')



                    }}</el-button> -->



                    <el-button @click="InsertQueueGlass(1)" style="margin-right: 100px;" type="primary"



                        :disabled="disabled1">



                        {{ $t('Confirm') }}</el-button>



                </div>



            </el-form>



            <!-- <template #footer>



                <span class="dialog-footer">



                    <el-button @click="cancel3()">{{ $t('cancel') }}</el-button>



                </span>



            </template> -->



        </el-dialog>







        <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outing Queue')" top="5vh">



@@ -772,9 +755,6 @@


            <label style="background-color:yellow;font-size: 23px;" for="">



                {{ isQueueWarning == true ? $t('The cage is disabled') : "" }}



            </label>



            <!-- <span style="background-color:yellow;">



                {{ isQueueWarning== true ? $t('The cage is disabled') : $t('The cage is disabled') }}



            </span> -->



            <div style="display:flex;">



                <div style="width:70%;">



                    <el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border



@@ -798,51 +778,18 @@


                        <el-table-column :min-width="90" prop="barcode" :label="$t('Complete')">



                            <template slot-scope='scope' style="height:100px;height:100px;">



                                <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"



                                    :disabled="!(!isAllowQueue && scope.row.state != 2 && scope.row.state != 4)"



                                    :disabled="!(!isAllowQueue && scope.row.state != 1 && scope.row.state != 2)"



                                    @click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{



                                        $t('Complete')



                                    }}</el-button>



                            </template>



                        </el-table-column>



                        <!-- <el-table-column :min-width="300" prop="position" :label="$t('Position')" style="font-size: 20px;">



                    <template slot-scope='scope'>



                        <div



                            :style="'width:' + (scope.row.position == 1 ? '300' : '100') + 'px;height:' + (scope.row.position == 1 ? '100' : '200') + 'px;background-Color:gray;margin:0 auto;'">



                            


                        </div>



                    </template>



                </el-table-column> -->



                        <!-- <el-table-column prop="position" :label="$t('Flipped')" :min-width="200">



                    <template slot-scope='scope'>



                        {{ scope.row.flip == true ? $t('EXTERIQR OUT AND BYPASS TO THE LEFT')



                            : $t('EXTERIQR OUT AND BYPASS TO THE RIGHT') }}



                    </template>



                </el-table-column> -->







                        <el-table-column :width="100" :label="$t('Operate')">



                            <template slot-scope='scope'>



                                <!-- <el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)"



                            style="font-size: 15px;"



                            :disabled="(scope.$index == 0 || isAllowReordering == true || scope.row.state == 1)">



                            {{ $t('Top') }}



                        </el-button>



                        <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)"



                            style="font-size: 15px;"



                            :disabled="(scope.$index == 0 || isAllowReordering == true || scope.row.state == 1)">



                            {{ $t('Up') }}



                        </el-button>



                        <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)"



                            style="font-size: 15px;"



                            :disabled="(OutSlice.length - 1 == scope.$index || isAllowReordering == true || scope.row.state == 1)">



                            {{ $t('Down') }}



                        </el-button> -->



                                <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"



                                    :disabled="isAllowQueue" @click="deleteproductionqueueglass(scope.row.barcode)">{{



                                        $t('Delete') }}</el-button>







                                <!-- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="isAllowQueue"



                            @click="FrameStateUpdate(scope.row.barcode,scope.row.framestate)">{{



                            scope.row.framestate == 0 ? $t('Stop') : $t('Start') }}</el-button> -->



                            </template>



                        </el-table-column>



                    </el-table>



@@ -892,7 +839,6 @@


                    </template>



                </el-table-column>







                <!-- <el-table-column prop="Flip" :label="$t('Flipped')"></el-table-column> -->



                <el-table-column prop="out_slice.state" :label="$t('In the queue')">



                    <template slot-scope='scope'>



                        {{ scope.row.out_slice != null ? $t('Yes') : $t('No') }}



@@ -904,12 +850,6 @@


                        {{ scope.row.storageCage != null ? $t('Yes') : $t('No') }}



                    </template>



                </el-table-column>



                <!-- <el-table-column :width="80" :label="$t('Operate')">



                    <template slot-scope='scope'>



                        <el-checkbox label="" :disabled="!(scope.row.storageCage != null && scope.row.out_slice == null)"



                            :checked="scope.row.isCheck" @change="CheckBoxchange(scope.row.barcode, $event)"></el-checkbox>



                    </template>



                </el-table-column> -->



            </el-table>



        </el-dialog>



        <el-dialog :visible.sync="dialogFormCountDown" :title="$t('Approximately resettable time')" top="5vh">



@@ -1022,7 +962,7 @@


            reset: false,



            isQueueWarning: false,



            CurrentFrame: [],



            DeviceList: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],



            DeviceList: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],



            GlassIdList: [],



            Scanningmethod: true,



            CurrrentGlassId: ""



@@ -1031,6 +971,8 @@


    created() {



        this.load();







    },



    activated() {



        this.init();



    }



    ,



@@ -1057,12 +999,14 @@


                    //console.log("收到数据====" + msg.data);



                    let obj = JSON.parse(msg.data);



                    if (obj.params != null) {







                        this.car1 = 145 + 8.15 * Math.abs(obj.params[0][0] - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;



                        this.car2 = 210 + 8.15 * Math.abs(obj.params[0][1] - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;



                        var zhi1 = obj.params[0][0];



                        var zhi2 = obj.params[0][1];



                        this.car1 = 145 + 8.15 * Math.abs(zhi1 - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;



                        this.car2 = 210 + 8.15 * Math.abs(zhi2 - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;



                        // this.car1 = 210 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;



                        // this.car2 = 300 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;



                    }







                    this.tableData = obj.tableData[0];



                    this.cagelist1 = obj.cagelist1[0];



                    this.cagelist2 = obj.cagelist2[0];



@@ -1084,7 +1028,8 @@






                    //查询当前铝框信息



                    this.CurrentFrame = obj.CurrentFrame;



                    //获取设备状态







                    // 获取设备状态



                    if (obj.DeviceList != null) {



                        this.DeviceList = obj.DeviceList[0];



                    }



@@ -1099,6 +1044,15 @@


                            this.dialogFormVisible7 = true;



                        }



                    }







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



                    if (obj.FeedState != null) {



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



                            this.InsertQueueGlass(1);



                        }



                    }















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



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



@@ -1159,6 +1113,7 @@






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



                    this.isConfirm = obj.isConfirm[0];







                    //扫码位玻璃信息



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



                        this.form3 = obj.form3[0];



@@ -1205,6 +1160,10 @@


                socket.onerror = function () {



                    console.log("websocket发生了错误");



                }



                //跳转页面时关闭socket



                this.$router.afterEach(function () {



                    socket.close();



                });



            }



        },



        load() {



@@ -1257,14 +1216,6 @@


                this.cagelist3 = res.data.list3;



                this.cagelist4 = res.data.list4;



            });



            // //加载进片任务数据



            // loadtask(this.task1).then(res => {



            //     this.tasklist1 = res.data.list;



            // });



            // //加载进出片任务数据



            // loadtask(this.task2).then(res => {



            //     this.tasklist2 = res.data.list;



            // });



            //加载报警信息



            SelectAlarmmgInfo().then(res => {



                this.alarm = res.data.alarmmg;



@@ -1379,36 +1330,6 @@


        //获取扫码位和上片位数据



        SelectGlassByGlassIDs() {



            this.showform3();



            // if (parameter == 1) {



            //     SelectGlassByGlassID(this.glassid2).then(res => {



            //         if (res.data.form != null) {



            //             if (res.data.form.glassId != null) {



            //                 this.form4 = res.data.form;



            //                 this.$message.success(this.$t('query was successful'));



            //                 this.Sizerange(this.form4, 2);



            //             } else {



            //                 this.$message.error(this.$t('There is no such glass'));



            //             }







            //         } else {



            //             this.$message.error(this.$t('There is no such glass'));



            //         }



            //     });



            // } else {



            //     SelectGlassByGlassID(this.glassid1).then(res => {



            //         if (res.data.form != null) {



            //             if (res.data.form.glassId != null) {



            //                 this.form5 = res.data.form;



            //                 this.$message.success(this.$t('query was successful'));



            //                 this.Sizerange(this.form5, 1);



            //             } else {



            //                 this.$message.error(this.$t('There is no such glass'));



            //             }



            //         } else {



            //             this.$message.error(this.$t('There is no such glass'));



            //         }



            //     });



            // }







        },



        //查询客户玻璃信息



@@ -1434,16 +1355,6 @@


            //查询铝框id对应玻璃信息



            SelectAluminumFrameInfoById(this.framebarcode).then(res => {



                this.AluminumFrame = res.data.AluminumFrame;



                console.log(this.AluminumFrame);



                // this.AluminumFrame.forEach(item => {



                //     if (item.storageCage != null && item.out_slice == null) {



                //         item.isCheck = true;



                //     } else {



                //         item.isCheck = false;



                //     }



                //     item.Flip = res.data.flip;



                //     item.FrameNo = this.framebarcode;



                // });



            });



            this.dialogFormVisible7 = true;



        },



@@ -1640,6 +1551,8 @@


                    DeleteProductionQueueGlass(id).then(res => {



                        if (res.data.message == 200) {



                            this.$message.success(this.$t('Operation successful'));



                        } else {



                            this.$message.error(this.$t('This frame has glass that is currently outing'));



                        }



                    });



                }



@@ -1674,14 +1587,19 @@


        InsertQueueGlass(parameter) {



            if (parameter == 1 && this.form5.glassId != "") {



                if (this.form5.glassId != this.form2.glassId && this.form5.glassId != this.form3.glassId) {



                    InsertQueueGlassId(1, this.form5).then(res => {



                        if (res.data.message == 200) {



                            this.form5 = {};



                            this.$message.success(this.$t('Operation successful'));



                        } else {



                            this.$message.error(this.$t('This glass ID already exists in the sorting cage'));



                        }



                    });



                    if (this.dialogFormVisible5 == true) {



                        InsertQueueGlassId(1, this.form5).then(res => {



                            if (res.data.message == 200) {



                                this.form5 = {};



                                this.$message.success(this.$t('Operation successful'));



                            }



                            else if (res.data.message == 400) {



                                this.$message.error(this.$t('The glass size is not within the range'));



                            } else {



                                this.$message.error(this.$t('This glass ID already exists in the sorting cage'));



                            }



                        });



                    }



                } else {



                    this.$message.error(this.$t('The glass ID already exists in the loading queue'));



                }



@@ -1857,7 +1775,7 @@


            }



            this.UpdateSequence(Sequence);



        },



        //修改顺序



        //修改出片顺序



        UpdateSequence(Sequence) {



            let i = 0;



            this.OutSlice.forEach(item => {



@@ -1972,9 +1890,9 @@


                    } else {



                        this.disabled = false;



                    }



                    if (position == 3 && this.isConfirm == true && this.D01RequestState == true) {



                        this.InsertQueueGlass(1);



                    }



                    // if (position == 3 && this.isConfirm == true && this.D01RequestState == true && this.dialogFormVisible5 == true) {



                    //     this.InsertQueueGlass(1);



                    // }



                }



            }



        },



@@ -1990,9 +1908,9 @@


                }



            });



        },



        //45秒复位倒数计时



        //60秒复位倒数计时



        CountDown() {



            let count = 45;



            let count = 60;



            let timer = setInterval(



                () => {



                    if (this.EmergencyStop == true) {



@@ -2090,14 +2008,14 @@


            if (this.ClearGlassID == false) {



                console.log(this.DeviceList, num);



                if (this.DeviceList[num] == 0) {



                    if (this.GlassIdList[num].length < 14) {



                    if (this.GlassIdList[num].length <= 14) {



                        this.$confirm(this.$t('Are you sure to clear this barcode ?'), this.$t('confirm'), {



                            confirmButtonText: this.$t('Yes'),



                            cancelButtonText: this.$t('No'),



                            type: 'warning'



                        }).then(() => {



                            ClearGlassId(position, this.GlassIdList[num]).then(res => {



                                if (res.data.message3 == 200) {



                                if (res.data.message == 200) {



                                    this.$message.success(this.$t('Operation successful'));



                                } else {



                                    this.$message.success(this.$t('operation failed'));