From de74bcd66268c5ac54036bd014de3a21d409195f Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 9 Jan 2025 15:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 3 - src/components/Navmenu/index.vue | 10 +- src/components/header/index.vue | 60 +----- src/layout/header.vue | 61 +----- src/views/equip/detail.vue | 19 +- src/views/parity/index.vue | 7 +- src/views/user/index.vue | 41 +++- .../components/order-details.vue | 176 +++--------------- .../orderManagement/components/order-home.vue | 4 +- .../components/order-details.vue | 176 +++--------------- .../components/order-home.vue | 10 +- 11 files changed, 126 insertions(+), 441 deletions(-) diff --git a/components.d.ts b/components.d.ts index 06def7a..4676a52 100644 --- a/components.d.ts +++ b/components.d.ts @@ -29,7 +29,6 @@ declare module 'vue' { ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] @@ -37,7 +36,6 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] - ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] @@ -47,7 +45,6 @@ declare module 'vue' { ElSelect: typeof import('element-plus/es')['ElSelect'] ElStep: typeof import('element-plus/es')['ElStep'] ElSteps: typeof import('element-plus/es')['ElSteps'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] diff --git a/src/components/Navmenu/index.vue b/src/components/Navmenu/index.vue index 8830811..9b3064f 100644 --- a/src/components/Navmenu/index.vue +++ b/src/components/Navmenu/index.vue @@ -22,11 +22,11 @@ const navMenuList = computed(() => { { name: '首页', routerName: 'home' }, { name: '装备共享大厅', routerName: 'equipList' }, { name: '租赁需求大厅', routerName: 'parity' }, - { name: '装备管理', routerName: 'goodsManagement' }, - { name: '订单管理', routerName: 'orderManagementCz' }, - { name: '接单管理', routerName: 'accept-orders' }, - { name: '通知公告', routerName: 'enterpriseZone' }, - { name: '数据大屏', routerName: 'big-screen' }, + // { name: '装备管理', routerName: 'goodsManagement' }, + // { name: '订单管理', routerName: 'orderManagementCz' }, + // { name: '接单管理', routerName: 'accept-orders' }, + { name: '公告', routerName: 'enterpriseZone' }, + // { name: '数据大屏', routerName: 'big-screen' }, ] if (isType == 2) return [ diff --git a/src/components/header/index.vue b/src/components/header/index.vue index 9290deb..95bccdf 100644 --- a/src/components/header/index.vue +++ b/src/components/header/index.vue @@ -194,6 +194,14 @@ const onJumpMessage = () => {
+
+ 消息 +
+
+
+ 个人中心 +
+
{ >注册 退出登录 -
-
-
- - - - - - {{ rolesName == 1 ? '出租方' : '承租方' }} - - - - -
- -
-
- 出租方 -
-
- 承租方 -
-
-
-
- 消息 -
-
-
- 个人中心 -
diff --git a/src/layout/header.vue b/src/layout/header.vue index f5746c4..562b396 100644 --- a/src/layout/header.vue +++ b/src/layout/header.vue @@ -271,12 +271,20 @@ const onJumpMessage = () => {
- {{ activeLoginCompanyName }} / {{ store.userInfo.nickName }}
+ +
+ 消息 +
+
+
+ 个人中心 +
+
登录 { >注册 退出登录 -
-
- - - - {{ isAdmin ? '管理方' : rolesName == 1 ? '出租方' : '承租方' }} - - - - -
- -
-
- 出租方 -
-
- 承租方 -
-
-
- -
- 消息 -
-
-
- 个人中心 -
-
-
@@ -404,7 +363,7 @@ const onJumpMessage = () => {
-
+
- 加入预约车 @@ -105,11 +94,7 @@ 立即承租 diff --git a/src/views/parity/index.vue b/src/views/parity/index.vue index 07e25b5..c98127b 100644 --- a/src/views/parity/index.vue +++ b/src/views/parity/index.vue @@ -175,12 +175,7 @@ > 需求详情
- +
{ - return allList.filter((e) => e.permission.includes(isType.value)) + if (rolesType.value == '承租方') return allList.filter((e) => e.permission.includes('2')) + if (rolesType.value == '出租方') return allList.filter((e) => e.permission.includes('1')) }) const activeItem = computed(() => { - return store.currentMenuItem + return 'sourcingNeed' }) router.push({ name: activeItem.value, }) + +const onChange = (val: any) => { + if (val == '承租方') { + router.push({ + name: 'sourcingNeed', + }) + } else { + router.push({ + name: 'goodsManagement', + }) + } +}