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

wuyouming666

2024-05-06 627d77af3fcc77d012160c916349adc2340a846f

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

@@ -249,14 +249,17 @@
                    </label>

                </div>

            </div>

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

            <div style="display:flex;justify-content: space-around;width: 95%;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()" :disabled="ManuallyInfeedGlass"

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

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

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

                    :class="OrderInfo == true ? 'hide' : ''">{{ $t('OrderInfo')

                    :class="OrderInfo == true ? 'hide' : ''">{{ $t('Order Info')

                    }}</el-button>

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

                    :class="CageDetails == true ? 'hide' : ''">{{ $t('Cage Details')

                    }}</el-button>

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

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

@@ -264,7 +267,8 @@
                <el-button type="primary" @click="TaskStop(0)" :disabled="OutingQueue"

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

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

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

                <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' : ''">

@@ -274,9 +278,14 @@
            </div>

            <div>

                <el-table :data="this.tasklist1" border style="width: 100%">

                    <el-table-column :min-width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="180" prop="glassId"

                        :label="$t('Outfeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

                    <el-table-column :min-width="130" prop="cell" :label="$t('Slot No')"></el-table-column>

                    <el-table-column :min-width="130" prop="cell" :label="$t('Slot No')">

                        <template slot-scope='scope'>

                            {{ (scope.row.cage - 1) * 21 + scope.row.cell }}

                        </template>

                    </el-table-column>

                    <el-table-column :min-width="130" prop="orderId" :label="$t('Order No')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('List No')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>

@@ -294,9 +303,14 @@
                    </el-table-column>

                </el-table>

                <el-table :data="this.tasklist2" border style="width: 100%">

                    <el-table-column :min-width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="180" prop="glassId"

                        :label="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

                    <el-table-column :min-width="130" prop="cell" :label="$t('Slot No')"></el-table-column>

                    <el-table-column :min-width="130" prop="cell" :label="$t('Slot No')">

                        <template slot-scope='scope'>

                            {{ (scope.row.cage - 1) * 21 + scope.row.cell }}

                        </template>

                    </el-table-column>

                    <el-table-column :min-width="130" prop="orderId" :label="$t('Order No')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('List No')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>

@@ -361,92 +375,101 @@
                <div class="blocks-img2"></div>

                <div class="blocks-img3"></div>



                <div class="device" :style="'top: 25px;left: 1027px;background-color: ' + ShowDeviceList(0) + ';'">D01</div>

                <div class="device" :style="'top: 25px;left: 1027px;background-color: ' + ShowDeviceList(0) + ';'">D01

                </div>

                <div class="device" :style="'top: 105px;left: 1027px;background-color: ' + ShowDeviceList(1) + ';'">D02

                </div>

                <div class="device" :style="'top: 102px;left: 605px;background-color: ' + ShowDeviceList(2) + ';'">B01</div>

                <div class="device" :style="'top: 102px;left: 197px;background-color: ' + ShowDeviceList(3) + ';'">B02</div>

                <div class="blocks-img" :style="'left:' + car2 + 'px;top:175px;background-color:' + ShowDeviceList(4) + ''">

                <div class="device" :style="'top: 102px;left: 605px;background-color: ' + ShowDeviceList(2) + ';'">B01

                </div>

                <div class="device" :style="'top: 102px;left: 197px;background-color: ' + ShowDeviceList(3) + ';'">B02

                </div>

                <div class="blocks-img"

                    :style="'left:' + car2 + 'px;top:175px;background-color:' + ShowDeviceList(4) + ''">

                    A01</div>

                <div class="blocks-img" :style="'left:' + car1 + 'px;top:16px;background-color:' + ShowDeviceList(5) + ''">

                <div class="blocks-img"

                    :style="'left:' + car1 + 'px;top:16px;background-color:' + ShowDeviceList(5) + ''">

                    A02</div>

                <div class="device" :style="'top: 108px;left: 150px;background-color: ' + ShowDeviceList(6) + ';'">D03</div>

                <div class="device" :style="'top: 185px;left: 150px;background-color: ' + ShowDeviceList(7) + ';'">D04</div>

                <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="device" :style="'top: 108px;left: 150px;background-color: ' + ShowDeviceList(6) + ';'">D03

                </div>

                <div class="device" :style="'top: 185px;left: 150px;background-color: ' + ShowDeviceList(7) + ';'">D04

                </div>

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

@@ -457,7 +480,8 @@
        <el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">

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

                <el-form-item :label="$t('Barcode')">

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

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

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

                    <el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>

                </el-form-item>

                <el-form-item :label="$t('Barcode')">

@@ -493,7 +517,7 @@
                            $t('confirm') }}</el-button> -->

                    <el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"

                        type="primary">{{

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

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

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

                </span>

            </template>

@@ -527,15 +551,19 @@
        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">

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

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

            <el-table :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700" border

                style="width: 100%;overflow: auto;">

            <el-table :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700"

                border style="width: 100%;overflow: auto;">

                <el-table-column :min-width="50" prop="cage" :label="$t('Cage No')"></el-table-column>

                <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')"></el-table-column>

                <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')">

                    <template slot-scope='scope'>

                        {{ (scope.row.cage - 1) * 21 + scope.row.cell }}

                    </template>

                </el-table-column>

                <el-table-column :min-width="55" prop="tier" :label="$t('The Side')">

                    <template slot-scope='scope'>

                        {{

                            scope.row.tier == 1 ? $t('Inside') : $t('Outside')

                        }}

                scope.row.tier == 1 ? $t('Inside') : $t('Outside')

            }}

                    </template>

                </el-table-column>

                <el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>

@@ -545,14 +573,16 @@
                <el-table-column :min-width="80" prop="state" :label="$t('Glass State')">

                    <template slot-scope='scope'>

                        {{

                            scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?

                                $t('Outing') : ""

                        }}

                scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state ==

                    3 ?

                    $t('Outing') : ""

            }}

                    </template>

                </el-table-column>

                <el-table-column :min-width="150" prop="lengthWidth" :label="$t('Dim')">

                    <template slot-scope='scope'>

                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{ scope.row.glassHeightMm }}

                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{

                scope.row.glassHeightMm }}

                    </template>

                </el-table-column>



@@ -588,7 +618,7 @@


        </el-dialog>



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

        <el-dialog :visible.sync="dialogFormVisible4" :title="$t('Order Info')" top="5vh">

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

            <el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>

            <el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)

@@ -601,40 +631,37 @@
                <el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>

                <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>

            </el-table>

            <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"

                :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"

                layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"

                background style="float: right; margin-top: 20px">

            <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange"

                @current-change="handleCurrentChange" :pager-count="7" :current-page="currentPage"

                :page-sizes="[5, 10, 15, 20]" :page-size="pagesize" layout="total, sizes, prev, pager, next, jumper"

                :total="GlassInfo.length > 0 ? GlassInfo.length : null" background

                style="float: right; margin-top: 20px">

            </el-pagination>

        </el-dialog>

        <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-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-button>

                    </el-form-item>

                    <el-form-item>

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

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

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

@@ -734,22 +761,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">

@@ -757,24 +773,14 @@
            {{ this.isAllowQueue

                == true ? $t('Start') : $t('Stop')

            }}

            <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue

                == true ? $t('Stop') : $t('Start')

            <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{

                this.isAllowQueue

                    == true ? $t('Stop') : $t('Start')

            }}</el-button>

            <!-- {{  $t('Sorting State') }}:

            {{

                this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')

            }}

            <el-button type="primary" @click="isAllowReorderings()" :disabled="this.isAllowQueue">{{

                this.isAllowReordering == true ? $t('Allow') : $t('Not Allow')

            }}</el-button> -->

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

            <el-button type="primary" @click="showform7()">{{ $t('Add') }}</el-button>

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

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

                {{ isQueueWarning == true ? $t('The slot 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

@@ -789,79 +795,47 @@
                        <el-table-column :min-width="90" prop="state" :label="$t('Glass State')">

                            <template slot-scope='scope'>

                                {{ scope.row.state == 0 ? $t('Waiting') : scope.row.state == 1 ? $t('Outing') :

                                    scope.row.state

                                        == 2

                                        ? $t('Outed') : scope.row.state == 3 ? $t('Absent') : $t('Completed') }}

                scope.row.state

                    == 2

                    ? $t('Outed') : scope.row.state == 3 ? $t('Absent') : $t('Completed') }}

                            </template>

                        </el-table-column>

                        <el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>

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

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

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

                            </template>

                        </el-table-column>

                    </el-table>

                </div>

                <div style="width:30%;" v-for="(item) in CurrentFrame" :key="item['barcode']">

                    <el-button style="margin-left: 42%;" type="primary" @click="FrameStateUpdate(item['barcode'])">{{

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

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

                    <h1 style="font-size: 40px;text-align: center;">{{ $t('Current Frame') }}:{{ item['barcode'] }}</h1>

                    <h1 style="font-size: 30px;text-align: center;">

                        {{ item['flip'] == true ? $t('EXTERIQR OUT AND BYPASS TO THE LEFT')

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

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

                    </h1>

                    <h1 style="font-size: 30px;text-align: center;">{{ item['framewidthmm'] }}*{{ item['frameheightmm'] }}

                    <h1 style="font-size: 30px;text-align: center;">{{ item['framewidthmm'] }}*{{ item['frameheightmm']

                        }}

                    </h1>



                    <div class="frame" :style="'background-color: green;margin-top:30px;margin:0 auto;width: ' +

                        FrameWidthHeight('before', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;height:' +

                        FrameWidthHeight('after', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;'

                        ">

                FrameWidthHeight('before', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;height:' +

                FrameWidthHeight('after', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;'

                ">

                    </div>

                </div>

            </div>

@@ -883,16 +857,20 @@
                <el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>

                <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>

                <el-table-column prop="storageCage.cage" :label="$t('Cage No')"></el-table-column>

                <el-table-column prop="storageCage.cell" :label="$t('Slot No')"></el-table-column>

                <el-table-column prop="storageCage.cell" :label="$t('Slot No')">

                    <template slot-scope='scope'>

                        {{ (scope.row.cage - 1) * 21 + scope.row.cell }}

                    </template>

                </el-table-column>

                <el-table-column prop="storageCage.tier" :label="$t('The Side')">

                    <template slot-scope='scope'>

                        {{

                            scope.row.storageCage == null ? "" : scope.row.storageCage.tier == 1 ? $t('Inside') : $t('Outside')

                        }}

                scope.row.storageCage == null ? "" : scope.row.storageCage.tier == 1 ? $t('Inside') :

                    $t('Outside')

            }}

                    </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 +882,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,15 +994,28 @@
            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: ""

            CurrrentGlassId: "",

            feedglassid:"",

            count1:0,

            count2:1

        };

    },

    created() {

        this.load();



        // setInterval(() => {

        //     if(this.count1<this.count2){

        //         this.count1=this.count2;

        //     }else{

        //         const now = new Date();

        //         console.log(now);

        //         alert("websocket停止"+now);

        //     }

        // }, 3000);

    },

    activated() {

        this.init();

    }

    ,

@@ -1054,15 +1039,18 @@
                };

                //  浏览器端收消息，获得从服务端发送过来的文本消息

                socket.onmessage = function (msg) {

                    this.count2=this.count2+1;

                    //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 +1072,8 @@


                    //查询当前铝框信息

                    this.CurrentFrame = obj.CurrentFrame;

                    //获取设备状态



                    // 获取设备状态

                    if (obj.DeviceList != null) {

                        this.DeviceList = obj.DeviceList[0];

                    }

@@ -1094,10 +1083,22 @@
                    }

                    //获取待确认的铝框玻璃信息

                    if (obj.AluminumFrame != null) {

                        
                        this.AluminumFrame = obj.AluminumFrame[0];

                        if (this.dialogFormVisible6 == true) {

                            this.dialogFormVisible7 = true;

                        }

                    }



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

                    if (obj.FeedState != null) {

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

                            this.InsertQueueGlass(1);

                        }

                    }



                    if(obj.feedglassid!=null){

                        this.feedglassid=obj.feedglassid[0];

                    }



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

@@ -1159,6 +1160,8 @@


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

                    this.isConfirm = obj.isConfirm[0];





                    //扫码位玻璃信息

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

                        this.form3 = obj.form3[0];

@@ -1169,8 +1172,9 @@


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

                        this.loadglassheight1 = 70;

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

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

                            this.showform3();



                        }

                        this.form5 = obj.form3[0];

                        this.glassid1 = "";

@@ -1205,6 +1209,10 @@
                socket.onerror = function () {

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

                }

                //跳转页面时关闭socket

                this.$router.afterEach(function () {

                    socket.close();

                });

            }

        },

        load() {

@@ -1257,14 +1265,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;

@@ -1306,7 +1306,16 @@
        //手动上片

        sbumitglassid() {

            if (this.form.order != "") {

                if (this.form.height < 380 || this.form.width < 390 || this.form.height > 1810 || this.form.width > 2760) {

                let width=0;

                let height=0;

                if(this.form.glassheight<this.form.glasswidth){

                    width=this.form.glasswidth;

                    height=this.form.glassheight;

                }else{

                    height=this.form.glasswidth;

                    width=this.form.glassheight;

                }

                if (height < 380 || width < 380 || height > 1810 || width > 2760) {

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

                } else {

                    if (this.zhuangtai == true) {

@@ -1379,36 +1388,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'));

            //         }

            //     });

            // }



        },

        //查询客户玻璃信息

@@ -1420,9 +1399,9 @@
        },

        //显示客户玻璃信息

        showform2() {

            SelectGlass(this.orderid).then(res => {

                this.GlassInfo = res.data.glass;

            });

            // SelectGlass(this.orderid).then(res => {

            //     this.GlassInfo = res.data.glass;

            // });

            this.dialogFormVisible4 = true;

        },

        //显示出片队列

@@ -1434,16 +1413,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;

        },

@@ -1605,6 +1574,13 @@
                    if (res.data.message == 200) {

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

                        this.dialogFormVisible = false;

                        this.glassid = "";

                        this.form = {

                            orderId: "",

                            glassId: "",

                            height: "",

                            width: ""

                        };

                    }

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

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

@@ -1621,11 +1597,27 @@
        },

        //启用//理片笼禁用

        UpdateDisabled(cage, cell, disabled) {

            Disabled(cage, cell, disabled).then(res => {

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

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

            this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                inputType: 'password',

                inputPlaceholder: this.$t('Please enter the password'),

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

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

                type: 'warning'

            }).then(({ value }) => {

                if (this.password == value) {

                    Disabled(cage, cell, disabled).then(res => {

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

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

                        }

                    });

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

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

                });

            });



        },

        //删除出片队列玻璃

        deleteproductionqueueglass(id) {

@@ -1640,6 +1632,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 +1668,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('There is no such slot'));

                            } 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 +1856,7 @@
            }

            this.UpdateSequence(Sequence);

        },

        //修改顺序

        //修改出片顺序

        UpdateSequence(Sequence) {

            let i = 0;

            this.OutSlice.forEach(item => {

@@ -1947,8 +1946,18 @@
        },

        //判断玻璃是否超出范围

        Sizerange(Glass, position) {

            console.log(position);

            if (this.ManuallyInfeedGlass == false) {

                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)) {

                let width=0;

                let height=0;

                if(Glass.glassheight<Glass.glasswidth){

                    width=Glass.glasswidth;

                    height=Glass.glassheight;

                }else{

                    height=Glass.glasswidth;

                    width=Glass.glassheight;

                }

                if (height < 380 || width < 380 || height > 1810 || width > 2760) {

                    this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {

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

                        type: 'info',

@@ -1972,9 +1981,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 +1999,9 @@
                }

            });

        },

        //45秒复位倒数计时

        //60秒复位倒数计时

        CountDown() {

            let count = 45;

            let count = 60;

            let timer = setInterval(

                () => {

                    if (this.EmergencyStop == true) {

@@ -2090,14 +2099,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'));