#

Junjie

13 小时以前 a8e8b92a28fd7b48b6eeae2f2f859ba381a39614

#

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

@@ -103,7 +103,7 @@
        defaults.put("site-auto-run", "#FA51F6");
        defaults.put("site-auto-id", "#C4C400");
        defaults.put("site-auto-run-id", "#30BFFC");
        defaults.put("site-enable-in", "#18C7B8");
        defaults.put("site-enable-in", "#A81DEE");
        defaults.put("site-unauto", "#B8B8B8");
        defaults.put("machine-pakin", "#30BFFC");
        defaults.put("machine-pakout", "#97B400");

 src/main/webapp/components/MapCanvas.js

@@ -138,7 +138,7 @@
        'site-auto-run': 0xfa51f6,
        'site-auto-id': 0xc4c400,
        'site-auto-run-id': 0x30bffc,
        'site-enable-in': 0x18c7b8,
        'site-enable-in': 0xA81DEE,
        'site-unauto': 0xb8b8b8,
        'machine-pakin': 0x30bffc,
        'machine-pakout': 0x97b400,
@@ -2452,7 +2452,7 @@
        'site-auto-run': 0xfa51f6,
        'site-auto-id': 0xc4c400,
        'site-auto-run-id': 0x30bffc,
        'site-enable-in': 0x18c7b8,
        'site-enable-in': 0xA81DEE,
        'site-unauto': 0xb8b8b8,
        'machine-pakin': 0x30bffc,
        'machine-pakout': 0x97b400,
@@ -2640,7 +2640,6 @@
    }
  }
});





 src/main/webapp/components/MonitorWorkbench.js

File was deleted

 src/main/webapp/static/js/watch/stationColorConfig.js

@@ -9,7 +9,7 @@
            '#FA51F6',
            '#C4C400',
            '#30BFFC',
            '#18C7B8',
            '#A81DEE',
            '#97B400',
            '#E69138',
            '#B8B8B8',

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

@@ -524,7 +524,6 @@
                    <div class="monitor-panel" ref="monitorPanel" :class="{ 'is-collapsed': panelCollapsed }">
                        <div class="monitor-panel-header">
                            <div class="monitor-panel-title">监控工作台</div>
                            <div class="monitor-panel-desc">围绕地图做操作，设备点击后自动切换到对应面板</div>
                        </div>
                        <div class="monitor-panel-body">
                            <div class="wb-tabs" role="tablist">