Browse Source

Fix worker grouping

pull/3/MERGE
break60 5 years ago committed by gaojun2048
parent
commit
54a0273fd7
  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

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

@ -34,9 +34,9 @@
<th> <th>
<span>{{$t('Update Time')}}</span> <span>{{$t('Update Time')}}</span>
</th> </th>
<th width="70"> <!-- <th width="70">
<span>{{$t('Operation')}}</span> <span>{{$t('Operation')}}</span>
</th> </th> -->
</tr> </tr>
<tr v-for="(item, $index) in list" :key="$index"> <tr v-for="(item, $index) in list" :key="$index">
<td> <td>
@ -48,7 +48,7 @@
</span> </span>
</td> </td>
<td> <td>
<span>{{item.ipList}}</span> <span>{{item.ipList.join(',')}}</span>
</td> </td>
<td> <td>
<span v-if="item.createTime">{{item.createTime | formatDate}}</span> <span v-if="item.createTime">{{item.createTime | formatDate}}</span>
@ -58,7 +58,7 @@
<span v-if="item.updateTime">{{item.updateTime | formatDate}}</span> <span v-if="item.updateTime">{{item.updateTime | formatDate}}</span>
<span v-else>-</span> <span v-else>-</span>
</td> </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 type="info" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-edit" :title="$t('Edit')" @click="_edit(item)">
</x-button> </x-button>
<x-poptip <x-poptip
@ -75,7 +75,7 @@
</x-button> </x-button>
</template> </template>
</x-poptip> </x-poptip>
</td> </td> -->
</tr> </tr>
</table> </table>
</div> </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')"> <m-list-construction :title="$t('Worker group manage')">
<template slot="conditions"> <template slot="conditions">
<m-conditions @on-conditions="_onConditions"> <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> <x-button type="ghost" size="small" @click="_create('')">{{$t('Create worker group')}}</x-button>
</template> </template> -->
</m-conditions> </m-conditions>
</template> </template>
<template slot="content"> <template slot="content">

Loading…
Cancel
Save