From 1cb33495ac0de7c77f7164669f28a42b13c02c60 Mon Sep 17 00:00:00 2001 From: guoapeng Date: Fri, 1 Aug 2025 13:52:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/system.ts | 1 + src/components/user/Edit/index.vue | 18 +++++------ src/layouts/default.vue | 2 +- src/router/routes.ts | 63 +++++--------------------------------- src/types/system.d.ts | 6 ++++ src/views/setting/device/index.vue | 48 +++++++++++++++++++++++++---- src/views/setting/index.vue | 35 ++++++++++++--------- src/views/setting/user/index.vue | 42 +++++++++++++++++++++++-- 8 files changed, 124 insertions(+), 91 deletions(-) diff --git a/src/apis/system.ts b/src/apis/system.ts index 3e059c9..54b45e6 100644 --- a/src/apis/system.ts +++ b/src/apis/system.ts @@ -11,3 +11,4 @@ export const setTime = (params: { epochMilli?: number }): Promise => http. export const configList = (params: System.Page = { pageNum: 1, pageSize: 999 }): Promise> => http.post('/system-config/list', params) export const updateConfig = (params: System.SystemConfig): Promise => http.put('/system-config', params) export const sync = (params: any): Promise => http.post('/device/sync', params) +export const getDeviceInfo = (): Promise => http.get('/device/device-info') diff --git a/src/components/user/Edit/index.vue b/src/components/user/Edit/index.vue index c612ace..db72b56 100644 --- a/src/components/user/Edit/index.vue +++ b/src/components/user/Edit/index.vue @@ -85,8 +85,6 @@ const okHandle = async () => { await updateUser(form.value) } else { - form.value.deleted = 'DISABLE' - form.value.fixedUser = 'DISABLE' await addUser(form.value) } // 修改的是当前用户, 则退出登录 @@ -112,8 +110,8 @@ const roleList = [ value: 'ADMIN', }, { - label: '开发者', - value: 'DEVELOPER', + label: '仓库管理员', + value: 'STORE', }, { label: '普通用户', @@ -125,16 +123,16 @@ const roleList = [ diff --git a/src/layouts/default.vue b/src/layouts/default.vue index d6c517a..186c9af 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -182,7 +182,7 @@ const remoteControlState = computed(() => { img(src="../assets/images/logo.svg" alt="" @click="handleLogoClick") div(class="menu-box") el-tag( - v-for="item in menuList" + v-for="item in menuList.filter((item) => item.meta?.auth?.includes(systemStore.systemStatus.currentUser?.role))" :key="item.path" class="menu-tag" :effect="router.currentRoute.value.path.includes(item.path) ? 'dark' : 'plain'" diff --git a/src/router/routes.ts b/src/router/routes.ts index 7ac4f3e..2ee4c1d 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,28 +1,5 @@ import type { RouteRecordRaw } from 'vue-router' -import n_debug from 'assets/images/menuIcon/n_debug.svg' -import n_expe from 'assets/images/menuIcon/n_expe.svg' -import n_home from 'assets/images/menuIcon/n_home.svg' -import n_liquid from 'assets/images/menuIcon/n_liquid.svg' -import n_liquid_config from 'assets/images/menuIcon/n_liquid_config.svg' -import n_log from 'assets/images/menuIcon/n_log.svg' -import n_ore from 'assets/images/menuIcon/n_ore.svg' -import n_point from 'assets/images/menuIcon/n_point.svg' -import n_ps from 'assets/images/menuIcon/n_ps.svg' -import n_setting from 'assets/images/menuIcon/n_setting.svg' -import n_user from 'assets/images/menuIcon/n_user.svg' -import s_debug from 'assets/images/menuIcon/s_debug.svg' -import s_expe from 'assets/images/menuIcon/s_expe.svg' -import s_home from 'assets/images/menuIcon/s_home.svg' -import s_liquid from 'assets/images/menuIcon/s_liquid.svg' -import s_liquid_config from 'assets/images/menuIcon/s_liquid_config.svg' -import s_log from 'assets/images/menuIcon/s_log.svg' -import s_ore from 'assets/images/menuIcon/s_ore.svg' -import s_point from 'assets/images/menuIcon/s_point.svg' -import s_ps from 'assets/images/menuIcon/s_ps.svg' -import s_setting from 'assets/images/menuIcon/s_setting.svg' -import s_user from 'assets/images/menuIcon/s_user.svg' - const authRoutes: RouteRecordRaw[] = [ { path: '/home', @@ -31,8 +8,7 @@ const authRoutes: RouteRecordRaw[] = [ meta: { isDefault: true, title: '加液', - icon: n_home, - activeIcon: s_home, + auth: ['ADMIN', 'STORE', 'USER'], }, }, { @@ -42,8 +18,7 @@ const authRoutes: RouteRecordRaw[] = [ meta: { isDefault: true, title: '溶液管理', - icon: n_liquid_config, - activeIcon: s_liquid_config, + auth: ['ADMIN', 'STORE', 'USER'], }, }, { @@ -53,8 +28,7 @@ const authRoutes: RouteRecordRaw[] = [ meta: { isDefault: true, title: '加液配方', - icon: n_liquid, - activeIcon: s_liquid, + auth: ['ADMIN', 'STORE', 'USER'], }, }, { @@ -64,8 +38,7 @@ const authRoutes: RouteRecordRaw[] = [ meta: { isDefault: true, title: '领液记录', - icon: n_liquid, - activeIcon: s_liquid, + auth: ['ADMIN', 'STORE'], }, }, @@ -76,31 +49,18 @@ const authRoutes: RouteRecordRaw[] = [ meta: { isDefault: true, title: '审计', - icon: n_liquid_config, - activeIcon: s_liquid_config, - }, - }, - { - path: '/channel', - name: 'channel', - component: () => import('views/channel/index.vue'), - meta: { - isDefault: false, - title: '通道配置', - icon: n_ore, - activeIcon: s_ore, + auth: ['ADMIN'], }, }, { path: '/setting', name: 'setting', - redirect: '/setting/user', + redirect: '/setting/device', component: () => import('views/setting/index.vue'), meta: { isDefault: true, title: '设置', - icon: n_user, - activeIcon: s_user, + auth: ['ADMIN', 'STORE', 'USER'], }, children: [ { @@ -121,15 +81,6 @@ const authRoutes: RouteRecordRaw[] = [ title: '设备信息', }, }, - { - path: 'handle', - name: 'handle', - component: () => import('views/setting/handle/index.vue'), - meta: { - isDefault: false, - title: '手柄绑定', - }, - }, ], }, ] diff --git a/src/types/system.d.ts b/src/types/system.d.ts index 715898b..9117925 100644 --- a/src/types/system.d.ts +++ b/src/types/system.d.ts @@ -17,6 +17,12 @@ declare namespace System { status: 'start' | 'success' | 'fail' time: string } + interface DeviceInfo { + backendSoftwareVersion?: string + deviceSoftwareVersion?: string + remoteControlSoftwareVersion?: string + deviceSn?: string + } interface ChannelState { channelCode: 'CHANNEL_1' | 'CHANNEL_2' | 'CHANNEL_3' | 'CHANNEL_4' diff --git a/src/views/setting/device/index.vue b/src/views/setting/device/index.vue index 9c1f8cb..df60c37 100644 --- a/src/views/setting/device/index.vue +++ b/src/views/setting/device/index.vue @@ -1,4 +1,5 @@ diff --git a/src/views/setting/index.vue b/src/views/setting/index.vue index 7159ce6..5161472 100644 --- a/src/views/setting/index.vue +++ b/src/views/setting/index.vue @@ -1,4 +1,5 @@