Skip to content

Commit

Permalink
fix width
Browse files Browse the repository at this point in the history
  • Loading branch information
itimor committed Sep 15, 2020
1 parent 476074f commit dd810aa
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion backend/tickets/management/commands/init_ticket.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def handle(self, *args, **options):
menumodel = Menu.objects.create(name='编辑工单', code='u_ticket', curl='/u_ticket/:id', icon='u_ticket', sequence=10, type=2,
hidden=True, active_menu='/new_ticket', parent_id=ticketmenu.id)
init_menu(menumodel)
menumodel = Menu.objects.create(name='处理工单', code='s_ticket', curl='/s_ticket/:id', icon='s_ticket', sequence=10, type=2,
menumodel = Menu.objects.create(name='审核工单', code='s_ticket', curl='/s_ticket/:id', icon='s_ticket', sequence=10, type=2,
hidden=True, active_menu='/todo_ticket', parent_id=ticketmenu.id)
init_menu(menumodel)
menumodel = Menu.objects.create(name='我的工单', code='my_ticket', curl='/my_ticket', icon='my_ticket', sequence=30, type=2,
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default {
new_ticket: 'new_ticket',
u_ticket: 'u_ticket',
s_ticket: 's_ticket',
c_ticket: 'c_ticket',
my_ticket: 'my_ticket',
todo_ticket: 'todo_ticket',
all_ticket: 'all_ticket',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ export default {
ticket: '工单系统',
new_ticket: '新建工单',
u_ticket: '编辑工单',
s_ticket: '处理工单',
s_ticket: '审核工单',
c_ticket: '查看工单',
my_ticket: '我创建的',
todo_ticket: '我的待办',
all_ticket: '所有工单',
Expand Down
19 changes: 10 additions & 9 deletions frontend/src/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,11 @@ code {
text-align: right;
padding-right: 20px;
transition: 600ms ease position;
background: linear-gradient(
90deg,
rgba(32, 182, 249, 1) 0%,
rgba(32, 182, 249, 1) 0%,
rgba(33, 120, 241, 1) 100%,
rgba(33, 120, 241, 1) 100%
);
background: linear-gradient(90deg,
rgba(32, 182, 249, 1) 0%,
rgba(32, 182, 249, 1) 0%,
rgba(33, 120, 241, 1) 100%,
rgba(33, 120, 241, 1) 100%);

.subtitle {
font-size: 20px;
Expand Down Expand Up @@ -211,6 +209,7 @@ code {
.table-pagination {
padding: 10px 0;
float: right;

.pagination-container {
margin: 0;
padding: 10px 0 !important;
Expand All @@ -231,9 +230,11 @@ p img {
.card-title {
font-weight: 700;
}

margin-bottom: 20px !important;
}

.ticket-form {
margin: 20px 200px !important ;
}
width: 900px;
margin: 0 auto;
}
2 changes: 1 addition & 1 deletion frontend/src/views/ticket/all_ticket.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<el-table-column label="名称" prop="name"></el-table-column>
<el-table-column label="工单流水号" prop="sn" width="240">
<template slot-scope="{ row }">
<router-link :to="'/s_ticket/' + row.id">
<router-link :to="'/c_ticket/' + row.id">
<el-link type="success">{{row.sn}}</el-link>
</router-link>
</template>
Expand Down

0 comments on commit dd810aa

Please sign in to comment.