+
diff --git a/src/views/dashboard/analysis/components/DataCard/components/index.ts b/src/views/dashboard/analysis/components/DataCard/components/index.ts
new file mode 100644
index 00000000..a8834d17
--- /dev/null
+++ b/src/views/dashboard/analysis/components/DataCard/components/index.ts
@@ -0,0 +1,3 @@
+import GradientBg from './GradientBg.vue';
+
+export { GradientBg };
diff --git a/src/views/dashboard/analysis/components/DataCard/index.vue b/src/views/dashboard/analysis/components/DataCard/index.vue
new file mode 100644
index 00000000..5b16ad8f
--- /dev/null
+++ b/src/views/dashboard/analysis/components/DataCard/index.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dashboard/analysis/components/NavCard.vue b/src/views/dashboard/analysis/components/NavCard.vue
deleted file mode 100644
index b7c37321..00000000
--- a/src/views/dashboard/analysis/components/NavCard.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dashboard/analysis/components/TopChart/data.json b/src/views/dashboard/analysis/components/TopChart/data.json
new file mode 100644
index 00000000..481c9ae7
--- /dev/null
+++ b/src/views/dashboard/analysis/components/TopChart/data.json
@@ -0,0 +1,152 @@
+[
+ {
+ "date": "2021/10/1",
+ "type": "下载量",
+ "value": 4623
+ },
+ {
+ "date": "2021/10/1",
+ "type": "注册数",
+ "value": 2208
+ },
+ {
+ "date": "2021/10/2",
+ "type": "下载量",
+ "value": 6145
+ },
+ {
+ "date": "2021/10/2",
+ "type": "注册数",
+ "value": 2016
+ },
+ {
+ "date": "2021/10/3",
+ "type": "下载量",
+ "value": 508
+ },
+ {
+ "date": "2021/10/3",
+ "type": "注册数",
+ "value": 2916
+ },
+ {
+ "date": "2021/10/4",
+ "type": "下载量",
+ "value": 6268
+ },
+ {
+ "date": "2021/10/4",
+ "type": "注册数",
+ "value": 4512
+ },
+ {
+ "date": "2021/10/5",
+ "type": "下载量",
+ "value": 6411
+ },
+ {
+ "date": "2021/10/5",
+ "type": "注册数",
+ "value": 8281
+ },
+ {
+ "date": "2021/10/6",
+ "type": "下载量",
+ "value": 1890
+ },
+ {
+ "date": "2021/10/6",
+ "type": "注册数",
+ "value": 2008
+ },
+ {
+ "date": "2021/10/7",
+ "type": "下载量",
+ "value": 4251
+ },
+ {
+ "date": "2021/10/7",
+ "type": "注册数",
+ "value": 1963
+ },
+ {
+ "date": "2021/10/8",
+ "type": "下载量",
+ "value": 2978
+ },
+ {
+ "date": "2021/10/8",
+ "type": "注册数",
+ "value": 2367
+ },
+ {
+ "date": "2021/10/9",
+ "type": "下载量",
+ "value": 3880
+ },
+ {
+ "date": "2021/10/9",
+ "type": "注册数",
+ "value": 2956
+ },
+ {
+ "date": "2021/10/10",
+ "type": "下载量",
+ "value": 3606
+ },
+ {
+ "date": "2021/10/10",
+ "type": "注册数",
+ "value": 678
+ },
+ {
+ "date": "2021/10/11",
+ "type": "下载量",
+ "value": 4311
+ },
+ {
+ "date": "2021/10/11",
+ "type": "注册数",
+ "value": 3188
+ },
+ {
+ "date": "2021/10/12",
+ "type": "下载量",
+ "value": 4116
+ },
+ {
+ "date": "2021/10/12",
+ "type": "注册数",
+ "value": 3491
+ },
+ {
+ "date": "2021/10/13",
+ "type": "下载量",
+ "value": 6419
+ },
+ {
+ "date": "2021/10/13",
+ "type": "注册数",
+ "value": 2852
+ },
+ {
+ "date": "2021/10/14",
+ "type": "下载量",
+ "value": 1643
+ },
+ {
+ "date": "2021/10/14",
+ "type": "注册数",
+ "value": 4788
+ },
+ {
+ "date": "2021/10/15",
+ "type": "下载量",
+ "value": 445
+ },
+ {
+ "date": "2021/10/15",
+ "type": "注册数",
+ "value": 4319
+ }
+]
diff --git a/src/views/dashboard/analysis/components/TopChart/index.vue b/src/views/dashboard/analysis/components/TopChart/index.vue
new file mode 100644
index 00000000..d968ecf8
--- /dev/null
+++ b/src/views/dashboard/analysis/components/TopChart/index.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
Dashboard
+
Overview Of Lasted Month
+
+
+
+
Current Month Earnings
+
+
+
+
Current Month Sales
+
Last Month Summary
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dashboard/analysis/components/index.ts b/src/views/dashboard/analysis/components/index.ts
index 256c9574..8e940b19 100644
--- a/src/views/dashboard/analysis/components/index.ts
+++ b/src/views/dashboard/analysis/components/index.ts
@@ -1,4 +1,5 @@
-import DataCard from './DataCard.vue';
-import NavCard from './NavCard.vue';
+import TopChart from './TopChart/index.vue';
+import DataCard from './DataCard/index.vue';
+import BottomPart from './BottomPart/index.vue';
-export { DataCard, NavCard };
+export { TopChart, DataCard, BottomPart };
diff --git a/src/views/dashboard/analysis/index.vue b/src/views/dashboard/analysis/index.vue
index 22d54241..420a3258 100644
--- a/src/views/dashboard/analysis/index.vue
+++ b/src/views/dashboard/analysis/index.vue
@@ -1,24 +1,13 @@
-
-
-
-
+
+
+
+
+
+
diff --git a/src/views/dashboard/workbench/components/HeaderInfo/index.vue b/src/views/dashboard/workbench/components/HeaderInfo/index.vue
new file mode 100644
index 00000000..fbc813da
--- /dev/null
+++ b/src/views/dashboard/workbench/components/HeaderInfo/index.vue
@@ -0,0 +1,47 @@
+
+
+
+

+
+
早安,{{ auth.userInfo.userName }}, 今天又是充满活力的一天!
+
今日多云转晴,20℃ - 25℃!
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dashboard/workbench/components/index.ts b/src/views/dashboard/workbench/components/index.ts
index a8834d17..09119354 100644
--- a/src/views/dashboard/workbench/components/index.ts
+++ b/src/views/dashboard/workbench/components/index.ts
@@ -1,3 +1,3 @@
-import GradientBg from './GradientBg.vue';
+import HeaderInfo from './HeaderInfo/index.vue';
-export { GradientBg };
+export { HeaderInfo };
diff --git a/src/views/dashboard/workbench/index.vue b/src/views/dashboard/workbench/index.vue
index 9f597cd0..7970127e 100644
--- a/src/views/dashboard/workbench/index.vue
+++ b/src/views/dashboard/workbench/index.vue
@@ -1,93 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
diff --git a/src/views/document/naive/index.vue b/src/views/document/naive/index.vue
index 444349d0..e16de3ea 100644
--- a/src/views/document/naive/index.vue
+++ b/src/views/document/naive/index.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/document/vite/index.vue b/src/views/document/vite/index.vue
index 78b5df13..5cf7da59 100644
--- a/src/views/document/vite/index.vue
+++ b/src/views/document/vite/index.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/document/vue/index.vue b/src/views/document/vue/index.vue
index 8c3100a9..e5c80ea1 100644
--- a/src/views/document/vue/index.vue
+++ b/src/views/document/vue/index.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/system/exception/403.vue b/src/views/system/exception/403.vue
index 59960f11..6a7c2e1a 100644
--- a/src/views/system/exception/403.vue
+++ b/src/views/system/exception/403.vue
@@ -1,5 +1,5 @@
-
+
回到首页
diff --git a/src/views/system/exception/404.vue b/src/views/system/exception/404.vue
index 95be6511..c32a8871 100644
--- a/src/views/system/exception/404.vue
+++ b/src/views/system/exception/404.vue
@@ -1,5 +1,5 @@
-
+
回到首页
diff --git a/src/views/system/exception/500.vue b/src/views/system/exception/500.vue
index 012fbac9..3174c295 100644
--- a/src/views/system/exception/500.vue
+++ b/src/views/system/exception/500.vue
@@ -1,5 +1,5 @@
-
+
回到首页
diff --git a/src/views/system/login/components/PwdLogin/index.vue b/src/views/system/login/components/PwdLogin/index.vue
index 77b093b4..04f2c35b 100644
--- a/src/views/system/login/components/PwdLogin/index.vue
+++ b/src/views/system/login/components/PwdLogin/index.vue
@@ -35,18 +35,20 @@ import { reactive, ref } from 'vue';
import { NForm, NFormItem, NInput, NSpace, NCheckbox, NButton, useNotification } from 'naive-ui';
import type { FormInst, FormRules } from 'naive-ui';
import { EnumLoginModule } from '@/enum';
+import { useAuthStore } from '@/store';
import { useRouterChange, useRouteQuery, useLoading } from '@/hooks';
import { setToken } from '@/utils';
import { OtherLogin } from './components';
+const notification = useNotification();
+const auth = useAuthStore();
const { toHome, toCurrentLogin, toLoginRedirectUrl } = useRouterChange();
const { loginRedirectUrl } = useRouteQuery();
const { loading, startLoading, endLoading } = useLoading();
-const notification = useNotification();
const formRef = ref<(HTMLElement & FormInst) | null>(null);
const model = reactive({
- phone: '15100000000',
+ phone: '151****3876',
pwd: '123456'
});
const rules: FormRules = {
@@ -78,9 +80,10 @@ function handleSubmit(e: MouseEvent) {
} else {
toHome();
}
+ const { userName } = auth.userInfo;
notification.success({
title: '登录成功!',
- content: '欢迎回来,Soybean!',
+ content: `欢迎回来,${userName}!`,
duration: 3000
});
}, 1000);
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index 40d5808c..12a26707 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -1,9 +1,9 @@
-
+
diff --git a/windi.config.ts b/windi.config.ts
index 12a8a452..f4fc7b3d 100644
--- a/windi.config.ts
+++ b/windi.config.ts
@@ -12,6 +12,7 @@ export default defineConfig({
},
darkMode: 'class',
shortcuts: {
+ 'wh-full': 'w-full h-full',
'center-layout': 'w-1280px mx-auto px-15px',
'flex-center': 'flex justify-center items-center',
'flex-x-center': 'flex justify-center',
@@ -22,12 +23,12 @@ export default defineConfig({
'flex-1-hidden': 'flex-1 overflow-hidden',
'flex-col-stretch': 'flex flex-col items-stretch',
'inline-flex-col-stretch': 'flex flex-col items-stretch',
- 'absolute-center': 'absolute left-0 top-0 flex justify-center items-center w-full h-full',
+ 'absolute-center': 'absolute left-0 top-0 flex justify-center items-center wh-full',
'absolute-lt': 'absolute left-0 top-0',
'absolute-lb': 'absolute left-0 bottom-0',
'absolute-rt': 'absolute right-0 top-0',
'absolute-rb': 'absolute right-0 bottom-0',
- 'fixed-center': 'fixed left-0 top-0 flex justify-center items-center w-full h-full',
+ 'fixed-center': 'fixed left-0 top-0 flex justify-center items-center wh-full',
'ellipsis-text': 'whitespace-nowrap overflow-hidden overflow-ellipsis',
'nowrap-hidden': 'whitespace-nowrap overflow-hidden'
},