From f27869ea60dfdd4eed02c36b220c3333950ddce0 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 15 Jun 2023 18:12:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=9E=8B=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/layout.styl | 94 +++++- src/assets/js/getData2.js | 468 ++++++++++++++++++++++++++++ src/images/dot_line.png | Bin 0 -> 4117 bytes src/images/popup_bg.png | Bin 0 -> 7187 bytes src/images/popup_dot.png | Bin 0 -> 1523 bytes src/images/popup_line.png | Bin 0 -> 1917 bytes src/pages/modules/homepage/one.vue | 6 +- src/pages/modules/homepage/two.vue | 2 +- src/pages/modules/takeshape/one.vue | 440 +++++++++++++++++++++++--- 9 files changed, 961 insertions(+), 49 deletions(-) create mode 100644 src/images/dot_line.png create mode 100644 src/images/popup_bg.png create mode 100644 src/images/popup_dot.png create mode 100644 src/images/popup_line.png 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 0000000000000000000000000000000000000000..3db129d3352ae540e6a44eace8c9ac359fd7044e GIT binary patch literal 4117 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
-
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 @@