diff --git a/ruoyi-ui/public/monitor/json/config.json b/ruoyi-ui/public/monitor/json/config.json index bda4808..85871d8 100644 --- a/ruoyi-ui/public/monitor/json/config.json +++ b/ruoyi-ui/public/monitor/json/config.json @@ -2,285 +2,88 @@ "boxRows": [ { "id": "row1", - "boxWidth": 20, - "boxHeight": 17, - "boxCount": 46, + "boxWidth": 30, + "boxHeight": 30, + "boxCount": 33, "rowGap": 0 }, { "id": "row2", - "boxWidth": 20, - "boxHeight": 17, - "boxCount": 46, - "rowGap": 30 - }, - { - "id": "row3", - "boxWidth": 12, - "boxHeight": 20, - "boxCount": 69, - "rowGap": 10 - }, - { - "id": "row4", - "boxWidth": 12, - "boxHeight": 20, - "boxCount": 69, - "rowGap": 30 - }, - { - "id": "row1_1", - "boxWidth": 20, - "boxHeight": 17, - "boxCount": 46, - "rowGap": 200 - }, - { - "id": "row2_1", - "boxWidth": 20, - "boxHeight": 17, - "boxCount": 46, - "rowGap": 30 - }, - { - "id": "row3_1", - "boxWidth": 12, - "boxHeight": 20, - "boxCount": 69, - "rowGap": 10 - }, - { - "id": "row4_1", - "boxWidth": 12, - "boxHeight": 20, - "boxCount": 69, - "rowGap": 30 + "boxWidth": 30, + "boxHeight": 30, + "boxCount": 33, + "rowGap": 40 } ], "conveyors": [ - { - "id": "L1002", - "width": 45, - "height": 25, - "rotation": 0, - "x": 362, - "y": 330 - }, { "id": "L1001", - "width": 45, - "height": 25, + "width": 80, + "height": 30, "rotation": 0, - "x": 316, - "y": 330 + "x": 317, + "y": 563 }, { - "id": "L1011", - "width": 30, - "height": 25, + "id": "G1002", + "width": 80, + "height": 30, "rotation": 0, - "x": 285, - "y": 330 - }, - { - "id": "L1004", - "width": 45, - "height": 25, - "rotation": 0, - "x": 362, - "y": 415 - }, - { - "id": "L1003", - "width": 45, - "height": 25, - "rotation": 0, - "x": 316, - "y": 415 - }, - { - "id": "L1012", - "width": 30, - "height": 25, - "rotation": 0, - "x": 285, - "y": 415 - }, - { - "id": "L2001", - "width": 45, - "height": 25, - "rotation": 0, - "x": 1513, - "y": 638 - }, - { - "id": "L2002", - "width": 45, - "height": 25, - "rotation": 0, - "x": 1559, - "y": 638 - }, - { - "id": "L2003", - "width": 45, - "height": 25, - "rotation": 0, - "x": 1513, - "y": 689 - }, - { - "id": "L2004", - "width": 45, - "height": 25, - "rotation": 0, - "x": 1559, - "y": 689 - }, - { - "id": "L2012", - "width": 30, - "height": 25, - "rotation": 0, - "x": 1605, - "y": 689 - }, - { - "id": "L2005", - "width": 45, - "height": 25, - "rotation": 0, - "x": 1513, - "y": 722 - }, - { - "id": "L2006", - "width": 50, - "height": 25, - "rotation": 0, - "x": 1559, - "y": 722 - }, - { - "id": "L1013", - "width": 25, - "height": 25, - "rotation": 0, - "x": 1610, - "y": 722 - }, - { - "id": "L2007", - "width": 45, - "height": 25, - "rotation": 0, - "x": 1513, - "y": 776 - }, - { - "id": "L2008", - "width": 45, - "height": 25, - "rotation": 0, - "x": 1559, - "y": 776 + "x": 232, + "y": 563 } ], "stackers": [ { "id": "1", - "width": 60, - "height": 28, + "width": 70, + "height": 35, "rotation": 0, "x": 441, - "y": 302, + "y": 522, "shelfId": "row1" - }, - { - "id": "2", - "width": 60, - "height": 28, - "rotation": 0, - "x": 441, - "y": 388, - "shelfId": "row3" } ], "tracks": [ { "id": "gd1", - "width": 1230, + "width": 1350, "height": 2, "rotation": 0, - "x": 346, - "y": 314 - }, - { - "id": "gd2", - "width": 1230, - "height": 2, - "rotation": 0, - "x": 346, - "y": 400 - }, - { - "id": "gd1_1", - "width": 1230, - "height": 2, - "rotation": 0, - "x": 346, - "y": 676 - }, - { - "id": "gd2_1", - "width": 1230, - "height": 2, - "rotation": 0, - "x": 346, - "y": 760 + "x": 240, + "y": 539 } ], "rollerConveyors": [ { - "id": "G1005", - "width": 20, - "height": 45, - "rotation": 90, - "x": 376, - "y": 463 + "id": "G1003", + "width": 40, + "height": 30, + "rotation": 0, + "x": 250, + "y": 597 }, { - "id": "G1006", - "width": 20, + "id": "G1004", + "width": 40, "height": 45, - "rotation": 90, - "x": 423, - "y": 463 + "rotation": 0, + "x": 250, + "y": 630 } ], "deviceDraggable": false, "editMode": false, "labels": [ { - "id": "bq", - "content": "二 层", - "fontSize": 24, - "fontColor": "#000000", - "bgColor": "#ffffff", - "borderRadius": 4, - "x": 882, - "y": 198 - }, - { - "id": "bq2", + "id": "bq1", "content": "一 层", "fontSize": 24, "fontColor": "#000000", "bgColor": "#ffffff", "borderRadius": 4, "x": 882, - "y": 562 + "y": 200 }, { "id": "bq3", @@ -289,38 +92,8 @@ "fontColor": "#ffffff", "bgColor": "#006666", "borderRadius": 4, - "x": 189, - "y": 293 - }, - { - "id": "bq4", - "content": "一巷道", - "fontSize": 16, - "fontColor": "#ffffff", - "bgColor": "#006666", - "borderRadius": 4, - "x": 189, - "y": 658 - }, - { - "id": "bq5", - "content": "二巷道", - "fontSize": 16, - "fontColor": "#ffffff", - "bgColor": "#006666", - "borderRadius": 4, - "x": 189, - "y": 383 - }, - { - "id": "bq6", - "content": "二巷道", - "fontSize": 16, - "fontColor": "#ffffff", - "bgColor": "#006666", - "borderRadius": 4, - "x": 189, - "y": 743 + "x": 150, + "y": 522 } ], "titleSettings": { diff --git a/ruoyi-ui/public/monitor/json/ddj.json b/ruoyi-ui/public/monitor/json/ddj.json index 7c627f5..ffeafd8 100644 --- a/ruoyi-ui/public/monitor/json/ddj.json +++ b/ruoyi-ui/public/monitor/json/ddj.json @@ -12,8 +12,8 @@ "ywz":"3", "yc":"1", "mbp":"2", - "mbwz":"46", - "mbc":"5" + "mbwz":"33", + "mbc":"6" },{ "id":"2", "name":"堆垛机", diff --git a/ruoyi-ui/src/views/device/ddj/index.vue b/ruoyi-ui/src/views/device/ddj/index.vue index 266c80e..e418981 100644 --- a/ruoyi-ui/src/views/device/ddj/index.vue +++ b/ruoyi-ui/src/views/device/ddj/index.vue @@ -246,7 +246,7 @@ import { listDeviceCar, getDeviceCar, delDeviceCar, addDeviceCar, updateDeviceCa export default { name: "deviceMonitor", - dicts: ['ddj_task_status', 'ddj_sbzt', 'ddj_czfs', 'ddj_yxxf', 'ddj_hczt', 'ssj_rkqq', 'ssj_dw', 'ssj_kx', 'ssj_ex','ssj_allow_put','tray_size','ssj_rkqq'], + dicts: ['ddj_task_status', 'ddj_sbzt', 'ddj_czfs', 'ddj_yxxf', 'ddj_hczt', 'ssj_rkqq', 'ssj_dw', 'ssj_kx', 'ssj_ex','ssj_allow_put','tray_size'], data() { return { // 查询参数