| CanadaMes-ui/src/views/Electrical/Parameter2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CanadaMes-ui/src/views/home/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CanadaMes-ui/src/views/login/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -187,7 +187,7 @@ if (typeof WebSocket === "undefined") { console.log("您的浏览器不支持WebSocket"); } else { let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname; let socketUrl = "ws://" + "192.168.10.102:8888" + "/springboot-vue3/api/talk/" + viewname; if (socket != null) { socket.close(); CanadaMes-ui/src/views/home/index.vue
@@ -182,8 +182,32 @@ } } .blocks { transform: scale(1, 1); } .el-dialog { width: 90%; } .el-message-box__message { font-size: 27px; } .el-message-box { height: 200px; width: 600px; } .el-button--small { font-size: 25px; } .el-message-box__btns { padding: 0px 15px 0; text-align: right; } /* .el-table td, @@ -873,8 +897,19 @@ }, load() { //加载笼子使用情况数据 let cookies = document.cookie; var cooks = cookies.split(";")[0]; var value = cooks.substring(cooks.indexOf("=") + 1); console.log(value); // let cookie=cookies.split(';'); // console.log() // console.log(cookies.get('name')); home().then(res => { this.tableData = res.data.list; }); SelectCageInfo(1).then(res => { this.cageinfo = res.data.cageinfo; this.currentPages = 1; }); //加载理片笼玻璃数据 home2().then(res => { @@ -1542,25 +1577,41 @@ if (this.disabled == false) { this.disabled = true; this.$message.error(this.$t('The glass size is not within the range')); this.$confirm(this.$t('The glass size is not within the range'), this.$t('confirm'), { // confirmwidth: 7000, // height: 8000, // confirmButtonText: this.$t('Yes'), // cancelButtonText: this.$t('No'), type: 'warning' }).then(() => { this.$message.success(this.$t('Operation successful')); }).catch(() => { this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), { confirmButtonText: this.$t('Yes'), callback: action => { this.$message({ type: 'info', message: this.$t('Operation canceled') }); message: this.DeleteBarcodeGlass() }); } }); } // this.$message(this.$t('The glass size is not within the range'), this.$t('confirm'), { // // confirmwidth: 7000, // // height: 8000, // confirmButtonText: this.$t('Yes'), // type: 'info' // }).then(() => { // this.$message.success(this.$t('Operation successful')); // }).catch(() => { // this.$message({ // type: 'warning', // message: this.$t('Operation canceled') // }); // }); // } this.disabled1 = true; } else { // if(isConfirmStates==true){ // this.InsertQueueGlass(); // } this.disabled1 = false; } }, DeleteBarcodeGlass(){ this.form5={}; } } } CanadaMes-ui/src/views/login/index.vue
@@ -78,6 +78,8 @@ this.$refs.loginFormRef.validate(async valid => { if (!valid) return; login(this.loginForm).then(res => { document.cookie="Authorizationssss="+this.loginForm.username+"; expires=Thu, 18 Dec 2203 12:00:00 GMT"; // 设置token setToken(res.data.Authorization); this.$router.push('/layout') springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -4,6 +4,7 @@ import cn.hutool.poi.excel.sax.handler.MapRowHandler; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +18,6 @@ import com.example.springboot.service.JdbcConnections; import com.example.springboot.service.North_Glass_Buffer1Service; import com.example.springboot.service.SpianService; public class Plchome extends Thread { @@ -33,6 +33,7 @@ public static String FrameNo; //是否需要手动确认玻璃 public static Boolean isConfirm=true; // public static Map b=new HashMap<>(); // b.put() @Override @@ -71,25 +72,28 @@ List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo(); jsonObject.append("alarmmg", alarmmg); // 读去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); // } // 伍 获取进是否有待确认的玻璃id List<String> addressList = new ArrayList<String>(); if (addressList != null) { 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); } // 获取进是否有待确认的玻璃id String queid = spianMapper.Selectqueueid(); int state = spianMapper.Selectqueuestate(); jsonObject.append("queid", queid); @@ -151,11 +155,6 @@ // S7control.getinstance().WriteWord("铝框翻转发送地址", (short)send); // } dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class); boolean dbconnected = false; try { @@ -171,8 +170,6 @@ if (sendwServer != null) { sendwServer.sendMessage(jsonObject.toString()); } } } springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -36,10 +36,10 @@ System.out.println("启动完成"); // new PlcHold().start(); new Plchome().start(); // // // new Plchome().start(); // // new PlcParameter().start(); // // new Plcalarm().start();
