Browse Source

Merge pull request #538 from hymzcn/dev-1.1.0

remove default tenant
pull/2/head
hymzcn 5 years ago committed by GitHub
parent
commit
324a3c1dc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
  2. 8
      escheduler-ui/src/js/conf/home/store/security/actions.js

5
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@ -184,7 +184,10 @@
_getTenantList () {
return new Promise((resolve, reject) => {
this.store.dispatch('security/getTenantList').then(res => {
this.tenantList = _.map(res, v => {
let arr = _.filter(res, (o) => {
return o.id !== -1
})
this.tenantList = _.map(arr, v => {
return {
id: v.id,
code: v.tenantName

8
escheduler-ui/src/js/conf/home/store/security/actions.js

@ -241,10 +241,10 @@ export default {
return new Promise((resolve, reject) => {
io.get(`tenant/list`, payload, res => {
let list=res.data
// list.unshift({
// id: -1,
// tenantName: 'Default'
// })
list.unshift({
id: -1,
tenantName: 'Default'
})
state.tenantAllList = list
resolve(list)
}).catch(e => {

Loading…
Cancel
Save