diff --git a/src/assets/css/layout.styl b/src/assets/css/layout.styl index 18c0fd3..85cc8f5 100644 --- a/src/assets/css/layout.styl +++ b/src/assets/css/layout.styl @@ -1,5 +1,11 @@ @import 'mixin.styl' +// 样式测试 +.style_block + position absolute + _wh(calc(100% / 3), calc(100% / 3)) + background red +// 页面跳转 .tooltip_wrap position fixed bottom 10% @@ -35,4 +41,90 @@ &:hover background-color #03fcfd border-color #03fcfd - color #fff \ No newline at end of file + color #fff +.current_page + background-color #049293 + border-color #049293 + color #fff + +// 弹窗 +.popup_block_wraper + position fixed + top 0 + left 0 + z-index 100 + width 550px + padding 20px 14px 30px 14px + _bis('../../images/popup_bg.png') +.foldline + position absolute + right -109px + z-index 10 + _wh(127px,105px) + _bis('../images/dot_line.png') +.foldline_right + right -109px +.foldline_left + left -109px + transform rotateY(180deg) +.popup_bg + _wh(100%, 100%) + background top center / 100% 18px url(../../images/popup_line.png) no-repeat + overflow hidden +.popup_block + _wh(100%,100%) + padding 15px 0 0 0 +.pop_header + _wh(100%, 28px) + padding 0 5px + _fj(row) +.pop_name + width 50% + _font(14px,28px,#32C5FF,,left) + text-shadow 2px 2px 4px #A6E6FF + margin-bottom 8px +.pop_status + _wh(50%, 28px) + _fj(row,flex-end) +.pop_status_dot + _wh(15px, 15px) + border-radius 50% + margin-right 10px +.pop_status_text + _font(16px, 28px, #fff,,) +.pop_content + _wh(100%, calc(100% - 28px)) + padding 0 5px + overflow-y auto + _fj(row,flex-start) + flex-wrap wrap +.pop_item + _wh(calc(50% - 2.5px), 30px) + _fj(row,flex-start) + background-color rgba(50,197,255,50%) + border-left 3px solid #fdfd0f + margin-bottom 5px + padding 0 5px + &:nth-child(2n+2) + width calc(50% - 2.5px) + margin-left 5px +.pop_label + width 100px + _font(12px, 24px, #fff,,left) +.pop_val + width calc(100% - 100px) + _font(13px, 24px, #0ff,,left) + white-space nowrap +.pop_val_s + width calc(100% - 118px) +.pop_unit + width 18px + _font(13px, 24px, #fff,,right) + overflow hidden +.icon-guanbi + position absolute + top 8px + right 9px + _wh(30px, 22px) + _font(15px, 22px, #fff,,center) + background-color #0a3679 \ No newline at end of file diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js index c8cbdb6..098ea17 100644 --- a/src/assets/js/getData2.js +++ b/src/assets/js/getData2.js @@ -1597,3 +1597,471 @@ export const workshopCondition = () => { } return res } + +// 成型左 +// export const moldingMaterialCondition = () => post('api/cockpit/moldingMaterialCondition', {}) +export const moldingMaterialCondition = () => { + let res = { + 'code': 200, + 'desc': '操作成功', + 'result': { + 'ManipulatorList': [ + { + 'device_status': 2, + 'device_name': '码垛机械手1', + 'device_status_name': '运行中', + 'error_time': '0', + 'stand_time': '2', + 'device_code': 'MDJXS01', + 'open_time': '2023-06-02 11:12:02', + 'work_time': '7' + }, + { + 'device_status': 2, + 'device_name': '码垛机械手2', + 'device_status_name': '运行中', + 'error_time': '0', + 'stand_time': '2', + 'device_code': 'MDJXS02', + 'open_time': '2023-06-02 11:12:02', + 'work_time': '7' + }, + { + 'device_status': 2, + 'device_name': '码垛机械手3', + 'device_status_name': '运行中', + 'error_time': '0', + 'stand_time': '2', + 'device_code': 'MDJXS03', + 'open_time': '2023-06-02 11:12:02', + 'work_time': '7' + }, + { + 'device_status': 2, + 'device_name': '码垛机械手4', + 'device_status_name': '运行中', + 'error_time': '0', + 'stand_time': '2', + 'device_code': 'MDJXS04', + 'open_time': '2023-06-02 11:12:02', + 'work_time': '7' + } + ], + 'TrayStationPopoverList': [ + { + 'bom': '3038C2', + 'device_name': '压机1', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ01', + 'point_name': '压机1下料位1', + 'vehicle_code': '0000', + 'point_code': 'YJ01XL01', + 'point_status': '1', + 'material_code': 'GBMAC3038C2' + }, + { + 'bom': '3038C2', + 'device_name': '压机1', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ01', + 'point_name': '压机1下料位2', + 'vehicle_code': '0000', + 'point_code': 'YJ01XL02', + 'point_status': '1', + 'material_code': 'GBMAC3038C2' + }, + { + 'bom': '3015C2', + 'device_name': '压机2', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ02', + 'point_name': '压机2下料位1', + 'vehicle_code': '0000', + 'point_code': 'YJ02XL01', + 'point_status': '1', + 'material_code': 'GBMAC3015C2' + }, + { + 'bom': '3015C2', + 'device_name': '压机2', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ02', + 'point_name': '压机2下料位2', + 'vehicle_code': '0000', + 'point_code': 'YJ02XL02', + 'point_status': '1', + 'material_code': 'GBMAC3015C2' + }, + { + 'bom': '3003C1', + 'device_name': '压机3', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ03', + 'point_name': '压机3下料位1', + 'vehicle_code': '0000', + 'point_code': 'YJ03XL01', + 'point_status': '1', + 'material_code': 'GBMAC3003C1' + }, + { + 'bom': '3003C1', + 'device_name': '压机3', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ03', + 'point_name': '压机3下料位2', + 'vehicle_code': '0000', + 'point_code': 'YJ03XL02', + 'point_status': '1', + 'material_code': 'GBMAC3003C1' + }, + { + 'bom': '3003C1', + 'device_name': '压机4', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ04', + 'point_name': '压机4下料位1', + 'vehicle_code': '0000', + 'point_code': 'YJ04XL01', + 'point_status': '1', + 'material_code': 'GBMAC3003C1' + }, + { + 'bom': '3003C1', + 'device_name': '压机4', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ04', + 'point_name': '压机4下料位2', + 'vehicle_code': '0000', + 'point_code': 'YJ04XL02', + 'point_status': '1', + 'material_code': 'GBMAC3003C1' + }, + { + 'bom': '-', + 'device_name': '压机5', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ05', + 'point_name': '压机5下料位1', + 'vehicle_code': '0000', + 'point_code': 'YJ05XL01', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机5', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ05', + 'point_name': '压机5下料位2', + 'vehicle_code': '0000', + 'point_code': 'YJ05XL02', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机6', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ06', + 'point_name': '压机6下料位1', + 'vehicle_code': '0000', + 'point_code': 'YJ06XL01', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机6', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ06', + 'point_name': '压机6下料位2', + 'vehicle_code': '0000', + 'point_code': 'YJ06XL02', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机7', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ07', + 'point_name': '压机7下料位1', + 'vehicle_code': '0000', + 'point_code': 'YJ07XL01', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机7', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ07', + 'point_name': '压机7下料位2', + 'vehicle_code': '0000', + 'point_code': 'YJ07XL02', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机8', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ08', + 'point_name': '压机8下料位1', + 'vehicle_code': '0000', + 'point_code': 'YJ08XL01', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机8', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ08', + 'point_name': '压机8下料位2', + 'vehicle_code': '0000', + 'point_code': 'YJ08XL02', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机9', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ09', + 'point_name': '压机9下料位1', + 'vehicle_code': '0000', + 'point_code': 'YJ09XL01', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机9', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ09', + 'point_name': '压机9下料位2', + 'vehicle_code': '0000', + 'point_code': 'YJ09XL02', + 'point_status': '1', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机10', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ10', + 'point_name': '压机10下料位1', + 'vehicle_code': '', + 'point_code': 'YJ10XL01', + 'point_status': '0', + 'material_code': '-' + }, + { + 'bom': '-', + 'device_name': '压机10', + 'is_full': '否', + 'material_qty': '0', + 'device_code': 'YJ10', + 'point_name': '压机10下料位2', + 'vehicle_code': '', + 'point_code': 'YJ10XL02', + 'point_status': '0', + 'material_code': '-' + } + ], + 'PressPopoverList': [ + { + 'total_unqualified_qty': '0', + 'device_status': 2, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '2', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '2023-06-02 11:12:02', + 'current_qty': '1200', + 'device_name': '压机1', + 'device_status_name': '运行中', + 'device_code': 'YJ01', + 'work_time': '7', + 'total_vehicle': '0', + 'material_code': 'GBMAC3038C2' + }, + { + 'total_unqualified_qty': '0', + 'device_status': 2, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '2', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '2023-06-02 11:12:02', + 'current_qty': '0', + 'device_name': '压机2', + 'device_status_name': '运行中', + 'device_code': 'YJ02', + 'work_time': '7', + 'total_vehicle': '0', + 'material_code': 'GBMAC3015C2' + }, + { + 'total_unqualified_qty': '0', + 'device_status': 2, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '2', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '2023-06-02 11:12:02', + 'current_qty': '5000', + 'device_name': '压机3', + 'device_status_name': '运行中', + 'device_code': 'YJ03', + 'work_time': '7', + 'total_vehicle': '0', + 'material_code': 'GBMAC3003C1' + }, + { + 'total_unqualified_qty': '0', + 'device_status': 2, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '2', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '2023-06-02 11:12:02', + 'current_qty': '1000', + 'device_name': '压机4', + 'device_status_name': '运行中', + 'device_code': 'YJ04', + 'work_time': '7', + 'total_vehicle': '0', + 'material_code': 'GBMAC3003C1' + }, + { + 'total_unqualified_qty': '0', + 'device_status': 1, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '5', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '-', + 'current_qty': '0', + 'device_name': '压机5', + 'device_status_name': '待机', + 'device_code': 'YJ05', + 'work_time': '0.5', + 'total_vehicle': '0', + 'material_code': '-' + }, + { + 'total_unqualified_qty': '0', + 'device_status': 1, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '5', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '-', + 'current_qty': '0', + 'device_name': '压机6', + 'device_status_name': '待机', + 'device_code': 'YJ06', + 'work_time': '0.5', + 'total_vehicle': '0', + 'material_code': '-' + }, + { + 'total_unqualified_qty': '0', + 'device_status': 1, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '5', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '-', + 'current_qty': '0', + 'device_name': '压机7', + 'device_status_name': '待机', + 'device_code': 'YJ07', + 'work_time': '0.5', + 'total_vehicle': '0', + 'material_code': '-' + }, + { + 'total_unqualified_qty': '0', + 'device_status': 1, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '5', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '-', + 'current_qty': '0', + 'device_name': '压机8', + 'device_status_name': '待机', + 'device_code': 'YJ08', + 'work_time': '0.5', + 'total_vehicle': '0', + 'material_code': '-' + }, + { + 'total_unqualified_qty': '0', + 'device_status': 1, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '5', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '-', + 'current_qty': '0', + 'device_name': '压机9', + 'device_status_name': '待机', + 'device_code': 'YJ09', + 'work_time': '0.5', + 'total_vehicle': '0', + 'material_code': '-' + }, + { + 'total_unqualified_qty': '0', + 'device_status': 1, + 'total_qualified_qty': '0', + 'error_time': '0', + 'stand_time': '5', + 'total_classify_material': '0', + 'total_actual_quantity': '0', + 'open_time': '-', + 'current_qty': '0', + 'device_name': '压机10', + 'device_status_name': '待机', + 'device_code': 'YJ10', + 'work_time': '0.5', + 'total_vehicle': '0', + 'material_code': '-' + } + ] + } + } + return res +} diff --git a/src/images/dot_line.png b/src/images/dot_line.png new file mode 100644 index 0000000..3db129d Binary files /dev/null and b/src/images/dot_line.png differ diff --git a/src/images/popup_bg.png b/src/images/popup_bg.png new file mode 100644 index 0000000..49efdb3 Binary files /dev/null and b/src/images/popup_bg.png differ diff --git a/src/images/popup_dot.png b/src/images/popup_dot.png new file mode 100644 index 0000000..9b6f023 Binary files /dev/null and b/src/images/popup_dot.png differ diff --git a/src/images/popup_line.png b/src/images/popup_line.png new file mode 100644 index 0000000..0e01a5f Binary files /dev/null and b/src/images/popup_line.png differ diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue index b440d48..1f1bcbf 100644 --- a/src/pages/modules/homepage/one.vue +++ b/src/pages/modules/homepage/one.vue @@ -571,7 +571,7 @@
-
1
+
1
2
3
4
@@ -1683,8 +1683,4 @@ export default { transform: rotateZ(15deg) } } -.style_block - position absolute - _wh(calc(100% / 3), calc(100% / 3)) - background red diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue index 6243695..4604e77 100644 --- a/src/pages/modules/homepage/two.vue +++ b/src/pages/modules/homepage/two.vue @@ -319,7 +319,7 @@
-
1
+
1
2
3
4
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue index 164e92c..16b59b0 100644 --- a/src/pages/modules/takeshape/one.vue +++ b/src/pages/modules/takeshape/one.vue @@ -1,5 +1,5 @@