joylink/xian-ncc-da-client
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m52s
Details

Browse Source
This commit is contained in:
joylink_fanyuhong 2024-11-20 09:21:14 +08:00
parent 9a6d4efedb
commit eafdc7b870
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/SysMenu.vue
View File

@ -125,11 +125,7 @@ const list = reactive([
}, },
{ {
show: true, show: true,
<<<<<<< HEAD
path: '/sysManage/alarmRecord',
=======
path: '/alarmInfo/list', path: '/alarmInfo/list',
>>>>>>> origin/develop
label: '报警管理', label: '报警管理',
icon: 'alarm_on', icon: 'alarm_on',
}, },