From 7ea8359f4fcf792176161ecc3ca3cab2fcbfe490 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 09 四月 2024 10:33:52 +0800
Subject: [PATCH] #
---
zy-asrs-flow/public/img/map/direction.svg | 4 ++++
zy-asrs-flow/src/pages/map/batch/modify.jsx | 8 ++++++++
zy-asrs-flow/src/locales/en-US/map.ts | 2 ++
zy-asrs-flow/public/img/map/charge.svg | 28 ++++++++++++++++++++++++++++
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 8 ++++++++
zy-asrs-flow/src/pages/map/utils.js | 8 ++++++++
6 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-flow/public/img/map/charge.svg b/zy-asrs-flow/public/img/map/charge.svg
new file mode 100644
index 0000000..e1bf00b
--- /dev/null
+++ b/zy-asrs-flow/public/img/map/charge.svg
@@ -0,0 +1,28 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M21.5 24.9805L8.5 24.9805C7.39543 24.9805 6.5 23.9571 6.5 22.6948L6.5 16.9805L23.5 16.9805L23.5 22.6948C23.5 23.9571 22.6046 24.9805 21.5 24.9805Z" fill="url(#paint0_linear_47_86929)"/>
+ <path d="M6.5 16.9802L23.5 16.9802L23.5 14.9802L6.5 14.9802L6.5 16.9802Z" fill="url(#paint1_linear_47_86929)"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M23.5 14.9802L6.5 14.9802L6.5 1.99997C6.5 0.8954 7.39543 -3.03255e-05 8.5 -3.03387e-05L21.5 -3.04937e-05C22.6046 -3.05069e-05 23.5 0.8954 23.5 1.99997L23.5 14.9802Z" fill="url(#paint2_linear_47_86929)"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M17.4591 24.9803L17.498 27.969L16.5029 30L13.4751 30L12.4962 27.969L12.4962 24.9803L17.4591 24.9803Z" fill="#818181"/>
+ <defs>
+ <linearGradient id="paint0_linear_47_86929" x1="23.5" y1="20.3934" x2="6.5" y2="20.3934" gradientUnits="userSpaceOnUse">
+ <stop stop-color="#3E3D3D"/>
+ <stop offset="0.281244" stop-color="#A1A1A1"/>
+ <stop offset="0.751963" stop-color="#909090"/>
+ <stop offset="1" stop-color="#474747"/>
+ </linearGradient>
+ <linearGradient id="paint1_linear_47_86929" x1="23.5" y1="15.8335" x2="6.5" y2="15.8335" gradientUnits="userSpaceOnUse">
+ <stop stop-color="#D7D7D7"/>
+ <stop offset="0.302202" stop-color="white"/>
+ <stop offset="0.767947" stop-color="white"/>
+ <stop offset="1" stop-color="#D7D7D7"/>
+ </linearGradient>
+ <linearGradient id="paint2_linear_47_86929" x1="23.5" y1="-3.05176e-05" x2="6.5" y2="-3.03149e-05" gradientUnits="userSpaceOnUse">
+ <stop stop-color="#61CF87"/>
+ <stop offset="0.0001" stop-color="#61CF87"/>
+ <stop offset="0.244318" stop-color="#2FEC70"/>
+ <stop offset="0.734457" stop-color="#30FE77"/>
+ <stop offset="1" stop-color="#61CF87"/>
+ <stop offset="1" stop-color="#61CF87"/>
+ </linearGradient>
+ </defs>
+</svg>
diff --git a/zy-asrs-flow/public/img/map/direction.svg b/zy-asrs-flow/public/img/map/direction.svg
new file mode 100644
index 0000000..1cba47c
--- /dev/null
+++ b/zy-asrs-flow/public/img/map/direction.svg
@@ -0,0 +1,4 @@
+<svg width="15" height="7" viewBox="0 0 15 7" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.5 3.5L6.28261 6.09808L6.28261 0.901924L14.5 3.5Z" fill="#0C98E8"/>
+<rect x="6.38403" y="2.68188" width="1.63636" height="5.88406" transform="rotate(90 6.38403 2.68188)" fill="#0C98E8"/>
+</svg>
diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index 0e48e7b..c28bcdb 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -83,6 +83,8 @@
'map.settings.shelf.value': 'Map Value',
'map.settings.shelf.store': 'Store',
'map.settings.shelf.track': 'Track',
+ 'map.settings.shelf.lift': 'Lift',
+ 'map.settings.shelf.charge': 'Charge',
'map.settings.shelf.diable': 'Diable',
'': '',
'': '',
diff --git a/zy-asrs-flow/src/pages/map/batch/modify.jsx b/zy-asrs-flow/src/pages/map/batch/modify.jsx
index b21bcd0..03a11a3 100644
--- a/zy-asrs-flow/src/pages/map/batch/modify.jsx
+++ b/zy-asrs-flow/src/pages/map/batch/modify.jsx
@@ -130,6 +130,14 @@
value: Utils.SHELF_TYPE.TRACK
},
{
+ label: intl.formatMessage({ id: 'map.settings.shelf.lift', defaultMessage: '鎻愬崌鏈�' }),
+ value: Utils.SHELF_TYPE.LIFT
+ },
+ {
+ label: intl.formatMessage({ id: 'map.settings.shelf.charge', defaultMessage: '鍏呯數绔�' }),
+ value: Utils.SHELF_TYPE.CHARGE
+ },
+ {
label: intl.formatMessage({ id: 'map.settings.shelf.diable', defaultMessage: '绂佺敤' }),
value: Utils.SHELF_TYPE.DISABLE
},
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 6b45b0b..02a1727 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -215,6 +215,14 @@
value: Utils.SHELF_TYPE.TRACK
},
{
+ label: intl.formatMessage({ id: 'map.settings.shelf.lift', defaultMessage: '鎻愬崌鏈�' }),
+ value: Utils.SHELF_TYPE.LIFT
+ },
+ {
+ label: intl.formatMessage({ id: 'map.settings.shelf.charge', defaultMessage: '鍏呯數绔�' }),
+ value: Utils.SHELF_TYPE.CHARGE
+ },
+ {
label: intl.formatMessage({ id: 'map.settings.shelf.diable', defaultMessage: '绂佺敤' }),
value: Utils.SHELF_TYPE.DISABLE
},
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 4dfd41e..373ea69 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -52,6 +52,8 @@
export const SHELF_TYPE = Object.freeze({
STORE: 0,
TRACK: 3,
+ LIFT: 67,
+ CHARGE: 5,
DISABLE: 1,
})
@@ -578,6 +580,12 @@
case SHELF_TYPE.TRACK:
showColor = '#faf6e9';
break;
+ case SHELF_TYPE.LIFT:
+ showColor = '#EBDEF0';
+ break;
+ case SHELF_TYPE.CHARGE:
+ showColor = '#D4EFDF';
+ break;
case SHELF_TYPE.DISABLE:
showColor = '#ffc8c8';
break;
--
Gitblit v1.9.1