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

wuyouming666

2024-01-11 5400d8b310ce6fe6919594a096f3a87307a66e61

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

@@ -46,9 +46,6 @@
    background-color: blue;

}



.red {

    background-color: red;

}



.yellow {

    background-color: yellow;

@@ -211,6 +208,14 @@
    text-align: right;

}



.hide {

    display: none;

}



.el-table .cell {

    display: flex;

}



/* .el-table td,

.el-table th {

    padding: 0px 0;

@@ -230,21 +235,23 @@
                </div>

            </div>

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

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

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

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

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

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

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

                    {{ $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 :width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>

                    <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="130" prop="orderId" :label="$t('Order No')"></el-table-column>

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

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

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

                    <el-table-column :min-width="130" prop="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')">

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

                        <template slot-scope='scope'>

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

                        </template>

@@ -258,13 +265,13 @@
                    </el-table-column>

                </el-table>

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

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

                    <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="130" prop="orderId" :label="$t('Order No')"></el-table-column>

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

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

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

                    <el-table-column :min-width="130" prop="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')">

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

                        <template slot-scope='scope'>

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

                        </template>

@@ -325,9 +332,11 @@
                <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()" :disabled="OrderInfo">{{ $t('OrderInfo')

                }}</el-button>

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

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

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

                    }}</el-button>

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

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

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



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

@@ -435,10 +444,10 @@
                <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')"></el-table-column>

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

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

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

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

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

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

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

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

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

                    <template slot-scope='scope'>

                        {{

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

@@ -451,6 +460,12 @@
                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{ scope.row.glassHeightMm }}

                    </template>

                </el-table-column>

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

                    <template slot-scope='scope'>

                        {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}

                    </template>

                </el-table-column>

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

                    <template slot-scope='scope'>

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

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

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

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

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

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

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

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

                            }}</el-button>

                    </template>

                </el-table-column>

@@ -472,7 +487,7 @@


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

                @current-change="handleCurrentChanges" :pager-count="7" :current-page="currentPages"

                :page-sizes="[21, 42, 84, 420]" :page-size="pagesizes" layout="total, sizes, prev, pager, next, jumper"

                :page-sizes="[42, 84, 126, 420]" :page-size="pagesizes" layout="total, sizes, prev, pager, next, jumper"

                :total="cageinfo.length > 0 ? cageinfo.length : null" background style="float: right; margin-top: 20px">

            </el-pagination>



@@ -501,8 +516,11 @@
            <el-form :model="form" label-width="100px" style="padding-right: 30px">

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

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

                    <div>

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

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

                        {{ this.isConfirm == true ? "Allow" : "Not Allow" }}</el-button>

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

                    </div>

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

                </div>

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

@@ -628,48 +646,66 @@
        </el-dialog>



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

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

            {{  $t('Queue State') }}:

            {{ this.isAllowQueue

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

            }}

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

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

            }}</el-button>

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

            {{  $t('Sorting State') }}:

            {{

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

            }}

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

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

            }}</el-button>

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

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

            <label style="background-color:yellow;font-size: 23px;" for="">{{ isQueueWarning== true ? $t('The cage is disabled') : "" }}</label>

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

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

            </span> -->

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

                style="width: 100%;overflow: auto;font-size: 18px;">

                <el-table-column :min-width="100" 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="storageCage.glasswidthmm" :label="$t('Length')"></el-table-column>

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

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

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

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

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

                <el-table-column :min-width="100" prop="glasswidthmm" :label="$t('Length')"></el-table-column>

                <el-table-column :min-width="100" prop="glassheightmm" :label="$t('Width')"></el-table-column>

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

                    <template slot-scope='scope'>

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

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

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

                    </template>

                </el-table-column>

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

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

                    <template slot-scope='scope'>

                        {{ scope.row.position == 1 ? "▄▄▄" : "▋" }}

                    </template>

                </el-table-column>

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

                    <template slot-scope='scope'>

                        {{ scope.row.flip == 1 ? $t('Yes') : $t('No') }}

                    </template>

                </el-table-column>

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



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

                    <template slot-scope='scope'>

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

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

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

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

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

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

                            }}</el-button>

                    </template>

                </el-table-column>

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

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

                    <template slot-scope='scope'>

                        <div

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

                            
                        </div>

                    </template>

                </el-table-column>

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

                    <template slot-scope='scope'>

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

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

                    </template>

                </el-table-column>

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

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

                    <template slot-scope='scope'>

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

                            style="font-size: 15px;"

@@ -688,6 +724,10 @@
                        </el-button>

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

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



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

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

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

                    </template>

                </el-table-column>

            </el-table>

@@ -697,7 +737,7 @@
            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-button type="primary" @click="addoutslice()">{{ $t('Add') }}</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>

@@ -710,7 +750,7 @@
                <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="Flip" :label="$t('Flipped')"></el-table-column>

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

                    <template slot-scope='scope'>

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

@@ -730,9 +770,9 @@
                </el-table-column>

            </el-table>

        </el-dialog>



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

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

                <!-- {{ this.CountDowns }} -->

                {{ this.CountDowns }}

            </div>

        </el-dialog>

@@ -743,7 +783,8 @@
import {

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

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

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

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

    isAllowReorderings, FrameStateUpdate

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





@@ -816,7 +857,7 @@
            pagesize: 15,    //每页默认显示的数据

            pageCount: 0,

            currentPages: 1,  //默认初始页

            pagesizes: 21,    //每页默认显示的数据

            pagesizes: 42,    //每页默认显示的数据

            pageCounts: 0,

            OutSlice: [],

            AluminumFrame: [],

@@ -829,10 +870,12 @@
            OutingQueue: true,

            OrderInfo: true,

            CageDetails: true,

            CountDowns: "EMERGENCY STOP",

            CountDowns: "0",

            D01RequestState: false,

            EmergencyStop: false,

            PromptSize: 250

            PromptSize: 250,

            reset: false,

            isQueueWarning: false

        };

    },

    created() {

@@ -877,24 +920,46 @@
                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];

                    if (this.alarm.length > 0) {

                        this.dialogFormVisible2 = true;

                    } else {

                        this.dialogFormVisible2 = false;

                    }

                    //是否急停

                    this.EmergencyStop = obj.emergencystop[0];

                    console.log(this.EmergencyStop);

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

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

                    //         if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {

                    //             this.alarm = obj.alarmmg[0];

                    //             this.dialogFormVisible2 = true;

                    //         }

                    //     } else {

                    //         this.alarm = obj.alarmmg[0];

                    //         this.dialogFormVisible2 = true;

                    //     }

                    // }

                    // //是否急停

                    // if (obj.emergencystop != null) {

                    //     this.EmergencyStop = obj.emergencystop[0];

                    // }



                    //复位倒计时

                    if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {

                        this.CountDown();

                    }

                    // //复位倒计时

                    // if (obj.countdown != null) {

                    //     if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {

                    //         this.CountDown();

                    //     }

                    // }



                    // //复位完成信号

                    // if (obj.reset != null) {

                    //     this.reset = obj.reset[0];

                    // }



                    //是否有进片请求

                    this.D01RequestState = obj.D01RequestState[0];

                    if (obj.D01RequestState != null) {

                        this.D01RequestState = obj.D01RequestState[0];

                    }

                    // this.D01RequestState=true;



                    //是否允许出片

                    this.isAllowQueue = obj.isAllowQueue[0];

                    //当前出片格子是否被禁用

                    this.isQueueWarning = obj.isQueueWarning[0];

                    //是否允许出片队列调序

                    this.isAllowReordering = obj.isAllowReordering[0];

                    //出片队列

                    if (this.isAllowReordering == true) {

                        this.OutSlice = obj.listoutslice[0];

@@ -1012,7 +1077,7 @@
            SelectAlarmmgInfo().then(res => {

                this.alarm = res.data.alarmmg;

            });

            


            //加载确认密码

            SelectPassword().then(res => {

                this.password = res.data.password;

@@ -1027,7 +1092,7 @@
            } else if (state == 2) {

                return "yellow gezi";

            } else if (state == 3) {

                return "red gezi";

                return "black gezi";

            } else {

                return "black gezi";

            }

@@ -1045,7 +1110,6 @@
                    this.load();

                });

            }



        },

        //手动上片

        sbumitglassid() {

@@ -1065,7 +1129,7 @@
                                this.$message.error(this.$t('There is no such glass'));

                            }

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

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

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

                            }

                        });

                    } else {

@@ -1470,19 +1534,24 @@
            this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })

        },

        //添加到出片队列

        addoutslice() {

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

        AddOutSliceS() {

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

            //     }

            // });

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

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

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

                }

@@ -1607,9 +1676,13 @@
                }

            })

        },

        //

        isAllowReorderingState() {

            this.isAllowReordering = !this.isAllowReordering;

        //是否允许出片队列排序

        isAllowReorderings() {

            isAllowReorderings(!this.isAllowReordering, this.OutSlice).then(res => {

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

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

                }

            })

        },

        //切换上片是否需要确认玻璃信息

        isConfirmState() {

@@ -1620,21 +1693,20 @@
            });

        }

        ,

        cellStyle({ row, column, rowIndex, columnIndex }) {

            // console.log(row, column, "ss");

        //表格样式

        cellStyle({ column, rowIndex, columnIndex }) {

            column = rowIndex;

            rowIndex = column;

            let style = "";

            if (columnIndex === 8) {

                style = "font-size:25px;text-align: center;";

                style = "font-size:200px;text-align: center;";

            }

            if (columnIndex === 9 && row.flip == 1) {

                style = "background-Color:yellow;";

            }

            if (columnIndex === 6 && row.state == 3) {

                style = "background-Color:gray;";

            }

            style

            // if (columnIndex === 9 && row.flip == 1) {

            //     style = "background-Color:yellow;";

            // }

            // if (columnIndex === 6 && row.state == 3) {

            //     style = "background-Color:gray;";

            // }

            return style;

        }

        ,

@@ -1652,7 +1724,7 @@
            if (rowIndex != 0) {

                barcode2 = arrOutSlice[rowIndex - 1].barcode;

            }

            if (columnIndex === 12) {

            if (columnIndex === 12 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11) {

                if (barcode != barcode2) {

                    // this.FrameNoFlag = barcode;

                    for (let i = rowIndex; i < this.OutSlice.length; i++) {

@@ -1660,7 +1732,6 @@
                            barcode = arrOutSlice[i].barcode;

                            rowspans += 1;

                        } else {



                            break;

                        }

                    }

@@ -1721,35 +1792,47 @@
                }

            });

        },

        //45秒复位倒数计时

        CountDown() {

            //50秒倒数计时

            let count = 45;

            let timer = setInterval(

                () => {

                    if (this.EmergencyStop == true) {

                        this.dialogFormCountDown = false;

                        clearInterval(timer);

                        this.PromptSize = 250;

                        this.CountDowns = "EMERGENCY STOP";

                        this.CountDowns = "0";

                    } else {

                        if (count > 0) {

                            this.PromptSize = 500;

                            this.CountDowns = count;

                            count--;

                            this.CountDowns = count;

                            this.dialogFormCountDown = true;

                        }

                        else {

                            this.PromptSize = 250;

                            this.PromptSize = 200;

                            this.CountDowns = "Waiting for reset";

                            
                            // if(复位完成==true){

                            //     clearInterval(timer);

                            //     this.dialogFormCountDown = false;

                            // }

                            if (this.reset == true) {

                                clearInterval(timer);

                                this.dialogFormCountDown = false;

                            }

                        }

                    }

                },

                1000

            );

            this.dialogFormCountDown = true;



        },

        FrameStateUpdate(frameno,framestate){

            if(framestate == 1){

                framestate=0;

            }else{

                framestate=1;

            }

            FrameStateUpdate(frameno,framestate).then(res=>{

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

                    this.$message.success("Operation successful");

                }

            });

        }

    }

}