| CanadaMes-ui/src/views/home/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
CanadaMes-ui/src/views/home/index.vue
@@ -186,6 +186,24 @@ 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, .el-table th { padding: 0px 0; @@ -876,6 +894,10 @@ home().then(res => { this.tableData = res.data.list; }); SelectCageInfo(1).then(res => { this.cageinfo = res.data.cageinfo; this.currentPages = 1; }); //加载理片笼玻璃数据 home2().then(res => { this.cagelist1 = res.data.list1; @@ -1542,26 +1564,35 @@ 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.$message({ type: 'info', message: this.$t('Operation canceled') }); 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: `action: ${action}` }); } }); } this.disabled1 = true; } else { this.disabled1 = false; } // 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 { this.disabled1 = false; } } } } </script> springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -35,28 +35,28 @@ // System.out.println("启动完成"); // new PlcHold().start(); // // // new Plchome().start(); // // new PlcParameter().start(); // // new Plcalarm().start(); // new Plcsign().start(); // new Plcaction().start(); new Plcstate().start(); new PlcPositioning1().start(); new PlcPositioning2().start(); new PlcParameter2().start(); new PlcParameter1().start(); new PLCAutomaticParameterSetting().start(); // new PlcHold().start(); new PlcManualonePosition().start(); new PlcManualonePosition2().start(); new PlcServoManualone().start(); new PLCManualJog().start(); new Plchome().start(); // // new PlcParameter().start(); // // // // new Plcalarm().start(); // // // new Plcsign().start(); // // // new Plcaction().start(); // new Plcstate().start(); // new PlcPositioning1().start(); // new PlcPositioning2().start(); // new PlcParameter2().start(); // new PlcParameter1().start(); // new PLCAutomaticParameterSetting().start(); // new PlcManualonePosition().start(); // new PlcManualonePosition2().start(); // new PlcServoManualone().start(); // new PLCManualJog().start(); } }