From fa9de9b2d52e29ada3c8531f367caf8a46027a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Thu, 27 Jan 2022 23:50:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=8F=91=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/{ => Chart}/BarChart.vue | 0 .../components/{ => Chart}/FunnelChart.vue | 0 .../components/{ => Chart}/PieChart.vue | 0 .../components/{ => Chart}/RadarChart.vue | 0 .../dashboard/components/Project/index.vue | 89 ++++++++++ src/views/dashboard/components/Team/index.vue | 168 ++++++++++++++++++ src/views/dashboard/index.vue | 145 ++------------- 7 files changed, 267 insertions(+), 135 deletions(-) rename src/views/dashboard/components/{ => Chart}/BarChart.vue (100%) rename src/views/dashboard/components/{ => Chart}/FunnelChart.vue (100%) rename src/views/dashboard/components/{ => Chart}/PieChart.vue (100%) rename src/views/dashboard/components/{ => Chart}/RadarChart.vue (100%) create mode 100644 src/views/dashboard/components/Project/index.vue create mode 100644 src/views/dashboard/components/Team/index.vue diff --git a/src/views/dashboard/components/BarChart.vue b/src/views/dashboard/components/Chart/BarChart.vue similarity index 100% rename from src/views/dashboard/components/BarChart.vue rename to src/views/dashboard/components/Chart/BarChart.vue diff --git a/src/views/dashboard/components/FunnelChart.vue b/src/views/dashboard/components/Chart/FunnelChart.vue similarity index 100% rename from src/views/dashboard/components/FunnelChart.vue rename to src/views/dashboard/components/Chart/FunnelChart.vue diff --git a/src/views/dashboard/components/PieChart.vue b/src/views/dashboard/components/Chart/PieChart.vue similarity index 100% rename from src/views/dashboard/components/PieChart.vue rename to src/views/dashboard/components/Chart/PieChart.vue diff --git a/src/views/dashboard/components/RadarChart.vue b/src/views/dashboard/components/Chart/RadarChart.vue similarity index 100% rename from src/views/dashboard/components/RadarChart.vue rename to src/views/dashboard/components/Chart/RadarChart.vue diff --git a/src/views/dashboard/components/Project/index.vue b/src/views/dashboard/components/Project/index.vue new file mode 100644 index 00000000..9f903baa --- /dev/null +++ b/src/views/dashboard/components/Project/index.vue @@ -0,0 +1,89 @@ + + + + + \ No newline at end of file diff --git a/src/views/dashboard/components/Team/index.vue b/src/views/dashboard/components/Team/index.vue new file mode 100644 index 00000000..4a422fad --- /dev/null +++ b/src/views/dashboard/components/Team/index.vue @@ -0,0 +1,168 @@ + + + + + + \ No newline at end of file diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index d2acfa45..c97e21a7 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -69,101 +69,12 @@ - - -
- - - youlai-mall - - 是基于Spring Boot 2.5、Spring Cloud 2020 & - Alibaba 2021、Vue3、Element-Plus、uni-app等主流技术栈构建的一整套全栈开源商城项目, - 涉及 - 后端微服务 - 、 - 前端管理 - 、 - 微信小程序 - - 和 - APP应用 - 等多端的开发。 - - - - - - - 源码地址 - - - - Github - - - 码云 - - - - - - - 后端技术栈 - - - Spring Boot、Spring Cloud & Alibaba、Spring Security - OAuth2、JWT、Seata、Sentinel、Elastic Stack ... - - - - - - 前端技术栈 - - - Vue3、TypeScript、Element-Plus、uni-app、vue3-element-admin ... - - -
-
+
- - - - -
-
    -
  • 12
  • -
  • 12
  • -
  • 123
  • -
  • 12
  • -
  • 123
  • -
  • 33
  • -
  • 33
  • -
  • 33
  • -
  • 33
  • -
  • 33
  • -
  • 33
  • -
  • 33
  • -
-
-
- - - - - - - -
-
+
@@ -197,10 +108,14 @@ import {computed, nextTick, onMounted, reactive, toRefs, watchEffect} from "vue" import GithubCorner from '@/components/GithubCorner/index.vue' import TodoList from './components/TodoList/index.vue' import SvgIcon from '@/components/SvgIcon/index.vue' -import BarChart from "./components/BarChart.vue"; -import PieChart from "./components/PieChart.vue"; -import RadarChart from "./components/RadarChart.vue"; -import FunnelChart from "./components/FunnelChart.vue"; +import BarChart from "./components/Chart/BarChart.vue"; +import PieChart from "./components/Chart/PieChart.vue"; +import RadarChart from "./components/Chart/RadarChart.vue"; +import FunnelChart from "./components/Chart/FunnelChart.vue"; + +import Project from "./components/Project/index.vue"; +import Team from "./components/Team/index.vue"; + import BScroll from 'better-scroll' import {useUserStoreHook} from "@/store/modules/user" @@ -209,29 +124,7 @@ const roles = computed(() => useUserStoreHook().roles); const avatar = computed(() => useUserStoreHook().avatar); const nickname = computed(() => useUserStoreHook().nickname); -const state = reactive({ - teamActiveName: 'developer' -}) -const {teamActiveName} = toRefs(state) - -let bScroll = reactive({}) - -onMounted(() => { - bScroll = new BScroll(document.querySelector('.developer-wrapper') as any, { - startX: 0, - click: true, - scrollX: true, - scrollY: false, - eventPassthrough: "vertical" // 横向滚动,保留纵向原生滚动 - }) -}) - -watchEffect(() => { - nextTick(() => { - bScroll && (bScroll as any).refresh() - }) -}) @@ -382,29 +275,11 @@ watchEffect(() => { } } - .project-card { - font-size: 14px; - - &__main { - line-height: 28px; - } - } - - .team-card { - font-size: 14px; - - &__main { - line-height: 28px; - } - } .chart-container { background: #ffffff; } - .fw-b { - font-weight: bold; - } }