lishenfeng
/
tsg-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix():合并冲突

lsf-dev
李神峰 2024-09-23 13:52:54 +08:00
parent 97bde58ba9
commit 8971744caa
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/models/auth/_.ts
View File

@ -232,15 +232,15 @@ export async function loadMenu(): Promise<MenuItem[]> {
{ id: id(), title: '四预', redirect: '/mgr/sy/fhxzfx', icon: 'fxzb', { id: id(), title: '四预', redirect: '/mgr/sy/fhxzfx', icon: 'fxzb',
children: [ children: [
{ id: id(), title: '防洪形势', path: '/mgr/sy/fhxzfx'}, { id: id(), title: '防洪形势', path: '/mgr/sy/fhxzfx'},
// { id: id(), title: '天气预报', path: '/mgr/fxzb/tqyb'}, { id: id(), title: '天气预报', path: '/mgr/fxzb/tqyb'},
// { {
// id: id(), title: '洪水预报', redirect: '/mgr/fxzb/hsyb/hyybjs', id: id(), title: '洪水预报', redirect: '/mgr/fxzb/hsyb/hyybjs',
// children: [ children: [
// { id: id(), title: '洪水预报计算', path: '/mgr/fxzb/hsyb/hyybjs' }, { id: id(), title: '洪水预报计算', path: '/mgr/fxzb/hsyb/hyybjs' },
// { id: id(), title: '预报方案管理', path: '/mgr/fxzb/hsyb/ybfagl' }, { id: id(), title: '预报方案管理', path: '/mgr/fxzb/hsyb/ybfagl' },
// { id: id(), title: '参数管理', path: '/mgr/fxzb/hsyb/csgl' }, { id: id(), title: '参数管理', path: '/mgr/fxzb/hsyb/csgl' },
// ] ]
// }, },
{ id: id(), title: '防汛预案', path: '/mgr/sy/fxya'}, { id: id(), title: '防汛预案', path: '/mgr/sy/fxya'},
{ id: id(), title: '调度规程', path: '/mgr/sy/ddgc'}, { id: id(), title: '调度规程', path: '/mgr/sy/ddgc'},
{ {