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

wuyouming666

2024-05-29 75375a0f68c8b91799482dc1cd2ec7d7f211167f

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

@@ -235,7 +235,6 @@
    height: 15px;

    position: absolute;

}



</style>

<template>

    <el-container>

@@ -244,7 +243,7 @@
            <div class="box" @click="dialogFormVisible2 = true">

                <div class="text">

                    <!-- Alarm: -->

                    {{ this.text }}{{this.plc1}}{{this.plc2}}

                    {{ this.text }}{{ this.plc1 }}{{ this.plc2 }}

                    <label v-for="item in this.alarm" :key="item['id']">

                        {{ item['content'] }}

                    </label>

@@ -259,13 +258,13 @@
                <el-button type="primary" @click="showform2()" :disabled="OrderInfo"

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

                    }}</el-button>

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

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

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

                    }}</el-button>

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

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

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

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

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

@@ -273,7 +272,7 @@
                    {{ $t('Terminate Outing') }}</el-button>

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

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

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

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

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

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

            </div>

@@ -295,7 +294,7 @@
                            {{ scope.row.glasswidthmm }}*{{ scope.row.glassheightmm }}

                        </template>

                    </el-table-column>

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

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

                        <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('Task Complete')

@@ -321,7 +320,7 @@
                        </template>

                    </el-table-column>



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

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

                        <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('Task Complete')

@@ -345,7 +344,8 @@
        </el-main>

        <el-footer>

            <div class="blocks" style="position: relative;">

                <div :style="'position:absolute;width:40px;height:40px;top:40px;left:50px;background-Color:'+StateColor+';font-size:30px;text-align:center;border-radius: 50%;'">

                <div

                    :style="'position:absolute;width:40px;height:40px;top:40px;left:50px;background-Color:' + StateColor + ';font-size:30px;text-align:center;border-radius: 50%;'">

                    {{ CountDowns }}

                </div>

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

@@ -416,66 +416,66 @@
                <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('Confirmation needed') }}</el-button>

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

                </div>

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

                    <br />

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

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

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

                </div>

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

                    B01:{{ ShowGlassIdList(2) }}

                    <br />

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

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

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

                </div>

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

                    <br />

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

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

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

                </div>

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

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

                    <br />

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

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

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

                </div>



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

                    <br />

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

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

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

                </div>



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

                    <br />

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

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

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

                </div>



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

                    {{ ShowGlassIdList(7) }}

                    <br />

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

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

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

                </div>

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

                    {{ ShowGlassIdList(8) }}

                    <br />

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

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

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

                </div>

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

                    {{ ShowGlassIdList(9) }}

                    <br />

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

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

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

                </div>

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

                    {{ ShowGlassIdList(10) }}

                    <br />

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

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

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

                </div>





@@ -598,16 +598,20 @@
                <el-table-column :min-width="250" :label="$t('Operate')">

                    <template slot-scope='scope'>

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

                            :disabled="scope.row.state == 1 ? false : true"

                            :disabled="(scope.row.state == 1 && (loadname == 'admin' || loadname == 'northglass')) ? false : true"

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

                            :disabled="(scope.row.state == 1 && (loadname == 'admin' || loadname == 'Transfer' || loadname == 'northglass' )) ? false : true"

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



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

                            :disabled="(loadname == 'admin' || loadname == 'northglass') ? false : true"

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

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



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

                            :disabled="scope.row.glassId != null ? true : false"

                            :disabled="(scope.row.glassId == null && (loadname == 'admin' || loadname == 'northglass')) ? false : true"

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

                            }}</el-button>

                    </template>

@@ -680,7 +684,7 @@
                </div>



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

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

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

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

                    </el-form-item>

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

@@ -689,8 +693,9 @@
                    <el-form-item :label="$t('Barcode')">

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

                    </el-form-item>

                    <el-form-item :label="$t('Barcode')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">

                        <el-input v-model="form6.barcode" readonly autocomplete="off"  />

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

                        :style="'background-Color:' + (form6state == 1 ? 'yellow' : '') + ';'">

                        <el-input v-model="form6.barcode" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

@@ -703,7 +708,8 @@
                    <el-form-item :label="$t('Order No')">

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

                    </el-form-item>

                    <el-form-item :label="$t('Order No')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">

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

                        :style="'background-Color:' + (form6state == 1 ? 'yellow' : '') + ';'">

                        <el-input v-model="form6.ordernumber" readonly autocomplete="off" />

                    </el-form-item>

                </div>

@@ -717,7 +723,8 @@
                    <el-form-item :label="$t('List No')">

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

                    </el-form-item>

                    <el-form-item :label="$t('List No')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">

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

                        :style="'background-Color:' + (form6state == 1 ? 'yellow' : '') + ';'">

                        <el-input v-model="form6.listnumber" readonly autocomplete="off" />

                    </el-form-item>

                </div>

@@ -731,7 +738,8 @@
                    <el-form-item :label="$t('Box No')">

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

                    </el-form-item>

                    <el-form-item :label="$t('Box No')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">

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

                        :style="'background-Color:' + (form6state == 1 ? 'yellow' : '') + ';'">

                        <el-input v-model="form6.boxnumber" readonly autocomplete="off" />

                    </el-form-item>

                </div>

@@ -745,7 +753,8 @@
                    <el-form-item :label="$t('Length')">

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

                    </el-form-item>

                    <el-form-item :label="$t('Length')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">

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

                        :style="'background-Color:' + (form6state == 1 ? 'yellow' : '') + ';'">

                        <el-input v-model="form6.glasslength" readonly autocomplete="off" />

                    </el-form-item>

                </div>

@@ -759,7 +768,8 @@
                    <el-form-item :label="$t('Width')">

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

                    </el-form-item>

                    <el-form-item :label="$t('Width')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">

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

                        :style="'background-Color:' + (form6state == 1 ? 'yellow' : '') + ';'">

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

                    </el-form-item>

                </div>

@@ -769,7 +779,8 @@
                        {{ $t('Confirm') }}</el-button>

                    <span style="margin-right: 12%;">

                        {{ $t('Remaining width:') }}

                        {{ (108.27 - (Object.keys(this.form6).length === 0 ? 0 : (form6.glassheight > form6.glasslength ?

                        {{ (108.27 - (Object.keys(this.form6).length === 0 ? 0 : (form6.glassheight > form6.glasslength

                ?

                form6.glassheight : form6.glasslength))).toFixed(2) }}



                    </span>

@@ -830,22 +841,48 @@
                    </el-table>

                </div>

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

                    <div style="background-color: yellow;">

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

                        <h1 style="font-size: 40px;text-align: center;">{{ $t('List No') }}:{{ frameInfo.listnumber }}

                        </h1>

                        <h1 style="font-size: 40px;text-align: center;">{{ $t('Box No') }}:{{ frameInfo.boxnumber }}

                        </h1>

                    </div>

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

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

                    </h1>

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

                        }}

                    </h1>

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

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

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

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

                    <div>

                        <div v-if="item['flip'] == 1"

                            style="width:40px;height:150px;border:1px solid black;float: left;">



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

                ">

                        </div>

                        <div class="frame"

                            :style="'background-color: ' + Colorchange(1) + ';margin-top:30px;margin:0 auto;width: 370px;height:150px;float: left;'">

                            <h1 style="font-size: 54px;text-align: center;color:white;margin-top: 0px;">

                                {{ framecolor1 == "green" ? $t('Interior Out Bypass: Right')

                : framecolor1 == "blue" ? $t('Exterior Out Bypass: Left')

                    : $t('Remove Frame') }}

                            </h1>

                        </div>

                        <div v-if="item['flip'] == 2"

                            style="width:40px;height:150px;border:1px solid black;float: left;">



                        </div>

                    </div>

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

                (item['framewidthmm'] * 1) > (item['frameheightmm'] * 1) ? item['frameheightmm'] :

                    item['framewidthmm']

            }}

                    </h1>

                    <div>

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

                            {{ (item['frameheightmm'] * 1) > (item['framewidthmm'] * 1) ? item['frameheightmm'] :

                item['framewidthmm'] }}</h1>

                    </div>



                </div>

            </div>



@@ -853,11 +890,12 @@


        <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="AddOutSliceS()">{{ $t('Outfeed') }}</el-button>

            <el-button type="primary" @click="AddOutSliceS()" :disabled="framestate">{{ $t('Outfeed') }}</el-button>

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

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

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

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

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

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

@@ -868,7 +906,10 @@
                <el-table-column prop="storageCage.cage" :label="$t('Cage 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 }}

                        {{

                scope.row.storageCage == null ? "" :

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

            }}

                    </template>

                </el-table-column>

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

@@ -892,6 +933,59 @@
                    </template>

                </el-table-column>

            </el-table>

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

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

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

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

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

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

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

                <div>

                    <div v-if="item['flip'] == 1" style="width:40px;height:150px;border:1px solid black;float: left;">

                    </div>

                    <div class="frame"

                        :style="'background-color: ' + Colorchange(0) + ';margin-top:30px;margin:0 auto;width: 370px;height:150px;float: left;'">

                        <h1 style="font-size: 54px;text-align: center;color:white;margin-top: 0px;">

                            {{ framecolor == "green" ? $t('Interior Out Bypass: Right')

                : framecolor == "blue" ? $t('Exterior Out Bypass: Left')

                    : $t('Remove Frame') }}

                        </h1>

                    </div>

                    <div v-if="item['flip'] == 2" style="width:40px;height:150px;border:1px solid black;float: left;">



                    </div>

                </div>

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

                (item['framelength'] * 1) > (item['frameheight'] * 1) ? item['frameheight'] :

                    item['framelength']

            }}

                </h1>

                <div>

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

                        {{ (item['frameheight'] * 1) > (item['framelength'] * 1) ? item['frameheight'] :

                        item['framelength']}}</h1>

                </div>



            </div>







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

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

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

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

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

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

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

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

                </h1>

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

                    }}

                </h1>

                <div class="frame"

                    :style="'background-color: ' + framecolor +';margin-top:30px;margin:0 auto;width:400px;height:150px;' ">

                </div>

            </div> -->

        </el-dialog>

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

            <div :style="'font-size: ' + PromptSize + 'px;text-align: center;'">

@@ -1013,21 +1107,25 @@
            count1: 0,

            count2: 1,

            loadname: "",

            form6state:0,

            StateColor:"green",

            plc1:"",

            plc2:""

            form6state: 0,

            StateColor: "green",

            plc1: "",

            plc2: "",

            AluminumFrameInfo: {},

            framestate: false,

            framecolor: "green",

            framecolor1: "green",

            frameInfo: {}

        };

    },

    created() {

        this.load();

        setInterval(() => {

            if(this.count1<this.count2){

                this.count1=this.count2;

            }else{

            if (this.count1 < this.count2) {

                this.count1 = this.count2;

            } else {

                const now = new Date();

                console.log(this.count1,this.count2);

                console.log(this.$t('Mes Connection failed')+now);

                console.log(this.$t('Mes Connection failed') + now);

            }

        }, 60000);

    },

@@ -1036,6 +1134,13 @@
    }

    ,

    methods: {

        Colorchange(i) {

            if (i == 0) {

                return this.framecolor;

            } else {

                return this.framecolor1;

            }

        },

        init() {

            let viewname = "Home";

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

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

                    }

                    if (obj.Plc1 != null) {

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

                            this.plc1="";

                        }else{

                            this.plc1=this.$t('Plc1 Connection failed');

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

                            this.plc1 = "";

                        } else {

                            this.plc1 = this.$t('Plc1 Connection failed');

                        }

                    }

                    if (obj.Plc2 != null) {

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

                            this.plc2="";

                        }else{

                            this.plc2=this.$t('Plc2 Connection failed');

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

                            this.plc2 = "";

                        } else {

                            this.plc2 = this.$t('Plc2 Connection failed');

                        }

                    }



@@ -1102,6 +1207,30 @@


                    //查询当前铝框信息

                    this.CurrentFrame = obj.CurrentFrame;

                    if (obj.CurrentFrame.length!=0) {

                        if (this.CurrentFrame[0].frameheightmm > this.CurrentFrame[0].framewidthmm) {

                            if (this.CurrentFrame[0].frameheightmm < 23.62205 || this.CurrentFrame[0].framewidthmm < 15.748||this.CurrentFrame[0].frameheightmm > 144.094488 || this.CurrentFrame[0].framewidthmm > 70.8661417) {

                                this.framecolor1 = "red";

                            } else {

                                if (this.CurrentFrame[0].flip == 2) {

                                    this.framecolor1 = "green";

                                } else {

                                    this.framecolor1 = "blue";

                                }



                            }

                        } else {

                            if (this.CurrentFrame[0].frameheightmm < 15.748 || this.CurrentFrame[0].framewidthmm < 23.62205||this.CurrentFrame[0].frameheightmm > 70.8661417 || this.CurrentFrame[0].framewidthmm > 144.094488) {

                                this.framecolor1 = "red";

                            } else {

                                if (this.CurrentFrame[0].flip == 2) {

                                    this.framecolor1 = "green";

                                } else {

                                    this.framecolor1 = "blue";

                                }

                            }

                        }

                    }



                    // 获取设备状态

                    if (obj.DeviceList != null) {

@@ -1115,9 +1244,47 @@
                    if (obj.AluminumFrame != null) {



                        this.AluminumFrame = obj.AluminumFrame[0];





                        if (this.dialogFormVisible6 == true) {

                            this.dialogFormVisible7 = true;

                        }

                    }



                    if (obj.frameInfo != null) {

                        this.frameInfo = obj.frameInfo[0];

                    }



                    if (obj.AluminumFrameInfo != null) {

                        this.AluminumFrameInfo = obj.AluminumFrameInfo;

                        if (this.AluminumFrameInfo[0].frameheightmm > this.AluminumFrameInfo[0].framelengthmm) {

                            if (this.AluminumFrameInfo[0].frameheightmm < 600 || this.AluminumFrameInfo[0].framelengthmm < 400||this.AluminumFrameInfo[0].frameheightmm > 3660|| this.AluminumFrameInfo[0].framelengthmm > 1800) {

                                this.framestate = true;

                                this.framecolor = "red";

                            } else {

                                this.framestate = false;

                                if (this.AluminumFrameInfo[0].flip == 2) {

                                    this.framecolor = "green";

                                } else {

                                    this.framecolor = "blue";

                                }



                            }

                        } else {

                            if (this.AluminumFrameInfo[0].frameheightmm < 400 || this.AluminumFrameInfo[0].framelengthmm < 600||this.AluminumFrameInfo[0].frameheightmm > 1800 || this.AluminumFrameInfo[0].framelengthmm > 3660) {

                                this.framestate = true;

                                this.framecolor = "red";

                            } else {

                                this.framestate = false;

                                if (this.AluminumFrameInfo[0].flip == 2) {

                                    this.framecolor = "green";

                                } else {

                                    this.framecolor = "blue";

                                }

                            }

                        }

                    } else {

                        this.AluminumFrameInfo = {};

                    }



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

@@ -1175,9 +1342,9 @@
                            }

                            else if (obj.zhi[0] == 400) {

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

                            } else if(obj.zhi[0] == 500) {

                            } else if (obj.zhi[0] == 500) {

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

                            } else if(obj.zhi[0] == 600) {

                            } else if (obj.zhi[0] == 600) {

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

                            }

                        }

@@ -1239,15 +1406,15 @@
                        }

                    }

                    if (obj.form6 != null) {

                        this.form6state=1;

                        this.form6state = 1;

                        this.form6 = obj.form6[0];

                        if(this.form6.glassheight=="0"){

                            this.form6.glassheight="";

                            this.form6.glasslength="";

                        if (this.form6.glassheight == "0") {

                            this.form6.glassheight = "";

                            this.form6.glasslength = "";

                        }

                    } else {

                        this.form6 = {};

                        this.form6state=0;

                        this.form6state = 0;

                    }

                    //数据库连接是否正常

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

@@ -1377,7 +1544,7 @@
                    height = this.form.glasswidth;

                    width = this.form.glassheight;

                }

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

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

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

                } else {

                    if (this.zhuangtai == true) {

@@ -1440,8 +1607,9 @@
        WriteGlassID() {

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

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

                    console.log(res.data);

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

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

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

                    }

                });

            } else {

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

@@ -1500,22 +1668,19 @@
        },

        //结束进/出片任务

        endtask(type, glassid, cell) {

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

                inputType: 'password',

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

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

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

            }).then(() => {

                    UpdateTask(type, glassid, cell).then(res => {

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

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

                        }

                    });

                } else {

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

                }

                
            }).catch(() => {

                this.$message({

                    type: 'info',

@@ -1539,23 +1704,19 @@
        },

        //删除理片笼玻璃

        deleteglass(glassid, state) {

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

                inputType: 'password',

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

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

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

            }).then(() => {

                    if (state == 1) {

                        DeleteByGlassID(glassid).then(res => {

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

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

                            }

                        });

                    } else {

                        this.$message.error(this.$t('No delete allowed'));

                    }

                } else {

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

                }

@@ -1569,14 +1730,13 @@
        },

        //手动出片

        outglass(glassid, state) {

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

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

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

            }).then(() => {

                    if (state == 1) {

                        OutByGlassID(glassid).then(res => {

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

@@ -1592,9 +1752,6 @@
                                this.$message.error(this.$t('This glass is already in the Queue'));

                            }

                        });

                    } else {

                        this.$message.error(this.$t('No out allowed'));

                    }

                } else {

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

                }

@@ -1607,21 +1764,17 @@
        },

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

        insertglass(cage, cell, tier) {

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

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

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

            }).then(() => {

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

@@ -1659,20 +1812,18 @@
        },

        //启用//理片笼禁用

        UpdateDisabled(cage, cell, disabled) {

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

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

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

            }).then(() => {

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

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

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

                        }

                    });

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

@@ -1683,22 +1834,20 @@
        },

        //删除出片队列玻璃

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

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

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

                        } else {

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

                        }

                    });

                }

            }).then(() => {

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

                    }

                });

            }).catch(() => {

                this.$message({

                    type: 'info',

@@ -1741,7 +1890,7 @@
                            }

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

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

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

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

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

                            }

                        });

@@ -1801,6 +1950,10 @@
            if (this.AluminumFrame != null) {

                AddOutSliceS(this.AluminumFrame[0].frameBarcode).then(res => {

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

                        this.AluminumFrame = null;

                        this.AluminumFrameInfo = null;

                        this.dialogFormVisible7 = false;

                        this.framebarcode = "";

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

                    }

                });

@@ -1812,7 +1965,9 @@
                CloseForm7().then(res => {

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

                        this.AluminumFrame = null;

                        this.AluminumFrameInfo = null;

                        this.dialogFormVisible7 = false;

                        this.framebarcode = "";

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

                    }

                });

@@ -2011,7 +2166,6 @@
        },

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

        Sizerange(Glass, position) {

            console.log(position);

            if (this.ManuallyInfeedGlass == false) {

                let width = 0;

                let height = 0;

@@ -2022,7 +2176,7 @@
                    height = Glass.glasswidth;

                    width = Glass.glassheight;

                }

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

                if (height < 225 || 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',

@@ -2072,28 +2226,28 @@
                () => {

                    if (this.EmergencyStop == true) {

                        clearInterval(timer);

                        this.StateColor="red";

                        this.StateColor = "red";

                        this.CountDowns = "";

                    } else {

                        if (count > 0) {

                        this.StateColor="yellow";

                        this.PromptSize = 500;

                        this.CountDowns = count;

                        count--;

                            this.StateColor = "yellow";

                            this.PromptSize = 500;

                            this.CountDowns = count;

                            count--;

                        }

                        else {

                        this.PromptSize = 200;

                        this.CountDowns = "";

                        this.StateColor="green";

                        if (this.reset == true) {

                            clearInterval(timer);

                        }

                            this.PromptSize = 200;

                            this.CountDowns = "";

                            this.StateColor = "green";

                            if (this.reset == true) {

                                clearInterval(timer);

                            }

                        }

                    }

                },

                1000

            );

            },

        },

        //更换当前铝框

        FrameStateUpdate(frameno) {

            FrameStateUpdate(frameno).then(res => {