From a560233c2fd276f27a08a3d7b7ac5d838133bf6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 19 Jul 2022 14:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/css/board/box.css   |  17 +++++++++++++++
 .../static/img/{ => board/box}/mid.png        | Bin
 .../main/resources/templates/broad/box.html   |  20 ++++++++++--------
 .../broad/finalAssemblyProductionData.html    |   3 ++-
 4 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/static/css/board/box.css
 rename ruoyi-admin/src/main/resources/static/img/{ => board/box}/mid.png (100%)

diff --git a/ruoyi-admin/src/main/resources/static/css/board/box.css b/ruoyi-admin/src/main/resources/static/css/board/box.css
new file mode 100644
index 0000000..bc3d670
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/css/board/box.css
@@ -0,0 +1,17 @@
+.mid {
+    background: url(../../img/board/box/mid.png) no-repeat;
+    background-size: 100% 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+.occupancy{
+    position: absolute;
+    top: 18.7%;
+    left: 61%;
+    width: 35%;
+    height: 3%;
+    font-size: 1vw;
+}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/static/img/mid.png b/ruoyi-admin/src/main/resources/static/img/board/box/mid.png
similarity index 100%
rename from ruoyi-admin/src/main/resources/static/img/mid.png
rename to ruoyi-admin/src/main/resources/static/img/board/box/mid.png
diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html
index 287c06b..57c6c63 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/box.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/box.html
@@ -6,6 +6,7 @@
           name="viewport">
     <title>箱壳成型数据监控平台</title>
     <meta content="箱壳成型数据监控平台" name="description">
+    <link href="../../static/css/board/box.css" rel="stylesheet" th:href="@{/css/board/box.css}"/>
     <link href="../../static/css/main-style.css" rel="stylesheet" th:href="@{/css/main-style.css}"/>
     <link href="../../static/css/materialdesignicons.min.css" rel="stylesheet"
           th:href="@{/css/materialdesignicons.min.css}"/>
@@ -17,15 +18,7 @@
 
     <style>
 
-        .mid {
-            background: url(../../static/img/mid.png) no-repeat;
-            background-size: 100% 100%;
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-        }
+
         #top-right {
             position: absolute;
             width: 23.8%;
@@ -356,11 +349,16 @@
 <div id="inner-bile-by-type"></div>
 <div id="inner-bile-by-hour"></div>
 <div class="mid"></div>
+<div class="occupancy" id="occupancy"></div>
 
 <script src="../../static/js/update-split-blocks.js" th:src="@{/js/update-split-blocks.js}"></script>
 <script src="../../static/js/auto-update.js" th:src="@{/js/auto-update.js}"></script>
 <script src="../../static/js/data-merger.js" th:src="@{/js/data-merger.js}"></script>
 <script>
+    const occupancy = (val1=0,val2=0) => {
+        const html = `内胆库库存占有率：${val1}%,箱壳库库存占有率${val2}%`
+        $('#occupancy').html(html)
+    }
     const planWorkOrderColumns = [
         "序号", "型号","计划数量", "完成数量", "完成率", "时间",
     ]
@@ -396,11 +394,15 @@
     const rowName1 = '内胆集存库'
     const rowName2 = '箱壳集存库'
     $(() => {
+        occupancy()
         let url = '/broad/box'
         //生产计划工单
         autoUpdate(url+"/getProductPlanInfo ", INTERVAL, data => {
               planWorkOrderTable.loadData(data.map((value,index) => [index+1,value.name, value.plan_number, value.actual_number, `${value.rate}%`, value.day]), Object.keys(planWorkOrderColumns))
           })
+        autoUpdate(url+"/selectStockOccupancy ", INTERVAL, data => {
+            occupancy(data.find(val => val.name == 'S001').rate,data.find(val => val.name == 'S002').rate)
+        })
 
         autoUpdate(url + '/selectStock/S001', INTERVAL, data => {
             inventoryInfoDataMerger.merge(
diff --git a/ruoyi-admin/src/main/resources/templates/broad/finalAssemblyProductionData.html b/ruoyi-admin/src/main/resources/templates/broad/finalAssemblyProductionData.html
index 8c6c570..6e21edc 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/finalAssemblyProductionData.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/finalAssemblyProductionData.html
@@ -1,4 +1,5 @@
-<!DOCTYPE html>
+<!DOCTYPE html><html lang="zh" xmlns:th="http://www.thymeleaf.org">
+
 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">