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

wu

2023-11-30 0ece3ba8c92df0438af52b8de6b9225d8ada4103

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

@@ -66,28 +66,18 @@
    /* width: 4.22px; */

}



/* .gezi:nth-child(22),

.gezi:nth-child(43),

.gezi:nth-child(64),

.gezi:nth-child(85) {

    margin-left: 7px;

    margin-left: 10px;

} */







.blocks {





    background-image: url('../../img/xmjc.png');

    margin: 0 auto;

    background-repeat: no-repeat;

    background-attachment: local;

    width: 1660px;

    min-height: 55vh;

    width: 1400px;

    max-width: 94vw;

    background-size: 1200px 510px;

    /* max-width: 100vw;

    margin: 0 auto;

    /* width: 1660px;

    max-width: 100vw;

    background-size: 1660px 560px; */





@@ -121,6 +111,18 @@
    top: 366px; */

}



.orderbutton1 {

    position: absolute;

    left: 1070px;

    top: 70px;

}



.orderbutton2 {

    position: absolute;

    left: 500px;

    top: -10px;

}



.blocks-img3 {

    height: 90px;

    max-width: 100vw;

@@ -139,7 +141,7 @@


.el-table td,

.el-table th {

    padding: 8px 0;

    padding: 5px 0;

}



.el-table__empty-block {

@@ -153,18 +155,21 @@
.box {

    width: 90%;

    margin-left: 5%;

    height: 35px;

    color: red;

    font-size: 12px;

    overflow: hidden;

    height: 20px;

    /* height: 35px; */

}



.text {

    width: auto;

    line-height: 35px;



    white-space: nowrap;

    animation: textScroll 20s linear infinite;

    margin: 0 auto;

    line-height: 20px;

    /* line-height: 35px; */

}



@keyframes textScroll {

@@ -178,8 +183,13 @@
}



.el-dialog {

    width: 80%;

    width: 90%;

}



/* .el-table td,

.el-table th {

    padding: 0px 0;

} */

</style>

<template>

    <el-container>

@@ -195,37 +205,52 @@
                </div>

            </div>

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

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

                <el-button type="primary" @click="showform()">{{ $t('Manually feed the glass') }}</el-button>

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

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

                <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Manually Infeed Glass') }}</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>

            </div>

            <div>

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

                    <el-table-column prop="glassId" :label="$t('Coming out glass ID')"></el-table-column>

                    <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>

                    <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>

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

                    <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>

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

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

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

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

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

                    <el-table-column :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>

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

                        <template slot-scope='scope'>

                            {{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}

                        </template>

                    </el-table-column>

                    <el-table-column :label="$t('Terminate Task')">

                        <template slot-scope='scope'>

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

                                @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>

                                @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')

                                }}</el-button>

                        </template>

                    </el-table-column>

                </el-table>

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

                    <el-table-column prop="glassId" :label="$t('Incoming glass ID')"></el-table-column>

                    <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>

                    <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>

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

                    <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>

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

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

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

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

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

                    <el-table-column :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>

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

                        <template slot-scope='scope'>

                            {{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}

                        </template>

                    </el-table-column>



                    <el-table-column :label="$t('Terminate Task')">

                        <template slot-scope='scope'>

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

                                @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>

                                @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')

                                }}</el-button>

                        </template>

                    </el-table-column>

                </el-table>

@@ -234,11 +259,11 @@
                <div v-for="item in tableData" :key="item['cageno']" class="occupy">

                    <el-col style="text-align:left;font-weight: bold;">#{{ item['cage'] }}</el-col>

                    <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">

                        <span class="biao">Usage</span><span class="zhi">{{ item['cell'] }}%</span>

                        <span class="biao">{{ $t('Usage') }}</span><span class="zhi">{{ item['cell'] }}%</span>

                    </el-col>

                    <hr style="width:80%;margin: 0 auto;" />

                    <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">

                        <span class="biao">Space (Pieces)</span><span class="zhi">{{ item['state'] }}</span>

                        <span class="biao">{{ $t('Space (Pieces)') }}</span><span class="zhi">{{ item['state'] }}</span>

                    </el-col>

                </div>

            </div>

@@ -273,6 +298,9 @@
                <div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>

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

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

                <el-button class="orderbutton1" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>

                <el-button class="orderbutton2" type="primary" @click="showform6()">{{ $t('Production queue') }}</el-button>



                <!-- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">

                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px',left:4.22*index+'px' }"

@@ -301,42 +329,66 @@
        </el-footer>

        <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('order')">

                    <el-input v-model="form.orderId" autocomplete="off" />

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

                    <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('glassid')">

                    <el-input v-model="form.glassId" autocomplete="off" />

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

                    <el-input v-model="form.glassId" readonly autocomplete="off" />

                </el-form-item>

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

                    <el-input v-model="form.height" autocomplete="off" />

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

                    <el-input v-model="form.orderId" readonly autocomplete="off" />

                </el-form-item>

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

                    <el-input v-model="form.width" autocomplete="off" />

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

                    <el-input v-model="form.listId" readonly autocomplete="off" />

                </el-form-item>

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

                    <el-input v-model="form.boxId" readonly autocomplete="off" />

                </el-form-item>

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

                    <el-input v-model="form.glasswidthmm" readonly autocomplete="off" />

                </el-form-item>

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

                    <el-input v-model="form.glassheightmm" readonly autocomplete="off" />

                </el-form-item>

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

                    <el-input v-model="form.glasswidth" readonly autocomplete="off" />

                </el-form-item>

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

                    <el-input v-model="form.glassheight" readonly autocomplete="off" />

                </el-form-item>



            </el-form>

            <template #footer>

                <span class="dialog-footer">

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

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

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

                        type="primary">{{

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

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

                        type="primary">{{

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

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

                </span>

            </template>

        </el-dialog>



        <el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">

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

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

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

                    <el-input v-model="form1.order" autocomplete="off" />

                </el-form-item>

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

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

                    <el-input v-model="form1.number" autocomplete="off" />

                </el-form-item>

            </el-form>

            <template #footer>

                <span class="dialog-footer">

                    <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>

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

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

                </span>

            </template>

        </el-dialog>



        <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">

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

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

@@ -345,23 +397,260 @@
                <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>

            </el-table>

        </el-dialog>

        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')">



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

            <el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">

                <el-table-column prop="cage" :label="$t('The Cage number')"></el-table-column>

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

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

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

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

                <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>

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

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

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

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

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

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

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

                <el-table-column :width="80" prop="listId"

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

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

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

                    <template slot-scope='scope'>

                        {{ 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 :width="150" prop="lengthWidth" :label="$t('Dim')">

                    <template slot-scope='scope'>

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

                    </template>

                </el-table-column>

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

                    <template slot-scope='scope'>

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

                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('delete') }}</el-button>

                        <!-- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="open">{{ $t('delete')

                        }}</el-button> -->

                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.state==1?false:true"

                            @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('Out') }}</el-button>

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

                            @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('out') }}</el-button>

                            @click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">

                            {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.glassId!=null?true:false"

                            @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')

                            }}</el-button>

                    </template>

                </el-table-column>

            </el-table>

        </el-dialog>



        <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" 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)

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

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

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

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

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

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

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

        </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: space-around;">

                    <el-form-item>

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

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

                    </el-form-item>

                </div>

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

                    <label for="">{{ $t('current Information') }}</label>

                    <label for="">{{ $t('Modify Information') }}</label>

                    <label for="">{{ $t('current Information') }}</label>

                    <label for="">{{ $t('Modify Information') }}</label>

                </div>

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

                    <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:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"

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

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

                        }}</el-button>

                    </el-form-item>

                </div>

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

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

                        <el-input v-model="form2.glassId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form4.glassId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form3.glassId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form5.glassId" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

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

                        <el-input v-model="form2.orderId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form4.orderId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form3.orderId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form5.orderId" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

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

                        <el-input v-model="form2.listId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form4.listId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form3.listId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form5.listId" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

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

                        <el-input v-model="form2.boxId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form4.boxId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form3.boxId" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form5.boxId" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

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

                        <el-input v-model="form2.glasswidthmm" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form4.glasswidthmm" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form3.glasswidthmm" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form5.glasswidthmm" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

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

                        <el-input v-model="form2.glassheightmm" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form4.glassheightmm" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form3.glassheightmm" readonly autocomplete="off" />

                    </el-form-item>

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

                        <el-input v-model="form5.glassheightmm" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

                    <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)" type="primary" :disabled="disabled1">

                        {{ $t('Confirm Modification') }}</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('Production queue')" top="5vh">

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

            <el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue==true?$t('Stop'):$t('Start') }}</el-button>

            
            <el-table :data="this.OutSlice" :height="700" border style="width: 100%;overflow: auto;">

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

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

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

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

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

                <el-table-column prop="storageCage.glasswidthmm" :label="$t('Length')"></el-table-column>

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

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

                    <template slot-scope='scope'>

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

                            :disabled="scope.$index == 0">

                            置顶

                        </el-button>

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

                            :disabled="scope.$index == 0">

                            上移

                        </el-button>

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

                            :disabled="OutSlice.length - 1 == scope.$index">下移

                        </el-button>

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

                            @click="deleteproductionqueueglass(scope.row.id)">{{ $t('Delete') }}</el-button>

                    </template>

                </el-table-column>

            </el-table>

        </el-dialog>



        <el-dialog :visible.sync="dialogFormVisible7" :title="$t('Glass information corresponding to aluminum frame')"

            top="5vh">

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

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

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

            <el-table :data="this.AluminumFrame" :height="700" border style="width: 100%;overflow: auto;">



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

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

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

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

                <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.tier" :label="$t('The Side')"></el-table-column>



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



                <el-table-column prop="Flip" :label="$t('Flip')"></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') }}

                    </template>

                </el-table-column>



                <el-table-column prop="storageCage.tier" :label="$t('In the cage')">

                    <template slot-scope='scope'>

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

@@ -370,7 +659,11 @@
</template>

<script>



import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID } from "../../api/home";

import {

    home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,

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

    SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues

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





import LanguageMixin from '../../lang/LanguageMixin'

@@ -379,22 +672,32 @@
    name: "Home",

    data() {

        return {

            confirm1: false,

            confirm2: false,

            insertcage: 0,

            insertcell: 0,

            inserttier: 0,

            name: 'Confirm',

            mixins: [LanguageMixin],

            dialogFormVisible: false,

            dialogFormVisible1: false,

            dialogFormVisible2: false,

            dialogFormVisible3: false,

            dialogFormVisible4: false,

            dialogFormVisible5: false,

            dialogFormVisible6: false,

            dialogFormVisible7: false,

            form: {

                orderId: "",

                glassId: "",

                height: "",

                width: ""

            },

            form1: {

                order: "NG2210210",

                number: 800,

            },

            form1: {},

            form2: {},

            form3: {},

            form4: {},

            form5: {},

            alarm: [],

            tableData: [],

            cagelist1: [],

@@ -407,6 +710,8 @@
            tasklist2: [],

            order: "",

            glassid: "",

            glassid1: "",

            glassid2: "",

            url: "../../img/bigcar01.png",

            car1: 145,

            car2: 210,

@@ -417,8 +722,19 @@
            carlist: [],

            loadglassheight: 0,

            password: 1,

            text: "DataBase Connection failed",

            zhuangtai: ""

            text: "",

            zhuangtai: "",

            orderid: "",

            GlassInfo: [],

            disabled: false,

            disabled1: false,

            currentPage: 1,  //默认初始页

            pagesize: 15,    //每页默认显示的数据

            pageCount: 0,

            OutSlice: [],

            AluminumFrame: [],

            framebarcode: "",

            isAllowQueue:true

        };

    },

    created() {

@@ -428,7 +744,6 @@
    methods: {

        init() {

            let viewname = "Home";



            if (typeof (WebSocket) == "undefined") {

                console.log("您的浏览器不支持WebSocket");

            } else {

@@ -446,7 +761,6 @@
                };

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

                socket.onmessage = function (msg) {



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

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

                    if (obj.params != null) {

@@ -463,14 +777,58 @@
                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];



                    this.isAllowQueue=obj.isAllowQueue;

                    console.log(obj);

                    //出片队列

                    this.OutSlice = obj.listoutslice[0];

                    this.loadglassheight = obj.loadglassheight;

                    this.zhuangtai = obj.zhuangtai[0];

                    if (obj.zhuangtai != null) {

                        this.zhuangtai = obj.zhuangtai[0];

                    }

                    if (this.dialogFormVisible7 == true) {

                        this.showform7();

                    }

                    if (obj.form2 != null && obj.form2 != "") {

                        this.form2 = obj.form2[0];

                    } else {

                        this.form2 = {};

                    }

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

                        this.form3 = obj.form3[0];



                    } else {

                        this.form3 = {};

                    }

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

                        this.form5 = obj.form3[0];

                        this.showform3();

                        if (this.form5.glassheight < 380 || this.form5.glasswidth < 390 || this.form5.glassheight > 1810 || this.form5.glasswidth > 2760) {

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

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

                            }

                        } else {

                            this.disabled1 = false;

                        }

                    } else {

                        if (this.form5.glassheight < 380 || this.form5.glasswidth < 390 || this.form5.glassheight > 1810 || this.form5.glasswidth > 2760) {

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

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

                            }

                        } else {

                            this.disabled1 = false;

                        }

                    }

                    //if (obj.dbconnected == "false") {

                    this.text = this.$t('DataBase Connection failed');

                    // }

                    SelectCageInfo(this.cage).then(res => {

                        this.cageinfo = res.data.cageinfo;

                    });

                    if (this.dialogFormVisible3 == true) {

                        SelectCageInfo(this.cage).then(res => {

                            this.cageinfo = res.data.cageinfo;

                        });

                    }



                    this.$forceUpdate();



@@ -486,36 +844,34 @@
            }

        },

        load() {

            //加载笼子使用情况数据

            home().then(res => {

                this.tableData = res.data.list;

            });

            //加载理片笼玻璃数据

            home2().then(res => {

                this.cagelist1 = res.data.list1;

                this.cagelist2 = res.data.list2;

                this.cagelist3 = res.data.list3;

                this.cagelist4 = res.data.list4;

            });

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

                this.tasklist1 = res.data.list;

                if (res.data.list.length > 0) {

                    this.incell = this.tasklist1[0]['cell'];

                }

            });

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

                this.tasklist2 = res.data.list;

                if (res.data.list.length > 0) {

                    this.outcell = this.tasklist2[0]['cell'];

                }

            });

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

                this.tasklist2 = res.data.list;

            });

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

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

            });

            //加载小车位置信息

            Loadcarlist().then(res => {

                this.carlist = res.data.carlist;

            });

            //加载确认密码

            SelectPassword().then(res => {

                this.password = res.data.password;

            });

@@ -560,7 +916,7 @@
                        Addglassid(this.glassid).then(res => {

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

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

                                this.cancal();

                                this.cancel();

                            } else if (res.data.message2 == 500) {

                                this.$message.error(this.$t('There are currently tasks'));

                            }

@@ -577,32 +933,133 @@
                }

            }

        },

        showform() {

            if (this.glassid != "") {

                SelectGlassByGlassID(this.glassid).then(res => {

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

                        this.form = res.data.form;

                        this.dialogFormVisible = true;

                    }else{

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

                    }

                });

                
        //显示确认玻璃信息也没

        showform(buttons) {

            if (buttons == 1) {

                this.confirm1 = true;

                this.confirm2 = false;

            } else if (buttons == 2) {

                this.confirm1 = false;

                this.confirm2 = true;

            }

            //根据输入的玻璃id获取玻璃信息

            SelectGlassByGlassID(this.glassid).then(res => {

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

                    this.form = res.data.form;

                    console.log(this.form);

                    this.dialogFormVisible = true;

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

                } else {

                    this.dialogFormVisible = true;

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

                }

            });

        },

        //显示订单信息页面

        showform1() {

            if (this.order != "") {

                this.form1 =

                {

                    order: "NG2210210",

                    number: 800,

                };

                SelectGlassNo(this.order).then(res => {

                    this.form1.order = this.order;

                    this.form1.number = res.data.count;

                });

                this.dialogFormVisible1 = true;

            }

        },

        //显示扫码位和上片位

        showform3() {

            this.dialogFormVisible5 = true;

        },

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

        SelectGlassByGlassIDs(parameter) {

            this.showform3();

            if (parameter == 1) {

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

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

                        this.form4 = res.data.form;

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

                        if (this.form4.glassheight < 380 || this.form4.glasswidth < 390 || this.form4.glassheight > 1810 || this.form4.glasswidth > 2760) {

                            if (this.disabled == false) {

                                this.disabled = true;

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

                            }

                        } else {

                            this.disabled = false;

                        }

                    } else {

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

                    }

                    if (this.form4.length > 0) {

                        if (this.form4.glassId == "") {

                            this.disabled = false;

                        } else {

                            this.disabled = true;

                        }

                    }



                });

            } else {

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

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

                        this.form5 = res.data.form;

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

                        if (this.form5.glassheight < 380 || this.form5.glasswidth < 390 || this.form5.glassheight > 1810 || this.form5.glasswidth > 2760) {

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

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

                            }

                        } else {

                            this.disabled1 = false;

                        }

                    } else {

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

                    }

                    if (this.form5.length > 0) {

                        if (this.form5.glassId == "") {

                            this.disabled = false;

                        } else {

                            this.disabled = true;

                        }

                    }



                });

            }



        },

        cancal() {

        selectglassinfo() {

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

                this.currentPage = 1;

                this.GlassInfo = res.data.glass;

            });

        },

        showform2() {

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

                this.GlassInfo = res.data.glass;

            });

            this.dialogFormVisible4 = true;

        },

        showform6() {

            SelectProductionqueue().then(res => {

                this.OutSlice = res.data.listoutslice;

            });

            this.dialogFormVisible6 = true;

        },

        showform7() {

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

                this.AluminumFrame = res.data.listAluminumFrame;

                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;

        },

        //取消操作时关闭页面

        cancel() {

            this.dialogFormVisible = false;

            this.form = {

                orderId: "",

@@ -611,10 +1068,16 @@
                width: ""

            };

        },

        cancal1() {

        //取消操作时关闭页面

        cancel1() {

            this.dialogFormVisible1 = false;

            this.form1 = {};

        },

        cancel3() {

            this.dialogFormVisible5 = false;

            this.form1 = {};

        },

        //结束进/出片任务

        endtask(type, glassid, cell) {

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

                inputType: 'password',

@@ -639,6 +1102,7 @@
                });

            });

        },

        //显示理片笼详情信息

        showcageinfo(cage) {

            this.cage = cage;

            SelectCageInfo(cage).then(res => {

@@ -646,6 +1110,7 @@
                this.dialogFormVisible3 = true;

            });

        },

        //删除理片笼玻璃

        deleteglass(glassid, state) {

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

                inputType: 'password',

@@ -675,6 +1140,7 @@
                });

            });

        },

        //手动出片

        outglass(glassid, state) {

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

                inputType: 'password',

@@ -689,8 +1155,8 @@
                            if (res.data.message3 == 200) {

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

                            }

                            else if (res.data.message2 == 300) {

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

                            else if (res.data.message2 == 500) {

                                this.$message.error(this.$t('This glass is already in the Queue'));

                            }

                        });

                    } else {

@@ -705,10 +1171,193 @@
                    message: this.$t('Operation canceled')

                });

            });

        },

        //手动往理片笼添加玻璃

        insertglass(cage, cell, tier) {

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

                    this.insertcage = cage;

                    this.insertcell = cell;

                    this.inserttier = tier;

                    this.showform(2);

                } else {

                    this.$message.error(this.$t('Password error'));//密码错误

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

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

                });

            });

        },

        //手动上片

        FeedInglassid() {

            Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {

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

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

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

                        this.dialogFormVisible = false;

                    } else {

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

                    }

                } else {

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

                }



            });

        },

        //启用//理片笼禁用

        UpdateDisabled(cage, cell, disabled) {

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

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

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

                }

            });

        },

        //删除出片队列玻璃

        deleteproductionqueueglass(id) {

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

                    DeleteProductionQueueGlass(id).then(res => {

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

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

                        }

                    });

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

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

                });

            });

        }, handleEdit(index, row) {

            console.log(index, row);

        },

        //表格删除

        handleDelete(index, row) {

            console.log(index, row);

        },

        //改变每页容纳的数据量

        handleSizeChange: function (size) {

            this.pagesize = size;

        },

        //切换页码

        handleCurrentChange: function (currentPage) {

            this.currentPage = currentPage;

        },

        //手动添加扫码位玻璃

        InsertQueueGlass(parameter) {

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

                if (this.form5.glassId != this.form2.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'));

                        }

                    });

                } else {

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

                }

            } else if (parameter == 2 && this.form4.glassId != "") {

                if (this.form4.glassId != this.form3.glassId) {

                    InsertQueueGlassId(2,this.form4).then(res => {

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

                            this.form4 = {};

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

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

                }





            }

        },

        //清除上片队列玻璃

        DeleteQueueGlasss(parameter) {

            if (parameter == 1) {

                DeleteQueueGlass(1).then(res => {

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

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

                    }

                });

            } else {

                DeleteQueueGlass(2).then(res => {

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

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

                    }

                });

            }

        },

        //修改扫码位玻璃状态

        UpdateQueueStates() {

            UpdateQueueState().then(res => {

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

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

                }

            });

        },

        CheckBoxchange(glassid, isChecked) {

            this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })

        },

        addoutslice() {

            // var AluminumFrames1=this.AluminumFrame.map(item=>{return item.barcode});

            // var AluminumFrames2=this.AluminumFrame.map(item=>{return item.isCheck});

            // var AluminumFrames3=this.AluminumFrame.map(item=>{return item.Flip});

            var dats_ = new Array();

            this.AluminumFrame.forEach(item => {

                var dats2_ = new Array();

                dats2_[0] = item.barcode;

                dats2_[1] = item.isCheck;

                dats2_[2] = item.Flip;

                dats2_[3] = item.FrameNo;

                dats2_[4] = item.glasslengthmm;

                dats2_[5] = item.glassheightmm;

                dats_[dats_.length] = dats2_;

            });

            AddOutSliceS(dats_).then(res => {

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

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

                }

            });

        }, getTopMove(row, index) {

            this.OutSlice.splice(index, 1)

            this.OutSlice.unshift(row)

        },

        //上移

        getUpMove(row, index) {

            let arr = this.OutSlice;

            arr.splice(index - 1, 1, ...arr.splice(index, 1, arr[index - 1]));

        },

        //下移

        getDownMove(row, index) {

            let arr = this.OutSlice;

            arr.splice(index, 1, ...arr.splice(index + 1, 1, arr[index]));

        },

        //切换出片队列状态

        isAllowQueueState(){

            isAllowQueues(!this.isAllowQueue).then(res=>{

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

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

                }

            })

        }

    }



}



</script>