Unverified Commit 28c370e3 authored by millionfor's avatar millionfor Committed by GitHub
Browse files

Merge pull request #99 from millionfor/dev-20190415 

增加worker
parents 41d8f39f ef76a868

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

+1 −1
Original line number Diff line number Diff line
@@ -474,5 +474,5 @@ 
</script>



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

  @import "dag";

  @import "./dag";

</style>

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
  import disabledState from '@/module/mixin/disabledState'



  export default {

    name: 'select-input',

    name: 'form-select-input',

    data () {

      return {

        isIconState: false,

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
  import disabledState from '@/module/mixin/disabledState'



  export default {

    name: 'timeout-alarm',

    name: 'form-timeout-alarm',

    data () {

      return {

        // Timeout display hiding

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

0 → 100644
+46 −0
Original line number Diff line number Diff line 
<template>

  <x-select

          @on-change="_onChange"

          v-model="value"

          style="width: 180px">

    <x-option

            v-for="item in workerGroupsList"

            :key="item.id"

            :value="item.id"

            :label="item.name">

    </x-option>

  </x-select>

</template>

<script>

  import disabledState from '@/module/mixin/disabledState'

  export default {

    name: 'form-worker-group',

    data () {

      return {

        workerGroupsList: []

      }

    },

    mixins: [disabledState],

    props: {

      value: Number

    },

    model: {

      prop: 'value',

      event: 'workerGroupsEvent'

    },

    methods: {

      _onChange (o) {

        this.value = o.value

        this.$emit('workerGroupsEvent', o.value)

      }

    },

    watch: {

    },

    created () {

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

      if (!this.value) {

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

      }

    }

  }

</script>

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

0 → 100644
+109 −0
Original line number Diff line number Diff line 
.form-model-model {

  width: 720px;

  position: relative;

  .title-box {

    height: 61px;

    border-bottom: 1px solid #DCDEDC;

    position: relative;

    .name {

      position: absolute;

      left: 24px;

      top: 18px;

      font-size: 16px;

    }

    .go-subtask {

      position: absolute;

      right: 30px;

      top: 17px;

      a {

        font-size: 14px;

        color: #0097e0;

        margin-left: 10px;

        i.iconfont {

          font-size: 18px;

          vertical-align: middle;

        }

        em {

          color: #333;

          vertical-align: middle;

          font-style: normal;

          vertical-align: middle;

          padding-left: 2px;

        }

        &:hover {

          em {

            text-decoration: underline;

          }

        }

      }

    }

  }

  .bottom-box {

    position: absolute;

    bottom: 0;

    left: 0;

    width: 100%;

    text-align: right;

    height: 60px;

    line-height: 60px;

    border-top: 1px solid #DCDEDC;

    background: #fff;

    .submit {

      padding-right: 20px;

      position: relative;

      z-index: 9;

    }

  }

  .content-box {

    overflow-y: scroll;

    height: calc(100vh - 61px);

    padding-bottom: 60px;

  }

}

.from-model {

  padding-top: 26px;

  >div {

    clear: both;

  }

  .list {

    position: relative;

    margin-bottom: 10px;

    .text-box {

      width: 112px;

      float: left;

      text-align: right;

      margin-right: 8px;

      >span {

        font-size: 14px;

        color: #777;

        display: inline-block;

        padding-top: 6px;

      }

    }

    .cont-box {

      width: 580px;

      float: left;

      .label-box {

        width: 100%;

      }

      .text-b {

        font-size: 14px;

        color: #777;

        display: inline-block;

        padding:0 6px 0 20px;

      }

    }

    .add {

      line-height: 32px;

      a {

        color: #0097e0;

      }

    }

    &:hover {

    }

    .list-t {

      width: 50%;

      float: left;

    }

  }

}
 
 No newline at end of file