普通用户不应该具有用户管理权限、测试权限、删除历史记录权限、设置系统时间权限

src/apis/user.ts

@@ -2,7 +2,7 @@ import { createWebSocket } from 'libs/socket'
 
 const wsClient = createWebSocket()
 export const login = async (params: User.Login) => {
-  const res = await wsClient.waitAndSend({
+  return await wsClient.waitAndSend({
     messageType: 'Command',
     fnName: 'login',
     className: 'UserMgrService',
@@ -11,5 +11,4 @@ export const login = async (params: User.Login) => {
       ...params,
     },
   })
-  return res
 }

src/components/common/SoftKeyboard/index.vue

@@ -15,7 +15,7 @@ const emits = defineEmits<{
   (e: 'confirm', value: string): void
   (e: 'close'): void
 }>()
-const deviceStete = useDeviceStore()
+const deviceState = useDeviceStore()
 const languageType = ref('en')
 const inputValue = ref(props.modelValue)
 const cnList = ref<string[]>([])
@@ -41,7 +41,7 @@ onMounted(() => {
 const isOpen = ref(false)
 watchEffect(() => {
   // 在焦点内二次点击时不触发EventListener，做一下延迟处理
-  if (deviceStete.deviceInfo.deviceType !== deviceStete.deviceTypeMap.LargeSpaceDM_B) { // 大空间标准版
+  if (deviceState.deviceInfo.deviceType !== deviceState.deviceTypeMap.LargeSpaceDM_B) { // 大空间标准版
     setTimeout(() => {
       isOpen.value = props.isVisible
     }, 100)
@@ -52,7 +52,7 @@ watchEffect(() => {
 watch(
   () => props.isVisible,
   (newVal) => {
-    if (deviceStete.deviceInfo.deviceType !== deviceStete.deviceTypeMap.LargeSpaceDM_B) {
+    if (deviceState.deviceInfo.deviceType !== deviceState.deviceTypeMap.LargeSpaceDM_B) {
       isOpen.value = newVal
     }
   },

src/components/setting/History.vue

@@ -2,7 +2,7 @@
 // import { useSettingStore } from '@/stores/settingStore'
 import { syncSendCmd } from 'apis/system'
 import { ElMessageBox } from 'element-plus'
-import { onMounted, ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 
 import { FtMessage } from '@/libs/message'
 
@@ -93,13 +93,16 @@ const handleSelectionChange = (rows: Setting.History[]) => {
 const onClose = () => {
   visible.value = false
 }
+const deleteBtnVisible = computed(() => {
+  return JSON.parse(localStorage.user).roleType.includes('admin')
+})
 </script>
 
 <template>
   <div>
     <div class="history-export">
       <bt-button type="primary" button-text="导出" @click="onExportHistory" />
-      <bt-button type="primary" button-text="删除" @click="onDelHistory" />
+      <bt-button v-if="deleteBtnVisible" type="primary" button-text="删除" @click="onDelHistory" />
     </div>
     <div class="history-table">
       <el-table :data="tableData" style="width: 100%" height="100%" @selection-change="handleSelectionChange">

src/components/system/ErrorEventsModal.vue

@@ -8,7 +8,7 @@ const deviceStore = useDeviceStore()
 const appEvents = ref<Record<string, any>[]>([])
 
 watchEffect(() => {
-  appEvents.value = deviceStore.deviceStete.appEvents
+  appEvents.value = deviceStore.deviceState.appEvents
 })
 
 const confirmClose = (item: Record<string, any>) => {

src/layouts/default.vue

@@ -33,7 +33,7 @@ const workStateName = ref<string>('空闲')
 const disinfectState = ref(homeStore.disinfectionState.state)
 const liquidAddState = ref(liquidStore.liquidAddWorkState)
 const liquidDrainState = ref(liquidStore.liquidDrainWorkState)
-const deviceStete = ref(deviceStore.deviceStete)
+const deviceState = ref(deviceStore.deviceState)
 const sealInfo = ref(sealStore.sealInfo)
 const websocketConnected = ref(systemStore.websocketConnected)
 let touchStartTime = 0
@@ -63,7 +63,7 @@ const onFullScreen = () => {
 }
 
 const showDeviceStateName = () => {
-  if (deviceStete.value.state.toLocaleLowerCase() !== 'idle') {
+  if (deviceState.value.state.toLocaleLowerCase() !== 'idle') {
     if (disinfectState.value !== 'idle' && disinfectState.value !== 'finished') {
       workStateName.value = homeStore.disinfectionState.statedisplayName
     }
@@ -94,7 +94,7 @@ watchEffect(() => {
   // 加液/排液状态
   liquidAddState.value = liquidStore.liquidStateData
   liquidDrainState.value = liquidStore.liquidDrainWorkState
-  deviceStete.value = deviceStore.deviceStete
+  deviceState.value = deviceStore.deviceState
   // 密封测试状态
   sealInfo.value = sealStore.sealInfo
   showDeviceStateName()

src/router/routes.ts

@@ -13,6 +13,7 @@ import s_liquid from 'assets/images/menuIcon/s-liquid.svg'
 import s_seal from 'assets/images/menuIcon/s-seal.svg'
 import s_setting from 'assets/images/menuIcon/s-setting.svg'
 import { useDeviceStore } from 'stores/deviceStore'
+import pinia from 'stores/index'
 import { ref, watchEffect } from 'vue'
 import type { RouteRecordRaw } from 'vue-router'
 
@@ -110,8 +111,8 @@ const authRoutes = ref<RouteRecordRaw[]>([
 ])
 
 watchEffect(() => {
+  const deviceStore = useDeviceStore(pinia)
   setTimeout(() => {
-    const deviceStore = useDeviceStore()
     if (deviceStore.deviceInfo.deviceType === deviceStore.deviceTypeMap.LargeSpaceDM_B) { // 大空间标准版
       authRoutes.value = authRoutes.value.filter((item) => {
         return item.name !== 'seal' && item.name !== 'liquid'
@@ -132,6 +133,11 @@ watchEffect(() => {
         return item.name !== 'liquid'
       })
     }
+    if (!deviceStore.deviceState.loginUser.roleType.includes('admin')) { // 测试菜单
+      authRoutes.value = authRoutes.value.filter((item) => {
+        return item.name !== 'debug'
+      })
+    }
     /*    else { // 管道式
       authRoutes.value = authRoutes.value.filter((item) => {
         return item.name !== 'liquid'

src/stores/deviceStore.ts

@@ -34,25 +34,31 @@ export const useDeviceStore = defineStore('device', () => {
   const deviceInfo = ref<Device.DeviceInfo>(initDeviceInfo)
   // 使用deviceType区分是什么消毒机。低成本消毒机部署在移动pad，不显示软件键盘的开关。 拉杆消毒机是上位机显示软键盘
   // 暂时使用 deviceType ： ture 表示 为低成本。
-  const deviceStete = ref<Device.State>(initState) // 设备状态
+  const deviceState = ref<Device.State>(initState) // 设备状态
 
+
+  /**
+   * @function setDeviceState
+   * @desc 更新设备信息
+   * @param info
+   */
   const updateDeviceInfo = (info: Device.DeviceInfo) => {
     deviceInfo.value = info
   }
 
   /**
    * @function setDeviceState
-   * @param {Device.State} deviceInfo - 设备状态信息
-   * @desc 更新设备整体状态
+   * @desc 更新设备状态
+   * @param state
    */
-  const setDeviceState = (deviceInfo: Device.State) => {
-    deviceStete.value = deviceInfo
+  const setDeviceState = (state: Device.State) => {
+    deviceState.value = state
   }
 
   return {
     deviceTypeMap,
     deviceInfo,
-    deviceStete,
+    deviceState,
     updateDeviceInfo,
     setDeviceState,
   }

src/stores/settingStore.ts

@@ -10,18 +10,23 @@ export const useSettingStore = defineStore('setting', () => {
   const settingMenus = [{
     name: '消毒历史记录',
     code: 'history',
+    roleType: 'admin,maintainer',
   }, {
     name: '消毒默认配置',
     code: 'defaultFormula',
+    roleType: 'admin,maintainer',
   }, {
     name: '用户管理',
     code: 'user',
+    roleType: 'admin',
   }, {
     name: '日期设置',
     code: 'date',
+    roleType: 'admin',
   }, {
     name: '设备信息',
     code: 'deviceInfo',
+    roleType: 'admin,maintainer',
   }]
 
   // 历史记录数据

src/types/device.d.ts

@@ -1,7 +1,7 @@
 declare namespace Device {
   interface State {
     appEvents: Array
-    loginUser: User.LoginUsr
+    loginUser: User.LoginUser
     state: string
   }
 

src/types/user.d.ts

@@ -25,7 +25,7 @@ declare namespace User {
     pwd: string
   }
 
-  interface LoginUsr {
+  interface LoginUser {
     isLogin: boolean
     name: string
     roleType: string

src/views/debug/index.vue

@@ -8,7 +8,7 @@ import { ref, watchEffect } from 'vue'
 
 const homeStore = useHomeStore()
 const debugStore = useDebugStore()
-const deviceStete = useDeviceStore()
+const deviceState = useDeviceStore()
 const h2O2SensorData = ref<Home.DisplayrelyMgrParams[]>(homeStore.h2O2SensorData)
 const sprayPumpGpmValue = ref<number>(5)
 const airLeakDetectTestMode = ref<string>('disinfection')
@@ -223,7 +223,7 @@ const printerDoTest = () => {
       <div class="debug-lower">
         <section>
           <div>
-            <div v-if="deviceStete.deviceInfo.deviceType !== deviceStete.deviceTypeMap.LargeSpaceDM_B" class="debug-left-lh">
+            <div v-if="deviceState.deviceInfo.deviceType !== deviceState.deviceTypeMap.LargeSpaceDM_B" class="debug-left-lh">
               <div class="debug-label">
                 加液泵控制：
               </div>
@@ -259,7 +259,7 @@ const printerDoTest = () => {
                 <bt-button button-text="关闭" @click="heatingDoClose" />
               </div>
             </div>
-            <div v-if="deviceStete.deviceInfo.deviceType !== deviceStete.deviceTypeMap.LargeSpaceDM_B" class="debug-left-lh">
+            <div v-if="deviceState.deviceInfo.deviceType !== deviceState.deviceTypeMap.LargeSpaceDM_B" class="debug-left-lh">
               <div class="debug-label">
                 气密性阀门模式：
               </div>

src/views/login/index.vue

@@ -6,6 +6,7 @@ import password from 'assets/images/password_icon.svg'
 import user from 'assets/images/user_icon.svg'
 import SoftKeyboard from 'components/common/SoftKeyboard/index.vue'
 import { nanoid } from 'nanoid'
+import { useDeviceStore } from 'stores/deviceStore'
 import { useSystemStore } from 'stores/systemStore'
 import { ref, watchEffect } from 'vue'
 import { useRouter } from 'vue-router'
@@ -15,6 +16,7 @@ import { setToken } from '@/libs/token'
 
 const router = useRouter()
 const sys = useSystemStore()
+const deviceStore = useDeviceStore()
 const formRef = ref()
 const loading = ref(false)
 const inputValue = ref('')
@@ -71,6 +73,7 @@ const loginHandle = async () => {
         syncSendCmd(params).then((res) => {
           if (res.ackcode === 0) {
             localStorage.setItem('user', JSON.stringify(res.rely.loginUser))
+            deviceStore.setDeviceState(res.rely.loginUser)
           }
         })
         await router.push('/home')

src/views/setting/index.vue

@@ -9,7 +9,8 @@ import User from '@/components/setting/User.vue'
 import { useSettingStore } from '@/stores/settingStore'
 
 const settingStore = useSettingStore()
-const settingMenus = settingStore.settingMenus
+const currentUserRoleType = JSON.parse(localStorage.user).roleType
+const settingMenus = settingStore.settingMenus.filter((item): boolean => item.roleType.includes(currentUserRoleType))
 const selectedMenuCode = ref('history')
 // 选择菜单项的方法
 const selectItem = (menuCode: string) => {