diff --git a/src/components/baozuo-demo/BottomCharts.vue b/src/components/baozuo-demo/BottomCharts.vue index 4339c89..c524be4 100644 --- a/src/components/baozuo-demo/BottomCharts.vue +++ b/src/components/baozuo-demo/BottomCharts.vue @@ -6,7 +6,13 @@ -
+
+
+
排工单执行进度
+ +
+
+
机芯派工单执行进度
@@ -15,7 +21,7 @@
盖板派工单执行进度
- +
@@ -121,7 +127,21 @@ export default { createProgressCircle(0), completedQuantity // 完成数量 ]; - } else { + }else if(title === 'U1机芯2'){ + newDataItem = [ + `PS-${formattedDate2}${String(i).padStart(3, '0')}`, // 编号 + title, // 固定值 + formattedDate, // 日期 + orderQuantity, // 订单量 + completionRate, // 完成率 + createProgressCircle(100), + createProgressCircle(completionRate2), + createProgressCircle(completionRate2), + createProgressCircle(completionRate2), + createProgressCircle(0), + completedQuantity, // 完成数量 + ] + }else { // eslint-disable-next-line no-const-assign newDataItem = [ `PS-${formattedDate2}${String(i).padStart(3, '0')}`, // 编号 @@ -176,6 +196,14 @@ export default { columnWidth: [80, 300], align: ['center'] }, + config4: { + header: ['工单号', '产品名称','派工日期', '派工数量', '工序进度', '进水调节', '按钮调节', '桶身调节', '桶身装底座', '包装','剩余数量'] , + data: generateRandomData(30, 'U1机芯2'), + headerHeight: 50, + index: true, + columnWidth: [80, 300], + align: ['center'] + }, } }, created() { diff --git a/src/components/baozuo-demo/CenterCmp.vue b/src/components/baozuo-demo/CenterCmp.vue index 26bbd5f..ede863e 100644 --- a/src/components/baozuo-demo/CenterCmp.vue +++ b/src/components/baozuo-demo/CenterCmp.vue @@ -15,7 +15,7 @@
- 订单信息 + 本月工单概况
@@ -29,12 +29,12 @@
- +
- 保养及备料信息 + {{dataType=='3'?'未完成订单数量':'保养及备料信息'}}