Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mould-vuecli3
Project
Project
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
Open sidebar
lhfe
mould-vuecli3
Commits
ad58411b
Commit
ad58411b
authored
Aug 28, 2020
by
yimj
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of gitlab.ilaihua.com:laihua-web/laihua-toolkit into develop
# Conflicts: # src/views/screenshot.vue
parents
e2490995
74fbaf1b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
66 deletions
+73
-66
App.vue
src/App.vue
+13
-13
index.vue
src/components/header/index.vue
+6
-6
modalLayer.vue
src/components/modal/modalLayer.vue
+5
-5
index.vue
src/components/rightPanel/index.vue
+3
-3
index.vue
src/components/sideNav/index.vue
+14
-14
screenshot.vue
src/views/screenshot.vue
+32
-25
No files found.
src/App.vue
View file @
ad58411b
...
@@ -32,21 +32,21 @@ export default {
...
@@ -32,21 +32,21 @@ export default {
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
#app
{
#app
{
font-family
:
Avenir
,
Helvetica
,
Arial
,
sans-serif
;
font-family
:
Avenir
,
Helvetica
,
Arial
,
sans-serif
;
-webkit-font-smoothing
:
antialiased
;
-webkit-font-smoothing
:
antialiased
;
-moz-osx-font-smoothing
:
grayscale
;
-moz-osx-font-smoothing
:
grayscale
;
text-align
:
center
;
text-align
:
center
;
color
:
#2c3e50
;
color
:
#2c3e50
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
height
:
100vh
;
height
:
100vh
;
position
:
relative
;
position
:
relative
;
}
}
.body-container
{
.body-container
{
flex
:
1
;
flex
:
1
;
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
overflow
:
hidden
;
overflow
:
hidden
;
}
}
</
style
>
</
style
>
src/components/header/index.vue
View file @
ad58411b
...
@@ -35,11 +35,11 @@ export default {
...
@@ -35,11 +35,11 @@ export default {
<
style
scoped
lang=
"scss"
>
<
style
scoped
lang=
"scss"
>
/* @import url(); 引入css类 */
/* @import url(); 引入css类 */
.comp-commonheader
{
.comp-commonheader
{
width
:
100%
;
width
:
100%
;
height
:
100px
;
height
:
100px
;
border
:
1px
solid
pink
;
border
:
1px
solid
pink
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
flex-start
;
justify-content
:
flex-start
;
}
}
</
style
>
</
style
>
src/components/modal/modalLayer.vue
View file @
ad58411b
...
@@ -22,10 +22,10 @@ export default {
...
@@ -22,10 +22,10 @@ export default {
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.modal-layer
{
.modal-layer
{
position
:
absolute
;
position
:
absolute
;
left
:
0
;
left
:
0
;
top
:
0
;
top
:
0
;
width
:
0
;
width
:
0
;
height
:
0
;
height
:
0
;
}
}
</
style
>
</
style
>
src/components/rightPanel/index.vue
View file @
ad58411b
...
@@ -17,8 +17,8 @@ export default {
...
@@ -17,8 +17,8 @@ export default {
<
style
scoped
lang=
"scss"
>
<
style
scoped
lang=
"scss"
>
/* @import url(); 引入css类 */
/* @import url(); 引入css类 */
.comp-rightpanel
{
.comp-rightpanel
{
width
:
150px
;
width
:
150px
;
height
:
100%
;
height
:
100%
;
border
:
1px
solid
skyblue
;
border
:
1px
solid
skyblue
;
}
}
</
style
>
</
style
>
src/components/sideNav/index.vue
View file @
ad58411b
...
@@ -31,22 +31,22 @@ export default {
...
@@ -31,22 +31,22 @@ export default {
<
style
scoped
lang=
"scss"
>
<
style
scoped
lang=
"scss"
>
/* @import url(); 引入css类 */
/* @import url(); 引入css类 */
.comp-sidenav
{
.comp-sidenav
{
padding
:
30px
;
padding
:
30px
;
// width: 100px;
// width: 100px;
border
:
1px
solid
skyblue
;
border
:
1px
solid
skyblue
;
height
:
100%
;
height
:
100%
;
// display: flex;
// display: flex;
a
{
a
{
font-weight
:
bold
;
font-weight
:
bold
;
color
:
#2c3e50
;
color
:
#2c3e50
;
display
:
inline-block
;
display
:
inline-block
;
width
:
100%
;
width
:
100%
;
padding
:
10px
0
;
padding
:
10px
0
;
&
.router-link-exact-active
{
&
.router-link-exact-active
{
color
:
#42b983
;
color
:
#42b983
;
}
}
}
}
}
}
</
style
>
</
style
>
src/views/screenshot.vue
View file @
ad58411b
...
@@ -10,13 +10,23 @@
...
@@ -10,13 +10,23 @@
></video>
></video>
</div>
</div>
<div
class=
"operate-area"
>
<div
class=
"operate-area"
>
<input
<div
class=
"play-area"
>
id=
"screenshot-input"
<input
type=
"file"
id=
"screenshot-input"
style=
"display:none;"
type=
"file"
@
change=
"changeFile"
style=
"display:none;"
>
@
change=
"changeFile"
<label
id=
"select-btn"
>
选择文件
</label>
>
<label
id=
"select-btn"
>
<span>
选择文件
</span>
</label>
</div>
<div
class=
"time-area"
>
<div
id=
"ss-time-line"
>
<div
class=
"track"
></div>
</div>
</div>
<div
class=
"clip-area"
></div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
@@ -26,7 +36,10 @@ export default {
...
@@ -26,7 +36,10 @@ export default {
name
:
'Screenshot'
,
name
:
'Screenshot'
,
data
()
{
data
()
{
return
{
return
{
srcUrl
:
null
srcUrl
:
null
,
videoEle
:
null
,
current
:
0
,
duration
:
10
}
}
},
},
created
()
{},
created
()
{},
...
@@ -51,24 +64,11 @@ export default {
...
@@ -51,24 +64,11 @@ export default {
//loadedmetadata
//loadedmetadata
},
},
methods
:
{
methods
:
{
selectClick
()
{},
changeFile
(
e
)
{
changeFile
(
e
)
{
//console.log('changeFile', e)
//console.log('changeFile', e)
if
(
e
.
target
.
files
[
0
])
{
if
(
e
.
target
.
files
[
0
])
{
this
.
srcUrl
=
URL
.
createObjectURL
(
e
.
target
.
files
[
0
])
this
.
srcUrl
=
URL
.
createObjectURL
(
e
.
target
.
files
[
0
])
// let _this = this
// let reader = new FileReader()
// reader.addEventListener(
// 'load',
// () => {
// console.log('_this.srcUrl', this)
// _this.srcUrl = reader.result
// },
// false
// )
// reader.readAsDataURL(e.target.files[0])
}
}
//e.target
}
}
}
}
}
}
...
@@ -76,20 +76,27 @@ export default {
...
@@ -76,20 +76,27 @@ export default {
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.screenshot
{
.screenshot
{
position
:
relative
;
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
margin
:
30px
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
.content
{
.content
{
height
:
90%
;
height
:
100%
;
margin
:
20px
30px
;
margin
:
20px
30px
;
background-color
:
lightcyan
;
background-color
:
lightcyan
;
}
}
.operate-area
{
.operate-area
{
background-color
:
aqua
;
height
:
200px
;
display
:
flex
;
flex-shrink
:
0
;
#select-btn
{
#select-btn
{
width
:
200px
;
background-color
:
bisque
;
height
:
100px
;
width
:
100px
;
height
:
30px
;
line-height
:
30px
;
}
}
}
}
}
}
...
...
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