Browse Source

fix

pull/2/head
break60 5 years ago
parent
commit
8313c70235
  1. 21
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
  2. 58
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue

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

@ -34,9 +34,6 @@
<th> <th>
<span>{{$t('Update Time')}}</span> <span>{{$t('Update Time')}}</span>
</th> </th>
<!-- <th width="70">
<span>{{$t('Operation')}}</span>
</th> -->
</tr> </tr>
<tr v-for="(item, $index) in list" :key="$index"> <tr v-for="(item, $index) in list" :key="$index">
<td> <td>
@ -58,24 +55,6 @@
<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>
<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
:ref="'poptip-delete-' + $index"
placement="bottom-end"
width="90">
<p>{{$t('Delete?')}}</p>
<div style="text-align: right; margin: 0;padding-top: 4px;">
<x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
<x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
</div>
<template slot="reference">
<x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-trash" :title="$t('delete')">
</x-button>
</template>
</x-poptip>
</td> -->
</tr> </tr>
</table> </table>
</div> </div>

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

@ -17,11 +17,7 @@
<template> <template>
<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"></m-conditions>
<!-- <template slot="button-group" v-if="isADMIN">
<x-button type="ghost" size="small" @click="_create('')">{{$t('Create worker group')}}</x-button>
</template> -->
</m-conditions>
</template> </template>
<template slot="content"> <template slot="content">
<template v-if="workerGroupList.length || total>0"> <template v-if="workerGroupList.length || total>0">
@ -92,32 +88,32 @@
_onEdit (item) { _onEdit (item) {
this._create(item) this._create(item)
}, },
// _create (item) { _create (item) {
// let self = this let self = this
// let modal = this.$modal.dialog({ let modal = this.$modal.dialog({
// closable: false, closable: false,
// showMask: true, showMask: true,
// escClose: true, escClose: true,
// className: 'v-modal-custom', className: 'v-modal-custom',
// transitionName: 'opacityp', transitionName: 'opacityp',
// render (h) { render (h) {
// return h(mCreateWorker, { return h(mCreateWorker, {
// on: { on: {
// onUpdate () { onUpdate () {
// self._debounceGET('false') self._debounceGET('false')
// modal.remove() modal.remove()
// }, },
// close () { close () {
// modal.remove() modal.remove()
// } }
// }, },
// props: { props: {
// item: item item: item
// } }
// }) })
// } }
// }) })
// }, },
_getList (flag) { _getList (flag) {
this.isLoading = !flag this.isLoading = !flag
this.getWorkerGroups(this.searchParams).then(res => { this.getWorkerGroups(this.searchParams).then(res => {

Loading…
Cancel
Save