From 3e96822ed257502829b28acf1da3b539accb6c07 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 16 Jun 2023 18:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=8B=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/js/getData2.js | 2 +-
src/pages/modules/homepage/one.vue | 164 +++++++++++++++--
src/pages/modules/sortpack/one.vue | 269 +++++++++++++++++++++++++---
src/pages/modules/takeshape/one.vue | 153 +++++++++++++---
4 files changed, 525 insertions(+), 63 deletions(-)
diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index 8a371a2..56cc4e8 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -2949,7 +2949,7 @@ export const moldingTableDate = () => {
// 分拣包装左
// 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'}}}}
+ 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': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'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
}
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index 1f1bcbf..e8616e7 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -117,12 +117,20 @@
+
200
+ +
+ 200
+ +
@@ -165,12 +173,20 @@
+ 200
+ +
+ 200
+ +
@@ -239,24 +255,40 @@
+ 200
+ +
+ 200
+ +
+ 200
+ +
+ 200
+ +
@@ -357,12 +389,20 @@
+ 200
+ +
+ 200
+ +
@@ -1395,11 +1435,47 @@ export default {
top: -800%;
left: -2000%;
.kongtuopan_1
- width: 12%;
+ _wh(12%, 12%)
top: 81%;
left: 61%;
+ .zhuan_qty
+ position absolute
+ bottom -30px
+ right: 0;
+ z-index 8
+ _wh(50px, 20px)
+ background-color: #0ff;
+ border: 1px solid #0ff;
+ border-radius: 5px
+ p
+ display block
+ _fj(row,center)
+ _wh(100%, 100%)
+ _font(13px, 13px, #fff,,center)
+ white-space nowrap
+ .zhuan_bg_arrow
+ position: absolute;
+ top -5px
+ right 10%
+ display: block;
+ width: 0;
+ height: 0;
+ border-color: transparent;
+ border-style: solid;
+ border-width: 5px
+ border-top-width: 0;
+ border-bottom-color: #0ff;
+ &:after
+ content: " ";
+ border-width: 5px;
.kongtuopan_2
left: 74%;
+ .zhuan_qty
+ right auto
+ left 0
+ .zhuan_bg_arrow
+ right auto
+ left 10%
.block_1
width: 10%;
height: 9%;
@@ -1413,11 +1489,24 @@ export default {
.robot
transform: rotate(-46deg)
.kongtuopan_1
- top 37%
+ top 31%
left 85%
- transform rotate(90deg)
+ img
+ transform rotate(90deg)
+ .zhuan_qty
+ bottom auto
+ top 0
+ right auto
+ left 32px
+ .zhuan_bg_arrow
+ border-color: transparent;
+ border-width: 5px;
+ border-left-width: 0;
+ border-right-color: #0ff;
+ top: 20%;
+ left: -5px;
.kongtuopan_2
- top 76%
+ top 80%
.weilan
top 16%
.block_2
@@ -1482,25 +1571,60 @@ export default {
.kongtuopan_1
top: 21%
left: 64%;
+ .zhuan_qty
+ bottom auto
+ top -47px
+ .zhuan_bg_arrow
+ border-color: transparent;
+ border-width: 5px;
+ border-bottom-width: 0;
+ border-top-color: #0ff;
+ top auto
+ bottom -5px
.kongtuopan_2
left: 80%;
.kongtuopan_3
top: 64%
+ .zhuan_qty
+ bottom -47px
+ top auto
+ .zhuan_bg_arrow
+ border-color: transparent;
+ border-width: 5px;
+ border-top-width: 0;
+ border-bottom-color: #0ff;
+ top -5px
+ bottom auto
.kongtuopan_4
top: 64%
left: 80%;
+ .zhuan_qty
+ bottom -47px
+ top auto
+ right auto
+ left 0
+ .zhuan_bg_arrow
+ border-color: transparent;
+ border-width: 5px;
+ border-top-width: 0;
+ border-bottom-color: #0ff;
+ top -5px
+ bottom auto
+ right auto
+ left 10%
.yj_wrap_5
top 61%
.kongtuopan_1
- top: 14%;
+ top: 7%;
left: 64%;
- transform rotate(90deg)
+ img
+ transform rotate(90deg)
.kongtuopan_2
- top 30%
+ top 25%
.kongtuopan_3
- top 70%
+ top 62%
.kongtuopan_4
- top 86%
+ top 80%
.yj_wrap_7
top 75%
.yj_info_wrap
@@ -1518,11 +1642,24 @@ export default {
left: 75%
transform: rotate(15deg);
.kongtuopan_1
- top 43%
+ top 35%
left 90%
- transform rotate(90deg)
+ img
+ transform rotate(90deg)
+ .zhuan_qty
+ bottom auto
+ top 0
+ right auto
+ left 32px
+ .zhuan_bg_arrow
+ border-color: transparent;
+ border-width: 5px;
+ border-left-width: 0;
+ border-right-color: #0ff;
+ top: 20%;
+ left: -5px;
.kongtuopan_2
- top: 63%
+ top: 59%
.jcpmj
width: 18%;
top: 12%;
@@ -1578,7 +1715,8 @@ export default {
.kongtuopan_1
left auto
right 64%
- transform rotate(-90deg)
+ img
+ transform rotate(-90deg)
.kl_wrap_1
width 2%
height 63%
diff --git a/src/pages/modules/sortpack/one.vue b/src/pages/modules/sortpack/one.vue
index 37bd16e..4cd1cba 100644
--- a/src/pages/modules/sortpack/one.vue
+++ b/src/pages/modules/sortpack/one.vue
@@ -1,5 +1,5 @@
-
@@ -73,19 +73,19 @@