From d4bb2a55087705e60d53dd38fe8443fc280308a5 Mon Sep 17 00:00:00 2001 From: hzz Date: Wed, 6 Sep 2023 18:05:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E4=BC=9A=E5=A4=A7=E5=B1=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/MicroExhibition/child/LineChart.vue | 5 - .../MicroExhibition/components/BarChart.vue | 24 +- .../MicroExhibition/components/DevCard.vue | 8 +- .../MicroExhibition/components/LineChart.vue | 5 - .../MicroExhibition/components/NewBoder.vue | 75 +++++ .../MicroExhibition/components/ringChart.vue | 2 +- src/views/MicroExhibition/images/u290.svg | 12 + src/views/MicroExhibition/images/u305.svg | 12 + src/views/MicroExhibition/index.vue | 194 ++++-------- src/views/MicroExhibition/index1.vue | 294 ++++++++++++++++++ 10 files changed, 476 insertions(+), 155 deletions(-) create mode 100644 src/views/MicroExhibition/components/NewBoder.vue create mode 100644 src/views/MicroExhibition/images/u290.svg create mode 100644 src/views/MicroExhibition/images/u305.svg create mode 100644 src/views/MicroExhibition/index1.vue diff --git a/src/views/MicroExhibition/child/LineChart.vue b/src/views/MicroExhibition/child/LineChart.vue index 0712c32..7752e65 100644 --- a/src/views/MicroExhibition/child/LineChart.vue +++ b/src/views/MicroExhibition/child/LineChart.vue @@ -53,31 +53,26 @@ const setCharts = ()=>{ { name: 'Email', type: 'line', - stack: 'Total', data: [120, 132, 101, 134, 90, 230, 210] }, { name: 'Union Ads', type: 'line', - stack: 'Total', data: [220, 182, 191, 234, 290, 330, 310] }, { name: 'Video Ads', type: 'line', - stack: 'Total', data: [150, 232, 201, 154, 190, 330, 410] }, { name: 'Direct', type: 'line', - stack: 'Total', data: [320, 332, 301, 334, 390, 330, 320] }, { name: 'Search Engine', type: 'line', - stack: 'Total', data: [820, 932, 901, 934, 1290, 1330, 1320] } ] diff --git a/src/views/MicroExhibition/components/BarChart.vue b/src/views/MicroExhibition/components/BarChart.vue index b68e24d..0b38676 100644 --- a/src/views/MicroExhibition/components/BarChart.vue +++ b/src/views/MicroExhibition/components/BarChart.vue @@ -4,18 +4,30 @@ + + diff --git a/src/views/MicroExhibition/components/ringChart.vue b/src/views/MicroExhibition/components/ringChart.vue index 03a8783..4cb32f9 100644 --- a/src/views/MicroExhibition/components/ringChart.vue +++ b/src/views/MicroExhibition/components/ringChart.vue @@ -15,7 +15,6 @@ import { ref, onMounted, onUnmounted, getCurrentInstance, watch, onUpdated } from 'vue' const { proxy } = getCurrentInstance() as any; import { useI18n } from 'vue-i18n' -import DecorationFadeOut from "@/components/decoration/DecorationFadeOut.vue"; let { t } = useI18n(); let ringRef = ref(); let ringChart = null; @@ -28,6 +27,7 @@ const init = () => { tooltip: { trigger: "item", }, + backgroundColor: '#0E0E0E', legend: { type: "scroll", bottom: "0", diff --git a/src/views/MicroExhibition/images/u290.svg b/src/views/MicroExhibition/images/u290.svg new file mode 100644 index 0000000..94f8184 --- /dev/null +++ b/src/views/MicroExhibition/images/u290.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/MicroExhibition/images/u305.svg b/src/views/MicroExhibition/images/u305.svg new file mode 100644 index 0000000..e68182a --- /dev/null +++ b/src/views/MicroExhibition/images/u305.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/MicroExhibition/index.vue b/src/views/MicroExhibition/index.vue index e5412b1..9977d55 100644 --- a/src/views/MicroExhibition/index.vue +++ b/src/views/MicroExhibition/index.vue @@ -2,21 +2,21 @@
-
- - - + + + + +
- - - +
@@ -38,30 +38,26 @@
- +
+ + + +
- - -
- -
工作时间
-
-
-
+ +
- - - -
-
- + - + +
+
+
@@ -70,127 +66,63 @@ + diff --git a/src/views/MicroExhibition/index1.vue b/src/views/MicroExhibition/index1.vue new file mode 100644 index 0000000..17ef6c2 --- /dev/null +++ b/src/views/MicroExhibition/index1.vue @@ -0,0 +1,294 @@ + + + + +