Commit dc2a3baf authored by 冷冷's avatar 冷冷

💄 Updating the UI and style files.

parent cbc955d4
...@@ -16,52 +16,53 @@ ...@@ -16,52 +16,53 @@
*/ */
const DIC = { const DIC = {
vaild: [{ vaild: [{
label: '否', label: '否',
value: 'false' value: 'false'
}, { }, {
label: '是', label: '是',
value: 'true' value: 'true'
}] }]
} }
export const tableOption = { export const tableOption = {
'border': true, 'border': true,
'index': true, 'index': true,
'indexLabel': '序号', 'indexLabel': '序号',
'stripe': true, 'stripe': true,
'menuAlign': 'center', 'menuAlign': 'center',
'align': 'center', 'align': 'center',
'addBtn': false, 'addBtn': false,
'editBtn': false, 'editBtn': false,
'delBtn': false, 'delBtn': false,
'dic': [], 'dic': [],
'column': [{ 'column': [{
label: '令牌', label: '用户ID',
prop: 'token_value', prop: 'user_id',
align: 'center' align: 'center'
}, { }, {
label: '用户ID', label: '用户名',
prop: 'user_id', prop: 'user_name',
align: 'center' align: 'center'
}, { }, {
label: '用户名', label: '令牌',
prop: 'user_name', prop: 'token_value',
align: 'center' align: 'center',
}, { 'overHidden': true
label: '类型', }, {
prop: 'token_type', label: '类型',
align: 'center' prop: 'token_type',
}, { align: 'center'
label: '过期时间', }, {
prop: 'expires_in', label: '过期时间',
align: 'center' prop: 'expires_in',
}, { align: 'center'
label: '客户端', }, {
prop: 'client_id', label: '客户端',
align: 'center' prop: 'client_id',
}, { align: 'center'
label: '授权类型', }, {
prop: 'grant_type', label: '授权类型',
align: 'center' prop: 'grant_type',
}] align: 'center'
}]
} }
...@@ -14,62 +14,85 @@ ...@@ -14,62 +14,85 @@
* this software without specific prior written permission. * this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com) * Author: lengleng (wangiegie@gmail.com)
*/ */
const DIC = {
isSuccess: [{
label: '成功',
value: 1
},
{
label: '失败',
value: 0
}
]
}
export const tableOption = { export const tableOption = {
'border': true, 'border': true,
'index': true, 'index': true,
'indexLabel': '序号', 'indexLabel': '序号',
'stripe': true, 'stripe': true,
'menuAlign': "center", 'menuAlign': "center",
'align': "center", 'align': "center",
'editBtn': false, 'editBtn': false,
'delBtn': false, 'delBtn': false,
'addBtn': false, 'addBtn': false,
'dic': [], 'viewBtn':true,
'column': [ 'dic': [],
{ 'column': [
label: 'ID', {
prop: 'id' label: 'ID',
}, prop: 'id',
{ hide: true
label: '任务名称', },
prop: 'jobName' {
}, label: '任务名称',
{ prop: 'jobName'
label: '任务ID', },
prop: 'taskId' {
}, label: '任务ID',
{ prop: 'taskId',
label: '主机名', hide: true,
prop: 'hostname' overHidden: true
}, },
{ {
label: 'IP', label: '主机名',
prop: 'ip' prop: 'hostname',
}, hide: true
{ },
label: '分片项', {
prop: 'shardingItem' label: 'IP',
}, prop: 'ip'
{ },
label: '执行源', {
prop: 'executionSource' width: 80,
}, label: '分片项',
{ prop: 'shardingItem'
label: '失败原因', },
prop: 'failureCause' {
}, label: '执行源',
{ prop: 'executionSource',
label: '执行结果', hide: true
prop: 'isSuccess' },
}, {
{ label: '失败原因',
label: '开始时间', prop: 'failureCause',
prop: 'startTime' hide: true
}, },
{ {
label: '完成时间', width: 100,
prop: 'completeTime' label: '执行结果',
}, prop: 'isSuccess',
] type: 'select',
dicData: DIC.isSuccess,
},
{
label: '开始时间',
prop: 'startTime',
hide: true
},
{
label: '完成时间',
prop: 'completeTime'
},
]
} }
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
const DIC = { const DIC = {
state: [{ state: [{
label: '准备中', label: '准备中',
value: 'TASK_STAGING' value: 'TASK_STAGING'
}, },
{ {
label: '执行中', label: '执行中',
value: 'TASK_RUNNING' value: 'TASK_RUNNING'
...@@ -39,12 +39,13 @@ export const tableOption = { ...@@ -39,12 +39,13 @@ export const tableOption = {
"editBtn": false, "editBtn": false,
"delBtn": false, "delBtn": false,
"addBtn": false, "addBtn": false,
"viewBtn": true,
"dic": [], "dic": [],
"column": [{ "column": [{
label: 'ID', label: 'ID',
prop: 'id', prop: 'id',
hide: true hide: true
}, },
{ {
label: '作业名称', label: '作业名称',
prop: 'jobName', prop: 'jobName',
...@@ -73,28 +74,31 @@ export const tableOption = { ...@@ -73,28 +74,31 @@ export const tableOption = {
{ {
label: '执行类型', label: '执行类型',
prop: 'executionType', prop: 'executionType',
hide: true, hide: true
width: 100
}, },
{ {
width: 100,
label: '分片项', label: '分片项',
prop: 'shardingItem' prop: 'shardingItem'
}, },
{ {
width: 100,
label: '状态', label: '状态',
prop: 'state', prop: 'state',
type: 'select', type: 'select',
dicData: DIC.state, dicData: DIC.state,
search: true search: true
}, },
{
label: '创建时间',
prop: 'creationTime'
},
{ {
label: '消息', label: '消息',
prop: 'message', prop: 'message',
width: 100 width: 100,
overHidden: true,
hide: true
},
{
label: '创建时间',
prop: 'creationTime'
} }
] ]
} }
\ No newline at end of file
...@@ -28,13 +28,6 @@ ...@@ -28,13 +28,6 @@
@row-update="handleUpdate" @row-update="handleUpdate"
@row-save="handleSave" @row-save="handleSave"
@row-del="rowDel"> @row-del="rowDel">
<template slot="menuLeft">
<el-button type="primary"
@click="handleAdd"
size="small"
v-if="permissions.daemon_execution_log_add">新 增</el-button>
<br /><br />
</template>
<template slot-scope="scope" <template slot-scope="scope"
slot="menu"> slot="menu">
<el-button type="text" <el-button type="text"
...@@ -78,10 +71,11 @@ ...@@ -78,10 +71,11 @@
this.tableLoading = true this.tableLoading = true
fetchList(Object.assign({ fetchList(Object.assign({
page: page.currentPage, page: page.currentPage,
limit: page.pageSize limit: page.pageSize,
descs: 'start_time'
}, params)).then(response => { }, params)).then(response => {
this.tableData = response.data.records this.tableData = response.data.data.records
this.page.total = response.data.total this.page.total = response.data.data.total
this.tableLoading = false this.tableLoading = false
}) })
}, },
......
const url = 'http://zn.huaxiadaowei.com' const url = 'http://127.0.0.1:9999'
module.exports = { module.exports = {
lintOnSave: true, lintOnSave: true,
productionSourceMap: false, productionSourceMap: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment