Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415

docs/zh_CN/前端部署文档.md

@@ -16,7 +16,7 @@
 以下两种方式任选其一部署即可，推荐自动化部署
 ### 2.1 自动化部署
 
-在前端项目根目录dist下编辑安装文件`vi install(线上环境).sh`(执行时，最好修改install(线上环境).sh为install-ui.sh,跟后端部署区分)
+在`escheduler-ui`目录下编辑安装文件`vi install(线上环境).sh`(执行时，最好修改install(线上环境).sh为install-ui.sh,跟后端部署区分)
 
 更改前端访问端口和后端代理接口地址
 
@@ -30,7 +30,7 @@ esc_proxy_port="http://192.168.xx.xx:12345"
 
 前端自动部署基于linux系统`yum`操作，部署之前请先安装更新`yum`
 
-在前端项目根目录dist下执行`./install(线上环境).sh` 或者改名后的 `./install-ui.sh`
+在`escheduler-ui`目录下执行`./install(线上环境).sh` 或者改名后的 `./install-ui.sh`
 
 
 ### 2.2 手动部署

escheduler-ui/dist/index.html

@@ -4,4 +4,4 @@
 d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23" 
 fill="#0097e0"></path></g></g><g transform="translate(19 19) scale(0.6)"><g transform="rotate(229.634)"><animateTransform attributeName="transform" type="rotate" values="360;0" keyTimes="0;1" dur="1s" begin="-0.0625s" repeatCount="indefinite"></animateTransform><path 
 d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23" 
-fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.5ba245f.js"></script><script src="/js/home/index.1b09c2f.js"></script></body></html>
+fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.467dcfa.js"></script><script src="/js/home/index.1b09c2f.js"></script></body></html>

escheduler-ui/dist/view/login/index.html

@@ -1,3 +1,3 @@
 <!doctype html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta http-equiv="Cache-Control" content="no-siteapp"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="标题"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><meta name="format-detection" content="telphone=no, email=no"><meta name="screen-orientation" content="portrait"><meta name="x5-orientation" content="portrait"><meta name="theme-color" content="#4a8dee"><meta name="msapplication-navbutton-color" content="#4a8dee"><meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><link rel="shortcut icon" href="/images/favicon.ico"><link href="/combo/1.0.0/base.css?v1.0.0.1" rel="stylesheet"><link href="/combo/1.0.0/3rd.css?v1.0.0.1" rel="stylesheet"><!--[if lt IE 9]>
 <script src="/combo/1.0.0/es5.js"></script>
-<![endif]--><script>let NODE_ENV = 'true'</script><title>Login - EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/login/index.5866c64.css" rel="stylesheet"></head><body><div id="app"></div><div class="login-bg"></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.5ba245f.js"></script><script src="/js/login/index.97eaebb.js"></script></body></html>
+<![endif]--><script>let NODE_ENV = 'true'</script><title>Login - EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/login/index.5866c64.css" rel="stylesheet"></head><body><div id="app"></div><div class="login-bg"></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.467dcfa.js"></script><script src="/js/login/index.97eaebb.js"></script></body></html>

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

@@ -75,7 +75,7 @@
 <script>
   import dayjs from 'dayjs'
   import mDefineUserCount from './_source/defineUserCount'
-  import mCommandStateCount from './_source/CommandStateCount'
+  import mCommandStateCount from './_source/commandStateCount'
   import mTaskCtatusCount from './_source/taskCtatusCount'
   import mProcessStateCount from './_source/processStateCount'
   import mQueueCount from './_source/queueCount'

script/del_zk_node.py

@@ -8,7 +8,7 @@ class ZkClient:
         self.zk.start()
     def del_node(self):
         self.zk.delete(sys.argv[2], recursive=True)
-	print('deleted success')
+        print('deleted success')
     def __del__(self):
         self.zk.stop()
 if __name__ == '__main__':