Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bms-vue-obear
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
daywrite
bms-vue-obear
Commits
72be0c2f
Commit
72be0c2f
authored
Mar 26, 2019
by
huai.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对字段
parent
40985d8e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
9 deletions
+26
-9
app.scss
src/assets/css/app.scss
+5
-0
scheduleItem.vue
src/components/common/scheduleItem.vue
+14
-6
scheduleHome.vue
src/components/schedule_list/scheduleHome.vue
+7
-3
No files found.
src/assets/css/app.scss
View file @
72be0c2f
...
@@ -19,4 +19,9 @@
...
@@ -19,4 +19,9 @@
.el-dialog__title
{
.el-dialog__title
{
color
:white
;
color
:white
;
}
}
.is-disabled
{
color
:
#fff
!
important
;
background-color
:
#999
!
important
;
border-color
:
#888
!
important
;
}
}
}
src/components/common/scheduleItem.vue
View file @
72be0c2f
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
<span><img
class=
"user-avatar rounded-circle"
:src=
"item.createdBy.avatar.name"
>
{{
item
.
createdBy
.
name
}}
</span>
<span><img
class=
"user-avatar rounded-circle"
:src=
"item.createdBy.avatar.name"
>
{{
item
.
createdBy
.
name
}}
</span>
</el-col>
</el-col>
<el-col
:span=
"24"
>
<el-col
:span=
"24"
>
<span><i
class=
"fa fa-
connectdevelo
p"
aria-hidden=
"true"
></i>
{{
item
.
department
.
name
}}
</span>
<span><i
class=
"fa fa-
sitema
p"
aria-hidden=
"true"
></i>
{{
item
.
department
.
name
}}
</span>
<span
class=
"obear-schedule-left__private
"
:class=
"[isPublic ? 'colRed' : 'colGreen']
"
>
{{
isPublic
?
'私人'
:
'共享'
}}
</span>
<span
class=
"obear-schedule-left__private
colWhite
"
>
{{
isPublic
?
'私人'
:
'共享'
}}
</span>
</el-col>
</el-col>
</el-row>
</el-row>
</el-col>
</el-col>
...
@@ -105,6 +105,9 @@ export default {
...
@@ -105,6 +105,9 @@ export default {
color
:
green
;
color
:
green
;
border
:
1px
solid
green
;
border
:
1px
solid
green
;
}
}
.colWhite
{
color
:
white
;
}
.rounded-circle
{
.rounded-circle
{
border-radius
:
50%
!
important
;
border-radius
:
50%
!
important
;
}
}
...
@@ -144,18 +147,23 @@ export default {
...
@@ -144,18 +147,23 @@ export default {
}
}
span
{
span
{
display
:
inline-block
;
display
:
inline-block
;
padding-left
:
5px
;
//
padding-left: 5px;
}
}
i
{
i
{
display
:inline-block
;
display
:inline-block
;
padding-right
:
5px
;
padding-right
:
5px
;
}
}
img
{
display
:inline-block
;
margin-right
:
5px
;
}
@include
e
(
'private'
)
{
@include
e
(
'private'
)
{
display
:
inline-block
;
display
:
inline-block
;
padding-
righ
t
:
5px
;
padding-
lef
t
:
5px
;
border-radius
:
5px
;
border-radius
:
5px
;
width
:
40px
;
border
:
1px
solid
white
;
height
:
20px
;
width
:
35px
;
height
:
17px
;
}
}
}
}
@include
c
(
'schedule-right'
)
{
@include
c
(
'schedule-right'
)
{
...
...
src/components/schedule_list/scheduleHome.vue
View file @
72be0c2f
...
@@ -21,9 +21,9 @@
...
@@ -21,9 +21,9 @@
:key=
"item.id"
>
:key=
"item.id"
>
<span
slot=
"opearate"
class=
"obear-opearate-button"
>
<span
slot=
"opearate"
class=
"obear-opearate-button"
>
<el-button
type=
"primary"
size=
"mini"
@
click
.
prevent
.
stop=
"leaveMessageSch(item)"
><span
class=
"badge"
v-if=
"item.unread"
>
{{
item
.
unread
?
item
.
unread
:
''
}}
</span><i
class=
"fa fa-commenting"
></i>
留言
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click
.
prevent
.
stop=
"leaveMessageSch(item)"
><span
class=
"badge"
v-if=
"item.unread"
>
{{
item
.
unread
?
item
.
unread
:
''
}}
</span><i
class=
"fa fa-commenting"
></i>
留言
</el-button>
<el-button
type=
"primary"
size=
"mini"
><i
class=
"fa fa-calendar-check-o"
></i>
汇报
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click
.
prevent
.
stop=
"editSch(item)"
:disabled=
"!item.can_report"
><i
class=
"fa fa-calendar-check-o"
></i>
汇报
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click
.
prevent
.
stop=
"editSch(item)"
><i
class=
"fa fa-edit animated"
></i>
编辑
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click
.
prevent
.
stop=
"editSch(item)"
:disabled=
"!item.can_update"
><i
class=
"fa fa-edit animated"
></i>
编辑
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click
.
prevent
.
stop=
"deleteSch(item.id)"
><i
class=
"fa fa-trash-o animated-hove"
></i>
删除
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click
.
prevent
.
stop=
"deleteSch(item.id)"
:disabled=
"!item.can_delete"
><i
class=
"fa fa-trash-o animated-hove"
></i>
删除
</el-button>
</span>
</span>
</ScheduleItem>
</ScheduleItem>
<Pagenation
<Pagenation
...
@@ -227,5 +227,9 @@ export default {
...
@@ -227,5 +227,9 @@ export default {
vertical-align
:
baseline
;
vertical-align
:
baseline
;
border-radius
:
.25rem
;
border-radius
:
.25rem
;
}
}
i
{
display
:
inline-block
;
padding-right
:
3px
;
}
}
}
</
style
>
</
style
>
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