ZengTao
2023-12-15 5f9ca1634f6a0ba288048556e29fe2b3e7784682
调整提示框
5个文件已修改
31 ■■■■ 已修改文件
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/home/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -440,7 +440,7 @@
          const jsonData2 = this.jsonData;
          const weihuiling = obj.weihuiling;
          const handleMouseMove = throttle(function (event) {
            const inputBox = document.querySelectorAll('.el-card__body');
            const inputBox = document.querySelectorAll('.input-box');
            const target = event.target;
            if (obj.zuhe1 &&inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
              // 执行更新逻辑
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -327,7 +327,7 @@
          const jsonData2 = this.jsonData;
          const weihuiling = obj.weihuiling;
          const handleMouseMove = throttle(function (event) {
            const inputBox = document.querySelectorAll('.el-card__body');
            const inputBox = document.querySelectorAll('.input-box');
            const target = event.target;
            if (obj.zuhe1 && inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
              // 执行更新逻辑
CanadaMes-ui/src/views/home/index.vue
@@ -1740,9 +1740,10 @@
                        else {
                            this.PromptSize = 250;
                            this.CountDowns = "Waiting for reset";
                            this.dialogFormCountDown = false;
                            // if(复位完成==true){
                            //     clearInterval(timer);
                            //     this.dialogFormCountDown = false;
                            // }
                        }
                    }
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
@@ -64,7 +64,7 @@
            addresses.add("DB100.116");
            addresses.add("DB100.16");
            addresses.add("DB103.20");
            addresses.add("DB106.2");
            List<Short> arraylist = S7control.getinstance().readWords(addresses);
            // System.out.println(arraylist);
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -21,21 +21,21 @@
        new Plchome().start();
        // new Plcalarm().start();
        new Plcalarm().start();
//         new Plcsign().start();
        new Plcsign().start();
//         new Plcaction().start();
//         new Plcstate().start();
//         new PlcPositioning1().start();
        new Plcaction().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();
    }
}