Unverified Commit 871bdd78 authored by millionfor's avatar millionfor Committed by GitHub
Browse files

Merge pull request #102 from millionfor/dev-20190415 

Dev 20190415
parents 28c370e3 137bef50

escheduler-ui/.env

+1 −1
Original line number Diff line number Diff line 


# 后端接口地址

API_BASE = http://192.168.220.247:12345

API_BASE = http://192.168.220.154:12345



# 本地开发如需ip访问项目把"#"号去掉

#DEV_HOST = 192.168.xx.xx

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue

+13 −4
Original line number Diff line number Diff line
@@ -22,7 +22,10 @@ 
    },

    mixins: [disabledState],

    props: {

      value: Number

      value: {

        type: Number,

        default: -1

      }

    },

    model: {

      prop: 'value',
@@ -37,9 +40,15 @@ 
    watch: {

    },

    created () {

      this.workerGroupsList = this.store.state.security.workerGroupsListAll || []

      if (!this.value) {

        this.$emit('workerGroupsEvent', this.workerGroupsList[0].id)

      let stateWorkerGroupsList = this.store.state.security.workerGroupsListAll || []

      if (stateWorkerGroupsList.length) {

        this.workerGroupsList = stateWorkerGroupsList

      } else {

        this.store.dispatch('security/getWorkerGroupsAll').then(res => {

          this.$nextTick(() => {

            this.workerGroupsList = res

          })

        })

      }

    }

  }

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ 
        // Task priority

        taskInstancePriority: 'MEDIUM',

        // worker group id

        workerGroupId: null

        workerGroupId: -1

      }

    },

    /**

escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue

+7 −7
Original line number Diff line number Diff line 
<template>

  <m-list-construction :title="$t('Service-Master')">

    <template slot="content">

      <template v-if="masterList.length">

        <m-list :list="masterList"></m-list>

      </template>

      <template v-if="!masterList.length">

        <m-no-data></m-no-data>

      </template>

      <m-spin :is-spin="isLoading" ></m-spin>

      <div class="servers-wrapper">

        <div class="row">

          <div class="col-md-4">.col-md-8</div>

          <div class="col-md-4">.col-md-4</div>

          <div class="col-md-4">.col-md-4</div>

        </div>

      </div>

    </template>

  </m-list-construction>

</template>

escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/zookeeper.vue

+35 −26
Original line number Diff line number Diff line 
<template>

  <div class="zookeeper-model">

    zookeeper

  </div>

  <m-list-construction :title="$t('Service-Master')">

    <template slot="content">

      <template v-if="masterList.length">

        <m-list :list="masterList"></m-list>

      </template>

      <template v-if="!masterList.length">

        <m-no-data></m-no-data>

      </template>

      <m-spin :is-spin="isLoading" ></m-spin>

    </template>

  </m-list-construction>

</template>

<script>

  import { mapActions } from 'vuex'

  import mList from './_source/list'

  import mSpin from '@/module/components/spin/spin'

  import mNoData from '@/module/components/noData/noData'

  import mListConstruction from '@/module/components/listConstruction/listConstruction'



  export default {

    name: 'zookeeper',

    name: 'servers-zookeeper',

    data () {

      return {}

      return {

        pageSize: 10,

        pageNo: 1,

        totalPage: null,

        searchVal: '',

        isLoading: false,

        masterList: []

      }

    },

    props: {},

    methods: {},

    watch: {},

    beforeCreate () {

    methods: {

      ...mapActions('security', ['getProcessMasterList'])

    },

    watch: {},

    created () {

    },

    beforeMount () {

      this.isLoading = true

      this.getProcessMasterList().then(res => {

        this.masterList = res.data

        this.isLoading = false

      })

    },

    mounted () {

    },

    beforeUpdate () {

    },

    updated () {

    },

    beforeDestroy () {

    },

    destroyed () {

    },

    computed: {},

    components: {}

    components: { mList, mListConstruction, mSpin, mNoData }

  }

</script>
 


<style lang="scss" rel="stylesheet/scss">

  .zookeeper-model {



  }

</style>