diff --git a/screen-vue/src/views/Login.vue b/screen-vue/src/views/Login.vue index 143ae26..47d1dd9 100644 --- a/screen-vue/src/views/Login.vue +++ b/screen-vue/src/views/Login.vue @@ -64,15 +64,15 @@ const isLoading = ref(false) const handleLogin = async () => { try { - await loginFormRef.value.validate() - isLoading.value = true - const res = await login(loginForm.value) - localStorage.setItem('token', res.token) - localStorage.setItem('username', res.username) - ElMessage.success('登录成功!') + await loginFormRef.value.validate(); + isLoading.value = true; + const res = await login(loginForm.value); + localStorage.setItem('token', res.token); + localStorage.setItem('userName', res.userName); + ElMessage.success('登录成功!'); setTimeout(() => { router.push('/dashboard'); - }, 3000) + }, 3000); } catch (error) { ElMessage.error(res.msg); }finally{ diff --git a/screen-vue/src/views/desktop/index.vue b/screen-vue/src/views/desktop/index.vue index 4591ea7..2864870 100644 --- a/screen-vue/src/views/desktop/index.vue +++ b/screen-vue/src/views/desktop/index.vue @@ -18,13 +18,10 @@
@@ -33,49 +30,60 @@
- +
- +
+
+ +
- +
\ No newline at end of file diff --git a/screen-vue/src/views/desktop/screen/Erp/components/ChartPic.vue b/screen-vue/src/views/desktop/screen/Erp/components/ChartPic.vue deleted file mode 100644 index 4ba992e..0000000 --- a/screen-vue/src/views/desktop/screen/Erp/components/ChartPic.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - \ No newline at end of file diff --git a/screen-vue/src/views/desktop/screen/Erp/index.vue b/screen-vue/src/views/desktop/screen/Erp/index.vue index 15993fa..b1ce701 100644 --- a/screen-vue/src/views/desktop/screen/Erp/index.vue +++ b/screen-vue/src/views/desktop/screen/Erp/index.vue @@ -10,20 +10,17 @@
-

上部列1

-

ERP数据面板1

+
-

上部列2

-

ERP数据面板2

+
-

上部列3

-

ERP数据面板3

+
@@ -33,22 +30,19 @@
-

中部左1列

-

ERP明细1

+
-

中部左2列

-

ERP明细2

+
-

中部右侧列

-

ERP核心数据展示

+
@@ -58,22 +52,19 @@
-

下部左1列

-

ERP统计1

+
-

下部左2列

-

ERP统计2

+
-

下部右侧列

-

ERP报表/图表展示

+
@@ -81,6 +72,29 @@