pjb
5 天以前 81f958af697e8d35f0755c670d6c56d69bb14551
可禁用rgv,不分配任务
2个文件已修改
30 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -365,9 +365,11 @@
                return;
            }
            List<BasCircularShuttle> basCircularShuttleList = basCircularShuttleService.selectList(new EntityWrapper<BasCircularShuttle>().eq("status", 0));
            LinkedList<RgvProtocol> rgvProtocolList = new LinkedList<>();
            for (int i = 1; i <= 5; i++) {
                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, i);
            for (BasCircularShuttle basCircularShuttle : basCircularShuttleList) {
                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basCircularShuttle.getRgvNo());
                RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
                if (rgvProtocol == null) {
                    continue;
src/main/webapp/views/index.html
@@ -350,18 +350,18 @@
                            prop="status$"
                            label="状态">
                    </el-table-column>
<!--                    <el-table-column-->
<!--                            label="操作"-->
<!--                            type="template">-->
<!--                        <template slot-scope="scope">-->
<!--                            <el-button-->
<!--                                    :type="scope.row.status === 0 ? 'primary' : 'danger'"-->
<!--                                    size="small"-->
<!--                                    @click="toggleStatus(scope.$index, scope.row)">-->
<!--                                {{ scope.row.status === 0 ? '禁用' : '解除禁用' }}-->
<!--                            </el-button>-->
<!--                        </template>-->
<!--                    </el-table-column>-->
                    <el-table-column
                            label="操作"
                            type="template">
                        <template slot-scope="scope">
                            <el-button
                                    :type="scope.row.status === 0 ? 'primary' : 'danger'"
                                    size="small"
                                    @click="toggleStatus(scope.$index, scope.row)">
                                {{ scope.row.status === 0 ? '禁用' : '解除禁用' }}
                            </el-button>
                        </template>
                    </el-table-column>
                </el-table>
            </div>
        </div>