|
@@ -109,17 +109,6 @@ export default [{
|
|
|
{ path: '/auth', name: 'auth', component: auth },
|
|
|
{ path: '/noUser', name: 'noUser', component: noUser },
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
- { path: '/dataUtil', name: 'dataUtil', component: LayoutMain, children: [{ path: 'index', component: dataUtil }] },
|
|
|
-
|
|
|
- {
|
|
|
- path: '/splitScreen',
|
|
|
- name: 'splitScreen',
|
|
|
- component: splitScreen,
|
|
|
- children: [
|
|
|
- { path: 'spaceledger', name: 'spaceLedger', component: spaceLedger },
|
|
|
- { path: 'integrateresults', name: 'integrateResults', component: integrateResults }
|
|
|
-=======
|
|
|
{
|
|
|
path: '/dataUtil',
|
|
|
name: 'dataUtil',
|
|
@@ -127,7 +116,6 @@ export default [{
|
|
|
children: [
|
|
|
{ path: 'index', component: dataUtil },
|
|
|
{ path: 'index2', component: dataUtil2 }
|
|
|
->>>>>>> 37001d3372c630523546307a3029267b6cab6664
|
|
|
]
|
|
|
},
|
|
|
|