更新驾驶舱叉车

Merge pull request '11-wms-zjl' (#22 ) from 11-wms-zjl into master
Reviewed-on: #22
2022-12-01 10:32:30 +08:00 · 2022-11-28 16:49:46 +08:00 · 2022-11-28 16:48:38 +08:00 · 2022-11-28 16:44:07 +08:00 · 2022-11-28 16:10:28 +08:00 · 2022-11-28 16:09:53 +08:00
36 changed files with 836 additions and 345 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,3 +1,10 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-10-20 09:22:39
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-11-24 10:37:57
+ * @Description:
+-->
 <template>
  <div id="app">
    <router-view />
@@ -7,7 +14,18 @@
 <script>
 export default {
  name: 'App',
+  data() {
+    return {
+      beilv: 1
+    }
+  },
  mounted() {
+    this.beilv = document.body.offsetWidth / 1920
+    document.documentElement.style.setProperty('--beilv', this.beilv)
+    window.addEventListener('resize', () => {
+      this.beilv = document.body.offsetWidth / 1920
+      document.documentElement.style.setProperty('--beilv', this.beilv)
+    })
  }
 }
 </script>
--- a/src/assets/img/choicepart/basicData.png
+++ b/src/assets/img/choicepart/basicData.png
--- a/src/assets/img/choicepart/choicepart-back-u.png
+++ b/src/assets/img/choicepart/choicepart-back-u.png
--- a/src/assets/img/choicepart/choicepart-back.png
+++ b/src/assets/img/choicepart/choicepart-back.png
--- a/src/assets/img/choicepart/inStore.png
+++ b/src/assets/img/choicepart/inStore.png
--- a/src/assets/img/choicepart/inventoryManagement.png
+++ b/src/assets/img/choicepart/inventoryManagement.png
--- a/src/assets/img/choicepart/outStore.png
+++ b/src/assets/img/choicepart/outStore.png
--- a/src/assets/img/choicepart/statisticalReports.png
+++ b/src/assets/img/choicepart/statisticalReports.png
--- a/src/assets/img/choicepart/systemSettings.png
+++ b/src/assets/img/choicepart/systemSettings.png
--- a/src/icons/svg/alarmb.svg
+++ b/src/icons/svg/alarmb.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>2</title>
+    <g id="2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/banner/消息">
+            <rect id="矩形" x="0" y="0" width="24" height="24"></rect>
+            <rect id="矩形" x="0" y="0" width="24" height="24"></rect>
+            <g id="消息" transform="translate(1.500000, 0.330627)" fill="#000000" fill-rule="nonzero">
+                <rect id="矩形" opacity="0" x="0" y="0" width="21" height="21"></rect>
+                <path d="M12.375,20.8465581 L12.481439,20.8533125 C12.8247806,20.8979809 13.05,21.1605815 13.05,21.5329218 C13.05,21.9061929 12.8231926,22.1712138 12.4745438,22.2133994 L12.4745438,22.2133994 L12.369085,22.2194605 L8.625,22.2192854 L8.51856095,22.2125311 C8.17521937,22.1678627 7.95,21.905262 7.95,21.5329218 C7.95,21.1596507 8.17680737,20.8946298 8.52545616,20.8524442 L8.52545616,20.8524442 L8.63091503,20.8463831 L12.375,20.8465581 Z M10.5,1.11928542 L10.518,1.12028542 L10.6067486,1.12608537 C10.8823216,1.16207049 11.0827652,1.33862074 11.1502336,1.60173001 L11.1691881,1.70434797 L11.1751648,1.81138832 L11.174,2.96819941 L11.2623551,3.06760509 L11.4699366,3.09194324 L11.7169493,3.12873834 C15.1566001,3.70083281 17.8052189,6.65135102 18.0339536,10.2136799 L18.0339536,10.2136799 L18.0460319,10.4648785 L18.0500129,10.7163433 L18.05,18.2002854 L18.1499256,18.3002854 L19.2499256,18.3011036 L19.3566944,18.3079035 C19.6667682,18.3483868 19.8817022,18.5667728 19.9191881,18.8861662 L19.9191881,18.8861662 L19.9251648,18.9932065 L19.9184209,19.1002704 C19.8784201,19.4115142 19.6633278,19.6299778 19.3495438,19.6679448 L19.3495438,19.6679448 L19.244085,19.674006 L1.75,19.674006 L1.64356095,19.6670765 C1.30021937,19.6224081 1.075,19.3598075 1.075,18.9874672 C1.075,18.6142067 1.30179797,18.3491752 1.65038278,18.3069894 L1.648,18.3062854 L1.691,18.3042854 L1.75581803,18.3009285 L2.85007438,18.3002854 L2.95,18.2002854 L2.95,10.71474 L2.95401023,10.4643007 C3.0740175,6.72062696 5.87395857,3.57344707 9.53315802,3.09161275 L9.53315802,3.09161275 L9.73577793,3.0675894 L9.82399996,2.96837143 L9.82499996,1.80573506 L9.83178712,1.69643473 C9.8677099,1.41423605 10.0440196,1.20878035 10.3078503,1.14227473 L10.3078503,1.14227473 L10.398,1.12428542 L10.495,1.11928542 L10.5,1.11928542 Z M16.599,18.3002854 L16.699,18.2002988 L16.7,10.7147533 L16.6958906,10.484234 C16.5756984,7.11769965 13.8343245,4.4011036 10.5,4.4011036 C7.17435962,4.4011036 4.42460885,7.10883932 4.30410828,10.484267 L4.30410828,10.484267 L4.30001588,10.7129577 L4.299,18.2002721 L4.399,18.3002854 L16.599,18.3002854 Z" id="形状结合"></path>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/alarmw.svg
+++ b/src/icons/svg/alarmw.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>2</title>
+    <g id="2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组">
+            <rect id="矩形" x="0" y="0" width="24" height="24"></rect>
+            <rect id="矩形" x="0" y="0" width="24" height="24"></rect>
+            <g id="消息" transform="translate(1.500000, 0.330627)" fill-rule="nonzero">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="21" height="21"></rect>
+                <path d="M12.375,20.8465581 L12.481439,20.8533125 C12.8247806,20.8979809 13.05,21.1605815 13.05,21.5329218 C13.05,21.9061929 12.8231926,22.1712138 12.4745438,22.2133994 L12.4745438,22.2133994 L12.369085,22.2194605 L8.625,22.2192854 L8.51856095,22.2125311 C8.17521937,22.1678627 7.95,21.905262 7.95,21.5329218 C7.95,21.1596507 8.17680737,20.8946298 8.52545616,20.8524442 L8.52545616,20.8524442 L8.63091503,20.8463831 L12.375,20.8465581 Z M10.5,1.11928542 L10.518,1.12028542 L10.6067486,1.12608537 C10.8823216,1.16207049 11.0827652,1.33862074 11.1502336,1.60173001 L11.1691881,1.70434797 L11.1751648,1.81138832 L11.174,2.96819941 L11.2623551,3.06760509 L11.4699366,3.09194324 L11.7169493,3.12873834 C15.1566001,3.70083281 17.8052189,6.65135102 18.0339536,10.2136799 L18.0339536,10.2136799 L18.0460319,10.4648785 L18.0500129,10.7163433 L18.05,18.2002854 L18.1499256,18.3002854 L19.2499256,18.3011036 L19.3566944,18.3079035 C19.6667682,18.3483868 19.8817022,18.5667728 19.9191881,18.8861662 L19.9191881,18.8861662 L19.9251648,18.9932065 L19.9184209,19.1002704 C19.8784201,19.4115142 19.6633278,19.6299778 19.3495438,19.6679448 L19.3495438,19.6679448 L19.244085,19.674006 L1.75,19.674006 L1.64356095,19.6670765 C1.30021937,19.6224081 1.075,19.3598075 1.075,18.9874672 C1.075,18.6142067 1.30179797,18.3491752 1.65038278,18.3069894 L1.648,18.3062854 L1.691,18.3042854 L1.75581803,18.3009285 L2.85007438,18.3002854 L2.95,18.2002854 L2.95,10.71474 L2.95401023,10.4643007 C3.0740175,6.72062696 5.87395857,3.57344707 9.53315802,3.09161275 L9.53315802,3.09161275 L9.73577793,3.0675894 L9.82399996,2.96837143 L9.82499996,1.80573506 L9.83178712,1.69643473 C9.8677099,1.41423605 10.0440196,1.20878035 10.3078503,1.14227473 L10.3078503,1.14227473 L10.398,1.12428542 L10.495,1.11928542 L10.5,1.11928542 Z M16.599,18.3002854 L16.699,18.2002988 L16.7,10.7147533 L16.6958906,10.484234 C16.5756984,7.11769965 13.8343245,4.4011036 10.5,4.4011036 C7.17435962,4.4011036 4.42460885,7.10883932 4.30410828,10.484267 L4.30410828,10.484267 L4.30001588,10.7129577 L4.299,18.2002721 L4.399,18.3002854 L16.599,18.3002854 Z" id="形状结合" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/chromeb.svg
+++ b/src/icons/svg/chromeb.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>3</title>
+    <g id="3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="chrome-o备份" fill-rule="nonzero">
+            <rect id="矩形" fill="#404040" opacity="0" x="0" y="0" width="24" height="24"></rect>
+            <path d="M12.7426068,2.2146521 L12.7969308,2.21934763 L13.710624,2.37852186 L13.8758691,2.41111672 L14.1788117,2.47990569 C17.8083772,3.38984553 20.2183126,5.64775183 21.3576595,9.20681554 L21.4312071,9.45312684 C21.4424894,9.49407858 21.4533873,9.53539607 21.4640561,9.57770303 L21.5265612,9.84840829 L21.5910183,10.1727998 L21.7853479,11.2573932 L21.7800356,12.8004541 L21.6434884,13.5893768 L21.5856223,13.8887435 L21.5250256,14.1499693 C20.5620362,17.9780786 18.1617207,20.4349532 14.3625096,21.4705433 L14.1437836,21.5265071 L13.9137133,21.5771902 L13.4740829,21.6596966 L12.7426068,21.7854416 L11.1996505,21.7801487 L10.2834751,21.620599 L9.93360929,21.5474416 L9.82240675,21.5204237 C6.19289431,20.6111829 3.7827631,18.3541523 2.64317987,14.7958381 L2.56952614,14.5492643 L2.5050898,14.2938921 L2.44241633,13.9997935 L2.21455835,12.7427006 L2.21984617,11.199772 L2.37862691,10.2827451 L2.42714858,10.0429186 L2.47993468,9.82132437 C3.42439347,6.12371072 5.70744352,3.70983475 9.29593923,2.62735404 L9.7463242,2.50065857 L9.96673544,2.44825109 L10.3605303,2.37014553 L11.2572994,2.2146521 L12.7426068,2.2146521 Z M19.8184835,8.98242758 L17.8452559,8.98928786 L14.9675268,8.98709499 L15.0797892,9.10063515 C16.3213259,10.415573 16.6057788,12.2971205 15.7650723,13.9357578 L15.6541116,14.1392638 L11.9599009,20.4508985 L12.7565222,20.3999419 L13.0688801,20.3744215 L13.3296995,20.3453964 L13.5654615,20.3094959 C13.6041382,20.3027523 13.6428743,20.2955818 13.6822213,20.2879141 C18.6345664,19.3229989 21.6280381,14.1355163 20.0588392,9.36859749 L19.9720227,9.11812043 C19.9372981,9.02280001 19.9245375,8.99376084 19.8623201,8.98535805 L19.8184835,8.98242758 Z M4.65084236,7.78932117 L4.56424406,7.94798435 C3.4213887,10.0886924 3.19931203,12.295053 3.93454334,14.5371697 C4.93640021,17.5925026 7.03373243,19.4969892 10.189811,20.2723941 L10.5200771,20.3485817 C10.5838015,20.3623556 10.5888302,20.3684026 10.6099764,20.332771 L13.0943563,16.0777049 L12.9989912,16.1054787 C12.7989622,16.1602618 12.6660608,16.1894579 12.5271855,16.2051494 L12.4207667,16.2145748 C10.6168415,16.334373 9.21591352,15.605623 8.30414882,14.0584009 L6.61262152,11.158299 L4.65084236,7.78932117 Z M11.9929638,9.04613534 C10.3500684,9.04928839 9.04106198,10.3706195 9.04596815,12.0223123 C9.05081988,13.6444119 10.3772255,14.9584659 12.0068362,14.9543922 C13.6471232,14.95028 14.9674971,13.6178126 14.9549525,11.9796354 C14.9424363,10.3478671 13.6248992,9.04298847 11.9929638,9.04613534 Z M5.69719098,6.35076885 L5.46938856,6.60325105 C5.43203838,6.64588868 5.41753959,6.65640287 5.42320237,6.67714133 L7.90118893,10.9183074 L7.91414513,10.8757045 C8.46343996,9.03359313 9.95509795,7.86190859 11.8474474,7.76979085 L12.076418,7.76394483 L19.3270014,7.7650491 L19.2765877,7.67851428 C17.931894,5.47764056 16.0374498,4.13772493 13.5902231,3.69821656 L13.2678845,3.6459989 C10.288211,3.21475838 7.76432959,4.12699021 5.69719098,6.35076885 Z" id="形状结合" fill="#000000"></path>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/chromew.svg
+++ b/src/icons/svg/chromew.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>3</title>
+    <g id="3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="chrome-o备份" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="24"></rect>
+            <path d="M12.7426068,2.2146521 L12.7969308,2.21934763 L13.710624,2.37852186 L13.8758691,2.41111672 L14.1788117,2.47990569 C17.8083772,3.38984553 20.2183126,5.64775183 21.3576595,9.20681554 L21.4312071,9.45312684 C21.4424894,9.49407858 21.4533873,9.53539607 21.4640561,9.57770303 L21.5265612,9.84840829 L21.5910183,10.1727998 L21.7853479,11.2573932 L21.7800356,12.8004541 L21.6434884,13.5893768 L21.5856223,13.8887435 L21.5250256,14.1499693 C20.5620362,17.9780786 18.1617207,20.4349532 14.3625096,21.4705433 L14.1437836,21.5265071 L13.9137133,21.5771902 L13.4740829,21.6596966 L12.7426068,21.7854416 L11.1996505,21.7801487 L10.2834751,21.620599 L9.93360929,21.5474416 L9.82240675,21.5204237 C6.19289431,20.6111829 3.7827631,18.3541523 2.64317987,14.7958381 L2.56952614,14.5492643 L2.5050898,14.2938921 L2.44241633,13.9997935 L2.21455835,12.7427006 L2.21984617,11.199772 L2.37862691,10.2827451 L2.42714858,10.0429186 L2.47993468,9.82132437 C3.42439347,6.12371072 5.70744352,3.70983475 9.29593923,2.62735404 L9.7463242,2.50065857 L9.96673544,2.44825109 L10.3605303,2.37014553 L11.2572994,2.2146521 L12.7426068,2.2146521 Z M19.8184835,8.98242758 L17.8452559,8.98928786 L14.9675268,8.98709499 L15.0797892,9.10063515 C16.3213259,10.415573 16.6057788,12.2971205 15.7650723,13.9357578 L15.6541116,14.1392638 L11.9599009,20.4508985 L12.7565222,20.3999419 L13.0688801,20.3744215 L13.3296995,20.3453964 L13.5654615,20.3094959 C13.6041382,20.3027523 13.6428743,20.2955818 13.6822213,20.2879141 C18.6345664,19.3229989 21.6280381,14.1355163 20.0588392,9.36859749 L19.9720227,9.11812043 C19.9372981,9.02280001 19.9245375,8.99376084 19.8623201,8.98535805 L19.8184835,8.98242758 Z M4.65084236,7.78932117 L4.56424406,7.94798435 C3.4213887,10.0886924 3.19931203,12.295053 3.93454334,14.5371697 C4.93640021,17.5925026 7.03373243,19.4969892 10.189811,20.2723941 L10.5200771,20.3485817 C10.5838015,20.3623556 10.5888302,20.3684026 10.6099764,20.332771 L13.0943563,16.0777049 L12.9989912,16.1054787 C12.7989622,16.1602618 12.6660608,16.1894579 12.5271855,16.2051494 L12.4207667,16.2145748 C10.6168415,16.334373 9.21591352,15.605623 8.30414882,14.0584009 L6.61262152,11.158299 L4.65084236,7.78932117 Z M11.9929638,9.04613534 C10.3500684,9.04928839 9.04106198,10.3706195 9.04596815,12.0223123 C9.05081988,13.6444119 10.3772255,14.9584659 12.0068362,14.9543922 C13.6471232,14.95028 14.9674971,13.6178126 14.9549525,11.9796354 C14.9424363,10.3478671 13.6248992,9.04298847 11.9929638,9.04613534 Z M5.69719098,6.35076885 L5.46938856,6.60325105 C5.43203838,6.64588868 5.41753959,6.65640287 5.42320237,6.67714133 L7.90118893,10.9183074 L7.91414513,10.8757045 C8.46343996,9.03359313 9.95509795,7.86190859 11.8474474,7.76979085 L12.076418,7.76394483 L19.3270014,7.7650491 L19.2765877,7.67851428 C17.931894,5.47764056 16.0374498,4.13772493 13.5902231,3.69821656 L13.2678845,3.6459989 C10.288211,3.21475838 7.76432959,4.12699021 5.69719098,6.35076885 Z" id="形状结合" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/homeb.svg
+++ b/src/icons/svg/homeb.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>1</title>
+    <g id="1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="首页" fill-rule="nonzero">
+            <rect id="矩形" fill="#404040" opacity="0" x="0" y="0" width="24" height="24"></rect>
+            <path d="M11.1710783,2.42919989 C11.7298936,2.09409047 12.4328291,2.12455473 12.9654367,2.52059014 L12.9654367,2.52059014 L20.3218013,7.99000647 L20.4665209,8.10559268 C21.0744501,8.62656431 21.4302636,9.40344805 21.4302636,10.227099 L21.4302636,10.227099 L21.4302636,19.0470569 L21.4250327,19.2212289 C21.3382831,20.6611171 20.1833875,21.8011882 18.7715031,21.8011882 L18.7715031,21.8011882 L5.2284969,21.8011882 L5.06035624,21.7957697 C3.67032883,21.7059084 2.56973638,20.5095861 2.56973638,19.0470569 L2.56973638,19.0470569 L2.56973638,10.2273587 L2.57600507,10.0381789 C2.63012926,9.22282649 3.03207443,8.47038558 3.67819781,7.99000711 L3.67819781,7.99000711 L11.034559,2.52059336 Z M12.0713092,3.55793652 C11.9772762,3.53774358 11.8769764,3.55793433 11.7954857,3.6185066 L11.7954857,3.6185066 L4.43911542,9.0879271 L4.32641124,9.18150853 C4.04059293,9.44596068 3.87451485,9.82573182 3.87451485,10.2273587 L3.87451485,10.2273587 L3.87451485,19.0470569 L3.880713,19.1821318 C3.94632222,19.8933667 4.52470053,20.4496068 5.2284969,20.4496068 L5.2284969,20.4496068 L11.2507497,20.4487759 L11.3507364,20.3451977 L11.3512202,14.4627186 L11.3582338,14.3683764 C11.4044406,14.0603828 11.6734228,13.8227675 12,13.8227675 C12.3345637,13.8227675 12.6123182,14.0734451 12.6454705,14.3976012 L12.6454705,14.3976012 L12.6489183,14.4681588 L12.6487364,20.3451881 L12.7487231,20.4487759 L18.7714898,20.4496068 L18.9018895,20.4431864 C19.5885066,20.3752237 20.1254851,19.7760987 20.1254851,19.0470569 L20.1254851,19.0470569 L20.1254851,10.2273587 L20.1177907,10.0779557 C20.0769951,9.68325297 19.8759128,9.32208831 19.5608746,9.08791971 L19.5608746,9.08791971 L12.2045243,3.61851399 L12.1402672,3.58065321 Z" id="形状结合" fill="#000000"></path>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/homew.svg
+++ b/src/icons/svg/homew.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>1</title>
+    <g id="1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="首页" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="24"></rect>
+            <path d="M11.1710783,2.42919989 C11.7298936,2.09409047 12.4328291,2.12455473 12.9654367,2.52059014 L12.9654367,2.52059014 L20.3218013,7.99000647 L20.4665209,8.10559268 C21.0744501,8.62656431 21.4302636,9.40344805 21.4302636,10.227099 L21.4302636,10.227099 L21.4302636,19.0470569 L21.4250327,19.2212289 C21.3382831,20.6611171 20.1833875,21.8011882 18.7715031,21.8011882 L18.7715031,21.8011882 L5.2284969,21.8011882 L5.06035624,21.7957697 C3.67032883,21.7059084 2.56973638,20.5095861 2.56973638,19.0470569 L2.56973638,19.0470569 L2.56973638,10.2273587 L2.57600507,10.0381789 C2.63012926,9.22282649 3.03207443,8.47038558 3.67819781,7.99000711 L3.67819781,7.99000711 L11.034559,2.52059336 Z M12.0713092,3.55793652 C11.9772762,3.53774358 11.8769764,3.55793433 11.7954857,3.6185066 L11.7954857,3.6185066 L4.43911542,9.0879271 L4.32641124,9.18150853 C4.04059293,9.44596068 3.87451485,9.82573182 3.87451485,10.2273587 L3.87451485,10.2273587 L3.87451485,19.0470569 L3.880713,19.1821318 C3.94632222,19.8933667 4.52470053,20.4496068 5.2284969,20.4496068 L5.2284969,20.4496068 L11.2507497,20.4487759 L11.3507364,20.3451977 L11.3512202,14.4627186 L11.3582338,14.3683764 C11.4044406,14.0603828 11.6734228,13.8227675 12,13.8227675 C12.3345637,13.8227675 12.6123182,14.0734451 12.6454705,14.3976012 L12.6454705,14.3976012 L12.6489183,14.4681588 L12.6487364,20.3451881 L12.7487231,20.4487759 L18.7714898,20.4496068 L18.9018895,20.4431864 C19.5885066,20.3752237 20.1254851,19.7760987 20.1254851,19.0470569 L20.1254851,19.0470569 L20.1254851,10.2273587 L20.1177907,10.0779557 C20.0769951,9.68325297 19.8759128,9.32208831 19.5608746,9.08791971 L19.5608746,9.08791971 L12.2045243,3.61851399 L12.1402672,3.58065321 Z" id="形状结合" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -2,7 +2,7 @@
  <div class="navbar" :style="showTitle ? 'background: rgba(8,17,50,0.25)' : ''" style="padding-right: 23px;">
    <hamburger v-if="showhome" id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />

-    <div v-if="showTitle" style="color: #fff;font-size: 22px; float: left; letter-spacing: 1px; font-weight: 500; padding-left: 24px; marginTop: 5px">
+    <div v-if="showTitle" style="color: #fff;font-size: 22px; float: left; letter-spacing: 1px; font-weight: 500; padding-left: 24px; marginTop: 5px; cursor: pointer;" @click="toHome">
      <img src="../../assets/img/cnbm.png" style="width: 26px; height: 26px; position: relative; top: 6px; marginRight: 14px" alt="">
      {{ 'title' | i18nFilter }}
    </div>
@@ -11,13 +11,17 @@

    <div class="right-menu">

-      <div v-if="showhome" class="right-menu-back" @click="toHome">
+      <!-- <div v-if="showhome" class="right-menu-back" @click="toHome">
        <svg-icon class="item-icon" icon-class="home" style="height: 24px; width: 24px; vertical-align: -6px; margin-right: 2px;" />
        {{ 'navbar.homepage' | i18nFilter }}
-      </div>
+      </div> -->
+      <div :style="showTitle ? 'color: #fff' : ''" class="right-menu-back" @click="toHome">
+        <svg-icon class="item-icon" :icon-class="showTitle ? 'homew' : 'homeb'" style="height: 24px; width: 24px; vertical-align: -8px; margin-right: 2px;" /></div>
+      <!-- <svg-icon class="item-icon" icon-class="home" style="height: 24px; width: 24px; vertical-align: -6px; margin-right: 2px;" /></div> -->
      <el-dropdown :style="showTitle ? 'color: #fff' : '#000'" class="avatar-container right-menu-item hover-effect" trigger="click">
        <el-badge :hidden="alarmNum>0?false:true" :value="alarmNum" class="item" style="line-height: 0; margin: 0 10px; vertical-align: -3px" @click.native="handleAlarm">
-          <svg-icon style="width: 24px; height: 24px" class="item-icon" icon-class="alarm" />
+          <!-- <svg-icon style="width: 24px; height: 24px" class="item-icon" icon-class="alarm" /> -->
+          <svg-icon style="width: 24px; height: 24px" class="item-icon" :icon-class="showTitle ? 'alarmw' : 'alarmb'" />
        </el-badge>
        <el-dropdown-menu slot="dropdown">
          <el-dropdown-item>暂无数据</el-dropdown-item>
@@ -34,7 +38,10 @@
        <a href="Lodap.zip"><svg-icon :style="showTitle ? 'color: #fff' : ''" style="width: 24px; height: 24px; vertical-align: -7px" icon-class="download" /></a>
      </div>
      <div class="right-menu-back">
-        <a href="google.exe"><svg-icon :style="showTitle ? 'color: #fff' : ''" style="width: 24px; height: 24px; vertical-align: -7px" icon-class="chrome" /></a>
+        <a href="google.exe">
+          <svg-icon style="width: 24px; height: 24px; vertical-align: -7px" :icon-class="showTitle ? 'chromew' : 'chromeb'" />
+          <!-- <svg-icon :style="showTitle ? 'color: #fff' : ''" style="width: 24px; height: 24px; vertical-align: -7px" icon-class="chrome" /> -->
+        </a>
      </div>
      <el-dropdown :style="showTitle ? 'color: #fff' : 'color: #000'" class="avatar-container right-menu-item hover-effect" trigger="click">
        <div class="avatar-wrapper">
@@ -49,7 +56,7 @@
              {{ 'navbar.profile' | i18nFilter }}
            </el-dropdown-item>
          </router-link>
-          <el-dropdown-item @click.native="toHome">
+          <el-dropdown-item @click.native="toMain">
            <svg-icon class="item-icon" icon-class="help" />
            {{ 'navbar.help' | i18nFilter }}
          </el-dropdown-item>
@@ -203,10 +210,18 @@ export default {
      this.$router.push(`/login?redirect=${this.$route.fullPath}`)
      clearInterval(logoutInterval)
    },
-    async toHome() {
+    toMain() {
      this.$store.dispatch('app/setChoicepart')
      this.$router.push('/')
    },
+    async toHome() {
+      // this.$store.dispatch('app/setChoicepart')
+      // this.$router.push('/')
+      if (sessionStorage.getItem('param')) {
+        const param = JSON.parse(window.atob(sessionStorage.getItem('param')))
+        window.location = 'http://192.168.1.103:9527/#/?' + param
+      }
+    },
    handleAlarm() {},
    getAlarm() {
      // getAlarmNum().then(response => {
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -69,8 +69,8 @@ export default {
    width: 100%;

    & .sidebar-logo {
-      width: 36px;
-      height: 36px;
+      width: 26px;
+      height: 26px;
      vertical-align: middle;
      margin-right: 12px;
    }
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -230,7 +230,7 @@ export const routes = [
        path: 'goodsData',
        name: 'goodsData',
        meta: {
-          title: '物品数据',
+          title: '物料数据',
          icon: 'form'
        },
        component: () => import('@/views/wmsBasicData/goodsData.vue')
--- a/src/utils/wmsDic.js
+++ b/src/utils/wmsDic.js
@@ -27,17 +27,15 @@ export function getCustomerCodeList() {

 // 成品规格List
 export function getProductSpecList() {
-  const list = ['50*50mm', '70*50mm', '70*70mm', '100*50mm', '100*70mm', '100*100mm', '100*120mm', '120*120mm']
+  const list = ['2.0-1128*1716', '2.0-1128*2251', '2.0-1128*2272', '3.2-1128*1716', '3.2-1128*1718', '3.2-1032*1747', '3.2-1033*2089']
  const spec = list[parseInt(Math.random() * (list.length))]
  return spec
 }

 // 批次List
 export function getBatchList() {
-  let batch = '2022'
-  for (let i = 0; i < 8; i++) {
-    batch += parseInt(Math.random() * 89 + 10)
-  }
+  const sj = parseInt(Math.random() * 100 + 1)
+  const batch = moment().subtract(sj, 'days').format('YYYYMMDD')
  return batch
 }

@@ -94,7 +92,7 @@ export function getOperationCode2List() {
 }

 // 仓库
-const storeList = ['1号立体库', '2号立体库', '3号立体库', '4号立体库', '5号立体库', '6号立体库', '7号立体库', '8号立体库']
+const storeList = ['成品库A', '成品库B', '成品库C', '成品库D', '备件库', '辅材库']
 export function getStoreList() {
  let store = ''
  store += storeList[parseInt(Math.random() * storeList.length)]
@@ -102,7 +100,7 @@ export function getStoreList() {
 }

 // 库区
-const KQList = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N']
+const KQList = ['A', 'B', 'C', 'D']
 export function getKQList() {
  let KQ = ''
  KQ += KQList[parseInt(Math.random() * KQList.length)]
@@ -153,10 +151,8 @@ export function getTimeArr() {

 // 物料编码List
 export function getMaterialCodeList() {
-  let materialCode = 'WL'
-  for (let i = 0; i < 4; i++) {
-    materialCode += parseInt(Math.random() * 89 + 10)
-  }
+  const sj = parseInt(Math.random() * 365)
+  const materialCode = 'M' + (sj % 2 ? 'G' : 'F') + moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYYMMDDhhmmss')
  return materialCode
 }

@@ -169,7 +165,7 @@ export function getNameList() {
 }

 // 客户数据
-const compList = ['台玻', 'FUYAO福耀', 'SG南玻', 'XYG信义玻璃', '耀皮', '福莱特玻璃', 'CLFG洛玻', 'SHABO沙玻', 'KIBING旗滨', '金晶玻璃', '济南金昊', '东莞佳美特', '汇中矿产', '文盛新材料', '西点化学', '开源塑胶', '奥驰商贸', '竹中科技', '程龙玻璃']
+const compList = ['隆基绿能科技股份有限公司', '天合光能股份有限公司', '晶澳太阳能科技股份有限公司', '晶科能源股份有限公司', '阿特斯阳光电力集团', '东方日升新能源股份有限公司', '尚德集团', '浙江正泰新能源开发有限公司', '环晟光伏(江苏)有限公司', '江苏赛拉弗光伏系统有限公司', '唐山海泰新能科技股份有限公司', '阳光能源控股有限公司', '横店集团东磁股份有限公司', '常州亿晶光电科技有限公司', '协鑫集成科技股份有限公司', '苏州中来光伏新材股份有限公司', '中节能太阳能科技(镇江)有限公司', '苏州腾晖光伏技术有限公司', '英利绿色能源控股有限公司', '湖南红太阳新能源科技有限公司']
 export function getCompTyleList() {
  let comp = ''
  comp = compList[parseInt(Math.random() * (compList.length))]
@@ -193,7 +189,7 @@ export function getPhoneList() {
 }

 // 物品名称
-const goodsList = ['钢化玻璃', '磨砂玻璃', '喷砂玻璃', '压花玻璃', '夹丝玻璃', '夹层玻璃']
+const goodsList = ['盖板玻璃', '背板玻璃']
 export function getGoodsList() {
  let name = ''
  name = goodsList[parseInt(Math.random() * (goodsList.length))]
--- a/src/views/OperationalOverview/components/baseTable.vue
+++ b/src/views/OperationalOverview/components/baseTable.vue
@@ -1,7 +1,7 @@
 <!--
 * @Date: 2020-12-14 09:07:03
- * @LastEditors: gtz
- * @LastEditTime: 2022-06-14 11:12:39
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-11-08 15:30:44
 * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseTable.vue
 * @Description:
 -->
@@ -9,7 +9,7 @@
  <div class="visual-base-table-container">
    <el-table
      v-loading="isLoading"
-      :header-cell-style="{background:'rgba(79,114,136,0.29)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
+      :header-cell-style="{background:'rgba(32, 55, 96, 0.5)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
      :row-style="setRowStyle"
      :data="renderData"
      border
@@ -111,7 +111,7 @@ export default {
    setRowStyle(v) {
      if (v.rowIndex % 2 === 0) {
        return {
-          background: 'rgba(76,97,123,0.2)',
+          background: 'rgba(14, 32, 62, 0.5)',
          color: 'rgba(255,255,255,0.5)',
          height: 26 * this.beilv + 'px',
          lineHeight: 26 * this.beilv + 'px',
@@ -120,7 +120,7 @@ export default {
        }
      } else {
        return {
-          background: 'rgba(79,114,136,0.29)',
+          background: 'rgba(32, 55, 96, 0.5)',
          color: 'rgba(255,255,255,0.5)',
          height: 26 * this.beilv + 'px',
          lineHeight: 26 * this.beilv + 'px',
--- a/src/views/OperationalOverview/components/newBar.vue
+++ b/src/views/OperationalOverview/components/newBar.vue
@@ -175,7 +175,6 @@ export default {
      ]
    }
    this.$nextTick(() => {
-      console.log(this.series)
      this.initChart()
    })
  },
--- a/src/views/OperationalOverview/components/newPie.vue
+++ b/src/views/OperationalOverview/components/newPie.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2022-01-21 14:43:06
 * @LastEditors: zwq
- * @LastEditTime: 2022-11-02 16:52:34
+ * @LastEditTime: 2022-11-28 15:03:58
 * @Description:
 -->
 <template>
@@ -93,6 +93,7 @@ export default {
        // 默认的legend配置
        legend: {
          orient: 'vertical',
+          show: false,
          bottom: 0,
          itemHeight: 10,
          itemWidth: 10,
@@ -112,14 +113,17 @@ export default {
            rich: {
              a: {
                align: 'center',
-                fontSize: 10,
+                fontSize: 12,
+                fontWeight: 400,
                color: 'rgba(255, 255, 255, 0.7)',
+                padding: [0, 1],
                lineHeight: 16
              },
              b: {
                // verticalAlign: 'top',
                align: 'center',
-                fontSize: 10,
+                fontSize: 12,
+                fontWeight: 400,
                color: 'rgba(255, 255, 255)'
              },
              c: {
@@ -167,7 +171,6 @@ export default {
        },
        // 默认的series配置
        series: {
-          center: ['60%', '55%'],
          radius: ['50%', '70%'],
          silent: true,
          avoidLabelOverlap: false,
@@ -192,8 +195,18 @@ export default {
    }
  },
  mounted() {
+    window.addEventListener('resize', () => {
+      if (this.chart) {
+        this.chart.resize()
+        this.$nextTick(() => {
+          // 重新绘制文本大小
+          this.initChart()
+        })
+      }
+    })
    this.$nextTick(() => {
      this.initChart()
+      this.chart.resize()
    })
  },
  beforeDestroy() {
@@ -209,22 +222,24 @@ export default {
      this.chart.setOption({
        title: this.showCenterTitle
          ? {
-            text: this.seriesData.reduce((pre, cur) => pre + cur.value, 0),
-            subtext: '总共',
-            top: '45%',
-            left: '59%',
+            text: `${this.seriesData.reduce((pre, cur) => pre + cur.value, 0)}\n{name|总共}`,
+            top: '44%',
+            left: '49%',
            textAlign: 'center',
-            itemGap: 5,
            textStyle: {
              color: '#fff',
-              fontSize: 22,
-              fontWeight: 'lighter',
-              lineHeight: 15
-            },
-            subtextStyle: {
-              color: '#c0c0c0',
-              fontSize: 12,
-              lineHeight: 20
+              fontSize: 26 * this.beilv,
+              fontWeight: 400,
+              lineHeight: 15 * this.beilv,
+              rich: {
+                name: {
+                  color: 'rgba(255, 255, 255, 0.7)',
+                  fontWeight: 400,
+                  textAlign: 'center',
+                  fontSize: 14 * this.beilv,
+                  lineHeight: 20 * this.beilv
+                }
+              }
            }
          }
          : {},
@@ -255,6 +270,18 @@ export default {
            ...this.seriesConfig,
            itemStyle: {
              normal: {
+                label: {
+                  show: true,
+                  fontSize: 15 * this.beilv,
+                  lineHeight: 18,
+                  formatter: '{d}%\n{name|{b}}',
+                  rich: {
+                    name: {
+                      color: 1,
+                      fontSize: 10 * this.beilv
+                    }
+                  }
+                },
                color: (list) => {
                  var colorList = [
                    {
@@ -288,10 +315,10 @@ export default {
                }
              }
            },
-            label: {
-              formatter: [
-                '{d}%'
-              ].join('\n')
+            labelLine: {
+              length: 8,
+              length2: 15,
+              maxSurfaceAngle: 80
            },
            data: this.seriesData.map((item, index) => {
              item.label = {
--- a/src/views/OperationalOverview/components/storageCockpitArea.vue
+++ b/src/views/OperationalOverview/components/storageCockpitArea.vue
@@ -2,31 +2,109 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-11-03 08:58:07
+ * @LastEditTime: 2022-11-24 15:47:14
 * @Description:
 -->
 <template>
  <div class="container">
-    <div
-      v-for="i in areaArr"
-      :key="i"
-      :style="{ height: 135 * beilv + 'px', marginTop: 11 * beilv + 'px' }"
-      class="area"
-    >
-      <el-row>
-        <el-col :span="1"><div class="areaName">{{ i }}</div></el-col>
-        <el-col :span="23">
-          <div class="locationFlex">
-            <div
-              v-for="l in 72"
-              :key="l"
-              :class="l>Math.round(Math.random()*100)?'waring':''"
-              :style="{ marginRight: 6 * beilv + 'px',marginTop: 2 * beilv + 'px',marginBottom: 1 * beilv + 'px',width: 30 * beilv + 'px',height: 28 * beilv + 'px'}"
-              class="location"
-            >{{ l }}</div>
+    <div>
+      <div
+        v-for="i in areaArr"
+        :key="i.title"
+        :style="{ height: 145 * beilv + 'px', width: 730 * beilv + 'px' }"
+        class="box"
+      >
+        <div
+          :style="{ fontSize: 22 * beilv + 'px', width: 40 * beilv + 'px' }"
+          class="box-name title"
+          :class="titleClick === i.title ? 'title-click' : ''"
+          @click="titleClick = i.title"
+        >
+          {{ i.title }}
+        </div>
+        <div class="bg" :style="{ height: 145 * beilv + 'px', width: 685 * beilv + 'px' }">
+          <div
+            :style="{ fontSize: 22 * beilv + 'px', height: 116 * beilv + 'px', width: 26 * beilv + 'px' }"
+            class="box-name subtitle"
+          >
+            {{ i.subtitle }}
          </div>
-        </el-col>
-      </el-row>
+          <div class="locationFlex">
+            <div v-for="j in 4" :key="j + 'div1'" class="finished">
+              <div
+                v-for="(l, index) in 19"
+                :key="l + 'box1'"
+                :class="l > Math.round(Math.random() * 80) ? 'waring' : ''"
+                :style="{
+                  marginRight: 2 * beilv + 'px',
+                  marginTop: 2 * beilv + 'px',
+                  marginBottom: 1 * beilv + 'px',
+                  height: 26 * beilv + 'px',
+                  lineHeight: 28 * beilv + 'px',
+                  fontSize: 12 * beilv + 'px'
+                }"
+                class="location"
+              >
+                {{ j + 4 * index }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 辅材库 -->
+    <div
+      v-for="i in areaArr1"
+      :key="i + 'div2'"
+      :style="{ width: 730 * beilv + 'px', padding: 9 * beilv + 'px' + ' 0' }"
+      class="box2"
+    >
+      <div :style="{ fontSize: 22 * beilv + 'px', width: 40 * beilv + 'px', color: '#fff' }" class="box-name title">
+        {{ i }}
+      </div>
+      <div v-if="i === '辅材库'" class="locationFlex" style="margin-left:0">
+        <div v-for="j in 4" :key="j + 'div3'" class="Auxiliary">
+          <div
+            v-for="(l, index) in 19"
+            :key="l + 'box5'"
+            :class="[num.indexOf(j + 4 * index) > 0 ? 'waring' : '', l === 10 ? 'interlayer' : '']"
+            :style="{
+              marginRight: 2 * beilv + 'px',
+              marginTop: 2 * beilv + 'px',
+              height: 26 * beilv + 'px',
+              lineHeight: 28 * beilv + 'px',
+              fontSize: 12 * beilv + 'px'
+            }"
+            class="location"
+          >
+            {{ j + 4 * index }}
+          </div>
+        </div>
+      </div>
+      <div v-else class="locationFlex" style="margin-left:0">
+        <div v-for="j in [3, 2, 1]" :key="j + 'div4'">
+          <div
+            v-for="l in 20"
+            :key="l + 'box9'"
+            :class="num.indexOf(l + 4 * j) > 0 ? 'waring' : ''"
+            :style="{
+              marginRight: 2 * beilv + 'px',
+              marginTop: 2 * beilv + 'px',
+              marginBottom: 1 * beilv + 'px',
+              height: 38 * beilv + 'px',
+              width: '4.5%',
+              lineHeight: 19 * beilv + 'px',
+              fontSize: 12 * beilv + 'px'
+            }"
+            class="location"
+          >
+            <div style="border-bottom:1px dotted rgba(255,255,255,0.5);">
+              {{ j }}
+            </div>
+            <div>{{ l }}</div>
+          </div>
+        </div>
+      </div>
    </div>
  </div>
 </template>
@@ -44,7 +122,36 @@ export default {
  },
  data() {
    return {
-      areaArr: ['A区', 'B区', 'C区', 'D区', 'E区', 'F区']
+      areaArr: [
+        {
+          title: '成品库 A',
+          subtitle: 'A 区'
+        },
+        {
+          title: '成品库 B',
+          subtitle: 'B 区'
+        },
+        {
+          title: '成品库 C',
+          subtitle: 'C 区'
+        },
+        {
+          title: '成品库 D',
+          subtitle: 'D 区'
+        }
+      ],
+      titleClick: '成品库 A',
+      locationArr: [1, 5, 9],
+      areaArr1: ['辅材库', '备件库'],
+      num: []
+    }
+  },
+  created() {
+    for (let i = 0; i <= 30; i++) {
+      this.num.push(Math.round(Math.random() * 90))
+      if (i === 30) {
+        console.log(this.num)
+      }
    }
  },
  methods: {}
@@ -52,34 +159,97 @@ export default {
 </script>

 <style scoped>
-.area {
-  background-image: linear-gradient(to right, rgba(59, 76, 118,0.6), transparent);
-  background-size: 100% 100%;
-  padding: 5px 0;
-  padding-left: 15px;
-  text-align: center;
-  border-radius: 4px;
-  border: 1px dotted #5EC3D8;
-}
-.areaName {
-  margin-top: 100%;
-  font-weight: 600;
-  font-size: 24px;
-  line-height: 30px;
-}
-.locationFlex{
-  margin-left: 25px;
+.container {
  display: flex;
-  flex-wrap: wrap;
+  flex-flow: row wrap;
  align-content: space-between;
+  margin: calc(16px * var(--beilv));
+  gap: calc(16px * var(--beilv));
+  position: absolute;
+  height: 95%;
+  top: 0;
+  left: 0;
+  overflow:hidden;
 }
-.location{
-  background: #63cf74;
+.box {
+  border: 1px dotted rgba(94, 195, 216, 0.6);
+  display: flex;
+  align-items: center;
+  justify-content: left;
+}
+.box::after {
+  width: 95%;
+  height: 10px;
+  display: block;
+  margin: 0 auto;
+  border-bottom: 1px solid red;
+}
+.box:first-child {
+  border-radius: 4px 4px 0 0;
+}
+.box:last-child {
+  border-radius: 0 0 4px 4px;
+}
+.bg {
+  background-image: linear-gradient(to right, rgba(48, 112, 125, 0.6), transparent);
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  justify-content: left;
+}
+.box-name {
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.title {
+  font-weight: 600;
+  height: 100%;
+  cursor: pointer;
+  color: #afb8c5;
+  background-color: transparent;
+}
+.title-click {
+  color: #fff;
+  background-color: rgba(48, 112, 125, 0.6);
+}
+.subtitle {
+  font-weight: 400;
+  margin-left: 8px;
  border-radius: 4px;
-  font-size: 12px;
-  line-height: 25px;
+  border: 1px dotted rgba(94, 195, 216, 0.6);
 }
-.waring{
-  background: #FF5D6B;
+.locationFlex {
+  width: 100%;
+  margin-left: 10px;
+  text-align: center;
+}
+.location {
+  display: inline-block;
+  background: #63cf74;
+  width: 4.7%;
+  border-radius: 4px;
+}
+.waring {
+  background: #ff5d6b;
+}
+.box2 {
+  background-image: linear-gradient(to right, rgba(48, 112, 125, 0.6), transparent);
+  background-size: 100% 100%;
+  border: 1px dotted rgba(94, 195, 216, 0.6);
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  justify-content: left;
+}
+.finished:nth-child(2) {
+  margin-bottom: 8px;
+}
+.Auxiliary:nth-child(2) {
+  margin-bottom: 8px;
+}
+.interlayer {
+  margin-left: 8px;
 }
 </style>
--- a/src/views/OperationalOverview/storageCockpit.vue
+++ b/src/views/OperationalOverview/storageCockpit.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-07-19 15:18:30
 * @LastEditors: zwq
- * @LastEditTime: 2022-11-03 10:06:28
+ * @LastEditTime: 2022-12-01 10:31:37
 * @Description:
 -->
 <template>
@@ -20,7 +20,7 @@
      <el-button
        type="text"
        class="title-button"
-        :style="{ right: 33 * beilv + 'px', top: 37 * beilv + 'px' }"
+        :style="{ right: 9 * beilv + 'px', top: 37 * beilv + 'px', fontSize: 35 * beilv + 'px' }"
        @click="changeFullScreen"
      >
        <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" />
@@ -29,75 +29,150 @@
    </el-row>

    <el-row class="container-main">
-      <el-row :style="{ padding: '0 ' + 9 * beilv + 'px' }" :gutter="9 * beilv">
+      <el-row :style="{ padding: '0 ' + 9 * beilv + 'px' }" :gutter="16 * beilv">
+
        <el-col :span="8">
          <el-row type="flex" class="h-full flex-col">
-            <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
-              <base-container :beilv="beilv" :height="190" :title="'成品入库作业'" :title-icon="'入库管理'">
-                <div :style="{ fontSize: 13 * beilv + 'px' }">
-                  <el-row :style="{ marginBottom: 15 * beilv + 'px'}">
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">时间:</span><span class="rightText">2022.12.12 13:12:45</span></div></el-col>
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">34394233442</span></div></el-col>
-                  </el-row>
-                  <el-row :style="{ marginBottom: 15 * beilv + 'px'}">
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">入库作业号:</span><span class="rightText">347384734</span></div></el-col>
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">234*345*34</span></div></el-col>
-                  </el-row>
-                  <el-row>
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">执行叉车:</span><span class="rightText">叉车</span></div></el-col>
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">A区34货位3层</span></div></el-col>
-                  </el-row>
-                </div>
-              </base-container>
-            </el-col>
-            <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
-              <!-- 成品入库列队 -->
-              <base-container :beilv="beilv" :height="190" :title="'成品入库列队'" :title-icon="'编组'">
-                <div style="background:rgba(14, 32, 62, 1);border-radius:5px">
-                  <base-table
-                    :limit="10"
-                    :beilv="beilv"
-                    :table-config="inAndOutOfEachLine.tableProps"
-                    :table-data="inAndOutOfEachLine.list"
-                  />
-                </div>
-              </base-container>
-            </el-col>
-            <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
-              <base-container :beilv="beilv" :height="190" :title="'成品出库作业'" :title-icon="'出库管理'">
-                <div :style="{ fontSize: 13 * beilv + 'px' }">
-                  <el-row :style="{ marginBottom: 10 * beilv + 'px'}">
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">时间:</span><span class="rightText">2022.12.12 13:12:45</span></div></el-col>
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">ERP订单:</span><span class="rightText">34394233442</span></div></el-col>
-                  </el-row>
-                  <el-row :style="{ marginBottom: 10 * beilv + 'px'}">
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">34394233442</span></div></el-col>
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">出库作业号:</span><span class="rightText">347384734</span></div></el-col>
-                  </el-row>
-                  <el-row :style="{ marginBottom: 10 * beilv + 'px'}">
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">234*345*34</span></div></el-col>
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">执行叉车:</span><span class="rightText">叉车</span></div></el-col>
-                  </el-row>
-                  <el-row>
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">A区34货位3层</span></div></el-col>
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">库位前置区:</span><span class="rightText">A区34货位3层</span></div></el-col>
-                  </el-row>
-                </div>
-              </base-container>
-            </el-col>
-            <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
-              <!-- 成品入库列队 -->
-              <base-container :beilv="beilv" :height="190" :title="'成品出库列队'" :title-icon="'编组备份 2'">
-                <div style="background:rgba(14, 32, 62, 1);border-radius:5px">
-                  <base-table
-                    :limit="10"
-                    :beilv="beilv"
-                    :table-config="inAndOutOfEachLine.tableProps"
-                    :table-data="inAndOutOfEachLine.list"
-                  />
-                </div>
-              </base-container>
-            </el-col>
+            <div class="div-box-left">
+              <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
+                <base-container :beilv="beilv" :height="190" :title="'成品入库作业'" :title-icon="'入库管理'">
+                  <div :style="{ fontSize: 13 * beilv + 'px' }">
+                    <el-row :style="{ marginBottom: 15 * beilv + 'px' }">
+                      <el-col :span="12">
+                        <div class="inTest" :style="{ padding: 9 * beilv + 'px' }">
+                          <span class="leftText">时间:</span>
+                          <span class="rightText">2022.12.12 13:12:45</span>
+                        </div>
+                      </el-col>
+                      <el-col :span="12">
+                        <div class="inTest" :style="{ padding: 9 * beilv + 'px' }">
+                          <span class="leftText">成品编码:</span>
+                          <span class="rightText">CP5651696250</span>
+                        </div>
+                      </el-col>
+                    </el-row>
+                    <el-row :style="{ marginBottom: 15 * beilv + 'px' }">
+                      <el-col :span="12">
+                        <div class="inTest" :style="{ padding: 9 * beilv + 'px' }">
+                          <span class="leftText">入库作业号:</span>
+                          <span class="rightText">RQ5055348160</span>
+                        </div>
+                      </el-col>
+                      <el-col :span="12">
+                        <div class="inTest" :style="{ padding: 9 * beilv + 'px' }">
+                          <span class="leftText">成品规格:</span>
+                          <span class="rightText">3.2-1033*2089</span>
+                        </div>
+                      </el-col>
+                    </el-row>
+                    <el-row>
+                      <el-col :span="12">
+                        <div class="inTest" :style="{ padding: 9 * beilv + 'px' }">
+                          <span class="leftText">执行叉车:</span>
+                          <span class="rightText">2-03</span>
+                        </div>
+                      </el-col>
+                      <el-col :span="12">
+                        <div class="inTest" :style="{ padding: 9 * beilv + 'px' }">
+                          <span class="leftText">库位:</span>
+                          <span class="rightText">成品库D-D区-14</span>
+                        </div>
+                      </el-col>
+                    </el-row>
+                  </div>
+                </base-container>
+              </el-col>
+              <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
+                <!-- 成品入库列队 -->
+                <base-container :beilv="beilv" :height="190" :title="'成品入库列队'" :title-icon="'编组'">
+                  <div style="background:rgba(14, 32, 62, 1);border-radius:5px;opacity: 0.8;">
+                    <base-table
+                      :limit="10"
+                      :beilv="beilv"
+                      :show-index="false"
+                      :table-config="inAndOutOfEachLine.tableProps"
+                      :table-data="inAndOutOfEachLine.list"
+                    />
+                  </div>
+                </base-container>
+              </el-col>
+              <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
+                <base-container :beilv="beilv" :height="190" :title="'成品出库作业'" :title-icon="'出库管理'">
+                  <div :style="{ fontSize: 13 * beilv + 'px' }">
+                    <el-row :style="{ marginBottom: 10 * beilv + 'px' }">
+                      <el-col :span="12">
+                        <div class="outTest" :style="{ padding: 7 * beilv + 'px' }">
+                          <span class="leftText">时间:</span>
+                          <span class="rightText">2022.12.12 13:12:45</span>
+                        </div>
+                      </el-col>
+                      <el-col :span="12">
+                        <div class="outTest" :style="{ padding: 7 * beilv + 'px' }">
+                          <span class="leftText">ERP订单:</span>
+                          <span class="rightText">TCP203</span>
+                        </div>
+                      </el-col>
+                    </el-row>
+                    <el-row :style="{ marginBottom: 10 * beilv + 'px' }">
+                      <el-col :span="12">
+                        <div class="outTest" :style="{ padding: 7 * beilv + 'px' }">
+                          <span class="leftText">成品编码:</span>
+                          <span class="rightText">CP3212128221</span>
+                        </div>
+                      </el-col>
+                      <el-col :span="12">
+                        <div class="outTest" :style="{ padding: 7 * beilv + 'px' }">
+                          <span class="leftText">出库作业号:</span>
+                          <span class="rightText">CQ3727367699</span>
+                        </div>
+                      </el-col>
+                    </el-row>
+                    <el-row :style="{ marginBottom: 10 * beilv + 'px' }">
+                      <el-col :span="12">
+                        <div class="outTest" :style="{ padding: 7 * beilv + 'px' }">
+                          <span class="leftText">成品规格:</span>
+                          <span class="rightText">3.2-1128*1716</span>
+                        </div>
+                      </el-col>
+                      <el-col :span="12">
+                        <div class="outTest" :style="{ padding: 7 * beilv + 'px' }">
+                          <span class="leftText">执行叉车:</span>
+                          <span class="rightText">1-01</span>
+                        </div>
+                      </el-col>
+                    </el-row>
+                    <el-row>
+                      <el-col :span="12">
+                        <div class="outTest" :style="{ padding: 7 * beilv + 'px' }">
+                          <span class="leftText">库位:</span>
+                          <span class="rightText">成品库C-C区-1</span>
+                        </div>
+                      </el-col>
+                      <el-col :span="12">
+                        <div class="outTest" :style="{ padding: 7 * beilv + 'px' }">
+                          <span class="leftText">库位前置区:</span>
+                          <span class="rightText">A区34货位3层</span>
+                        </div>
+                      </el-col>
+                    </el-row>
+                  </div>
+                </base-container>
+              </el-col>
+              <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
+                <!-- 成品出库列队 -->
+                <base-container :beilv="beilv" :height="190" :title="'成品出库列队'" :title-icon="'编组备份 2'">
+                  <div style="background:rgba(14, 32, 62, 1);border-radius:5px;opacity: 0.8;">
+                    <base-table
+                      :limit="10"
+                      :beilv="beilv"
+                      :show-index="false"
+                      :table-config="OutOfEachLine.tableProps"
+                      :table-data="OutOfEachLine.list"
+                    />
+                  </div>
+                </base-container>
+              </el-col>
+            </div>
          </el-row>
        </el-col>

@@ -105,7 +180,7 @@
          <!-- 中间栏 -->
          <el-row type="flex" class="h-full flex-col">
            <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
-              <base-container :beilv="beilv">
+              <base-container :beilv="beilv" :height="958">
                <storage-cockpit-area :beilv="beilv" />
              </base-container>
            </el-col>
@@ -116,50 +191,77 @@
          <!-- 右边栏 设备工单管理 -->
          <el-row type="flex" class="h-full flex-col">
            <el-col :style="{ margin: 8 * beilv + 'px' + ' 0' }" :span="24">
-              <base-container :beilv="beilv" :title="'设备工单管理'" :title-icon="'编组(1)'">
-                <div class="div-box" :style="{textAlign: 'center', padding: 8 * beilv + 'px', paddingTop: 15 * beilv + 'px',marginBottom: 12 * beilv + 'px'}">
-                  <span v-html="titleLeftSVG" />
-                  <span style="color: #01CFCC; line-height: 18px;" :style="{ fontSize: 15 * beilv + 'px' }">
-                    成品库存一览1
-                  </span>
-                  <div style="transform: rotateY(180deg); display: inline-block;" v-html="titleLeftSVG" />
-                  <new-pie
-                    :id="'pie-chart1'"
-                    :show-center-title="true"
-                    :legend-config="{ left: '1%', top: '30%', itemGap: 5 }"
-                    :series-data="legendData1"
-                    :beilv="beilv"
-                    :height="226"
-                  />
-                </div>
-                <div class="div-box" :style="{textAlign: 'center', position: 'relative', padding: 8 * beilv + 'px', paddingTop: 15 * beilv + 'px', marginBottom: 12 * beilv + 'px'}">
-                  <span v-html="titleLeftSVG" />
-                  <span style="color: #01CFCC; line-height: 18px;" :style="{ fontSize: 15 * beilv + 'px' }">
-                    成品库存一览2
-                  </span>
-                  <div style="transform: rotateY(180deg); display: inline-block;" v-html="titleLeftSVG" />
-                  <new-bar
+              <base-container :beilv="beilv" :title="'库存总览'" :title-icon="'编组(1)'">
+                <div class="div-box-main">
+                  <div
+                    class="div-box"
+                    :style="{
+                      textAlign: 'center',
+                      padding: 8 * beilv + 'px',
+                      paddingTop: 15 * beilv + 'px',
+                    }"
+                  >
+                    <span v-html="titleLeftSVG" />
+                    <span style="color: #01CFCC; line-height: 18px;" :style="{ fontSize: 15 * beilv + 'px' }">
+                      成品库存一览
+                    </span>
+                    <div style="transform: rotateY(180deg); display: inline-block;" v-html="titleLeftSVG" />
+                    <new-pie
+                      :id="'pie-chart1'"
+                      :show-center-title="true"
+                      :legend-config="{ left: '0%', top: '30%', itemGap: 5 }"
+                      :series-data="legendData1"
+                      :beilv="beilv"
+                      :height="226"
+                    />
+                  </div>
+                  <div
+                    class="div-box"
+                    :style="{
+                      textAlign: 'center',
+                      padding: 8 * beilv + 'px',
+                      paddingTop: 15 * beilv + 'px',
+                    }"
+                  >
+                    <span v-html="titleLeftSVG" />
+                    <span style="color: #01CFCC; line-height: 18px;" :style="{ fontSize: 15 * beilv + 'px' }">
+                      辅材库存一览
+                    </span>
+                    <div style="transform: rotateY(180deg); display: inline-block;" v-html="titleLeftSVG" />
+                    <new-pie
+                      :id="'pie-chart2'"
+                      :show-center-title="true"
+                      :legend-config="{ left: '0%', top: '30%', itemGap: 5 }"
+                      :series-data="legendData2"
+                      :beilv="beilv"
+                      :height="226"
+                    />
+                    <!-- <new-bar
                    :name-list="clNameList"
                    :data-list="clDataList"
                    :height="226"
                    :beilv="beilv"
                  />
-                  <div class="barDiv" :style="{width: 345* beilv + 'px'}" />
-                </div>
-                <div class="div-box" :style="{textAlign: 'center', padding: 8 * beilv + 'px', paddingTop: 15 * beilv + 'px'}">
-                  <span v-html="titleLeftSVG" />
-                  <span style="color: #01CFCC; line-height: 18px;" :style="{ fontSize: 15 * beilv + 'px' }">
-                    成品库存一览3
-                  </span>
-                  <div style="transform: rotateY(180deg); display: inline-block;" v-html="titleLeftSVG" />
-                  <new-pie
-                    :id="'pie-chart3'"
-                    :show-center-title="true"
-                    :legend-config="{ left: '1%', top: '30%', itemGap: 5 }"
-                    :series-data="legendData3"
-                    :beilv="beilv"
-                    :height="226"
-                  />
+                  <div class="barDiv" :style="{width: 355* beilv + 'px'}" /> -->
+                  </div>
+                  <div
+                    class="div-box"
+                    :style="{ textAlign: 'center', padding: 8 * beilv + 'px', paddingTop: 15 * beilv + 'px' }"
+                  >
+                    <span v-html="titleLeftSVG" />
+                    <span style="color: #01CFCC; line-height: 18px;" :style="{ fontSize: 15 * beilv + 'px' }">
+                      备件库存一览
+                    </span>
+                    <div style="transform: rotateY(180deg); display: inline-block;" v-html="titleLeftSVG" />
+                    <new-pie
+                      :id="'pie-chart3'"
+                      :show-center-title="true"
+                      :legend-config="{ left: '0%', top: '30%', itemGap: 5 }"
+                      :series-data="legendData3"
+                      :beilv="beilv"
+                      :height="226"
+                    />
+                  </div>
                </div>
              </base-container>
            </el-col>
@@ -174,7 +276,7 @@
 import baseContainer from './components/baseContainer'
 import baseTable from './components/baseTable'
 import newPie from './components/newPie'
-import newBar from './components/newBar'
+// import newBar from './components/newBar'
 import storageCockpitArea from './components/storageCockpitArea'
 // import LineChart1 from './components/LineChart'
 // import LineChart2 from './components/LineChart'
@@ -185,58 +287,80 @@ import screenfull from 'screenfull'
 import axios from '@/utils/request'
 import moment from 'moment'

-const legendData3 = [
+const legendData1 = [
  {
-    name: 'A',
+    name: '2.0-1128*1716',
    icon: 'circle',
-    value: 196
+    value: 128
  },
  {
-    name: 'B',
+    name: '2.0-1128*2251',
    icon: 'circle',
-    value: 111
+    value: 225
  },
  {
-    name: 'C',
+    name: '2.0-1128*2272',
    icon: 'circle',
-    value: 89
+    value: 24
  },
  {
-    name: 'D',
+    name: '3.2-1128*1716',
    icon: 'circle',
    value: 77
  },
  {
-    name: 'E',
+    name: '3.2-1128*1716',
+    icon: 'circle',
+    value: 93
+  }
+]
+const legendData2 = [
+  {
+    name: '丝印类',
+    icon: 'circle',
+    value: 128
+  },
+  {
+    name: '磨边类',
+    icon: 'circle',
+    value: 104
+  },
+  {
+    name: '镀膜类',
+    icon: 'circle',
+    value: 80
+  },
+  {
+    name: '包装类',
    icon: 'circle',
    value: 77
  }
 ]
-const legendData1 = [
+const legendData3 = [
  {
-    name: 'A',
+    name: '磨边机备件',
    icon: 'circle',
-    value: 134
+    value: 128
  },
  {
-    name: 'B',
+    name: '打孔机备件',
    icon: 'circle',
-    value: 125
+    value: 96
  },
  {
-    name: 'C',
+    name: '丝印机备件',
    icon: 'circle',
-    value: 107
+    value: 201
  },
  {
-    name: 'D',
+    name: '固化机备件',
    icon: 'circle',
-    value: 61
+    value: 77
  },
  {
-    name: 'E',
+    name: '钢化机备件',
    icon: 'circle',
-    value: 153
+    value: 66
  }
 ]
 const clDataList = [
@@ -303,8 +427,8 @@ export default {
    baseContainer,
    baseTable,
    storageCockpitArea,
-    newPie,
-    newBar
+    newPie
+    // newBar
    // LineChart1,
    // LineChart2,
    // LinearBarChart
@@ -313,39 +437,73 @@ export default {
  data() {
    return {
      legendData1,
+      legendData2,
      legendData3,
      clNameList,
      clDataList,
      inAndOutOfEachLine: {
        tableProps: [
-          { prop: 'test1', label: '作业号' },
-          { prop: 'test2', label: '执行叉车' },
-          { prop: 'test3', label: '成品编码' },
-          { prop: 'test4', label: '成品规格' },
-          { prop: 'test5', label: '库位' }
+          { prop: 'test1', label: '作业号', align: 'center' },
+          { prop: 'test2', label: '执行叉车', align: 'center' },
+          { prop: 'test3', label: '成品编码', align: 'center' },
+          { prop: 'test4', label: '成品规格', align: 'center' },
+          { prop: 'test5', label: '库位', align: 'center' }
        ],
        total: 0,
        list: [
          {
-            test1: '392849829',
-            test2: '叉车1',
-            test3: '392849829',
-            test4: '322*234*12',
-            test5: '库位1'
+            test1: 'RQ5055348178',
+            test2: '1-01',
+            test3: 'CP5651696263',
+            test4: '3.2-1033*2089',
+            test5: '成品库D-D区-15'
          },
          {
-            test1: '392849829',
-            test2: '叉车2',
-            test3: '392849829',
-            test4: '322*234*12',
-            test5: '库位2'
+            test1: 'RQ3722771932',
+            test2: '1-02',
+            test3: 'CP4140258231',
+            test4: '2.0-1128*2272',
+            test5: '成品库B-A区-13'
          },
          {
-            test1: '392849829',
-            test2: '叉车3',
-            test3: '392849829',
-            test4: '322*234*12',
-            test5: '库位3'
+            test1: 'RQ1342208728',
+            test2: '2-03',
+            test3: 'CP5284407553',
+            test4: '2.0-1128*1716',
+            test5: '成品库A-B区-9'
+          }
+        ]
+      },
+      OutOfEachLine: {
+        tableProps: [
+          { prop: 'test1', label: '作业号', align: 'center' },
+          { prop: 'test2', label: 'ERP订单', align: 'center' },
+          { prop: 'test3', label: '成品编码', align: 'center' },
+          { prop: 'test4', label: '成品规格', align: 'center' },
+          { prop: 'test5', label: '库位', align: 'center' }
+        ],
+        total: 0,
+        list: [
+          {
+            test1: 'CQ3727367714',
+            test2: 'TCP231',
+            test3: 'CP3212128336',
+            test4: '3.2-1128*1716',
+            test5: '成品库C-C区-4'
+          },
+          {
+            test1: 'CQ7080508785',
+            test2: 'TCP186',
+            test3: 'CP2760242729',
+            test4: '3.2-1128*1718',
+            test5: '成品库D-D区-1'
+          },
+          {
+            test1: 'CQ8843212447',
+            test2: 'TCP67',
+            test3: 'CP1569191519',
+            test4: '3.2-1032*1747',
+            test5: '成品库C-B区-12'
          }
        ]
      },
@@ -613,15 +771,14 @@ export default {
    background: url('../../assets/img/OperationalOverview/title (2).png') no-repeat;
    background-size: 100% 100%;
    color: #fff;
-    text-align: center;
+    padding-left: 41%;
    .title-button {
      color: #00fff0;
-      font-size: 32px;
      position: absolute;
    }
  }
  .container-main {
-    padding: 16px;
+    padding: 16px 8px;
  }
 }
 .inTest {
@@ -632,30 +789,55 @@ export default {
  background: url('../../assets/img/OperationalOverview/矩形@2x(1).png') no-repeat;
  background-size: 100% 100%;
 }
-.leftText{
+.leftText {
  display: inline-block;
-  width: 100px;
+  width: 40%;
  text-align: right;
 }
-.rightText{
-  color:rgba(255, 255, 255, 0.6)
+.rightText {
+  color: rgba(255, 255, 255, 0.6);
+}
+.div-box-left{
+  display: flex;
+  flex-flow: row wrap;
+  align-content: space-between;
+  position: absolute;
+  height: 100%;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow:hidden;
+}
+.div-box-main {
+  display: flex;
+  flex-flow: row wrap;
+  align-content: space-between;
+  margin: calc(16px * var(--beilv));
+  gap: calc(16px * var(--beilv));
+  padding-top: 4em;
+  position: absolute;
+  height: 95%;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow:hidden;
 }
 .div-box {
  background: transparent;
-  box-shadow: inset 0 0 16px 1px rgba(255, 255, 255, 0.5);
-  display: inline-block;
+  box-shadow: inset 0 0 16px 1px rgba(255, 255, 255, 0.2);
  width: 100%;
  border-radius: 4px;
 }
 .barDiv {
-  height: 46px;
+  height: 40px;
  opacity: 0.5;
  position: absolute;
  bottom: 40px;
-  left:55px;
+  left: 55px;
  transform: skewX(-30deg);
  background: linear-gradient(180deg, rgba(59, 76, 118, 0) 0%, #49fbd6 100%);
-  border: 1px solid #3c7080;
 }
 .now-team-title {
  margin: 0;
@@ -728,7 +910,7 @@ export default {

 <style lang="scss" scoped>
 .h-full {
-  height: calc(100vh - 150px);
+  height: calc(100vh - 110px * var(--beilv));
 }

 .flex-col {
--- a/src/views/wmsBasicData/goodsAreaData.vue
+++ b/src/views/wmsBasicData/goodsAreaData.vue
@@ -43,7 +43,7 @@ import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import i18n from '@/lang'
-import { getHWList } from '@/utils/wmsDic'
+import { getStoreList, getKQList } from '@/utils/wmsDic'
 import moment from 'moment'
 /**
 * 表格表头配置项 TypeScript接口注释
@@ -201,8 +201,9 @@ export default {
        const obj = {}
        const sj = Math.floor(Math.random() * 720 + 10)
        obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
-        obj.name2 = getHWList()
-        obj.name1 = obj.name2[2] + '区'
+        obj.store = getStoreList()
+        obj.name1 = (obj.store === '辅材库' || obj.store === '备件库') ? '' : getKQList() + '区'
+        obj.name2 = obj.store + (obj.name1 ? '-' + obj.name1 : '') + '-' + (obj.store === '备件库' ? (parseInt(Math.random() * 19 + 1) + '-' + parseInt(Math.random() * 2 + 1)) : parseInt(Math.random() * 16))
        obj.name3 = obj.name2
        obj.name4 = parseInt(Math.random() * 2) ? '有货' : '无货'
        obj.name5 = parseInt(Math.random() * 2) ? 'Y' : 'N'
--- a/src/views/wmsBasicData/warehouseData.vue
+++ b/src/views/wmsBasicData/warehouseData.vue
@@ -179,7 +179,7 @@ export default {
        const sj = Math.floor(Math.random() * 720 + 10)
        obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
        obj.name1 = getStoreList()
-        obj.name2 = getKQList() + '区'
+        obj.name2 = (obj.name1 === '辅材库' || obj.name1 === '备件库') ? '' : getKQList() + '区'
        obj.name3 = '成品仓'
        obj.name4 = 'TCP' + sj
        temp.push(obj)
--- a/src/views/wmsHome/index.vue
+++ b/src/views/wmsHome/index.vue
@@ -1,21 +1,25 @@
 <template>
-  <div class="choicepart-container">
+  <div id="container" class="choicepart-container">
    <div class="choicepat-navbar">
      <navbar :showhome="false" :show-title="true" />
    </div>
-    <div class="choicepart-box">
+    <div class="choicepart-box" :style="{ width: 1585 * beilv + 'px' }">
      <div
        v-for="(item, index) in moduleList"
        :key="item.path"
        class="choicepart-item"
+        :style="{ width: 180 * beilv + 'px', height: 223 * beilv + 'px', margin: 40 * beilv + 'px' }"
        @click="handelClick(item, index)"
      >
        <div class="choicepart-item-border">
-          <img :src="require(`../../assets/img/choicepart/${item.name}.png`)" alt="">
+          <img :src="require(`../../assets/img/choicepart/${item.name}.png`)" alt="" :style="{ width: 90 * beilv + 'px', height: 90 * beilv + 'px', top: 35 * beilv + 'px', left: 50 * beilv + 'px' }">
        </div>
-        <div class="choicepart-item-title" :title="item.meta.title">{{ item.meta.title }}</div>
+        <div class="choicepart-item-title" :title="item.meta.title" :style="{ height: 40 * beilv + 'px', lineHeight: 40 * beilv + 'px', fontSize: 16 * beilv + 'px' }">{{ item.meta.title }}</div>
      </div>
    </div>
+    <div class="bottom-img">
+      <img :src="require('../../assets/img/choicepart/choicepart-back-u.png')" alt="">
+    </div>
  </div>
 </template>

@@ -28,11 +32,25 @@ export default {
  components: { Navbar },
  data() {
    return {
+      beilv: 1,
      moduleList: []
    }
  },
  mounted() {
+    this.beilv = document.getElementById('container').offsetWidth / 1920
+    window.addEventListener('resize', () => {
+      if (this.isFullScreen) {
+        this.beilv = document.body.offsetWidth / 1920
+      } else {
+        this.beilv = document.getElementById('container').offsetWidth / 1920
+      }
+    })
    this.getModuleList()
+    const path = location.href
+    if (path.indexOf('?') !== -1) {
+      const param = path.split('?')
+      sessionStorage.setItem('param', window.btoa(JSON.stringify(param[1])))
+    }
  },
  methods: {
    getModuleList() {
@@ -70,41 +88,38 @@ export default {
 .choicepart-container {
  min-width: 100%;
  min-height: 100vh;
-  // background: linear-gradient(-45deg, rgb(25, 25, 200), rgb(0, 100, 200));
  background: url('../../assets/img/choicepart/choicepart-back.png') repeat;
  background-size: cover;
  overflow-x: auto;
  .choicepart-box {
-    width: 1585px;
+    // width: 1585px;
    margin: 0 auto;
    padding-top: 25vh;
    .choicepart-item {
      display: inline-block;
-      width: 180px;
-      height: 223px;
-      margin: 40px;
+      // width: 180px;
+      // height: 223px;
+      // margin: 40px;
      background: url('../../assets/img/choicepart/choice-item-back.png') no-repeat;
      background-size: 100% 100%;
-      // border: 1px dashed #fff;
-      box-shadow: 0 2px 10px rgba(0, 0, 0, 0.5);
      top: 0;
      border-radius: 5px;
      overflow: hidden;
      cursor: pointer;
      position: relative;
      img {
-        width: 90px;
-        height: 99px;
+        // width: 90px;
+        // height: 90px;
        position: absolute;
-        top: 32px;
-        left: 43px;
+        // top: 32px;
+        // left: 43px;
      }
      .choicepart-item-border {
        height: 100%;
        border-radius: 5px;
        padding: 0 5px;
-        line-height: 32px;
-        font-size: 28px;
+        // line-height: 32px;
+        // font-size: 28px;
        font-weight: lighter;
        color: #2c6bd8;
        overflow: hidden;
@@ -120,9 +135,9 @@ export default {
        right: 2px;
        text-align: center;
        color: #fff;
-        font-size: 16px;
-        line-height: 40px;
-        height: 40px;
+        // font-size: 16px;
+        // line-height: 40px;
+        // height: 40px;
        letter-spacing: 2px;
        background-color: rgba($color: #0b58ff, $alpha: 0.45);
      }
@@ -140,6 +155,13 @@ export default {
    right: 0;
    z-index: 10;
  }
+  .bottom-img {
+    img {
+      width: 100%;
+      position: fixed;
+      bottom: 0;
+    }
+  }
 }
 ::-webkit-scrollbar-track-piece {
  //滚动条凹槽的颜色，还可以设置边框属性
--- a/src/views/wmsInStore/acceptGoods.vue
+++ b/src/views/wmsInStore/acceptGoods.vue
@@ -50,7 +50,7 @@ const tableProps = [
  },
  {
    prop: 'internalControlCode',
-    label: '成品内控码'
+    label: '成品内控码/商品条码'
  },
  {
    prop: 'customerCode',
@@ -67,10 +67,6 @@ const tableProps = [
  {
    prop: 'batch',
    label: '批次'
-  },
-  {
-    prop: 'packCode',
-    label: '包装机号'
  }
 ]
 const tableBtn = [
@@ -92,7 +88,7 @@ export default {
        {
          type: 'input',
          label: '关键字',
-          placeholder: '托盘号或成品内控码',
+          placeholder: '托盘号或成品内控码/商品条码',
          param: 'name',
          width: 300
        },
@@ -133,8 +129,8 @@ export default {
        obj.trayID = getTrayList()
        obj.internalControlCode = getProductList()
        obj.customerCode = getCustomerCodeList()
-        obj.num = parseInt(Math.random() * 1000)
        obj.productDpec = getProductSpecList()
+        obj.num = obj.productDpec.substring(0, 1) === '3' ? parseInt(Math.random() * 100 + 100) : parseInt(Math.random() * 100 + 200)
        obj.batch = getBatchList()
        obj.packCode = getPackList()
        temp.push(obj)
--- a/src/views/wmsInStore/components/accetpGoodsAdd.vue
+++ b/src/views/wmsInStore/components/accetpGoodsAdd.vue
@@ -5,11 +5,11 @@
      :visible.sync="dialogVisible"
      width="50%"
    >
-      <el-form ref="formList" label-position="right" label-width="80px" :model="formList">
+      <el-form ref="formList" label-position="right" label-width="140px" :model="formList">
        <el-form-item label="托盘号" prop="trayID">
          <el-input v-model="formList.trayID" />
        </el-form-item>
-        <el-form-item label="成品内控码" prop="internalControlCode">
+        <el-form-item label="成品内控码/商品条码" prop="internalControlCode">
          <el-input v-model="formList.internalControlCode" />
        </el-form-item>
        <el-form-item label="客户标签号" prop="customerCode">
@@ -24,9 +24,6 @@
        <el-form-item label="批次" prop="batch">
          <el-input v-model="formList.batch" />
        </el-form-item>
-        <el-form-item label="包装机号" prop="packCode">
-          <el-input v-model="formList.packCode" />
-        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="resetForm('formList')">取 消</el-button>
@@ -53,8 +50,7 @@ export default {
        customerCode: '',
        productDpec: '',
        num: '',
-        batch: '',
-        packCode: ''
+        batch: ''
      }
    }
  },
@@ -70,7 +66,6 @@ export default {
          this.formList.productDpec = val.productDpec
          this.formList.num = val.num
          this.formList.batch = val.batch
-          this.formList.packCode = val.packCode
        })
      }
      this.dialogVisible = true
--- a/src/views/wmsInStore/components/inStoreDocumentsAdd.vue
+++ b/src/views/wmsInStore/components/inStoreDocumentsAdd.vue
@@ -5,14 +5,14 @@
      :visible.sync="dialogVisible"
      width="50%"
    >
-      <el-form ref="formList" label-position="right" label-width="80px" :model="formList">
+      <el-form ref="formList" label-position="right" label-width="140px" :model="formList">
        <el-form-item label="入库单号" prop="receiptNo">
          <el-input v-model="formList.receiptNo" />
        </el-form-item>
        <el-form-item label="托盘号" prop="trayID">
          <el-input v-model="formList.trayID" />
        </el-form-item>
-        <el-form-item label="成品内控码" prop="internalControlCode">
+        <el-form-item label="成品内控码/商品条码" prop="internalControlCode">
          <el-input v-model="formList.internalControlCode" />
        </el-form-item>
        <el-form-item label="客户标签号" prop="customerCode">
@@ -27,9 +27,6 @@
        <el-form-item label="批次" prop="batch">
          <el-input v-model="formList.batch" />
        </el-form-item>
-        <el-form-item label="包装机号" prop="packCode">
-          <el-input v-model="formList.packCode" />
-        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="resetForm('formList')">取 消</el-button>
@@ -57,8 +54,7 @@ export default {
        customerCode: '',
        productDpec: '',
        num: '',
-        batch: '',
-        packCode: ''
+        batch: ''
      }
    }
  },
@@ -75,7 +71,6 @@ export default {
          this.formList.productDpec = val.productDpec
          this.formList.num = val.num
          this.formList.batch = val.batch
-          this.formList.packCode = val.packCode
        })
      }
      this.dialogVisible = true
--- a/src/views/wmsInStore/inStoreDocuments.vue
+++ b/src/views/wmsInStore/inStoreDocuments.vue
@@ -52,9 +52,13 @@ const tableProps = [
    prop: 'trayID',
    label: '托盘号'
  },
+  {
+    prop: 'type',
+    label: '类型'
+  },
  {
    prop: 'internalControlCode',
-    label: '成品内控码'
+    label: '成品内控码/商品条码'
  },
  {
    prop: 'customerCode',
@@ -71,10 +75,6 @@ const tableProps = [
  {
    prop: 'batch',
    label: '批次'
-  },
-  {
-    prop: 'packCode',
-    label: '包装机号'
  }
 ]
 const tableBtn = [
@@ -96,7 +96,7 @@ export default {
        {
          type: 'input',
          label: '关键字',
-          placeholder: '入库单号,托盘号或成品内控码',
+          placeholder: '入库单号,托盘号或成品内控码/商品条码',
          param: 'name',
          width: 300
        },
@@ -132,13 +132,17 @@ export default {
    getList() {
      const temp = []
      const num = 20
+      const typeList = ['成品', '辅料', '备件']
      for (let i = 0; i < num; i++) {
        const obj = {}
+        const sj = parseInt(Math.random() * 3 + 1)
+        console.log(sj)
        obj.receiptNo = getReceiptNoList()
        obj.trayID = getTrayList()
-        obj.internalControlCode = getProductList()
+        obj.type = typeList[sj - 1]
+        obj.internalControlCode = sj === 1 ? getProductList() : ''
        obj.customerCode = getCustomerCodeList()
-        obj.num = parseInt(Math.random() * 1000)
+        obj.num = parseInt(Math.random() * 180 + 100)
        obj.productDpec = getProductSpecList()
        obj.batch = getBatchList()
        obj.packCode = getPackList()
--- a/src/views/wmsOutStore/outStoreDocuments.vue
+++ b/src/views/wmsOutStore/outStoreDocuments.vue
@@ -134,7 +134,7 @@ export default {
        obj.outboundOrderNo = getOutboundNoList()
        obj.customerName = getCompTyleList()
        obj.shipmentCacheArea = getHCQList()
-        obj.num = parseInt(Math.random() * 1000)
+        obj.num = parseInt(Math.random() * 40 + 20) + '（箱）'
        obj.spec = getProductSpecList()
        const sj = Math.floor(Math.random() * 100)
        obj.deliveryTime = moment().add(sj, 'days').add(sj, 'hour').add(sj, 'minutes').add(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
--- a/src/views/wmsOutStore/outStoreOperation.vue
+++ b/src/views/wmsOutStore/outStoreOperation.vue
@@ -34,7 +34,7 @@ import Pagination from '@/components/Pagination'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { tableHeight } from '@/utils/index'
 import outStoreDocumentsAdd from './components/outStoreDocumentsAdd.vue'
-import { getOperationCode2List, getOutboundNoList, getHWList, getHCQList, getTimeArr, getDriverCodeList } from '@/utils/wmsDic'
+import { getOperationCode2List, getOutboundNoList, getStoreList, getTimeArr, getDriverCodeList } from '@/utils/wmsDic'
 const tableProps = [
  {
    prop: 'operationCode',
@@ -110,7 +110,7 @@ export default {
        current: 1,
        size: 20
      },
-      tableH: tableHeight(275),
+      tableH: tableHeight(290),
      tableProps,
      list: [],
      listLoading: false,
@@ -122,29 +122,45 @@ export default {
  },
  mounted() {
    window.addEventListener('resize', () => {
-      this.tableH = tableHeight(275)
+      this.tableH = tableHeight(290)
    })
    this.getList()
  },
  methods: {
    getList() {
      const temp = []
-      const num = 20
+      const temp2 = []
+      const num = 17
      for (let i = 0; i < num; i++) {
        const obj = {}
        const timeArrList = getTimeArr()
-        obj.operationCode = getOperationCode2List()
+        obj.operationCode = 'CQ1510433590'
        obj.outboundOrderNo = getOutboundNoList()
-        obj.goodsArea = getHWList()
-        obj.shipmentCacheArea = getHCQList()
+        obj.store = getStoreList()
+        obj.goodsArea = '成品库C-C区-' + (i + 8)
+        obj.shipmentCacheArea = 'HCQC' + (2631 - i)
        obj.startTime = timeArrList[0]
        obj.endTime = timeArrList[1]
        obj.driverCode = getDriverCodeList()
        temp.push(obj)
      }
-      this.list = temp
+      const arr = ['备件库-13-2', '辅材库-14', '备件库-13-4']
+      for (let i = 0; i < 3; i++) {
+        const obj = {}
+        const timeArrList = getTimeArr()
+        obj.operationCode = getOperationCode2List()
+        obj.outboundOrderNo = getOutboundNoList()
+        obj.store = getStoreList()
+        obj.goodsArea = arr[i]
+        obj.shipmentCacheArea = 'HCQC' + (2897 - i)
+        obj.startTime = timeArrList[0]
+        obj.endTime = timeArrList[1]
+        obj.driverCode = getDriverCodeList()
+        temp2.push(obj)
+      }
+      this.list = temp.concat(temp2)
      console.log(this.list)
-      this.total = num
+      this.total = 20
    },
    btnClick(val) {
      console.log(val)
--- a/src/views/wmsStatisticalReports/inventoryReport.vue
+++ b/src/views/wmsStatisticalReports/inventoryReport.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="app-container">
    <head-form :form-config="headFormConfig" @headBtnClick="btnClick" />
-    <div style="text-align:right">
+    <div style="text-align:left">
      <span>合计： 265395</span>
    </div>
    <base-table
@@ -26,7 +26,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getReceiptNoList, getProductSpecList, getMaterialCodeList, getGoodsList } from '@/utils/wmsDic'
+import { getReceiptNoList, getProductSpecList, getMaterialCodeList } from '@/utils/wmsDic'
 import moment from 'moment'
 const tableProps = [
  {
@@ -37,10 +37,6 @@ const tableProps = [
    prop: 'type',
    label: '类型'
  },
-  {
-    prop: 'productName',
-    label: '品名'
-  },
  {
    prop: 'spec',
    label: '规格'
@@ -115,7 +111,6 @@ export default {
        const obj = {}
        obj.orderCode = getReceiptNoList()
        obj.type = '深加工玻璃'
-        obj.productName = getGoodsList()
        const sj = Math.floor(Math.random() * 100)
        obj.spec = getProductSpecList()
        obj.materialCode = getMaterialCodeList()
--- a/src/views/wmsStatisticalReports/outStoreReport.vue
+++ b/src/views/wmsStatisticalReports/outStoreReport.vue
@@ -9,7 +9,7 @@
 <template>
  <div class="app-container">
    <head-form :form-config="headFormConfig" @headBtnClick="btnClick" />
-    <div style="text-align:right">
+    <div style="text-align:left">
      <span>合计： 265395</span>
    </div>
    <base-table
@@ -34,7 +34,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getOutboundNoList, getProductSpecList, getMaterialCodeList, getGoodsList } from '@/utils/wmsDic'
+import { getOutboundNoList, getProductSpecList, getMaterialCodeList } from '@/utils/wmsDic'
 import moment from 'moment'
 const tableProps = [
  {
@@ -45,10 +45,6 @@ const tableProps = [
    prop: 'type',
    label: '类型'
  },
-  {
-    prop: 'productName',
-    label: '品名'
-  },
  {
    prop: 'spec',
    label: '规格'
@@ -123,7 +119,6 @@ export default {
        const obj = {}
        obj.orderCode = getOutboundNoList()
        obj.type = '深加工玻璃'
-        obj.productName = getGoodsList()
        const sj = Math.floor(Math.random() * 5)
        obj.spec = getProductSpecList()
        obj.materialCode = getMaterialCodeList()
--- a/src/views/wmsSystemSettings/roleManagement.vue
+++ b/src/views/wmsSystemSettings/roleManagement.vue
@@ -61,12 +61,10 @@ const tableProps = [{
  align: 'center'
 }, {
  prop: 'name',
-  label: i18n.t('roleManage.roleName'),
-  align: 'center'
+  label: i18n.t('roleManage.roleName')
 }, {
  prop: 'enabled',
-  label: i18n.t('roleManage.status'),
-  align: 'center'
+  label: i18n.t('roleManage.status')
 },
 // {
 //   prop: 'category',
@@ -76,8 +74,7 @@ const tableProps = [{
 // },
 {
  prop: 'remark',
-  label: i18n.t('roleManage.remark'),
-  align: 'center'
+  label: i18n.t('roleManage.remark')
 }]
 import AddForm from './AddForm'
 import EditForm from './EditForm'
Author	SHA1	Message	Date
zwq	4f60cbdd52	更新驾驶舱叉车	2022-12-01 10:32:30 +08:00
juzi	f3cab73116	Merge pull request '11-wms-zjl' (#22 ) from 11-wms-zjl into master Reviewed-on: #22	2022-11-28 16:49:46 +08:00
juzi	864bdac590	merge master	2022-11-28 16:48:38 +08:00
juzi	bdf53317c3	品名	2022-11-28 16:44:07 +08:00
朱文强	1d50fbde4b	Merge pull request '更新驾驶舱' (#21 ) from zwq into master Reviewed-on: #21	2022-11-28 16:10:28 +08:00
zwq	9c14efef55	更新驾驶舱	2022-11-28 16:09:53 +08:00
朱文强	bc114666e5	Merge pull request '更新' (#20 ) from zwq into master Reviewed-on: #20	2022-11-28 15:05:40 +08:00
zwq	326300566f	更新	2022-11-28 15:05:00 +08:00
juzi	3c34e31711	Merge pull request '地址' (#19 ) from 11-wms-zjl into master Reviewed-on: #19	2022-11-28 14:36:16 +08:00
juzi	988b4ce47b	地址	2022-11-28 14:34:50 +08:00
朱文强	c3127d4066	Merge pull request '更新驾驶舱' (#18 ) from zwq into master Reviewed-on: #18	2022-11-24 16:20:46 +08:00
zwq	10e7ec7268	更新驾驶舱	2022-11-24 16:19:58 +08:00
juzi	dfa7206e41	Merge pull request '11.23修改' (#17 ) from 11-wms-zjl into master Reviewed-on: #17	2022-11-24 08:41:15 +08:00
juzi	d027ff4d64	11.23修改	2022-11-24 08:40:39 +08:00
juzi	57159bec8d	Merge pull request '11-wms-zjl' (#16 ) from 11-wms-zjl into master Reviewed-on: #16	2022-11-18 11:09:49 +08:00
juzi	93ea975af5	数据修改	2022-11-18 11:08:23 +08:00
juzi	0cd98e9e40	merge master	2022-11-18 09:01:03 +08:00
朱文强	6f5607a841	Merge pull request '更新驾驶舱' (#15 ) from zwq into master Reviewed-on: #15	2022-11-17 16:41:53 +08:00
zwq	ced84a73ec	更新驾驶舱	2022-11-17 16:41:15 +08:00
juzi	fcd63d5059	wms数据	2022-11-17 10:37:59 +08:00
juzi	2d586c19de	Merge pull request '11.14修改样式' (#14 ) from 11-wms-zjl into master Reviewed-on: #14	2022-11-14 16:51:20 +08:00
juzi	a595bc46bd	11.14修改样式	2022-11-14 16:50:39 +08:00
朱文强	19fd321a4e	Merge pull request '更新驾驶舱' (#13 ) from zwq into master Reviewed-on: #13	2022-11-14 14:48:32 +08:00
zwq	ab8848b6e3	更新驾驶舱	2022-11-14 14:47:57 +08:00
juzi	23bb88b20c	Merge pull request '11-wms-zjl' (#12 ) from 11-wms-zjl into master Reviewed-on: #12	2022-11-11 10:56:47 +08:00
juzi	1dae37bbb4	marge master	2022-11-11 10:56:03 +08:00
juzi	0567df8d68	左侧图标跳转main	2022-11-11 10:54:01 +08:00
juzi	3dc45e4a7e	Merge pull request 'navbar图标' (#11 ) from 11-wms-zjl into master Reviewed-on: #11	2022-11-09 14:38:10 +08:00
juzi	1856588f04	navbar图标	2022-11-09 14:34:27 +08:00
朱文强	7a651b816e	Merge pull request '更新驾驶舱' (#10 ) from zwq into master Reviewed-on: #10	2022-11-08 16:09:27 +08:00
zwq	3ed9692541	更新驾驶舱	2022-11-08 16:08:26 +08:00
朱文强	2aa7d296c3	Merge pull request '更新驾驶舱表格居中' (#9 ) from zwq into master Reviewed-on: #9	2022-11-03 16:05:21 +08:00
zwq	955bb96ad1	更新驾驶舱表格居中	2022-11-03 16:04:44 +08:00
juzi	ae573d7e4b	Merge pull request '11-wms-zjl' (#8 ) from 11-wms-zjl into master Reviewed-on: #8	2022-11-03 14:31:11 +08:00
juzi	00071dddee	首页更改	2022-11-03 14:21:07 +08:00
juzi	17d4befd54	merge master	2022-11-03 10:22:24 +08:00
juzi	73a60d5da3	home跳转	2022-11-03 10:19:19 +08:00