From b24a62470d1c937dcd033728b05a47ad3e13500d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 05 十二月 2023 10:40:14 +0800
Subject: [PATCH] dashboard字段更新

---
 model/dashboard.go |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/model/dashboard.go b/model/dashboard.go
index 6146a2b..0beed25 100644
--- a/model/dashboard.go
+++ b/model/dashboard.go
@@ -53,21 +53,23 @@
 	}
 
 	WorkshopStats struct {
-		Name      string
-		Total     int64
-		Qualified int64
-		Defective int
-		Percent   int
+		Name      string //杞﹂棿鍚嶇О
+		Total     int64  //鐢熶骇鎬绘暟
+		Qualified int64  //姝e搧鏁伴噺
+		Defective int    //娆″搧鏁伴噺
+		Percent   int    //姝e搧鐜�
 	}
 
 	WorkOrderStats struct {
-		Number       string //缂栧彿
-		Product      string //浜у搧
-		Scale        string //瑙勬牸
-		PlanTime     string //璁″垝鏃堕棿
-		Percent      int    //瀹屾垚杩涘害
-		procedureNum int    //宸ュ簭鏁伴噺
-		DelayDays    int    //寤舵湡澶╂暟
+		Number                 string //缂栧彿
+		Product                string //浜у搧
+		Scale                  string //瑙勬牸
+		Amount                 int64  //鐢熶骇鏁伴噺
+		PlanTime               string //璁″垝鏃堕棿
+		DelayDays              int    //寤舵湡澶╂暟
+		ProcedureNum           int    //宸ュ簭鏁伴噺
+		FinishProcedureNum     int    //宸插畬鎴愬伐搴忔暟閲�
+		ProcessingProcedureNum int    //杩涜涓伐搴忔暟閲�
 	}
 
 	DashboardSearch struct {
@@ -100,41 +102,49 @@
 	if slf.DeviceLoadData != "" {
 		if err = json.Unmarshal([]byte(slf.DeviceLoadData), &deviceLoad); err == nil {
 			slf.DeviceLoad = deviceLoad
+			slf.DeviceLoadData = ""
 		}
 	}
 	if slf.MaterialRequirementData != "" {
 		if err = json.Unmarshal([]byte(slf.MaterialRequirementData), &materialRequirement); err == nil {
 			slf.MaterialRequirement = materialRequirement
+			slf.MaterialRequirementData = ""
 		}
 	}
 	if slf.OrderFinishRateData != "" {
 		if err = json.Unmarshal([]byte(slf.OrderFinishRateData), &orderFinishRate); err == nil {
 			slf.OrderFinishRate = orderFinishRate
+			slf.OrderFinishRateData = ""
 		}
 	}
 	if slf.PersonnelProductivityData != "" {
 		if err = json.Unmarshal([]byte(slf.PersonnelProductivityData), &personnelProductivity); err == nil {
 			slf.PersonnelProductivity = personnelProductivity
+			slf.PersonnelProductivityData = ""
 		}
 	}
 	if slf.PersonnelSkillPercentData != "" {
 		if err = json.Unmarshal([]byte(slf.PersonnelSkillPercentData), &personnelSkillPercent); err == nil {
 			slf.PersonnelSkillPercent = personnelSkillPercent
+			slf.PersonnelSkillPercentData = ""
 		}
 	}
 	if slf.WorkerTypeStatsData != "" {
 		if err = json.Unmarshal([]byte(slf.WorkerTypeStatsData), &workerTypeStats); err == nil {
 			slf.WorkerTypeStats = workerTypeStats
+			slf.WorkerTypeStatsData = ""
 		}
 	}
 	if slf.WorkshopStatsData != "" {
 		if err = json.Unmarshal([]byte(slf.WorkshopStatsData), &workshopStats); err == nil {
 			slf.WorkshopStats = workshopStats
+			slf.WorkshopStatsData = ""
 		}
 	}
 	if slf.WorkOrderStatsData != "" {
 		if err = json.Unmarshal([]byte(slf.WorkOrderStatsData), &workOrderStats); err == nil {
 			slf.WorkOrderStats = workOrderStats
+			slf.WorkOrderStatsData = ""
 		}
 	}
 	return nil

--
Gitblit v1.8.0