Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DA-Platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
文档服务地址:
http://47.92.0.57:3000/
周报索引地址:
http://47.92.0.57:3000/s/NruNXRYmV
Open sidebar
Berlin
DA-Platform
Commits
9e9c7d64
Commit
9e9c7d64
authored
Jun 01, 2020
by
Wang Yuhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合并
parent
9c31fe0d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
15 deletions
+0
-15
index.js
DAPlatform-front/src/router/index.js
+0
-15
No files found.
DAPlatform-front/src/router/index.js
View file @
9e9c7d64
import
Vue
from
'vue'
import
Vue
from
'vue'
import
Router
from
'vue-router'
import
Router
from
'vue-router'
<<<<<<<
HEAD
import
HelloWorld
from
'@/components/HelloWorld'
import
test1
from
'@/components/test1'
=======
import
Login
from
'../components/Login'
import
Login
from
'../components/Login'
import
userhome
from
'../components/UserHome'
import
userhome
from
'../components/UserHome'
import
TaskHall
from
'../components/Taskhall'
import
TaskHall
from
'../components/Taskhall'
...
@@ -21,7 +17,6 @@ import SelectedText from '../components/textAnnotation/SelectedText'
...
@@ -21,7 +17,6 @@ import SelectedText from '../components/textAnnotation/SelectedText'
import
Table
from
'../components/textAnnotation/Table'
import
Table
from
'../components/textAnnotation/Table'
import
imageAnnotiation
from
'../components/imageAnnotation/imageAnnotiation'
import
imageAnnotiation
from
'../components/imageAnnotation/imageAnnotiation'
import
layerAnnotation
from
'../components/imageAnnotation/layerAnnotation'
import
layerAnnotation
from
'../components/imageAnnotation/layerAnnotation'
>>>>>>>
1
bbb2e17abc83db9f556796abf7cad13a94852ad
Vue
.
use
(
Router
)
Vue
.
use
(
Router
)
...
@@ -117,18 +112,8 @@ export default new Router({
...
@@ -117,18 +112,8 @@ export default new Router({
},
},
{
{
path
:
'/'
,
path
:
'/'
,
<<<<<<<
HEAD
name
:
'HelloWorld'
,
component
:
HelloWorld
},
{
path
:
'/test1'
,
name
:
'test1'
,
component
:
test1
=======
name
:
'login'
,
name
:
'login'
,
component
:
Login
component
:
Login
>>>>>>>
1
bbb2e17abc83db9f556796abf7cad13a94852ad
}
}
]
]
})
})
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment