Browse Source

Fix worker grouping

pull/2/head
break60 5 years ago
parent
commit
21fa3148e4
  1. 10
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
  3. 8
      dolphinscheduler-ui/src/js/conf/home/router/index.js
  4. 9
      dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js

10
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue

@ -34,9 +34,9 @@
<th>
<span>{{$t('Update Time')}}</span>
</th>
<th width="70">
<!-- <th width="70">
<span>{{$t('Operation')}}</span>
</th>
</th> -->
</tr>
<tr v-for="(item, $index) in list" :key="$index">
<td>
@ -48,7 +48,7 @@
</span>
</td>
<td>
<span>{{item.ipList}}</span>
<span>{{item.ipList.join(',')}}</span>
</td>
<td>
<span v-if="item.createTime">{{item.createTime | formatDate}}</span>
@ -58,7 +58,7 @@
<span v-if="item.updateTime">{{item.updateTime | formatDate}}</span>
<span v-else>-</span>
</td>
<td>
<!-- <td>
<x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-edit" :title="$t('Edit')" @click="_edit(item)">
</x-button>
<x-poptip
@ -75,7 +75,7 @@
</x-button>
</template>
</x-poptip>
</td>
</td> -->
</tr>
</table>
</div>

4
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue

@ -18,9 +18,9 @@
<m-list-construction :title="$t('Worker group manage')">
<template slot="conditions">
<m-conditions @on-conditions="_onConditions">
<template slot="button-group" v-if="isADMIN">
<!-- <template slot="button-group" v-if="isADMIN">
<x-button type="ghost" size="small" @click="_create('')">{{$t('Create worker group')}}</x-button>
</template>
</template> -->
</m-conditions>
</template>
<template slot="content">

8
dolphinscheduler-ui/src/js/conf/home/router/index.js

@ -374,6 +374,14 @@ const router = new Router({
title: `${i18n.$t('Queue manage')}`
}
},
{
path: '/security/worker-groups',
name: 'worker-groups-manage',
component: resolve => require(['../pages/security/pages/workerGroups/index'], resolve),
meta: {
title: `${i18n.$t('Worker group manage')}`
}
},
{
path: '/security/token',
name: 'token-manage',

9
dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js

@ -109,6 +109,15 @@ const menu = {
icon: 'ans-icon-recycle',
children: []
},
{
name: `${i18n.$t('Worker group manage')}`,
id: 4,
path: 'worker-groups-manage',
isOpen: true,
disabled: true,
icon: 'ans-icon-diary',
children: []
},
{
name: `${i18n.$t('Token manage')}`,
id: 2,

Loading…
Cancel
Save