Commit fdac47b3 authored by gongzijian's avatar gongzijian
Browse files

add monitor/router,edit dag bug, edit udfc

parent be6770e9

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

+46 −27
Original line number Diff line number Diff line
@@ -11,13 +11,14 @@ 
              :placeholder="$t('prop(required)')"

              maxlength="64"

              @on-blur="_verifProp()"

              style="width: 164px;">

              :style="inputStyle">

      </x-input>

      <template v-if="hide">

        <x-select

                style="width: 80px;"

                @change="_handleDirectChanged"

                v-model="localParamsList[$index].direct"

              :disabled="isDetails || !hide">

                :disabled="isDetails">

          <x-option

                  v-for="city in directList"

                  :key="city.code"
@@ -29,7 +30,7 @@ 
                style="width: 118px;"

                @change="_handleTypeChanged"

                v-model="localParamsList[$index].type"

              :disabled="isDetails || !hide">

                :disabled="isDetails">

          <x-option

                  v-for="city in typeList"

                  :key="city.code"
@@ -37,6 +38,7 @@ 
                  :label="city.code">

          </x-option>

        </x-select>

      </template>

      <x-input

              :disabled="isDetails"

              type="text"
@@ -44,7 +46,7 @@ 
              :placeholder="$t('value(optional)')"

              maxlength="64"

              @on-blur="_handleValue()"

              style="width: 150px;position: relative;margin-bottom: -2px;">

              :style="inputStyle">

      </x-input>

      <span class="lt-add">

        <a href="javascript:" style="color:red;" @click="!isDetails && _removeUdp($index)" >
@@ -57,7 +59,7 @@ 
        </a>

      </span>

    </div>

    <span class="add" v-if="!localParamsList.length">

    <span class="add-dp" v-if="!localParamsList.length">

      <a href="javascript:" @click="!isDetails && _addUdp()" >

        <i class="iconfont" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')">&#xe636;</i>

      </a>
@@ -173,6 +175,11 @@ 
    created () {

      this.localParamsList = this.udpList

    },

    computed: {

      inputStyle () {

        return `width:${this.hide ? 160 : 262}px`

      }

    },

    mounted () {

    },

    components: { }
@@ -197,6 +204,7 @@ 
    }

    .add {

      a {

        color: #000;

        .iconfont {

          font-size: 18px;

          vertical-align: middle;
@@ -205,5 +213,16 @@ 
        }

      }

    }

    .add-dp{

      a {

        color: #0097e0;

        .iconfont {

          font-size: 18px;

          vertical-align: middle;

          display: inline-block;

          margin-top: 2px;

        }

      }

    }

  }

</style>

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

+10 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ 


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

  .udp-model {

    width: 616px;

    min-height: 326px;

    width: 624px;

    min-height: 420px;

    background: #fff;

    border-radius: 3px;

    padding:20px 0 ;
@@ -182,6 +182,14 @@ 
    }

    .content {

      padding-bottom: 50px;

      .user-def-params-model {

        .add {

          a {

            color: #0097e0;

          }

        }

      }

    }



  }

</style>

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

+3 −1
Original line number Diff line number Diff line 
<template>

  <div class="variable-model">

    <template v-if="list">

      <div class="list">

        <div class="name"><i class="fa fa-code"></i><b style="padding-top: 3px;display: inline-block">{{$t('Global parameters')}}</b></div>

        <div class="var-cont">
@@ -22,6 +23,7 @@ 
          </template>

        </div>

      </div>

    </template>

  </div>

</template>

<script>

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

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

  <div class="index-model">

    index

  <div class="main-layout-box">

    <m-secondary-menu :type="'monitor'"></m-secondary-menu>

    <router-view></router-view>

  </div>



</template>

<script>

  import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'

  export default {

    name: 'monitor-index',

    data () {

      return {}

    },

    props: {},

    methods: {},

    watch: {},

    beforeCreate () {

    },

    created () {

    },

    beforeMount () {

    },

    mounted () {

    },

    beforeUpdate () {

    },

    updated () {

    },

    beforeDestroy () {

    },

    destroyed () {

    },

    computed: {},

    components: {}

    components: { mSecondaryMenu }

  }

</script>
 
 No newline at end of file
 


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

  .index-model {



  }

</style>