ZengTao
2024-01-19 70a93a33fabd58e1f4b3a50410060ae1b855c8ed
更换清除id按钮
3个文件已修改
127 ■■■■■ 已修改文件
CanadaMes-ui/src/views/home/index.vue 94 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/home/index.vue
@@ -375,37 +375,81 @@
                <div class="device" :style="'top: 262px;left: 150px;background-color: ' + ShowDeviceList(8) + ';'">D05</div>
                <div class="device" :style="'top: 339px;left: 150px;background-color: ' + ShowDeviceList(9) + ';'">D06</div>
                <div class="glass D01" style="top: 54px;left: 1055px;position: absolute;"
                    @click="ClearGlassId('DB101.9.2', 0)">{{ ShowGlassIdList(0) }}</div>
                <div class="glass D02" style="top: 132px;left: 1055px;position: absolute;"
                    @click="ClearGlassId('DB101.9.2', 1)">{{ ShowGlassIdList(1) }}</div>
                <div class="glass D01" style="top: 39px;left: 1055px;position: absolute;"
                    >{{ ShowGlassIdList(0) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 0)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D02" style="top: 117px;left: 1055px;position: absolute;"
                    >{{ ShowGlassIdList(1) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 1)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass B01" style="top: 270px;left: 640px;position: absolute;"
                    @click="ClearGlassId('DB101.10.2', 2)">
                    B01:{{ ShowGlassIdList(2) }}</div>
                    >
                    B01:{{ ShowGlassIdList(2) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.2', 2)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass B02" style="top: 290px;left: 640px;position: absolute;"
                    @click="ClearGlassId('DB101.10.3', 3)">B02:{{ ShowGlassIdList(3) }}</div>
                    >B02:{{ ShowGlassIdList(3) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.3', 3)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass A01" style="top: 270px;left: 289px;position: absolute;"
                    @click="ClearGlassId('DB101.10.0', 4)">
                    A01.1:{{ ShowGlassIdList(4) }}</div>
                    >
                    A01.1:{{ ShowGlassIdList(4) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 4)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass A01" style="top: 290px;left: 289px;position: absolute;"
                    @click="ClearGlassId('DB101.10.1,5',5)">A01.2:{{ ShowGlassIdList(5) }}</div>
                <div class="glass A01" style="top: 315px;left: 289px;position: absolute;"
                    >A01.2:{{ ShowGlassIdList(5) }}X21942611703GV
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.1,5', 5)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass A02" style="top: 310px;left: 289px;position: absolute;"
                    @click="ClearGlassId('DB101.10.2,6',6)">A02:{{ ShowGlassIdList(6) }}</div>
                <div class="glass A02" style="top: 360px;left: 289px;position: absolute;"
                    >A02:{{ ShowGlassIdList(6) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.2,6', 6)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D03" style="top: 137px;left: 42px;position: absolute;"
                    @click="ClearGlassId('DB101.9.4', 7)">
                    {{ ShowGlassIdList(7) }}</div>
                <div class="glass D04" style="top: 213px;left: 42px;position: absolute;"
                    @click="ClearGlassId('DB101.9.5', 8)">
                    {{ ShowGlassIdList(8) }}</div>
                <div class="glass D05" style="top: 290px;left: 42px;position: absolute;"
                    @click="ClearGlassId('DB101.9.6', 9)">
                    {{ ShowGlassIdList(9) }}</div>
                <div class="glass D06" style="top: 367px;left: 42px;position: absolute;"
                    @click="ClearGlassId('DB101.9.5', 10)">
                    {{ ShowGlassIdList(10) }}</div>
                <div class="glass D03" style="top: 122px;left: 42px;position: absolute;"
                    >
                    {{ ShowGlassIdList(7) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.4', 7)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D04" style="top: 198px;left: 42px;position: absolute;"
                    >
                    {{ ShowGlassIdList(8) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 8)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D05" style="top: 275px;left: 42px;position: absolute;"
                    >
                    {{ ShowGlassIdList(9) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.6', 9)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D06" style="top: 352px;left: 42px;position: absolute;"
                    >
                    {{ ShowGlassIdList(10) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 10)">
                        {{ $t('Clear') }}</el-button>
                </div>
            </div>
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -153,7 +153,7 @@
            // // TODO: handle exception
            // }
            // if (S7control.getinstance().CheckConnected() == true) {
            if (S7control.getinstance().CheckConnected() == true) {
            // 获取当前扫码方式
            List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
@@ -162,7 +162,6 @@
                    jsonObject.append("Scanningmethod", Scanningmethod);
                }
            }
            String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
            jsonObject.append("CurrrentGlassId", CurrrentGlassId);
@@ -295,7 +294,7 @@
            // }
            // }
            // }
            }
            storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
            dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,28 +17,28 @@
        //
        System.out.println("启动完成");
       new PlcHold().start();
        // new PlcHold().start();
        new Plchome().start();
            new PlcLayout().start();
        new Plcalarm().start();
            // new PlcLayout().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 Plclog().start();
        // new PlcManualonePosition().start();
        // new PlcManualonePosition2().start();
        // new PlcServoManualone().start();
        // new PLCManualJog().start();
        // new Plclog().start();
        new PlcInteractionState().start();
        // new PlcInteractionState().start();
        // new PlcParameter1Review().start();
      //  new PLCAutomaticParameterSettingReview().start();
    }