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

Merge pull request #60 from millionfor/dev-20190415 

Dev 20190415
parents f14f8866 b5188004

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Timing')" @click="_timing(item)" :disabled="item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null" v-ps="['GENERAL_USER']" icon="iconfont icon-timer"><!--{{$t('定时')}}--></x-button>

            <x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('offline')" @click="_downline(item)" v-if="item.releaseState === 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu"><!--{{$t('下线')}}--></x-button>

            <x-button type="warning" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('online')" @click="_poponline(item)" v-if="item.releaseState === 'OFFLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu-copy"><!--{{$t('上线')}}--></x-button>

            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Cron Management')" @click="_timingManage(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-paibanguanli"><!--{{$t('定时管理')}}--></x-button>

            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Cron Manage')" @click="_timingManage(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-paibanguanli"><!--{{$t('定时管理')}}--></x-button>

            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('TreeView')" @click="_treeView(item)"  icon="iconfont icon-juxingkaobei"><!--{{$t('树形图')}}--></x-button>

          </td>

        </tr>

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue

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

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

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

    <m-list-construction :title="$t('Cron Management')">

    <m-list-construction :title="$t('Cron Manage')">

      <template slot="content">

        <m-list></m-list>

      </template>

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

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

  <m-list-construction :title="$t('Cron Management')">

  <m-list-construction :title="$t('Cron Manage')">

    <template slot="content">

      <m-list></m-list>

    </template>

escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue

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

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

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

    <m-list-construction :title="$t('File Management')">

    <m-list-construction :title="$t('File Manage')">

      <template slot="conditions">

        <m-conditions @on-conditions="_onConditions">

          <template slot="button-group">

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

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  <div class="main-layout-box">

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

    <template>

      <m-list-construction :title="$t('Tenant Management')">

      <m-list-construction :title="$t('Tenant Manage')">

        <template slot="conditions">

          <m-conditions @on-conditions="_onConditions">

            <template slot="button-group">