修改进出片终止功能

ZengTao

2023-12-21 03ddbc02f5f0f35354489af3badacccd993457f0

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

@@ -214,9 +214,11 @@
.hide {

    display: none;

}



.el-table .cell {

    display: flex;

}



/* .el-table td,

.el-table th {

    padding: 0px 0;

@@ -262,7 +264,9 @@
                            <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

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

                                }}</el-button>



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

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

                                }}</el-button>

                        </template>

                    </el-table-column>

                </el-table>

@@ -663,10 +667,10 @@
                    </template>

                </el-table-column>

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

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

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

@@ -683,13 +687,13 @@
                </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') }}

                        {{ 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="280" :label="$t('Operate')">

                    <template slot-scope='scope'>

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

@@ -900,7 +904,7 @@
                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];

                    if (this.alarm.length > 0) {

                    if (this.alarm.length > 0&&this.alarm!=obj.alarmmg[0]) {

                        this.dialogFormVisible2 = true;

                    } else {

                        this.dialogFormVisible2 = false;

@@ -911,22 +915,22 @@
                    }



                    //复位倒计时

                    if(obj.countdown!=null){

                    if (obj.countdown != null) {

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

                        this.CountDown();

                            this.CountDown();

                        }

                    }

                    }

                    


                    //复位完成信号

                    if( obj.reset!=null){

                    if (obj.reset != null) {

                        this.reset = obj.reset[0];

                    }

                    


                    //是否有进片请求

                    if(obj.D01RequestState!=null){

                    if (obj.D01RequestState != null) {

                        this.D01RequestState = obj.D01RequestState[0];

                    }

                    




                    //是否允许出片

                    this.isAllowQueue = obj.isAllowQueue[0];

@@ -1667,10 +1671,9 @@
            // if (columnIndex === 9 && row.flip == 1) {

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

            // }

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

                style = "background-Color:gray;";

            }

            style

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

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

            // }

            return style;

        }

        ,

@@ -1688,7 +1691,7 @@
            if (rowIndex != 0) {

                barcode2 = arrOutSlice[rowIndex - 1].barcode;

            }

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

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

                if (barcode != barcode2) {

                    // this.FrameNoFlag = barcode;

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