Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
Project
Project
Details
Activity
Releases
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
黄媛媛
ElectricitySheep
Commits
0dd33c4e
Commit
0dd33c4e
authored
Sep 01, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
41e1b0f3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
29 deletions
+16
-29
materialMan.vue
src/components/CommodityMan/materialMan.vue
+0
-3
Choosevideo.vue
src/components/global/Choosevideo.vue
+16
-26
No files found.
src/components/CommodityMan/materialMan.vue
View file @
0dd33c4e
...
...
@@ -117,9 +117,7 @@
:content=
"item.Name"
placement=
"top-start"
>
<div
@
click=
"PageSelect(item,index)"
:class=
"item.Selected ? 'selected' :''"
class=
"el-tooltip item material-item "
>
<img
:src=
"getIconLink(item.Image)"
class=
"material-img"
style=
"width: 140px; height: 140px;"
>
<div
class=
"material-video-info"
><i
class=
"el-icon-video-play"
></i>
<span>
{{
Time
(
item
.
VideoTime
)
}}
</span></div>
<div
flex=
"dir:left"
style=
"margin-top: 5px;"
>
...
...
@@ -475,7 +473,6 @@
that
.
addpageMsg
.
Image
=
res
.
VideoCoverImg
;
that
.
addpageMsg
.
Path
=
res
.
FileUrl
;
that
.
addpageMsg
.
Name
=
res
.
FileName
;
that
.
addPageList
();
that
.
$forceUpdate
();
}
...
...
src/components/global/Choosevideo.vue
View file @
0dd33c4e
...
...
@@ -42,7 +42,7 @@
<div
class=
"basefix app-attachment-list"
>
<div
class=
"material-item material-upload"
>
<el-upload
class=
"avatar-uploader"
action=
""
accept=
"video/mp4,video/ogg,video/webm"
:show-file-list=
"false"
:http-request=
"Upload
Image
"
>
:http-request=
"Upload
Video
"
>
<div
class=
"app-upload"
flex=
"main:center cross:center"
style=
"width: 100px; height: 100px;"
>
<i
class=
"el-icon-upload"
></i>
</div>
...
...
@@ -52,21 +52,13 @@
placement=
"top-start"
>
<div
@
click=
"PageSelect(item,index)"
:class=
"selectId==item.Id ? 'selected' :''"
class=
"el-tooltip item material-item "
>
<img
:src=
"getIconLink(item.Path)+'?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast'"
class=
"material-img"
style=
"width: 100px; height: 100px;"
>
<img
:src=
"getIconLink(item.Image)"
class=
"material-img"
style=
"width: 100px; height: 100px;"
>
<div
class=
"material-video-info"
><i
class=
"el-icon-video-play"
></i>
<span>
{{
item
.
VideoTime
}}
</span></div>
<div
flex=
"dir:left"
style=
"margin-top: 5px;"
>
<div
class=
"material-name"
>
{{
item
.
Name
}}
</div>
<!--
<div
style=
"margin: 0px 5px;"
>
|
</div>
<div>
<button
type=
"button"
class=
"el-button el-button--text"
style=
"padding: 0px;"
>
<span
@
click=
"EditPage(item)"
>
编辑
</span>
</button>
</div>
-->
</div>
</div>
</el-tooltip>
</div>
<div
style=
"padding-right:10px"
>
<el-pagination
style=
"text-align:right"
background
:current-page=
"currentPage4"
...
...
@@ -87,9 +79,6 @@
show-word-limit
>
</el-input>
</el-form-item>
<!--
<el-form-item
label=
"排序"
prop=
"Sort"
>
<el-input
@
keyup
.
native=
"checkInteger(addGroupMsg,'Sort')"
size=
"small"
v-model=
"addGroupMsg.Sort"
></el-input>
</el-form-item>
-->
</el-form>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"small"
@
click=
"addGroupMsgDig = false"
>
取 消
</el-button>
...
...
@@ -165,9 +154,6 @@
selectId
:
-
1
,
emitmsg
:
{},
}
},
created
()
{
},
computed
:
{
NewItems
()
{
...
...
@@ -186,10 +172,22 @@
this
.
GetPageList
();
},
methods
:
{
//上传视频
UploadVideo
(
file
)
{
var
that
=
this
;
this
.
UploadSelfFile
(
this
.
FileType
().
Video
,
file
.
file
,
res
=>
{
if
(
res
.
resultCode
==
1
)
{
that
.
addpageMsg
.
Image
=
res
.
VideoCoverImg
;
that
.
addpageMsg
.
Path
=
res
.
FileUrl
;
that
.
addpageMsg
.
Name
=
res
.
FileName
;
that
.
addPageList
();
that
.
$forceUpdate
();
}
})
},
InitData
(
Type
)
{
this
.
czType
=
Type
;
this
.
selectId
=
-
1
;
},
SelectImgId
()
{
this
.
$emit
(
'Selectvideo'
,
this
.
emitmsg
)
...
...
@@ -209,18 +207,16 @@
this
.
apipost
(
"/api/product/SetMaterialInfo"
,
this
.
addpageMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
GetPageList
();
}
})
},
PageSelect
(
item
)
{
this
.
emitmsg
=
{
Path
:
this
.
domainManager
().
ImageUrl
+
item
.
Path
,
Path
:
item
.
Path
,
Id
:
item
.
Id
}
this
.
selectId
=
item
.
Id
;
},
addGroup
()
{
this
.
addGroupMsgDig
=
true
;
this
.
addGroupMsg
=
{
...
...
@@ -229,7 +225,6 @@
Type
:
2
,
Sort
:
''
,
}
},
HsGroup
(
item
)
{
let
that
=
this
;
...
...
@@ -245,7 +240,6 @@
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
GetMemberGradeList
();
this
.
Success
(
res
.
data
.
message
)
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
@@ -274,7 +268,6 @@
this
.
GetMemberGradeList
();
this
.
Success
(
res
.
data
.
message
)
this
.
addGroupMsgDig
=
false
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
@@ -308,11 +301,8 @@
this
.
total
=
res
.
data
.
data
.
count
;
let
data
=
res
.
data
.
data
.
pageData
;
this
.
PageList
=
data
;
})
},
},
}
...
...
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