diff --git a/src/assets/css/layout.styl b/src/assets/css/layout.styl index 328e336..d85b8ac 100644 --- a/src/assets/css/layout.styl +++ b/src/assets/css/layout.styl @@ -44,8 +44,8 @@ border-color #03fcfd color #fff .current_page - background-color #049293 - border-color #049293 + background-color #02d0d0 + border-color #02d0d0 color #fff // 弹窗 diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js index e9157c3..8a371a2 100644 --- a/src/assets/js/getData2.js +++ b/src/assets/js/getData2.js @@ -2946,6 +2946,13 @@ export const moldingTableDate = () => { return res } +// 分拣包装左 +// export const sortingAndPackagingPopover = () => post('api/cockpit/sortingAndPackagingPopover', {}) +export const sortingAndPackagingPopover = () => { + let res = {'code': 200, 'desc': '操作成功', 'result': {'SplitOrPalletizingList': [{'bom': '3012C1', 'is_full': '是', 'device_name': '压机1', 'qty': '270', 'mix_num': '20230606000', 'point_name': '分拣拆垛1对接位1', 'vehicle_code': '5070', 'point_code': 'FJCD01DJ01', 'point_status': '1', 'material_code': 'GBMAC3012C1'}, {'bom': '-', 'is_full': '-', 'device_name': '-', 'qty': '-', 'mix_num': '-', 'point_name': '分拣拆垛1对接位2', 'vehicle_code': '', 'point_code': 'FJCD01DJ02', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'is_full': '-', 'device_name': '-', 'qty': '-', 'mix_num': '-', 'point_name': '分拣码垛1对接位1', 'vehicle_code': '0000', 'point_code': 'FJMD01DJ01', 'point_status': '1', 'material_code': '-'}, {'bom': '-', 'is_full': '-', 'device_name': '-', 'qty': '-', 'mix_num': '-', 'point_name': '分拣码垛1对接位2', 'vehicle_code': '0000', 'point_code': 'FJMD01DJ02', 'point_status': '1', 'material_code': '-'}], 'HalfSupportCacheList': [{'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}], 'DevicesInfoList': {'DT01': {'device_status': 2, 'device_name': '叠托位', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'DT01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'FJCDJXS01': {'device_status': 2, 'device_name': '分拣拆垛机械手', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'FJCDJXS01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'RGV01': {'device_status': 2, 'device_name': 'RGV搬运车', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'RGV01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'FJMDJXS01': {'device_status': 2, 'device_name': '分拣码垛机械手', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'FJMDJXS01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'CPJ01': {'device_status': 2, 'device_name': '拆盘机', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'CPJ01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'BZJ01': {'device_status': 2, 'device_name': '包装机', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'BZJ01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'FJRGCD01': {'device_status': 2, 'device_name': '分拣人工拆垛', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'FJRGCD01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}}}} + return res +} + // 分拣包装右 // export const sortingAndPackaging = () => post('api/cockpit/sortingAndPackaging', {}) export const sortingAndPackaging = () => { @@ -2955,19 +2962,19 @@ export const sortingAndPackaging = () => { 'result': { 'SortingDayList': [ { - 'total_palletizing_qty': '0', + 'total_palletizing_qty': '100', 'total_stripping_qty': '288', 'material_id': '1658742670023069696', 'material_code': 'GBMCZ3004M1' }, { - 'total_palletizing_qty': '0', + 'total_palletizing_qty': '100', 'total_stripping_qty': '270', 'material_id': '1655138063413809152', 'material_code': 'ZLMCZ1001C1' }, { - 'total_palletizing_qty': '0', + 'total_palletizing_qty': '100', 'total_stripping_qty': '576', 'material_id': '1659114773914193920', 'material_code': 'GBMCZ3004M1' diff --git a/src/images/workshop/liu.png b/src/images/workshop/liu.png deleted file mode 100644 index b6af125..0000000 Binary files a/src/images/workshop/liu.png and /dev/null differ diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue index d4f19cf..9d3018c 100644 --- a/src/pages/modules/homepage/two.vue +++ b/src/pages/modules/homepage/two.vue @@ -161,9 +161,6 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+