Merge pull request #62 from menghaoranss/1020
Fixes ui display style
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/lang/en-US.js b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/lang/en-US.js
index f3c79d4..8253963 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/lang/en-US.js
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/lang/en-US.js
@@ -226,6 +226,7 @@
labelInfo: {
serverIp: 'Server IP',
instancesNum: 'Instance count',
+ instanceCount: 'Instance count',
jobsNum: 'Job num',
disabledJobsNum: 'Disabled jobs num',
jobName: 'Job name',
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
index 06e5d58..2bbb4d9 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
@@ -71,7 +71,7 @@
</el-table-column>
<el-table-column
:label="$t('operationJobs.table.operate')"
- fixed="right" width="300">
+ fixed="right" width="100">
<template slot-scope="scope">
<el-button-group>
<el-button
@@ -108,28 +108,23 @@
column: [
{
label: this.$t('operationJobs').labelInfo.item,
- prop: 'item',
- width : 200
+ prop: 'item'
},
{
label: this.$t('operationJobs').labelInfo.serverIp,
- prop: 'serverIp',
- width : 140
+ prop: 'serverIp'
},
{
label: this.$t('operationJobs').labelInfo.instanceId,
- prop: 'instanceId',
- width : 100
+ prop: 'instanceId'
},
{
label: this.$t('operationJobs').labelInfo.status,
- prop: 'status',
- width : 120
+ prop: 'status'
},
{
label: this.$t('operationJobs').labelInfo.failover,
- prop: 'failover',
- width : 140
+ prop: 'failover'
}
],
statusColor: {
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
index 6f7c125..39e7182 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
@@ -56,7 +56,7 @@
</el-table-column>
<el-table-column
:label="$t('operationJobs.table.operate')"
- fixed="right" width="300">
+ fixed="right" width="380">
<template slot-scope="scope">
<el-button-group>
<el-button
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
index 4718ddc..02edac7 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
@@ -169,18 +169,15 @@
serverIp: "",
columnJobName: {
label: this.$t('operationServers').labelInfo.jobName,
- prop: 'jobName',
- width : 250
+ prop: 'jobName'
},
columnInstanceCount: {
label: this.$t('operationServers').labelInfo.instanceCount,
- prop: 'instanceCount',
- width : 250
+ prop: 'instanceCount'
},
columnStatus: {
label: this.$t('operationServers').labelInfo.status,
- prop: 'status',
- width : 200
+ prop: 'status'
},
statusColor: {
OK: 'success',
