From a46b2a1600317134ba5b30b7a978c945e7e171d0 Mon Sep 17 00:00:00 2001
From: 17602169347 <h17602169347@163.com>
Date: Thu, 13 Apr 2023 14:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LargeScreenController.java     | 24 ++++++++++++++-----
 .../basicInformation/tradeupload/Form2.vue    |  4 ++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/largeScreen/controller/LargeScreenController.java b/SC-boot/linkage-scm/src/main/java/jnpf/largeScreen/controller/LargeScreenController.java
index 416f5283..37a56102 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/largeScreen/controller/LargeScreenController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/largeScreen/controller/LargeScreenController.java
@@ -68,12 +68,14 @@ public class LargeScreenController {
             double datas = collectionService.queryCollectionStatistics(date);
             values.add(datas);
         }
+        List<Map<String, Object>> maps = new ArrayList<>();
         Map<String, Object> map2 = new HashMap<>();
         map2.put("name", "废钢");
         map2.put("data", values);
+        maps.add(map2);
         Map<String, Object> map = new HashMap<>();
         map.put("categories", dateList2);
-        map.put("series", map2);
+        map.put("series", maps);
         return ActionResult.success(map);
     }
 
@@ -105,12 +107,14 @@ public class LargeScreenController {
             double datas = paymentService.queryPaymentStatistics(date);
             values.add(datas);
         }
+        List<Map<String, Object>> maps = new ArrayList<>();
         Map<String, Object> map2 = new HashMap<>();
         map2.put("name", "废钢");
         map2.put("data", values);
+        maps.add(map2);
         Map<String, Object> map = new HashMap<>();
         map.put("categories", dateList2);
-        map.put("series", map2);
+        map.put("series", maps);
         return ActionResult.success(map);
     }
 
@@ -142,12 +146,14 @@ public class LargeScreenController {
             double datas = saleorderitemService.querySaleorderNumStatistics(date);
             values.add(datas);
         }
+        List<Map<String, Object>> maps = new ArrayList<>();
         Map<String, Object> map2 = new HashMap<>();
         map2.put("name", "废钢");
         map2.put("data", values);
+        maps.add(map2);
         Map<String, Object> map = new HashMap<>();
         map.put("categories", dateList2);
-        map.put("series", map2);
+        map.put("series", maps);
         return ActionResult.success(map);
     }
 
@@ -179,12 +185,14 @@ public class LargeScreenController {
             double datas = purchaseorderitemService.queryPurchaseorderNumStatistics(date);
             values.add(datas);
         }
+        List<Map<String, Object>> maps = new ArrayList<>();
         Map<String, Object> map2 = new HashMap<>();
         map2.put("name", "废钢");
         map2.put("data", values);
+        maps.add(map2);
         Map<String, Object> map = new HashMap<>();
         map.put("categories", dateList2);
-        map.put("series", map2);
+        map.put("series", maps);
         return ActionResult.success(map);
     }
 
@@ -216,12 +224,14 @@ public class LargeScreenController {
             double datas = saleorderitemService.querySaleorderAmountStatistics(date);
             values.add(datas);
         }
+        List<Map<String, Object>> maps = new ArrayList<>();
         Map<String, Object> map2 = new HashMap<>();
         map2.put("name", "废钢");
         map2.put("data", values);
+        maps.add(map2);
         Map<String, Object> map = new HashMap<>();
         map.put("categories", dateList2);
-        map.put("series", map2);
+        map.put("series", maps);
         return ActionResult.success(map);
     }
 
@@ -253,12 +263,14 @@ public class LargeScreenController {
             double datas = purchaseorderitemService.queryPurchaseorderAmountStatistics(date);
             values.add(datas);
         }
+        List<Map<String, Object>> maps = new ArrayList<>();
         Map<String, Object> map2 = new HashMap<>();
         map2.put("name", "废钢");
         map2.put("data", values);
+        maps.add(map2);
         Map<String, Object> map = new HashMap<>();
         map.put("categories", dateList2);
-        map.put("series", map2);
+        map.put("series", maps);
         return ActionResult.success(map);
     }
 }
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
index ac92a264..e06c1b2c 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
@@ -492,7 +492,7 @@
 			var param = {};
 			param.name = '';
 			param.contractType = '0';
-			param.menuId = '380358734926336581';
+			param.menuId = '380264320186993413';
 			this.formVisible6 = true
 			this.$nextTick(() => {
 				this.$refs.form6.init(param)
@@ -502,7 +502,7 @@
 			var param = {};
 			param.name = this.dataForm.customerName;
 			param.contractType = '1';
-			param.menuId = '380358734926336581';
+			param.menuId = '380264320186993413';
 			this.formVisible3 = true
 			this.$nextTick(() => {
 				this.$refs.form3.init(param)