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

wu

2023-12-12 63650b635ac59b24292c584a80a9ad3496a14748

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

@@ -104,7 +104,7 @@
    position: absolute;

    background-image: url('../../img/dipan.png');

    background-size: 70px 85px;

    left: 654px;

    left: 501px;

    top: 333px;

    /* background-size: 85px 100px;

    left: 912px;

@@ -132,7 +132,7 @@
    position: absolute;

    background-image: url('../../img/taimian.png');

    background-size: 120px 30px;

    left: 630px;

    left: 477px;

    top: 420px;

    /* background-size: 160px 40px;

    left: 875px;

@@ -199,9 +199,12 @@
    font-size: 25px;

}



@media screen and (min-width: 1900px) { 
    .blocks{transform: scale(1.5,1.05);width: 1210px;}

} 
@media screen and (min-width: 1900px) {

    .blocks {

        transform: scale(1.5, 1.05);

        width: 1210px;

    }

}



.el-message-box__btns {

    padding: 0px 15px 0;

@@ -228,15 +231,16 @@
            </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)">{{ $t('Manually Infeed Glass') }}</el-button>

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

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

                    <el-table-column :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>

@@ -254,9 +258,9 @@
                    </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="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :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>

@@ -312,14 +316,19 @@
                        @click="showcageinfo(item['cage'])"></div>

                </div>

                <div class="blue gezi"

                    :style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight + 'px', width: 5 + 'px' }">

                    :style="{ display: 'flex', position: 'absolute', float: 'left', top: 28 + 'px', left: 1050 + 'px', height: loadglassheight1 + 'px', width: 4 + 'px' }">

                </div>

                <div class="blue gezi"

                    :style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight2 + 'px', width: 4 + 'px' }">

                </div>

                <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>

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

                <el-button class="orderbutton2" type="primary" @click="showform6()">{{ $t('Outing Queue') }}</el-button>

                <el-button class="orderbutton1" type="primary" @click="showform2()" :disabled="OrderInfo">{{ $t('OrderInfo')

                }}</el-button>

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

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



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

                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"

@@ -381,9 +390,9 @@
            </el-form>

            <template #footer>

                <span class="dialog-footer">

                    <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"

                    <!-- <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"

                        type="primary">{{

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

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

                    <el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"

                        type="primary">{{

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

@@ -430,7 +439,7 @@
                <el-table-column :min-width="100" 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('State')">

                <el-table-column :min-width="90" 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 ?

@@ -445,7 +454,7 @@
                </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;"

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.state == 1 ? 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"

@@ -619,37 +628,61 @@
        </el-dialog>



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

            <el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue == true ? $t('Start') : $t('Stop')

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

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

            }}</el-button>

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

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

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

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

                <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('State')">

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

                    <template slot-scope='scope'>

                        {{ scope.row.state == 0 ? "Waiting" : "Outing" }}

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

                </el-table-column>

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

                <el-table-column prop="position" :label="$t('Position')"></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-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="(!isAllowQueue||scope.row.state!=1)"

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

                    <template slot-scope='scope'>

                        <el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)" style="font-size: 15px;"

                            :disabled="(scope.$index == 0 || isAllowQueue == true || scope.row.state == 1)">

                            {{$t('Top')}}

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

                            style="font-size: 15px;"

                            :disabled="(scope.$index == 0 || isAllowReordering == true || scope.row.state == 1)">

                            {{ $t('Top') }}

                        </el-button>

                        <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)" style="font-size: 15px;"

                            :disabled="(scope.$index == 0 || isAllowQueue == true || scope.row.state == 1)">

                            {{$t('Up')}}

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

                            style="font-size: 15px;"

                            :disabled="(scope.$index == 0 || isAllowReordering == true || scope.row.state == 1)">

                            {{ $t('Up') }}

                        </el-button>

                        <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)" style="font-size: 15px;"

                            :disabled="(OutSlice.length - 1 == scope.$index || isAllowQueue == true || scope.row.state == 1)">

                            {{$t('Down')}}

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

                            style="font-size: 15px;"

                            :disabled="(OutSlice.length - 1 == scope.$index || isAllowReordering == true || scope.row.state == 1)">

                            {{ $t('Down') }}

                        </el-button>

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

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

@@ -702,7 +735,7 @@
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

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

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





@@ -761,7 +794,8 @@
            cageinfo: [],

            cage: 0,

            carlist: [],

            loadglassheight: 0,

            loadglassheight1: 0,

            loadglassheight2: 0,

            password: 1,

            text: "",

            zhuangtai: "",

@@ -772,24 +806,31 @@
            currentPage: 1,  //默认初始页

            pagesize: 15,    //每页默认显示的数据

            pageCount: 0,



            currentPages: 1,  //默认初始页

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

            pageCounts: 0,



            OutSlice: [],

            AluminumFrame: [],

            framebarcode: "",

            isAllowQueue: true,

            isAllowReordering: true,

            FrameNoFlag: "",

            isConfirm: true

            isConfirm: true,

            ManuallyInfeedGlass: true,

            OutingQueue: true,

            OrderInfo: true,

            CageDetails: true,



        };

    },

    created() {

        this.load();

        this.init();

    },

    }

    ,

    methods: {





        init() {

            let viewname = "Home";

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

@@ -831,36 +872,41 @@
                    //是否允许出片

                    this.isAllowQueue = obj.isAllowQueue[0];

                    //出片队列

                    if (this.isAllowQueue == true) {

                    if (this.isAllowReordering == true) {

                        this.OutSlice = obj.listoutslice[0];

                    }

                    //获取上片位玻璃信息

                    this.loadglassheight = obj.loadglassheight;



                    if (obj.zhuangtai != null) {

                        this.zhuangtai = obj.zhuangtai[0];

                    }

                    //上片位玻璃信息

                    if (obj.form2 != null && obj.form2 != "") {

                        this.form2 = obj.form2[0];

                        this.loadglassheight2 = 70;

                    } else {

                        this.form2 = {};

                    }

                    


                    //是否需要手动确认上片

                    this.isConfirm = obj.isConfirm[0];

                    //扫码位玻璃信息

                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {

                        this.form3 = obj.form3[0];

                        this.loadglassheight1 = 70;

                    } else {

                        this.form3 = {};

                    }

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

                        this.loadglassheight1 = 70;

                        this.form5 = obj.form3[0];

                        this.showform3();

                        this.Sizerange(this.form5, 3);



                        this.glassid1 = "";

                    } else {

                        this.Sizerange(this.form5, 3);

                        if (this.glassid1 == "") {

                            this.DeleteBarcodeGlass();

                        }

                    }

                    //数据库连接是否正常

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

@@ -888,6 +934,26 @@
            }

        },

        load() {

            //加载用户权限

            currentUsername().then(res => {

                SelectPermissionByUserName(res.data).then(res => {

                    res.data.permission.forEach(item => {

                        if (item.permissionId == "32" && item.state == 1) {

                            this.ManuallyInfeedGlass = false;

                        }

                        if (item.permissionId == "33" && item.state == 1) {

                            this.OutingQueue = false;

                        }

                        if (item.permissionId == "34" && item.state == 1) {

                            this.OrderInfo = false;

                        }

                        if (item.permissionId == "35" && item.state == 1) {

                            this.CageDetails = false;

                        }

                    });

                });



            });

            //加载笼子使用情况数据

            home().then(res => {

                this.tableData = res.data.list;

@@ -946,7 +1012,6 @@
                    if (res.data.message == 200) {

                        this.dialogFormVisible1 = false;

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



                    } else {

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

                    }

@@ -1139,12 +1204,17 @@
        },

        //显示理片笼详情信息

        showcageinfo(cage) {

            cage = this.cageglassid;

            SelectCageInfo(cage).then(res => {

                this.cageinfo = res.data.cageinfo;

                this.currentPages = 1;

                this.dialogFormVisible3 = true;

            });

            if (this.CageDetails == false) {

                cage = this.cageglassid;

                SelectCageInfo(cage).then(res => {

                    this.cageinfo = res.data.cageinfo;

                    this.currentPages = 1;

                    this.dialogFormVisible3 = true;

                });

            } else {

                this.$message.error(this.$t('You do not have this permission'));

            }



        },

        //删除理片笼玻璃

        deleteglass(glassid, state) {

@@ -1188,8 +1258,14 @@
                if (this.password == value) {

                    if (state == 1) {

                        OutByGlassID(glassid).then(res => {

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

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

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

                            }

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

                                this.$message.error(this.$t('Unable to find the placement method of the aluminum frame'));

                            }

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

                                this.$message.error(this.$t('Unable to find whether the aluminum frame is flipped or not'));

                            }

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

                                this.$message.error(this.$t('This glass is already in the Queue'));

@@ -1234,19 +1310,24 @@
        },

        //手动上片

        FeedInglassid() {

            Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {

                if (this.form.barcode != "") {

            if (this.form.glassId != ""&&this.form.glassId != null) {

                Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {

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

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

                        this.dialogFormVisible = false;

                    } else {

                    }

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

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

                    }

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

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

                    }

                } else {

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

                }

                });

            } else {

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

            }



            });



        },

        //启用//理片笼禁用

        UpdateDisabled(cage, cell, disabled) {

@@ -1302,7 +1383,7 @@
        //手动添加扫码位玻璃

        InsertQueueGlass(parameter) {

            if (parameter == 1 && this.form5.glassId != "") {

                if (this.form5.glassId != this.form2.glassId) {

                if (this.form5.glassId != this.form2.glassId && this.form5.glassId != this.form3.glassId) {

                    InsertQueueGlassId(1, this.form5).then(res => {

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

                            this.form5 = {};

@@ -1315,7 +1396,7 @@
                    this.$message.error(this.$t('The glass ID already exists in the loading queue'));

                }

            } else if (parameter == 2 && this.form4.glassId != "") {

                if (this.form4.glassId != this.form3.glassId) {

                if (this.form4.glassId != this.form3.glassId && this.form4.glassId != this.form2.glassId) {

                    InsertQueueGlassId(2, this.form4).then(res => {

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

                            this.form4 = {};

@@ -1336,14 +1417,14 @@
            if (parameter == 1) {

                DeleteQueueGlass(1).then(res => {

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

                        this.form2 = {};

                        this.form3 = {};

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

                    }

                });

            } else {

                DeleteQueueGlass(2).then(res => {

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

                        this.form3 = {};

                        this.form2 = {};

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

                    }

                });

@@ -1379,7 +1460,7 @@
                    this.$message.success(this.$t('Operation successful'));

                }

            });

        }, 
        },

        //置顶

        getTopMove(row, index) {

            let Sequence = [];

@@ -1499,6 +1580,10 @@
                }

            })

        },

        //

        isAllowReorderingState() {

            this.isAllowReordering = !this.isAllowReordering;

        },

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

        isConfirmState() {

            isConfirmStates(!this.isConfirm).then(res => {

@@ -1506,6 +1591,21 @@
                    this.$message.success(this.$t('Operation successful'));

                }

            });

        }

        ,

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

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

            column = rowIndex;

            rowIndex = column;

            let style = "";

            if (columnIndex === 8 ) {

                style = "font-size:25px;";

            }

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

                style = "background-Color:yellow;";

            }

            style

            return style;

        }

        ,

        //合并行

@@ -1522,7 +1622,7 @@
            if (rowIndex != 0) {

                barcode2 = arrOutSlice[rowIndex - 1].barcode;

            }

            if (columnIndex === 10) {

            if (columnIndex === 12) {

                if (barcode != barcode2) {

                    // this.FrameNoFlag = barcode;

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

@@ -1548,38 +1648,48 @@
        },

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

        Sizerange(Glass, position) {

            if ((Glass.glassheight < 380 || Glass.glasswidth < 390 || Glass.glassheight > 1810 || Glass.glasswidth > 2760) || (Glass.glassheight < 390 || Glass.glasswidth < 380 || Glass.glassheight > 2760 || Glass.glasswidth > 1810)) {

                this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {

                    confirmButtonText: this.$t('Yes'),

                    type: 'info',

                    callback: (action) => {

                        this.$message({

                            type: 'info',

                            message: `action: ${ action }`

                        }).then(

                            this.DeleteBarcodeGlass()

                        );

            if (this.ManuallyInfeedGlass == true) {

                if ((Glass.glassheight < 380 || Glass.glasswidth < 390 || Glass.glassheight > 1810 || Glass.glasswidth > 2760) || (Glass.glassheight < 390 || Glass.glasswidth < 380 || Glass.glassheight > 2760 || Glass.glasswidth > 1810)) {

                    this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {

                        confirmButtonText: this.$t('Yes'),

                        type: 'info',

                        callback: (action) => {

                            this.$message({

                                type: 'info',

                                message: `action: ${action}`

                            }).then(

                                this.DeleteBarcodeGlass()

                            );

                        }

                    });

                    if (position == 1 || position == 3) {

                        this.disabled1 = true;

                    } else {

                        this.disabled = true;

                    }

                });

                if (position == 1 || position == 3) {

                    this.disabled1 = true;

                } else {

                    this.disabled = true;

                }

            } else {

                if (position == 1 || position == 3) {

                    this.disabled1 = false;

                } else {

                    this.disabled = false;

                }

                if (position == 3&&this.isConfirmState==true) {

                    this.InsertQueueGlass(1);

                    if (position == 1 || position == 3) {

                        this.disabled1 = false;

                    } else {

                        this.disabled = false;

                    }

                    if (position == 3 && this.isConfirmState == true) {

                        this.InsertQueueGlass(1);

                    }

                }

            }

        },

        //清空待确认玻璃信息

        DeleteBarcodeGlass() {

            this.form5 = {};

        },

        //手动完成出片任务

        CompleteQueue(id, frameid, glassid) {

            CompleteQueue(id, frameid, glassid).then(res => {

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

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

                }

            });

        }

    }

}