conf/app.go

@@ -8,9 +8,9 @@ import (
 	rcover "github.com/kataras/iris/v12/middleware/recover"
 )
 
-var ExampleFile = "http://localhost:9001/public/uploadxlsx/example.xlsx"
+var ExampleFile = "http://localhost:9005/public/uploadxlsx/example.xlsx"
 
-var Baseurl = "http://localhost:9001"
+var Baseurl = "http://localhost:9005"
 
 //var ExampleFile = "http://localhost:8097/public/uploadxlsx/example.xlsx"
 //

models/pln/pln.go

@@ -51,19 +51,19 @@ type PerDashboardData struct {
 }
 
 type ProductFamilyProduce struct {
-	ProductFamilyId string `json:"productFamilyId"`
-	Percent         string `json:"percent"`
+	ProductFamilyId string   `json:"productFamilyId"`
+	PercentLi       []string `json:"percentLi"`
 }
 
 type CutLine1 struct {
-	TimeLi             []string                 `json:"timeLi"`
-	ProductFamilyMeter map[string]int           `json:"productFamilyMeter"`
-	ProduceData        [][]ProductFamilyProduce `json:"produceData"`
+	TimeLi             []string               `json:"timeLi"`
+	ProductFamilyMeter map[string]int         `json:"productFamilyMeter"`
+	ProduceData        []ProductFamilyProduce `json:"produceData"`
 }
 
 //Dashboard数据展示
 type DashboardPic struct {
-	DashboardDataPic1   *CutLine1       //图例1
+	DashboardDataPic1   *CutLine1        //图例1
 	DashboardDataPic2   []DefectItem     //图例2
 	DashboardDataPic3   PerDashboardData //图例3
 	DashboardDataPic4   TargetItem       //目标数据

services/pln/implments/CustOrder.service.impl.go

@@ -2930,7 +2930,6 @@ func (impl *CustOrderServiceImplement) SelectPic1(user *global.User, ) (result *
 	now, _ := time.ParseInLocation(grmi.DateTimeOutFormat, "2022-03-20 23:00:00", utils.TimezoneLocation)
 	endTime := now.Format(grmi.DateTimeOutFormat)
 	todayStart := now.Format(grmi.DateOutFormat) + " 00:00:00"
-	fmt.Println("endTime:", endTime)
 	dateTimeLi := make([]int, 0, now.Hour())
 	todayStartTime, _ := time.ParseInLocation(grmi.DateTimeOutFormat, todayStart, utils.TimezoneLocation)
 	var num int
@@ -3039,22 +3038,51 @@ func (impl *CustOrderServiceImplement) SelectPic1(user *global.User, ) (result *
 	for _, num = range dateTimeLi {
 		result.TimeLi = append(result.TimeLi, strconv.Itoa(num) + "时")
 	}
-	for _, num = range dateTimeLi {
-		hourProduceData := make([]model.ProductFamilyProduce, 0)
-		for productFamilyId, accomplishTimeMap := range productFamilyAccomplishMap {
+	for productFamilyId, accomplishTimeMap := range productFamilyAccomplishMap {
+		percentData := model.ProductFamilyProduce{
+			ProductFamilyId: productFamilyId,
+		}
+		for _, num = range dateTimeLi {
 			qty, exist := accomplishTimeMap[num]
 			if exist {
 				meter := productFamilyMeterMap[productFamilyId]
 				percent := (float64(3600/qty)) / float64(meter) / 100
-				productFamilyProduceData := model.ProductFamilyProduce{
-					ProductFamilyId: productFamilyId,
-					Percent: fmt.Sprintf("%.2f", percent),
-				}
-				hourProduceData = append(hourProduceData, productFamilyProduceData)
+				percentData.PercentLi = append(percentData.PercentLi, fmt.Sprintf("%.2f", percent))
+			} else {
+				percentData.PercentLi = append(percentData.PercentLi, "0.00")
+			}
+		}
+		result.ProduceData = append(result.ProduceData, percentData)
+
+	}
+	displayIndexLi := make([]int, 0)
+	for index, _ := range dateTimeLi {
+		var zeroSign = true
+		for _, productData := range result.ProduceData {
+			if productData.PercentLi[index] != "0.00" {
+				zeroSign = false
+				break
 			}
 		}
-		result.ProduceData = append(result.ProduceData, hourProduceData)
+		if !zeroSign {
+			displayIndexLi = append(displayIndexLi, index)
+		}
+	}
+	displayTimeLi := make([]string, 0)
+	displayProductData := make([]model.ProductFamilyProduce, 0, len(result.ProduceData))
+	for _, productData := range result.ProduceData {
+		displayProductData = append(displayProductData, model.ProductFamilyProduce{
+			ProductFamilyId: productData.ProductFamilyId,
+		})
+	}
+	for _, index := range displayIndexLi {
+		displayTimeLi = append(displayTimeLi, result.TimeLi[index])
+		for productIndex, productData := range result.ProduceData {
+			displayProductData[productIndex].PercentLi = append(displayProductData[productIndex].PercentLi, productData.PercentLi[index])
+		}
 	}
+	result.TimeLi = displayTimeLi
+	result.ProduceData = displayProductData
 
 	return result, nil