From c77310c67501399b2b1c56c4bb0fd8dad606abd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Wed, 26 Jun 2024 18:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E5=92=8C?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 5 +-
src/assets/icons/index.js | 6 +
src/assets/icons/menu/Finance.vue | 13 +
src/assets/icons/menu/Home.vue | 2 +-
src/assets/icons/menu/ReportForms.vue | 13 +
src/assets/icons/menu/Setup.vue | 2 +-
src/assets/icons/menu/Shipment.vue | 13 +
src/assets/icons/menu/Stock.vue | 13 +
src/assets/icons/menu/WorkOrder.vue | 13 +
src/config/index.js | 4 +-
src/config/route.js | 76 +-
src/layout/components/NavMenu.vue | 2 +-
src/layout/components/sideM.vue | 2 +-
src/layout/index.vue | 13 +-
src/style/app.scss | 17 +-
src/style/fix.scss | 40 +-
src/views/login/components/passwordForm.vue | 2 +-
src/views/login/components/phoneForm.vue | 2 +-
src/views/login/index.vue | 271 +-
yarn.lock | 9719 ++++++++++---------
20 files changed, 5164 insertions(+), 5064 deletions(-)
create mode 100644 src/assets/icons/menu/Finance.vue
create mode 100644 src/assets/icons/menu/ReportForms.vue
create mode 100644 src/assets/icons/menu/Shipment.vue
create mode 100644 src/assets/icons/menu/Stock.vue
create mode 100644 src/assets/icons/menu/WorkOrder.vue
diff --git a/.env.development b/.env.development
index 97a5a87..a019ff9 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
NODE_ENV = development
# 标题
-VUE_APP_TITLE = 荣姿后台系统
+VUE_APP_TITLE = 德木测试
+# 象纬云科
# 接口地址
VUE_APP_API_BASEURL = https://api.dev.dwoodauto.com/api/v1
@@ -16,4 +17,4 @@ VUE_APP_WSS_URL = wss://api.dev.dwoodauto.com/wss
VUE_APP_PORT = 2801
# 是否开启代理
-VUE_APP_PROXY = true
\ No newline at end of file
+VUE_APP_PROXY = true
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index 6dbfe84..69ba889 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -34,3 +34,9 @@ export { default as Page } from './menu/Page.vue'
export { default as Loading } from './menu/Loading.vue'
export { default as Authentication } from './menu/Authenticat.vue'
export { default as Tags } from './menu/Tags.vue'
+export { default as WorkOrder } from './menu/WorkOrder.vue'
+export { default as Finance } from './menu/Finance.vue'
+export { default as ReportForms } from './menu/ReportForms.vue'
+export { default as Shipment } from './menu/Shipment.vue'
+export { default as Stock } from './menu/Stock.vue'
+
diff --git a/src/assets/icons/menu/Finance.vue b/src/assets/icons/menu/Finance.vue
new file mode 100644
index 0000000..c3c9ac8
--- /dev/null
+++ b/src/assets/icons/menu/Finance.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/menu/Home.vue b/src/assets/icons/menu/Home.vue
index 78632d7..f538948 100644
--- a/src/assets/icons/menu/Home.vue
+++ b/src/assets/icons/menu/Home.vue
@@ -1,5 +1,5 @@
-
+
+
+
diff --git a/src/assets/icons/menu/Setup.vue b/src/assets/icons/menu/Setup.vue
index 4c23376..a8e1418 100644
--- a/src/assets/icons/menu/Setup.vue
+++ b/src/assets/icons/menu/Setup.vue
@@ -1,5 +1,5 @@
-
+
+
+
diff --git a/src/assets/icons/menu/Stock.vue b/src/assets/icons/menu/Stock.vue
new file mode 100644
index 0000000..5c474c7
--- /dev/null
+++ b/src/assets/icons/menu/Stock.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/menu/WorkOrder.vue b/src/assets/icons/menu/WorkOrder.vue
new file mode 100644
index 0000000..3ea8467
--- /dev/null
+++ b/src/assets/icons/menu/WorkOrder.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/config/index.js b/src/config/index.js
index 2499aca..8205b77 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -40,13 +40,13 @@ const DEFAULT_CONFIG = {
//布局 默认：default | 通栏：header | 经典：menu | 功能坞：dock
//dock将关闭标签和面包屑栏
- LAYOUT: "default",
+ LAYOUT: "menu",
//菜单是否折叠
MENU_IS_COLLAPSE: false,
//菜单是否启用手风琴效果
- MENU_UNIQUE_OPENED: false,
+ MENU_UNIQUE_OPENED: true,
//是否开启多标签
LAYOUT_TAGS: true,
diff --git a/src/config/route.js b/src/config/route.js
index eef9531..52196de 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -29,24 +29,24 @@ const routes = [
title: "个人信息",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "document",
+ path: "/document",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
title: "文档管理",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "earlyWarning",
+ path: "/early-warning",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
title: "预警管理",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "mail",
+ path: "/mail",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
@@ -58,28 +58,28 @@ const routes = [
name: "order",
path: "/order",
meta: {
- icon: "sc-icon-Home",
+ icon: "sc-icon-WorkOrder",
title: "维保工单",
},
children: [{
- name: "dashboard",
- path: "/dashboard",
+ name: "order",
+ path: "/order",
component: "home",
meta: {
icon: "sc-icon-Console",
title: "维保工单",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "plan",
+ path: "/plan",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
title: "维保计划",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "dataConfirm",
+ path: "/data-confirm",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
@@ -91,28 +91,28 @@ const routes = [
name: "stock",
path: "/stock",
meta: {
- icon: "sc-icon-Home",
+ icon: "sc-icon-Stock",
title: "库存管理",
},
children: [{
- name: "dashboard",
- path: "/dashboard",
+ name: "stock",
+ path: "/stock",
component: "home",
meta: {
icon: "sc-icon-Console",
title: "库存列表",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "statistics",
+ path: "/statistics",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
title: "库存统计",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "accessForm",
+ path: "/access-form",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
@@ -124,28 +124,28 @@ const routes = [
name: "sell",
path: "/sell",
meta: {
- icon: "sc-icon-Home",
+ icon: "sc-icon-Shipment",
title: "出货管理",
},
children: [{
- name: "dashboard",
- path: "/dashboard",
+ name: "shipment",
+ path: "/shipment",
component: "home",
meta: {
icon: "sc-icon-Console",
title: "出货清单",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "shipmentStatistics",
+ path: "/shipment-statistics",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
title: "出货统计",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "shipmentConfirm",
+ path: "/shipment-confirm",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
@@ -157,20 +157,20 @@ const routes = [
name: "finance",
path: "/finance",
meta: {
- icon: "sc-icon-Home",
+ icon: "sc-icon-Finance",
title: "财务管理",
},
children: [{
- name: "dashboard",
- path: "/dashboard",
+ name: "finance",
+ path: "/finance",
component: "home",
meta: {
icon: "sc-icon-Console",
title: "费用成本",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "financeSummary",
+ path: "/finance-summary",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
@@ -182,20 +182,20 @@ const routes = [
name: "report",
path: "/report",
meta: {
- icon: "sc-icon-Home",
+ icon: "sc-icon-ReportForms",
title: "报表统计",
},
children: [{
- name: "dashboard",
- path: "/dashboard",
+ name: "report",
+ path: "/report",
component: "home",
meta: {
icon: "sc-icon-Console",
title: "维保报表",
}
},{
- name: "usercenter",
- path: "/usercenter",
+ name: "outReport",
+ path: "/out-report",
component: "userCenter",
meta: {
icon: "sc-icon-UserInfo",
@@ -219,7 +219,7 @@ const routes = [
title: "系统设置",
}
},{
- name: "user",
+ name: "userManage",
path: "/setting/user",
component: "setting/user",
meta: {
diff --git a/src/layout/components/NavMenu.vue b/src/layout/components/NavMenu.vue
index 8d4d083..83cc1ce 100644
--- a/src/layout/components/NavMenu.vue
+++ b/src/layout/components/NavMenu.vue
@@ -5,7 +5,7 @@
-
+
{{navMenu.meta.title}}
diff --git a/src/layout/components/sideM.vue b/src/layout/components/sideM.vue
index e83dea1..82a01c9 100644
--- a/src/layout/components/sideM.vue
+++ b/src/layout/components/sideM.vue
@@ -123,7 +123,7 @@
}
-