Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
ybf
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
xulili
ybf
Commits
0b188f77
Commit
0b188f77
authored
Jan 09, 2020
by
xd
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://114.67.93.201/xulili/ybf
parents
07a507de
d82cf73e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1154 additions
and
196 deletions
+1154
-196
mail.vue
ybf_admin/src/pages/in/contact/mail.vue
+2
-2
index.vue
ybf_admin/src/pages/task/bar/index.vue
+401
-182
index.vue
ybf_admin/src/pages/task/com/index.vue
+432
-1
index.vue
ybf_admin/src/pages/task/count/index.vue
+300
-1
index.vue
ybf_admin/src/pages/task/main/index.vue
+19
-10
No files found.
ybf_admin/src/pages/in/contact/mail.vue
View file @
0b188f77
...
@@ -329,7 +329,7 @@ export default {
...
@@ -329,7 +329,7 @@ export default {
<
style
scoped
>
<
style
scoped
>
.top
{
.top
{
padding-bottom
:
10px
;
padding-bottom
:
10px
;
border-bottom
:
1px
solid
#f8f8f8
;
border-bottom
:
1px
solid
#f8f8f8
;
}
}
.end
{
.end
{
position
:
absolute
;
position
:
absolute
;
...
@@ -388,7 +388,7 @@ export default {
...
@@ -388,7 +388,7 @@ export default {
.left
{
.left
{
position
:
relative
;
position
:
relative
;
width
:
20%
;
width
:
20%
;
}
}
.left
,
.left
,
.right
{
.right
{
...
...
ybf_admin/src/pages/task/bar/index.vue
View file @
0b188f77
This diff is collapsed.
Click to expand it.
ybf_admin/src/pages/task/com/index.vue
View file @
0b188f77
This diff is collapsed.
Click to expand it.
ybf_admin/src/pages/task/count/index.vue
View file @
0b188f77
<
template
>
<
template
>
<div>
任务统计
</div>
<div
class=
"ztask-coms"
>
<div
class=
"ztask-searchs"
>
<div
class=
"ztask-searchs-items"
>
<el-button
size=
"small"
@
click=
"searchsCreate"
>
创建任务
</el-button>
<el-button
type=
"primary"
size=
"small"
@
click=
"searchsDels"
>
批量删除
</el-button>
</div>
<div
class=
"ztask-searchs-items"
>
<el-form
class=
"ztask-searchs-forms"
:inline=
"true"
:model=
"data.search"
label-width=
"auto"
>
<el-form-item
label=
"柜组"
>
<el-select
size=
"small"
v-model=
"data.search.bar"
placeholder=
"请选择柜组"
style=
"width:160px;"
>
<el-option
v-for=
"item in cache.list.bar"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"任务类型"
class=
"nature"
>
<el-select
size=
"small"
v-model=
"data.search.taskType"
placeholder=
"请选择任务类型"
style=
"width:160px;"
>
<el-option
v-for=
"item in cache.list.taskType"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"关键词"
>
<el-input
size=
"small"
v-model=
"data.search.keys"
style=
"width:160px"
placeholder=
"请输入关键词"
/>
</el-form-item>
</el-form>
<el-button
type=
"primary"
size=
"small"
@
click=
"searchsSearch"
>
搜 索
</el-button>
</div>
</div>
<div
class=
"ztask-lists"
>
<el-table
stripe
ref=
"multipleTable"
:data=
"list.main"
tooltip-effect=
"dark"
style=
"width: 100%"
@
selection-change=
"listsSelectChange"
>
<el-table-column
type=
"selection"
width=
"60"
></el-table-column>
<el-table-column
prop=
"taskName"
label=
"任务名称"
align=
"center"
width=
"200"
></el-table-column>
<el-table-column
prop=
"taskDetail"
label=
"任务内容"
align=
"center"
></el-table-column>
<el-table-column
label=
"创建日期"
align=
"center"
width=
"160"
>
<template
slot-scope=
"scope"
>
{{
scope
.
row
.
createTime
}}
</
template
>
</el-table-column>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
width=
"240"
>
<
template
slot-scope=
"scope"
>
<el-button
v-if=
"scope.row.taskStatus === 'Top'"
type=
"text"
@
click=
"listsUntopClick(scope.row.id)"
>
已置顶
</el-button>
<el-button
v-if=
"scope.row.taskStatus !== 'Top'"
type=
"text"
@
click=
"listsTopClick(scope.row.id)"
>
置顶
</el-button>
<el-button
type=
"text"
@
click=
"listsSeeClick(scope.row)"
>
详情
</el-button>
<el-button
type=
"text"
@
click=
"listsEditClick(scope.row)"
>
编辑
</el-button>
<el-button
type=
"text"
@
click=
"listsDelClick(scope.row)"
class=
"listButtonRed"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
</div>
<div
class=
"ztask-pages"
>
<!-- <el-pagination-->
<!-- class="ztask-page"-->
<!-- @size-change="pagesSizeChange"-->
<!-- @current-change="pagesNowPageChange"-->
<!-- :current-page="data.page.nowPageNum"-->
<!-- :page-sizes="[100, 200, 300, 400]"-->
<!-- :page-size="100"-->
<!-- layout="prev, pager, next, sizes, jumper"-->
<!-- :total="400"-->
<!-- ></el-pagination>-->
</div>
</div>
</template>
</template>
<
script
>
export
default
{
components
:
{},
data
()
{
return
{
cache
:
{
status
:
{
},
list
:{
bar
:
[
{
id
:
"0"
,
name
:
"全部"
},
{
id
:
"1"
,
name
:
"柜组1"
}
],
taskType
:
[
{
id
:
"0"
,
name
:
"全部"
},
{
id
:
"1"
,
name
:
"测试"
}
],
}
},
list
:
{
main
:[
{
id
:
'1001'
,
taskName
:
'TaskComAlice'
,
taskDetail
:
'TaskComAliceDetail'
,
createTime
:
'2020-01-01 01:01:00'
,
taskStatus
:
'Top'
},
{
id
:
'1002'
,
taskName
:
'TaskComBob'
,
taskDetail
:
'TaskComBobDetail'
,
createTime
:
'2020-01-02 02:02:00'
,
taskStatus
:
''
},
{
id
:
'1003'
,
taskName
:
'TaskComClid'
,
taskDetail
:
'TaskComClidDetail'
,
createTime
:
'2020-01-03 03:03:00'
,
taskStatus
:
''
},
{
id
:
'1004'
,
taskName
:
'TaskComDive'
,
taskDetail
:
'TaskComDiveDetail'
,
createTime
:
'2020-01-04 04:04:00'
,
taskStatus
:
''
},
{
id
:
'1005'
,
taskName
:
'TaskComEmma'
,
taskDetail
:
'TaskComEmmaDetail'
,
createTime
:
'2020-01-05 05:05:00'
,
taskStatus
:
''
},
{
id
:
'1006'
,
taskName
:
'TaskComFaker'
,
taskDetail
:
'TaskComFakerDetail'
,
createTime
:
'2020-01-06 06:06:00'
,
taskStatus
:
''
},
{
id
:
'1007'
,
taskName
:
'TaskComGlass'
,
taskDetail
:
'TaskComGlassDetail'
,
createTime
:
'2020-01-07 07:07:00'
,
taskStatus
:
''
},
{
id
:
'1008'
,
taskName
:
'TaskComHardy'
,
taskDetail
:
'TaskComHardyDetail'
,
createTime
:
'2020-01-08 08:08:00'
,
taskStatus
:
''
},
{
id
:
'1009'
,
taskName
:
'TaskComIda'
,
taskDetail
:
'TaskComIdaDetail'
,
createTime
:
'2020-01-09 09:09:00'
,
taskStatus
:
''
},
{
id
:
'1010'
,
taskName
:
'TaskComJoke'
,
taskDetail
:
'TaskComJokeDetail'
,
createTime
:
'2020-01-10 10:10:00'
,
taskStatus
:
''
},
{
id
:
'1011'
,
taskName
:
'TaskComKey'
,
taskDetail
:
'TaskComKeyDetail'
,
createTime
:
'2020-01-11 11:11:00'
,
taskStatus
:
''
},
{
id
:
'1012'
,
taskName
:
'TaskComLux'
,
taskDetail
:
'TaskComLuxDetail'
,
createTime
:
'2020-01-12 12:12:00'
,
taskStatus
:
''
},
]
},
data
:
{
search
:{
bar
:
''
,
taskType
:
''
,
keys
:
''
,
},
page
:{
nowPageNum
:
''
,
}
},
rule
:{
}
};
},
created
()
{
},
methods
:
{
searchsCreate
(){},
searchsDels
(){},
searchsSearch
(){},
listsSelectChange
(){},
listsUntopClick
(){},
listsTopClick
(){},
listsSeeClick
(){},
listsEditClick
(){},
listsDelClick
(){},
pagesSizeChange
(){},
pagesNowPageChange
(){},
}
};
</
script
>
<
style
lang=
"scss"
scoped
>
.ztask-coms
{
/*border: 2px solid cyan;*/
height
:
calc
((
100vh
-
220px
)
*
1
.0
);
}
.ztask-searchs
{
/*border: 2px solid #0ea4c5;*/
height
:
70px
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
}
.ztask-searchs-items
{
border
:
2px
solid
#00c561
;
margin
:
17px
0px
20px
0px
;
width
:
auto
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
flex-start
;
align-items
:
center
;
}
.ztask-searchs-forms
{
/*border: 2px solid #f900ff;*/
height
:
30px
;
margin-bottom
:
10px
;
}
.ztask-lists
{
/*border: 2px solid #0dc50e;*/
height
:
calc
((
100vh
-
338px
)
*
1
.0
);
overflow
:
auto
;
}
.ztask-pages
{
/*border: 2px solid red;*/
/*height: 56px;*/
height
:
42px
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
flex-end
;
align-items
:
flex-end
;
}
.ztask-page
{
/*border: 2px solid red;*/
position
:
relative
;
margin-right
:
0
;
}
</
style
>
ybf_admin/src/pages/task/main/index.vue
View file @
0b188f77
<
template
>
<
template
>
<!--
<d2-container
type=
"card"
>
-->
<!--
<d2-container
type=
"card"
>
-->
<el-card
class=
"box-card mains"
>
<el-card
class=
"box-card mains"
>
<el-tabs
class=
"ztabs"
v-model=
"cache.nowMenu"
@
tab-click=
"
handle
Click"
>
<el-tabs
class=
"ztabs"
v-model=
"cache.nowMenu"
@
tab-click=
"
ztabs
Click"
>
<el-tab-pane
label=
"柜组任务"
name=
"taskBar"
>
<el-tab-pane
label=
"柜组任务"
name=
"taskBar"
>
<task-bar
/>
<task-bar
/>
</el-tab-pane>
</el-tab-pane>
...
@@ -32,22 +32,31 @@ export default {
...
@@ -32,22 +32,31 @@ export default {
nowMenu
:
"taskBar"
nowMenu
:
"taskBar"
}
}
};
};
},
methods
:{
ztabsClick
(){},
}
}
};
};
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.mains
{
.mains
{
border
:
1px
solid
red
;
/*border: 1px solid red;*/
height
:
90vh
;
height
:
calc
((
100vh
-
140px
)
*
1
.0
);
margin
:
10px
10px
;
min-width
:
1000px
;
margin
:
10px
20px
10px
10px
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
flex-start
;
}
}
.ztabs
{
.ztabs
{
// border: 2px solid red;
/*border: 2px solid darkviolet;*/
min-height
:
100vh
;
// min-height: 500px;
height
:
calc
((
100vh
-
180px
)
*
1
.0
);
}
d2-container
{
width
:
100%
;
overflow
:
hidden
;
}
}
</
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