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

wuyouming666

2024-02-23 376f9a04e2c2814d210e2c5177f0e27d115e1b5d

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

@@ -252,7 +252,7 @@
            <div style="display:flex;justify-content: space-around;width: 9zz5%;margin: 0 auto;">

                <!-- <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid1"

                    :class="ManuallyInfeedGlass == true ? 'hide' : ''"></el-input> -->

                <el-button type="primary" @click="SelectGlassByGlassIDs(2)" :disabled="ManuallyInfeedGlass"

                <el-button type="primary" @click="SelectGlassByGlassIDs()" :disabled="ManuallyInfeedGlass"

                    :class="ManuallyInfeedGlass == true ? 'hide' : ''">

                    {{ $t('Manually Infeed Glass') }}</el-button>

                <el-button type="primary" @click="showform2()" :disabled="OrderInfo"

@@ -263,12 +263,11 @@
                    {{ $t('Outing Queue') }}</el-button>

                <el-button type="primary" @click="TaskStop(0)" :disabled="OutingQueue"

                    :class="StopTask == true ? 'hide' : ''">

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

                <el-button type="primary" @click="TaskStop(1)" :disabled="StopTask"

                    :class="StopTask == true ? 'hide' : ''">

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

                <el-button type="primary" @click="SoftEmergencyStop()" :disabled="SoftEmergencyStop"

                    :class="SoftEmergencyStop == true ? 'hide' : ''">

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

                <el-button type="primary" @click="TaskStop(1)" :disabled="StopTask" :class="StopTask == true ? 'hide' : ''">

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

                <el-button type="primary" @click="SoftEmergencyStop()" :disabled="SoftEmergencyStopState"

                    :class="SoftEmergencyStopState == true ? 'hide' : ''">

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

                <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>

                <el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button> -->

@@ -376,37 +375,81 @@
                <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: 54px;left: 1055px;position: absolute;"

                    @click="ClearGlassId('DB101.9.2', 0)">{{ ShowGlassIdList(0) }}</div>

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

                    @click="ClearGlassId('DB101.9.2', 1)">{{ ShowGlassIdList(1) }}</div>

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

                    @click="ClearGlassId('DB101.10.2', 2)">

                    B01:{{ ShowGlassIdList(2) }}</div>

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

                    @click="ClearGlassId('DB101.10.3', 3)">B02:{{ ShowGlassIdList(3) }}</div>

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

                    @click="ClearGlassId('DB101.10.0', 4)">

                    A01.1:{{ ShowGlassIdList(4) }}</div>

                <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="glass A01" style="top: 290px;left: 289px;position: absolute;"

                    @click="ClearGlassId('DB101.10.1,5')">A01.2:{{ ShowGlassIdList(5) }}</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 A02" style="top: 310px;left: 300px;position: absolute;"

                    @click="ClearGlassId('DB101.10.2,6')">A02:{{ ShowGlassIdList(6) }}</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 />

                    <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;">

                    B01:{{ ShowGlassIdList(2) }}

                    <br />

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

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

                </div>

                <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;">

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

                    <br />

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

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

                </div>



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

                    @click="ClearGlassId('DB101.9.4', 7)">

                    {{ ShowGlassIdList(7) }}</div>

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

                    @click="ClearGlassId('DB101.9.5', 8)">

                    {{ ShowGlassIdList(8) }}</div>

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

                    @click="ClearGlassId('DB101.9.6', 9)">

                    {{ ShowGlassIdList(9) }}</div>

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

                    @click="ClearGlassId('DB101.9.5', 10)">

                    {{ ShowGlassIdList(10) }}</div>

                <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.1', 6)">

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

                </div>



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

                    {{ ShowGlassIdList(7) }}

                    <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;">

                    {{ ShowGlassIdList(8) }}

                    <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;">

                    {{ ShowGlassIdList(9) }}

                    <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;">

                    {{ ShowGlassIdList(10) }}

                    <br />

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

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

                </div>





            </div>

@@ -567,26 +610,30 @@
        <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>

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

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

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

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

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

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

                    </el-form-item>

                    <el-form-item>

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

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

                        }}</el-button>

                    </el-form-item>

                    <el-form-item>

                        <el-input style="width:70%;" maxlength="13" :placeholder="$t('Enter the glass barcode')"

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

                        <el-button type="primary" :disabled="!Scanningmethod" @click="WriteGlassID()">{{ $t('Add')

                        }}</el-button>

                    </el-form-item>

                    <el-form-item>

                        {{ $t('Barcode') }}:

                        <el-input style="width:70%;" maxlength="14" :disabled="true" v-model="CurrrentGlassId"></el-input>

                    </el-form-item>

                </div>

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

                    <label for="">{{ $t('Upper film position') }}</label>

                    <div>

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

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

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

                    </div>



                    <label for="">{{ $t('Scan Code Point') }}</label>

                </div>

                <div style="display: flex;justify-content: space-around;height: 40px;">

@@ -681,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 Modification') }}</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 Modification') }}</el-button>

                        {{ $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">

@@ -719,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

@@ -745,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>

@@ -839,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') }}

@@ -851,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">

@@ -873,7 +866,7 @@
    home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,

    SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,

    SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue,

    isAllowReorderings, FrameStateUpdate, WriteGlassID, ClearGlassId, CloseForm7, TaskStop, SoftEmergencyStop

    isAllowReorderings, FrameStateUpdate, WriteGlassID, ClearGlassId, CloseForm7, TaskStop, SoftEmergencyStop, SwitchScanMethod

} from "../../api/home";





@@ -959,9 +952,9 @@
            OutingQueue: true,

            OrderInfo: true,

            CageDetails: true,

            ClearGlassID:true,

            StopTask:true,

            SoftEmergencyStop:true,

            ClearGlassID: true,

            StopTask: true,

            SoftEmergencyStopState: true,

            CountDowns: "0",

            D01RequestState: false,

            EmergencyStop: false,

@@ -969,13 +962,17 @@
            reset: false,

            isQueueWarning: false,

            CurrentFrame: [],

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

            GlassIdList: []

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

            GlassIdList: [],

            Scanningmethod: true,

            CurrrentGlassId: ""

        };

    },

    created() {

        this.load();



    },

    activated() {

        this.init();

    }

    ,

@@ -1002,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];

@@ -1016,9 +1015,21 @@
                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];

                    //获取当前扫码方式

                    if (obj.Scanningmethod != null) {

                        this.Scanningmethod = obj.Scanningmethod[0];

                    }



                    //获取当前扫码枪玻璃id

                    if (obj.CurrrentGlassId != null) {

                        const specialChars = /[^\w\s]/g;

                        this.CurrrentGlassId = obj.CurrrentGlassId[0].replace(specialChars, "");

                    }



                    //查询当前铝框信息

                    this.CurrentFrame = obj.CurrentFrame;

                    //获取设备状态



                    // 获取设备状态

                    if (obj.DeviceList != null) {

                        this.DeviceList = obj.DeviceList[0];

                    }

@@ -1033,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) {

@@ -1093,6 +1113,7 @@


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

                    this.isConfirm = obj.isConfirm[0];



                    //扫码位玻璃信息

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

                        this.form3 = obj.form3[0];

@@ -1100,10 +1121,13 @@
                    } else {

                        this.form3 = {};

                    }



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

                        this.loadglassheight1 = 70;

                        if (this.form5.glassId != obj.form3[0].glassId) {

                            this.showform3();

                        }

                        this.form5 = obj.form3[0];

                        this.showform3();

                        this.glassid1 = "";

                        if (this.D01RequestState == true) {

                            this.Sizerange(this.form5, 3);

@@ -1136,6 +1160,10 @@
                socket.onerror = function () {

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

                }

                //跳转页面时关闭socket

                this.$router.afterEach(function () {

                    socket.close();

                });

            }

        },

        load() {

@@ -1155,14 +1183,14 @@
                        if (item.permissionId == "35" && item.state == 1) {

                            this.CageDetails = false;

                        }

                        if (item.permissionId == "36" && item.state == 1) {

                        if (item.permissionId == "37" && item.state == 1) {

                            this.ClearGlassID = false;

                        }

                        if (item.permissionId == "37" && item.state == 1) {

                        if (item.permissionId == "38" && item.state == 1) {

                            this.StopTask = false;

                        }

                        if (item.permissionId == "38" && item.state == 1) {

                            this.SoftEmergencyStop = false;

                        if (item.permissionId == "39" && item.state == 1) {

                            this.SoftEmergencyStopState = false;

                        }

                    });

                });

@@ -1188,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;

@@ -1298,46 +1318,18 @@
        },

        //手动写入plc扫码位玻璃id

        WriteGlassID() {

            if (this.glassid1 != "") {

            if (this.glassid1.length == 14) {

                WriteGlassID(this.glassid1).then(res => {

                    console.log(res.data);

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

                });

            } else {

                this.$message.error(this.$t('Please enter the correct glassID'));

            }

        },

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

        SelectGlassByGlassIDs(parameter) {

        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'));

            //         }

            //     });

            // }



        },

        //查询客户玻璃信息

@@ -1363,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;

        },

@@ -1569,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'));

                        }

                    });

                }

@@ -1603,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'));

                }

@@ -1786,7 +1775,7 @@
            }

            this.UpdateSequence(Sequence);

        },

        //修改顺序

        //修改出片顺序

        UpdateSequence(Sequence) {

            let i = 0;

            this.OutSlice.forEach(item => {

@@ -1901,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);

                    // }

                }

            }

        },

@@ -1919,9 +1908,9 @@
                }

            });

        },

        //45秒复位倒数计时

        //60秒复位倒数计时

        CountDown() {

            let count = 45;

            let count = 60;

            let timer = setInterval(

                () => {

                    if (this.EmergencyStop == true) {

@@ -2017,15 +2006,16 @@
        //清除玻璃id

        ClearGlassId(position, num) {

            if (this.ClearGlassID == false) {

                if (this.DeviceList[position] != null) {

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

                console.log(this.DeviceList, num);

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

                    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'));

@@ -2056,8 +2046,28 @@
                }

            });

        },

        //软急停

        SoftEmergencyStop() {

            SoftEmergencyStop.then(res => {

            this.$confirm(this.$t('Are you sure you want an emergency stop ?'), this.$t('confirm'), {

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

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

                type: 'warning'

            }).then(() => {

                SoftEmergencyStop.then(res => {

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

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

                    }

                });

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            });

        },

        //切换二维码获取方式

        SwitchScanMethod() {

            SwitchScanMethod(!this.Scanningmethod).then(res => {

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

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

                }