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

Merge pull request #147 from millionfor/dev-20190415 

Dev 20190415
parents c71e1521 7c0b234b

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

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

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

    <template slot="content">

      <m-project-chart :id="0"></m-project-chart>

      <m-project-home :id="0"></m-project-home>

    </template>

  </m-list-construction>

</template>



<script>

import mProjectChart from '@/conf/home/pages/projects/pages/index/_source/projectChart'

import mProjectHome from '@/conf/home/pages/projects/pages/index'

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

export default {

  name: 'home',

  components: { mProjectChart, mListConstruction }

  components: { mProjectHome, mListConstruction }

}

</script>

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

+4 −4
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 
          <div class="row-title">

            <div class="left">

              <span class="sp">IP: {{item.host}}</span>

              <span class="sp">端口: {{item.port}}</span>

              <span class="sp">zk注册目录: {{item.zkDirectory}}</span>

              <span class="sp">{{$t('Port')}}: {{item.port}}</span>

              <span class="sp">{{$t('Zk registration directory')}}: {{item.zkDirectory}}</span>

            </div>

            <div class="right">

              <span class="sp">创建时间: {{item.createTime | formatDate}}</span>

              <span class="sp">最后心跳时间: {{item.lastHeartbeatTime | formatDate}}</span>

              <span class="sp">{{$t('Create Time')}}: {{item.createTime | formatDate}}</span>

              <span class="sp">{{$t('Last heartbeat time')}}: {{item.lastHeartbeatTime | formatDate}}</span>

            </div>

          </div>

          <div class="row-cont">

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

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
          <div class="col-md-3">

            <div class="text-num-model text">

              <div class="title">

                <span>最大连接数</span>

                <span>最大连接数 - {{item.date | formatDate}}</span>

              </div>

              <div class="value-p">

                <b :style="{color:color[0]}">{{item.maxConnections}}</b>
@@ -48,13 +48,13 @@ 
          <div class="col-md-2">

            <div class="text-num-model text">

              <div class="title">

                <span>最大连接数</span>

                <span>最大使用连接数</span>

              </div>

              <div class="value-p">

                <b :style="{color:color[2]}">{{item.maxUsedConnections}}</b>

              </div>

              <div class="text-1">

                最大连接数

                最大使用连接数

              </div>

            </div>

          </div>

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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
        height: 160px;

        line-height: 160px;

        >b {

          font-size: 80px;

          font-size: 72px;

        }

        >.state {

          >i {

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

+4 −4
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 
          <div class="row-title">

            <div class="left">

              <span class="sp">IP: {{item.host}}</span>

              <span class="sp">端口: {{item.port}}</span>

              <span class="sp">zk注册目录: {{item.zkDirectory}}</span>

              <span class="sp">{{$t('Port')}}: {{item.port}}</span>

              <span class="sp">{{$t('Zk registration directory')}}: {{item.zkDirectory}}</span>

            </div>

            <div class="right">

              <span class="sp">创建时间: {{item.createTime | formatDate}}</span>

              <span class="sp">最后心跳时间: {{item.lastHeartbeatTime | formatDate}}</span>

              <span class="sp">{{$t('Create Time')}}: {{item.createTime | formatDate}}</span>

              <span class="sp">{{$t('Last heartbeat time')}}: {{item.lastHeartbeatTime | formatDate}}</span>

            </div>

          </div>

          <div class="row-cont">