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

wuyouming666

2023-12-14 73ac4d80b39ddb2c7077fed10e980f5c649f5333

 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>

@@ -728,6 +727,12 @@
                </el-table-column>

            </el-table>

        </el-dialog>



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

            <div style="font-size: 500px;text-align: center;">

                {{ this.CountDowns }}

            </div>

        </el-dialog>

    </el-container>

</template>

<script>

@@ -760,6 +765,7 @@
            dialogFormVisible5: false,

            dialogFormVisible6: false,

            dialogFormVisible7: false,

            dialogFormCountDown:false,

            form: {

                orderId: "",

                glassId: "",

@@ -820,11 +826,13 @@
            OutingQueue: true,

            OrderInfo: true,

            CageDetails: true,



            CountDowns:0,

            D01RequestState:false

        };

    },

    created() {

        this.load();

        
        this.init();

    }

    ,

@@ -839,7 +847,7 @@
                //console.log("您的浏览器支持WebSocket");

                let socketUrl = "ws://" + this.$t('ip') + ":8888" + "/springboot-vue3/api/talk/" + viewname;

                if (socket != null) {

                    socket.close();

                    socket.close();this.car1

                    socket = null;

                }

                // 开启一个websocket服务

@@ -853,6 +861,7 @@
                    //console.log("收到数据====" + msg.data);

                    let obj = JSON.parse(msg.data);

                    if (obj.params != null) {

                        
                        this.car1 = 145 + 8.15 * Math.abs(obj.params[0][0] - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;

                        this.car2 = 210 + 8.15 * Math.abs(obj.params[0][1] - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;

                        // this.car1 = 210 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;

@@ -866,9 +875,16 @@
                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];

                    //铝框id提示





                    if(this.alarm.length>0){

                        this.dialogFormVisible2=true;

                    }

                    //复位倒计时

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

                        this.CountDown();

                    }

                    //是否有进片请求

                    this.D01RequestState=obj.D01RequestState[0];

                    
                    //是否允许出片

                    this.isAllowQueue = obj.isAllowQueue[0];

                    //出片队列

@@ -901,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();

@@ -1651,7 +1673,7 @@
        },

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

        Sizerange(Glass, position) {

            if (this.ManuallyInfeedGlass == true) {

            if (this.ManuallyInfeedGlass == false) {

                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'),

@@ -1676,7 +1698,7 @@
                    } else {

                        this.disabled = false;

                    }

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

                    if (position == 3 && this.isConfirm == true&&this.D01RequestState==true) {

                        this.InsertQueueGlass(1);

                    }

                }

@@ -1693,6 +1715,25 @@
                    this.$message.success(this.$t('Operation successful'));

                }

            });

        },

        CountDown(){

            //50秒倒数计时

            let count = 45;

            let timer = setInterval(

                () => {

                    if (count > 0) {

                        this.CountDowns = count;

                        count--;

                    }

                    else {

                        clearInterval(timer);

                        this.CountDowns = 0;

                        this.dialogFormCountDown=false;

                    }

                },

                1000

            );

            
        }

    }

}