ZengTao
2023-12-14 a446066c5f3cedc33e035b2bbc9ad36b5aa18512
CanadaMes-ui/src/views/home/index.vue
@@ -419,11 +419,10 @@
        </el-dialog>
        <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
            <el-table :data="this.alarm" border style="width: 100%;">
            <el-table :data="this.alarm" border style="width: 100%;font-size: 25px;">
                <el-table-column prop="id" :label="$t('id')"></el-table-column>
                <el-table-column prop="content" :label="$t('content')"></el-table-column>
                <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
                <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
            </el-table>
        </el-dialog>
@@ -635,14 +634,14 @@
                this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
            }}</el-button>
            <el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border :cell-style="cellStyle"
                style="width: 100%;overflow: auto;">
                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 prop="state" :label="$t('Glass State')">
                <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') }}
                    </template>
@@ -729,7 +728,7 @@
            </el-table>
        </el-dialog>
        <el-dialog :visible.sync="dialogFormCountDown" :title="$t('Glass information corresponding to aluminum frame')" top="5vh">
        <el-dialog :visible.sync="dialogFormCountDown" :title="$t('Approximately resettable time')" top="5vh">
            <div style="font-size: 500px;text-align: center;">
                {{ this.CountDowns }}
            </div>
@@ -827,11 +826,13 @@
            OutingQueue: true,
            OrderInfo: true,
            CageDetails: true,
            CountDowns:0
            CountDowns:0,
            D01RequestState:false
        };
    },
    created() {
        this.load();
        this.init();
    }
    ,
@@ -881,6 +882,8 @@
                    if (obj.countdown[0]== true&&this.CountDowns==0) {
                        this.CountDown();
                    }
                    //是否有进片请求
                    this.D01RequestState=obj.D01RequestState[0];
                    //是否允许出片
                    this.isAllowQueue = obj.isAllowQueue[0];
@@ -914,8 +917,14 @@
                        this.loadglassheight1 = 70;
                        this.form5 = obj.form3[0];
                        this.showform3();
                        this.Sizerange(this.form5, 3);
                        this.glassid1 = "";
                        if(this.D01RequestState==true){
                            this.Sizerange(this.form5, 3);
                        }else{
                            this.disabled1=true;
                        }
                    } else {
                        if (this.glassid1 == "") {
                            this.DeleteBarcodeGlass();
@@ -1689,8 +1698,7 @@
                    } else {
                        this.disabled = false;
                    }
                    console.log(position,this.isConfirm);
                    if (position == 3 && this.isConfirm == true) {
                    if (position == 3 && this.isConfirm == true&&this.D01RequestState==true) {
                        this.InsertQueueGlass(1);
                    }
                }
@@ -1710,17 +1718,17 @@
        },
        CountDown(){
            //50秒倒数计时
            let count = 50;
            let count = 45;
            let timer = setInterval(
                () => {
                    if (count > 0) {
                        this.countDown = count;
                        count--;
                        this.CountDowns=count;
                        count--;
                    }
                    else {
                        clearInterval(timer);
                        this.countDown = 0;
                        this.CountDowns = 0;
                        this.dialogFormCountDown=false;
                    }
                },
                1000