修改倒计时显示，添加显示急停状态，等待复位

ZengTao

2023-12-14 689b10dd99adf31b5e2737f5c949fc5c132f8001

修改倒计时显示，添加显示急停状态，等待复位

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

@@ -453,7 +453,8 @@
                </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;" :disabled="scope.row.state == 1 ? false : true"

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

@@ -643,7 +644,8 @@
                <el-table-column prop="storageCage.glassheightmm" :label="$t('Width')"></el-table-column>

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

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

@@ -661,7 +663,8 @@


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

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

@@ -729,7 +732,7 @@
        </el-dialog>



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

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

            <div :style="'font-size: ' + PromptSize + 'px;text-align: center;'">

                {{ this.CountDowns }}

            </div>

        </el-dialog>

@@ -826,8 +829,10 @@
            OutingQueue: true,

            OrderInfo: true,

            CageDetails: true,

            CountDowns:0,

            D01RequestState:false

            CountDowns: "EMERGENCY STOP",

            D01RequestState: false,

            EmergencyStop: false,

            PromptSize: 250

        };

    },

    created() {

@@ -837,8 +842,6 @@
    }

    ,

    methods: {





        init() {

            let viewname = "Home";

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

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

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

                if (socket != null) {

                    socket.close();this.car1

                    socket.close();

                    socket = null;

                }

                // 开启一个websocket服务

@@ -877,9 +880,14 @@
                    this.alarm = obj.alarmmg[0];

                    if(this.alarm.length>0){

                        this.dialogFormVisible2=true;

                    } else {

                        this.dialogFormVisible2 = false;

                    }

                    //是否急停

                    this.EmergencyStop = obj.emergencystop[0];



                    //复位倒计时

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

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

                        this.CountDown();

                    }

                    //是否有进片请求

@@ -923,8 +931,6 @@
                        }else{

                            this.disabled1=true;

                        }

                        
                        
                    } else {

                        if (this.glassid1 == "") {

                            this.DeleteBarcodeGlass();

@@ -1721,19 +1727,29 @@
            let count = 45;

            let timer = setInterval(

                () => {

                    if (this.EmergencyStop == true) {

                        clearInterval(timer);

                        this.PromptSize = 250;

                        this.CountDowns = "EMERGENCY STOP";

                    } else {

                    if (count > 0) {

                            this.PromptSize = 500;

                        this.CountDowns = count;

                        count--;

                    }

                    else {

                        clearInterval(timer);

                        this.CountDowns = 0;

                            this.PromptSize = 250;

                            this.CountDowns = "Waiting for reset";

                        this.dialogFormCountDown=false;

                            // if(复位完成==true){

                            //     clearInterval(timer);

                            // }

                        }

                    }

                },

                1000

            );

            
            this.dialogFormCountDown = true;

        }

    }

}


 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -134,11 +134,15 @@
            jsonObject.append("D01RequestState", D01RequestState);

            //复位倒计时
            // 地址104.9.6
            List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
            for (Boolean countdowns : countdown) {
                jsonObject.append("countdown", countdowns);
            }
            //是否急停
            List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
            for (Boolean emergencystop : emergencystops) {
                jsonObject.append("emergencystop", emergencystop);
            }
            // jsonObject.append("countdown", true);
            // 铝框线交互


 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -17,7 +17,7 @@
        //
        System.out.println("启动完成");

 new PlcHold().start();
//  new PlcHold().start();

        new Plchome().start();