From 83bff199d22d380fc7e1b83bb2db0f0814385530 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 07 十二月 2023 16:11:34 +0800
Subject: [PATCH] 饼图背景优化、统计数量字体和位置调整、订单完成比率背景和颜色调整、工单进度列表修改
---
src/views/cockpitPage/index.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/views/cockpitPage/index.vue b/src/views/cockpitPage/index.vue
index 17dc483..6745256 100644
--- a/src/views/cockpitPage/index.vue
+++ b/src/views/cockpitPage/index.vue
@@ -75,7 +75,7 @@
{ value: 0, label: "鎬讳骇閲�" },
{ value: 0, label: "鐢熶骇宸ュ崟鏁�" },
{ value: 0, label: "寤舵湡浜や粯" },
- { value: 0, label: "鐗╂枡涓嶈冻" },
+ { value: 0, label: "鐗╂枡涓嶈冻/寰呮帓绋�" },
{ value: 0, label: "璁″垝杈炬垚鐜�" },
],
// 鏈哄櫒寮�鏈虹巼
@@ -165,8 +165,9 @@
item.value = data?.WorkOrderAmount ?? 0;
} else if (item.label === "寤舵湡浜や粯") {
item.value = data?.DelayWorkOrderAmount ?? 0;
- } else if (item.label === "鐗╂枡涓嶈冻") {
+ } else if (item.label === "鐗╂枡涓嶈冻/寰呮帓绋�") {
item.value = data?.MaterialMissWorkOrderAmount ?? 0;
+ item.value1 = data?.WaitSchedulingWorkOrderAmount ?? 0;
} else if (item.label === "璁″垝杈炬垚鐜�") {
let value =
typeof data?.PlanOrderFinishRate === "string"
@@ -206,7 +207,9 @@
setLeftBlock3(data) {
console.log(this.setNumbers(data?.OutPlanProductionAmount ?? 0));
this.totalObject = {
- InternalDeviceRunningAmount: data?.InternalDeviceRunningAmount ?? 0,
+ InternalDeviceRunningAmount: (
+ data?.InternalDeviceRunningAmount ?? 0
+ ).toString(),
ExternalDeviceRunningAmount: data?.ExternalDeviceRunningAmount ?? 0,
OutPlanProductionAmount: this.setNumbers(
data?.OutPlanProductionAmount ?? 0
@@ -309,10 +312,10 @@
// 璁＄畻鍔犲伐鏁� 鐢熶骇鏁�
setNumbers(val) {
if (val > 1000 && val < 10000) {
- let count = (val / 1000).toFixed(1);
+ let count = (val / 1000).toFixed(2);
return count.toString() + "鍗�";
} else if (val >= 10000 && val < 100000) {
- let count1 = (val / 10000).toFixed(1);
+ let count1 = (val / 10000).toFixed(2);
return count1.toString() + "涓�";
} else if (val >= 100000 && val < 1000000) {
let count1 = (val / 100000).toFixed(0);
@@ -324,8 +327,8 @@
let count1 = (val / 10000000).toFixed(0);
return count1.toString() + "鍗冧竾";
} else if (val >= 100000000 && val < 1000000000) {
- let count1 = (val / 100000000).toFixed(1);
- return count1.toString() + "浜�";
+ let count1 = (val / 100000000).toFixed(2);
+ return count1 + "浜�";
} else if (val >= 1000000000 && val < 10000000000) {
let count1 = (val / 1000000000).toFixed(0);
return count1.toString() + "鍗佷嚎";
@@ -339,7 +342,7 @@
let count1 = (val / 1000000000000).toFixed(0);
return count1.toString() + "涓囦嚎";
} else {
- return val;
+ return val.toString();
}
},
},
--
Gitblit v1.8.0