src/main/java/com/zy/asrs/controller/DeviceConfigController.java

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;

 src/main/java/com/zy/asrs/controller/LocMastController.java

@@ -170,12 +170,16 @@
                        initBay = 2;
                    }

                    int userConfigRow = -1;
                    int userConfirmBay = -1;
                    try {
                        userConfirmBay = (int) Double.parseDouble(value);
                        String[] split = value.split("-");
                        userConfigRow = Integer.parseInt(split[0]);
                        userConfirmBay = Integer.parseInt(split[1]);
                    }catch (Exception e){}

                    if (userConfirmBay != -1) {
                        initRow = userConfigRow;
                        initBay = userConfirmBay;
                    }

@@ -219,6 +223,7 @@
        }

        redisUtil.del(RedisKeyType.LOC_MAP_BASE.key);
        redisUtil.del(RedisKeyType.LOC_MAST_MAP_LIST.key);
        return R.ok();
    }


 src/main/java/com/zy/asrs/task/PlannerScheduler.java

@@ -21,11 +21,14 @@
    @Scheduled(fixedDelay = 3000)
    public void schedulePlanner() {
        try {
            String crnRunMethod = "normal";
            Config crnRunMethodConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "crnRunMethod"));
            if(crnRunMethodConfig != null) {
                if (!crnRunMethodConfig.getValue().equals("solver")) {
                    return;
                }
                crnRunMethod = crnRunMethodConfig.getValue();
            }

            if (!crnRunMethod.equals("solver")) {
                return;
            }
            JSONObject result = plannerService.calculateAndSaveSchedule();
            // 日志记录可以根据需要添加，避免过于频繁

 src/main/resources/logo/zy-logo-dark.png

 src/main/resources/logo/zy-logo.png

 src/main/webapp/components/WatchRgvCard.js

@@ -117,6 +117,7 @@
      handler(newVal) {
        if (newVal && newVal.rgvNo && newVal.rgvNo != 0) {
          this.activeNames = newVal.rgvNo;
          this.searchRgvNo = newVal.rgvNo;
          const idx = this.rgvList.findIndex(i => i.rgvNo == newVal.rgvNo);
          if (idx >= 0) { this.currentPage = Math.floor(idx / this.pageSize) + 1; }
        }

 src/main/webapp/static/js/basMap/basMap.js

@@ -58,32 +58,35 @@
            }
            pageCurr = curr;
            limit();
            renderUpload();
        }
    });

    // 渲染
    var loadIndex;
    upload.render({
        elem: '.demo-class-accept', // 绑定多个元素
        url: baseUrl + "/basMap/crn/upload", // 此处配置你自己的上传接口即可
        accept: 'file', // 普通文件
        before: function (obj) {
            loadIndex = layer.load(2);
        },
        done: function (res) {
            layer.close(loadIndex);
            if (res.code == 200) {
                layer.msg('导入成功');
                tableReload()
            }else {
                layer.msg(res.msg, {icon: 2})
    function renderUpload() {
        upload.render({
            elem: '.demo-class-accept', // 绑定多个元素
            url: baseUrl + "/basMap/crn/upload", // 此处配置你自己的上传接口即可
            accept: 'file', // 普通文件
            before: function (obj) {
                loadIndex = layer.load(2);
            },
            done: function (res) {
                layer.close(loadIndex);
                if (res.code == 200) {
                    layer.msg('导入成功');
                    tableReload()
                }else {
                    layer.msg(res.msg, {icon: 2})
                }
            },
            error: function () {
                layer.close(loadIndex);
                layer.msg('上传失败', {icon: 2});
            }
        },
        error: function () {
            layer.close(loadIndex);
            layer.msg('上传失败', {icon: 2});
        }
    });
        });
    }

    // 监听排序事件
    table.on('sort(basMap)', function (obj) {

 src/main/webapp/views/watch/console.html

@@ -38,7 +38,7 @@
                    </el-tabs>
                </div>

                <map-canvas :lev="currentLev" :crn-param="crnParam" :rgv-param="rgvParam" :devp-param="devpParam" @crn-click="openCrn" @dual-crn-click="openDualCrn" @station-click="openSite" style="width: 80%; height: 100vh;"></map-canvas>
                <map-canvas :lev="currentLev" :crn-param="crnParam" :rgv-param="rgvParam" :devp-param="devpParam" @crn-click="openCrn" @dual-crn-click="openDualCrn" @station-click="openSite" @rgv-click="openRgv" style="width: 80%; height: 100vh;"></map-canvas>

                <div style="position: absolute;top: 15px;left: 50%;display: flex;">
                    <div v-if="levList.length > 1" v-for="(lev,index) in levList" :key="index" style="margin-right: 10px;">
@@ -200,13 +200,10 @@
                    openCrn(id) {
                        this.crnParam.crnNo = id;
                        this.activateCard = 'crn';
                        console.log(id);
                    },
                    openDualCrn(id) {
                        this.dualCrnParam.crnNo = id;
                        this.activateCard = 'dualCrn';
                        console.log(id);
						
                    },
                    openRgv(id) {
                        this.rgvParam.rgvNo = id;