ZengTao
2023-12-26 7677ec6038c661951fcd74a2acfce65f2e83a01e
修改复位倒计时为全局弹出
5个文件已修改
286 ■■■■■ 已修改文件
CanadaMes-ui/src/layout/index.vue 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/home/index.vue 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java 155 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/layout/index.vue
@@ -101,6 +101,12 @@
        <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
      </el-table>
    </el-dialog>
    <el-dialog :visible.sync="dialogFormCountDown" :title="$t('Approximately resettable time')" top="5vh">
            <div :style="'font-size: ' + PromptSize + 'px;text-align: center;'">
                <!-- {{ this.CountDowns }} -->
                {{ this.CountDowns }}
            </div>
        </el-dialog>
  </el-container>
</template>
@@ -136,8 +142,13 @@
        pageNum: -1
      },
      dialogFormVisible2: false,
      dialogFormCountDown:false,
      alarm: [],
      alarm2: []
      alarm2: [],
      CountDowns: "0",
      EmergencyStop: false,
      PromptSize:500,
      reset:false
    }
  },
  // components: {
@@ -181,10 +192,10 @@
        socket.onmessage = function (msg) {
          //console.log("收到数据====" + msg.data);
          let obj = JSON.parse(msg.data);
          if (obj.alarmmg[0].length > 0) {
            if (this.alarm.length > 0) {
              if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length-1].id) {
              if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {
                this.alarm = obj.alarmmg[0];
                this.dialogFormVisible2 = true;
              }
@@ -193,7 +204,23 @@
              this.dialogFormVisible2 = true;
            }
          }
          //是否急停
          if (obj.emergencystop != null) {
            this.EmergencyStop = obj.emergencystop[0];
          }
          //复位倒计时
          if (obj.countdown != null) {
            if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {
              this.CountDown();
            }
          }
          //复位完成信号
          if (obj.reset != null) {
            this.reset = obj.reset[0];
          }
          this.$forceUpdate();
        }.bind(this);
@@ -207,6 +234,35 @@
        }
      }
    },
    //45秒复位倒数计时
    CountDown() {
      let count = 45;
      let timer = setInterval(
        () => {
          if (this.EmergencyStop == true) {
            this.dialogFormCountDown = false;
            clearInterval(timer);
            this.CountDowns = "0";
          } else {
            if (count > 0) {
              this.PromptSize = 500;
              this.CountDowns = count;
              count--;
              this.dialogFormCountDown = true;
            }
            else {
              this.PromptSize = 200;
              this.CountDowns = "Waiting for reset";
              if (this.reset == true) {
                clearInterval(timer);
                this.dialogFormCountDown = false;
              }
            }
          }
        },
        1000
      );
    },
    logout: function () {
      removeToken()
      this.$router.push('/login')
CanadaMes-ui/src/views/home/index.vue
@@ -46,9 +46,6 @@
    background-color: blue;
}
.black {
    background-color: black;
}
.yellow {
    background-color: yellow;
@@ -155,7 +152,7 @@
.box {
    width: 90%;
    margin-left: 5%;
    color: black;
    color: red;
    font-size: 12px;
    overflow: hidden;
    height: 20px;
@@ -899,6 +896,7 @@
                    this.cagelist4 = obj.cagelist4[0];
                    this.tasklist1 = obj.tasklist1[0];
                    this.tasklist2 = obj.tasklist2[0];
                    this.alarm = obj.alarmmg[0];
                    // if (obj.alarmmg[0].length > 0) {
                    //     if (this.alarm.length > 0) {
                    //         if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {
@@ -910,22 +908,22 @@
                    //         this.dialogFormVisible2 = true;
                    //     }
                    // }
                    //是否急停
                    if (obj.emergencystop != null) {
                        this.EmergencyStop = obj.emergencystop[0];
                    }
                    // //是否急停
                    // if (obj.emergencystop != null) {
                    //     this.EmergencyStop = obj.emergencystop[0];
                    // }
                    //复位倒计时
                    if (obj.countdown != null) {
                        if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {
                            this.CountDown();
                        }
                    }
                    // //复位倒计时
                    // if (obj.countdown != null) {
                    //     if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {
                    //         this.CountDown();
                    //     }
                    // }
                    //复位完成信号
                    if (obj.reset != null) {
                        this.reset = obj.reset[0];
                    }
                    // //复位完成信号
                    // if (obj.reset != null) {
                    //     this.reset = obj.reset[0];
                    // }
                    //是否有进片请求
                    if (obj.D01RequestState != null) {
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -32,7 +32,7 @@
    public static Boolean isAllowQueue = true;
    public static Boolean isAllowReordering = true;
    // 铝框id
    public static String FrameNo="";
    public static String FrameNo = "";
    // 是否需要手动确认玻璃
    public static Boolean isConfirm = false;
@@ -100,87 +100,90 @@
            // 是否需要人工确认上片玻璃
            jsonObject.append("isConfirm", isConfirm);
            // // 读去Plc进片车与出片车位置W
            // List<String> addressList = new ArrayList<String>();
            // addressList.add("DB106.12");
            // addressList.add("DB106.0");
            // List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
            // if (paramlist != null) {
            //     jsonObject.append("params", paramlist);
            // }
            // // 获取进片车状态
            // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
            //         1);// 获取进片车状态
            // boolean exist1 = datas1ListState.contains((short) 0);
            // jsonObject.append("zhuangtai", exist1);
            // // 获取进片玻璃信息
            // List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
            // if (inglassInfo != null) {
            //     if (inglassInfo.size() > 0)
            //         jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
            // }
            if (S7control.getinstance().CheckConnected() == true) {
                // 读去Plc进片车与出片车位置W
                List<String> addressList = new ArrayList<String>();
                addressList.add("DB106.12");
                addressList.add("DB106.0");
                List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
                if (paramlist != null) {
                jsonObject.append("params", paramlist);
                }
                // 获取进片车状态
                List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
                1);// 获取进片车状态
                boolean exist1 = datas1ListState.contains((short) 0);
                jsonObject.append("zhuangtai", exist1);
                // 获取进片玻璃信息
                List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
                if (inglassInfo != null) {
                if (inglassInfo.size() > 0)
                jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
                }
            // // 获取铝框idDB106.DBW64
            // String frameno = spianService.queGlassid("DB103.270", 14).toString();
            // // String frameno="X12345611002GV";
            // if (!frameno.equals(Plchome.FrameNo)) {
            //     Plchome.FrameNo = frameno;
            //     try {
            //         north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
            //     } catch (SQLException e) {
            //         // TODO Auto-generated catch block
            //         e.printStackTrace();
            //     }
            // }
                // 获取铝框idDB106.DBW64
                String frameno = spianService.queGlassid("DB103.270", 14).toString();
                // String frameno="X12345611002GV";
                if (!frameno.equals(Plchome.FrameNo)) {
                Plchome.FrameNo = frameno;
                try {
                north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
                } catch (SQLException e) {
                // TODO Auto-generated catch block
                e.printStackTrace();
                }
                }
            // // 获取进片请求状态
            // List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
            // boolean D01RequestState = D01Request.contains((short) 1);
            // // boolean D01RequestState =true;
            // jsonObject.append("D01RequestState", D01RequestState);
                // 获取进片请求状态
                List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
                boolean D01RequestState = D01Request.contains((short) 1);
                // boolean D01RequestState =true;
                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);
            // }
            // // jsonObject.append("countdown", true);
            // // 复位完成信号
            // List<Boolean> resets = S7control.getinstance().ReadBits("DB103.284", 1);
            // for (Boolean reset : resets) {
            //     jsonObject.append("reset", reset);
            // }
                // 复位倒计时
                // 地址104.9.6
                List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
                for (Boolean countdowns : countdown) {
                jsonObject.append("countdown", countdowns);
                }
                // jsonObject.append("countdown", true);
                // 复位完成信号
                List<Boolean> resets = S7control.getinstance().ReadBits("DB103.284", 1);
                for (Boolean reset : resets) {
                jsonObject.append("reset", reset);
                }
            // // 是否急停
            // List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
            // for (Boolean emergencystop : emergencystops) {
            //     jsonObject.append("emergencystop", emergencystop);
            // }
                // 是否急停
                List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1",
                1);
                for (Boolean emergencystop : emergencystops) {
                jsonObject.append("emergencystop", emergencystop);
                }
            // 铝框线交互
                // 铝框线交互
            // //铝框id请求字
            // List<Short> framerequest = S7control.getinstance().ReadWord("铝框id请求字地址", 1);
            // if(framerequest!=null){
            // //铝框id
            // String franmeno= spianService.queGlassid("铝框id地址", 14).toString();
            // String position;
            // try {
            // position=dbserve.SelectPositionByFrameBarcode(franmeno);
            // } catch (SQLException e) {
            // // TODO Auto-generated catch block
            // position="0";
            // e.printStackTrace();
            // }
            // Short send;
            // if(position=="0"){
            // send=0;
            // }else{
            // send=1;
            // }
            // S7control.getinstance().WriteWord("铝框翻转发送地址", (short)send);
            // }
                // //铝框id请求字
                // List<Short> framerequest = S7control.getinstance().ReadWord("铝框id请求字地址", 1);
                // if(framerequest!=null){
                // //铝框id
                // String franmeno= spianService.queGlassid("铝框id地址", 14).toString();
                // String position;
                // try {
                // position=dbserve.SelectPositionByFrameBarcode(franmeno);
                // } catch (SQLException e) {
                // // TODO Auto-generated catch block
                // position="0";
                // e.printStackTrace();
                // }
                // Short send;
                // if(position=="0"){
                // send=0;
                // }else{
                // send=1;
                // }
                // S7control.getinstance().WriteWord("铝框翻转发送地址", (short)send);
                // }
            }
            dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
            boolean dbconnected = false;
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -37,13 +37,21 @@
        }
        return instance;
    }
    /**
     * 关闭西门子s7通讯连接
     */
    public void CloseS7client() {
        if (s7PLC == null)
            s7PLC.close();
            s7PLC.checkConnected();
    }
    /**
     * s7通讯连接状态
     */
    public boolean CheckConnected() {
        return s7PLC.checkConnected();
    }
    /**
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,25 +17,24 @@
        //
        System.out.println("启动完成");
//    new PlcHold().start();
        // new PlcHold().start();
        new Plchome().start();
        //   new Plcalarm().start();
        // new Plcalarm().start();
        //   new Plcsign().start();
        // new Plcsign().start();
        // new Plcstate().start();
        // new PlcPositioning1().start();
        //   new Plcstate().start();
        //   new PlcPositioning1().start();
        // new PlcParameter2().start();
        //  new PlcParameter2().start();
        // new PLCAutomaticParameterSetting().start();
        //   new PLCAutomaticParameterSetting().start();
        //   new PlcManualonePosition().start();
        //   new PlcManualonePosition2().start();
        //   new PlcServoManualone().start();
        //   new PLCManualJog().start();
        // new PlcManualonePosition().start();
        // new PlcManualonePosition2().start();
        // new PlcServoManualone().start();
        // new PLCManualJog().start();
    }
}