From 5af1c027a05f215b3f49b8306ea7f8d1cf15ac7d Mon Sep 17 00:00:00 2001 From: lb Date: Mon, 8 May 2023 15:52:19 +0800 Subject: [PATCH] update Areaone --- src/assets/svgs/blue-bubble.svg | 18 ++++++ src/assets/svgs/blue-lightening.svg | 20 ++++++ src/assets/svgs/blue-menu.svg | 20 ++++++ src/assets/svgs/blue-pc.svg | 27 ++++++++ src/assets/svgs/blue-stack.svg | 14 +++++ src/assets/svgs/blue-water.svg | 16 +++++ src/assets/svgs/orange-clock.svg | 31 ++++++++++ src/assets/svgs/orange-fire.svg | 31 ++++++++++ src/assets/svgs/orange-sand.svg | 31 ++++++++++ src/assets/svgs/orange-tempe.svg | 31 ++++++++++ src/components/common/SmallBox2.vue | 86 +++++++++++++++++++++----- src/components/icons/clockSvg.vue | 80 ++++++++++++++++++++++++ src/components/icons/fireSvg.vue | 80 ++++++++++++++++++++++++ src/components/icons/sandSvg.vue | 80 ++++++++++++++++++++++++ src/components/icons/tempSvg.vue | 80 ++++++++++++++++++++++++ src/components/isolate-area-1/Area.vue | 33 +++++++--- src/components/layout/Main.vue | 2 +- 17 files changed, 652 insertions(+), 28 deletions(-) create mode 100644 src/assets/svgs/blue-bubble.svg create mode 100644 src/assets/svgs/blue-lightening.svg create mode 100644 src/assets/svgs/blue-menu.svg create mode 100644 src/assets/svgs/blue-pc.svg create mode 100644 src/assets/svgs/blue-stack.svg create mode 100644 src/assets/svgs/blue-water.svg create mode 100644 src/assets/svgs/orange-clock.svg create mode 100644 src/assets/svgs/orange-fire.svg create mode 100644 src/assets/svgs/orange-sand.svg create mode 100644 src/assets/svgs/orange-tempe.svg create mode 100644 src/components/icons/clockSvg.vue create mode 100644 src/components/icons/fireSvg.vue create mode 100644 src/components/icons/sandSvg.vue create mode 100644 src/components/icons/tempSvg.vue diff --git a/src/assets/svgs/blue-bubble.svg b/src/assets/svgs/blue-bubble.svg new file mode 100644 index 0000000..4a788f8 --- /dev/null +++ b/src/assets/svgs/blue-bubble.svg @@ -0,0 +1,18 @@ + + + 编组 15 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svgs/blue-lightening.svg b/src/assets/svgs/blue-lightening.svg new file mode 100644 index 0000000..583124d --- /dev/null +++ b/src/assets/svgs/blue-lightening.svg @@ -0,0 +1,20 @@ + + + 电,闪电,电力,电量 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svgs/blue-menu.svg b/src/assets/svgs/blue-menu.svg new file mode 100644 index 0000000..80d5647 --- /dev/null +++ b/src/assets/svgs/blue-menu.svg @@ -0,0 +1,20 @@ + + + 编组 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svgs/blue-pc.svg b/src/assets/svgs/blue-pc.svg new file mode 100644 index 0000000..6ca1a60 --- /dev/null +++ b/src/assets/svgs/blue-pc.svg @@ -0,0 +1,27 @@ + + + 编组 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svgs/blue-stack.svg b/src/assets/svgs/blue-stack.svg new file mode 100644 index 0000000..c68ee47 --- /dev/null +++ b/src/assets/svgs/blue-stack.svg @@ -0,0 +1,14 @@ + + + 物料信息 + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svgs/blue-water.svg b/src/assets/svgs/blue-water.svg new file mode 100644 index 0000000..a151349 --- /dev/null +++ b/src/assets/svgs/blue-water.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svgs/orange-clock.svg b/src/assets/svgs/orange-clock.svg new file mode 100644 index 0000000..dc0e743 --- /dev/null +++ b/src/assets/svgs/orange-clock.svg @@ -0,0 +1,31 @@ + + + 217时间-线性 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svgs/orange-fire.svg b/src/assets/svgs/orange-fire.svg new file mode 100644 index 0000000..575612d --- /dev/null +++ b/src/assets/svgs/orange-fire.svg @@ -0,0 +1,31 @@ + + + 燃脂 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svgs/orange-sand.svg b/src/assets/svgs/orange-sand.svg new file mode 100644 index 0000000..a5a1eed --- /dev/null +++ b/src/assets/svgs/orange-sand.svg @@ -0,0 +1,31 @@ + + + 沙漏 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svgs/orange-tempe.svg b/src/assets/svgs/orange-tempe.svg new file mode 100644 index 0000000..c986838 --- /dev/null +++ b/src/assets/svgs/orange-tempe.svg @@ -0,0 +1,31 @@ + + + 编组 36 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/common/SmallBox2.vue b/src/components/common/SmallBox2.vue index 49e0e4d..9eaf2ed 100644 --- a/src/components/common/SmallBox2.vue +++ b/src/components/common/SmallBox2.vue @@ -1,6 +1,8 @@ diff --git a/src/components/icons/clockSvg.vue b/src/components/icons/clockSvg.vue new file mode 100644 index 0000000..53c4028 --- /dev/null +++ b/src/components/icons/clockSvg.vue @@ -0,0 +1,80 @@ + diff --git a/src/components/icons/fireSvg.vue b/src/components/icons/fireSvg.vue new file mode 100644 index 0000000..6c3a0f6 --- /dev/null +++ b/src/components/icons/fireSvg.vue @@ -0,0 +1,80 @@ + diff --git a/src/components/icons/sandSvg.vue b/src/components/icons/sandSvg.vue new file mode 100644 index 0000000..c53243e --- /dev/null +++ b/src/components/icons/sandSvg.vue @@ -0,0 +1,80 @@ + diff --git a/src/components/icons/tempSvg.vue b/src/components/icons/tempSvg.vue new file mode 100644 index 0000000..14512d0 --- /dev/null +++ b/src/components/icons/tempSvg.vue @@ -0,0 +1,80 @@ + diff --git a/src/components/isolate-area-1/Area.vue b/src/components/isolate-area-1/Area.vue index 73ef634..060944a 100644 --- a/src/components/isolate-area-1/Area.vue +++ b/src/components/isolate-area-1/Area.vue @@ -1,9 +1,12 @@ @@ -14,17 +17,27 @@ import SmallBox2 from "../common/SmallBox2.vue"; export default { name: "IsolateArea--1", components: { DragabbleContainer, SmallBox2 }, + data() { + return { + rdata: [ + { icon: "temp", title: "车间温度", value: "27℃" }, + { icon: "fire", title: "当前火向", value: "东火" }, + { icon: "clock", title: "换火时间", value: "12:21:39" }, + { icon: "sand", title: "剩余时间", value: "6h" }, + ], + }; + }, }; diff --git a/src/components/layout/Main.vue b/src/components/layout/Main.vue index a59d215..7d9453e 100644 --- a/src/components/layout/Main.vue +++ b/src/components/layout/Main.vue @@ -26,6 +26,6 @@ export default { main { height: 1px; flex: 1; - background: #eee2; + // background: #eee2; }