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

clll

2023-11-29 707d28bd18f8832ac3824af4ae6f50dc1a30ee41

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

@@ -67,17 +67,17 @@
}



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





@@ -119,8 +119,8 @@


.orderbutton2 {

    position: absolute;

    left: 1170px;

    top: 70px;

    left: 500px;

    top: -10px;

}



.blocks-img3 {

@@ -185,6 +185,11 @@
.el-dialog {

    width: 90%;

}



/* .el-table td,

.el-table th {

    padding: 0px 0;

} */

</style>

<template>

    <el-container>

@@ -209,11 +214,17 @@
                <el-table :data="this.tasklist1" border style="width: 100%">

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

                    <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order 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="north_glass_buffer1s.ordernumber"

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

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

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

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

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

                        <template slot-scope='scope'>

                            {{ scope.row.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight

                            }}

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

@@ -225,13 +236,15 @@
                <el-table :data="this.tasklist2" border style="width: 100%">

                    <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="150" prop="glassId" :labelf="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order 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="north_glass_buffer1s.ordernumber"

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

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

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

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

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

                        <template slot-scope='scope'>

                            {{ scope.row.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight }}

                            {{ scope.row.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight

                            }}

                        </template>

                    </el-table-column>



@@ -341,10 +354,10 @@
                    <el-input v-model="form.glassheight" readonly autocomplete="off" />

                </el-form-item>

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

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

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

                </el-form-item>

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

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

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

                </el-form-item>



            </el-form>

@@ -392,12 +405,12 @@
                <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="100" prop="glassId" :label="$t('Barcode')"></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="100" prop="north_glass_buffer1s.listnumber"

                <el-table-column :width="80" prop="north_glass_buffer1s.listnumber"

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

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

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

                <el-table-column :width="150" prop="lengthWidth" :label="$t('Dim')"></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;"

@@ -420,11 +433,11 @@
            <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>

@@ -547,11 +560,11 @@
                    </el-form-item>

                </div>

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

                    <el-button @click="DeleteQueueGlasss(2)" type="primary" :disabled="disabled1">{{ $t('Clear Current')

                    <el-button @click="DeleteQueueGlasss(2)" type="primary" :disabled="disabled">{{ $t('Clear Current')

                    }}</el-button>

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

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

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

                    <el-button @click="DeleteQueueGlasss(1)" type="primary" :disabled="disabled1">{{ $t('Clear Current')

                    <el-button @click="DeleteQueueGlasss(1)" type="primary" :disabled="disabled">{{ $t('Clear Current')

                    }}</el-button>

                    <el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">

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

@@ -576,6 +589,17 @@
                <el-table-column prop="north_glass_buffer1s.glassheight" :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>

@@ -616,7 +640,8 @@
                </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>

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

@@ -709,7 +734,6 @@
    methods: {

        init() {

            let viewname = "Home";



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

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

            } else {

@@ -743,6 +767,9 @@
                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];



                    //出片队列

                    this.OutSlice = obj.listoutslice[0];

                    this.loadglassheight = obj.loadglassheight;

                    if (obj.zhuangtai != null) {

                        this.zhuangtai = obj.zhuangtai[0];

@@ -750,43 +777,46 @@
                    if(this.dialogFormVisible7==true){

                        this.showform7();

                    }

                    // this.glassid1 = obj.queid[0];

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

                    //     this.state = false;

                    //     this.disabled = true;

                    //     this.disabled1 = false;

                    //     this.showform3();

                    // } else if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 1) {

                    //     this.state = true;

                    //     this.disabled = true;

                    //     this.disabled1 = true;

                    // }

                    // else {

                    //     this.state = true;

                    //     this.disabled = false;

                    //     this.disabled1 = false;

                    // }

                    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.glassheightmm < 380 || this.form5.glasslengthmm < 390 || this.form5.glassheightmm > 1810 || this.form5.glasslengthmm > 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.glassheightmm < 380 || this.form5.glasslengthmm < 390 || this.form5.glassheightmm > 1810 || this.form5.glasslengthmm > 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');

                    // }

                    if (this.dialogFormVisible3 == true) {

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

                        this.cageinfo = res.data.cageinfo;

                    });

                    }

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

                        this.GlassInfo = res.data.glass;

                    });

@@ -954,6 +984,15 @@
                    if (res.data.form != null) {

                        this.form5 = res.data.form;

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

                        if (this.form5.glassheightmm < 380 || this.form5.glasslengthmm < 390 || this.form5.glassheightmm > 1810 || this.form5.glasslengthmm > 2760) {

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

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

                            }

                        } else {

                            alert(1);

                            this.disabled1 = false;

                        }

                    } else {

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

                    }

@@ -1051,7 +1090,6 @@
            this.cage = cage;

            SelectCageInfo(cage).then(res => {

                this.cageinfo = res.data.cageinfo;

                console.log(this.cageinfo)

                this.dialogFormVisible3 = true;

            });

        },

@@ -1263,7 +1301,6 @@
        },

        CheckBoxchange(glassid,isChecked){

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

            console.log(this.AluminumFrame);

        },

        addoutslice(){

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

@@ -1276,20 +1313,28 @@
                dats2_[1]=item.isCheck;

                dats2_[2]=item.Flip;

                dats2_[3]=item.FrameNo;

                dats2_[4]=item.glasslengthMm;

                dats2_[5]=item.glassheightMm;

                dats2_[4] = item.glasslengthmm;

                dats2_[5] = item.glassheightmm;

                dats_[dats_.length]=dats2_;

            });

            console.log(dats_);

            //var AluminumFrames=this.AluminumFrame.map((item)=>({barcode,isCheck,Flip}) );

            // console.log(AluminumFrames1);

            // console.log(AluminumFrames2);

            // console.log(AluminumFrames3);

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

        }

    }

}