From bc64ed3f3e0201f4711958c32375773a3f89b662 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Fri, 10 Jun 2022 18:33:56 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=BD=93=E5=89=8D=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/js/foamBox/index.js | 15 ++++++++-------
 .../src/main/resources/static/js/storage/index.js |  4 +++-
 .../main/resources/templates/storage/index.html   |  4 ++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js
index 3b58b45..7db0602 100644
--- a/productionboard/src/main/resources/static/js/foamBox/index.js
+++ b/productionboard/src/main/resources/static/js/foamBox/index.js
@@ -35,6 +35,7 @@ $(() => {
 
     const temperature = (res, ids) => {
         let mycharts = echarts.init(ids);
+        console.log(res);
 
 
         let option = {
@@ -52,9 +53,13 @@ $(() => {
                 {
                     interval: 0,
                     type: 'category',
-                    data: ['066', '066', '066', '066', '066'],
+                    data: res.xValueList,
                     axisPointer: {
                         type: 'shadow'
+                    },
+                    axisLabel:{
+                        // rotate:10,
+                        interval:0
                     }
                 }
             ],
@@ -82,9 +87,7 @@ $(() => {
                             return value + ' ml';
                         }
                     },
-                    data: [
-                        2.0, 4.9, 7.0, 23.2, 25.6
-                    ]
+                    data: res.interiorList
                 },
                 {
                     name: 'Precipitation',
@@ -94,9 +97,7 @@ $(() => {
                             return value + ' ml';
                         }
                     },
-                    data: [
-                        2.6, 5.9, 9.0, 26.4, 28.7
-                    ]
+                    data: res.lateralList
                 },
             ]
         };
diff --git a/productionboard/src/main/resources/static/js/storage/index.js b/productionboard/src/main/resources/static/js/storage/index.js
index 8632fd2..9309d2a 100644
--- a/productionboard/src/main/resources/static/js/storage/index.js
+++ b/productionboard/src/main/resources/static/js/storage/index.js
@@ -29,7 +29,9 @@ $(()=>{
     });
 
     //当前库存统计
-    multipleThreeDimensionalCylindrical(null,document.getElementById("theCurrentInventory"));
+    $.getJSON(`/storage/getStoreStatistics?ids=${ids}`, function (result) {
+        multipleThreeDimensionalCylindrical(result, document.getElementById("theCurrentInventory"));
+    });
 
     //库存统计
     $("#emptyLocation-left").text(123);
diff --git a/productionboard/src/main/resources/templates/storage/index.html b/productionboard/src/main/resources/templates/storage/index.html
index 50d9641..ba1c223 100644
--- a/productionboard/src/main/resources/templates/storage/index.html
+++ b/productionboard/src/main/resources/templates/storage/index.html
@@ -38,5 +38,9 @@
 
 </body>
 <script src="../../../js/storage/index.js"></script>
+<script>
+    
+    const ids = [[${positionId}]];
+</script>
 
 </html>
\ No newline at end of file