Merge pull request #220 from millionfor/dev-20190415

Dev 20190415

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

@@ -7,8 +7,8 @@
 
 目前最新安装包版本是1.0.2，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/)
 
-下载escheduler-ui-1.0.2.tar.gz后，解压后会产生dist目录,进入dist目录
-> cd dist  
+下载 escheduler-ui-1.0.2.tar.gz 后，解压`tar -zxvf escheduler-ui-1.0.2.tar.gz ./`后，进入`escheduler-ui`目录
+ 
 
 
 
@@ -16,7 +16,7 @@
 以下两种方式任选其一部署即可，推荐自动化部署
 ### 2.1 自动化部署
 
-在`escheduler-ui`目录下编辑安装文件`vi install(线上环境).sh`(执行时，最好修改install(线上环境).sh为install-ui.sh,跟后端部署区分)
+在`escheduler-ui`目录下编辑安装文件`vi install-escheduler-ui.sh`
 
 更改前端访问端口和后端代理接口地址
 
@@ -28,9 +28,9 @@ esc_proxy="8888"
 esc_proxy_port="http://192.168.xx.xx:12345"
 ```
 
-前端自动部署基于linux系统`yum`操作，部署之前请先安装更新`yum`
+>前端自动部署基于linux系统`yum`操作，部署之前请先安装更新`yum`
 
-在`escheduler-ui`目录下执行`./install(线上环境).sh` 或者改名后的 `./install-ui.sh`
+在该目录下执行`./install-escheduler-ui.sh`
 
 
 ### 2.2 手动部署

escheduler-ui/.env

@@ -1,6 +1,6 @@
 
 # 后端接口地址
-API_BASE = http://192.168.220.247:12345
+API_BASE = http://192.168.220.154:12345
 
 # 本地开发如需ip访问项目把"#"号去掉
 #DEV_HOST = 192.168.xx.xx

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

@@ -160,7 +160,10 @@
           pageNo: this.pageNo,
           pageSize: this.pageSize
         }).then(res => {
-          this.list = res.data.totalList
+          this.list = []
+          setTimeout(() => {
+            this.list = res.data.totalList
+          })
           this.total = res.data.total
           this.isLoading = false
         }).catch(e => {

escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@@ -39,7 +39,7 @@
             </x-select>
           </template>
         </m-list-box-f>
-        <m-list-box-f>
+        <m-list-box-f v-if="isADMIN">
           <template slot="name"><b>*</b>{{$t('Queue')}}</template>
           <template slot="content">
             <x-select v-model="queueName">

escheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue

@@ -31,7 +31,7 @@
     <m-list-box-f>
       <template slot="name">&nbsp;</template>
       <template slot="content">
-        <x-button type="primary" shape="circle" @click="_edit()" :loading="spinnerLoading">{{spinnerLoading ? 'Loading...' : 'Edit'}}</x-button>
+        <x-button type="primary" shape="circle" @click="_edit()" :loading="spinnerLoading">{{spinnerLoading ? 'Loading...' : $t('Edit')}}</x-button>
       </template>
     </m-list-box-f>
   </div>
@@ -80,6 +80,7 @@
             }, 1500)
           }).catch(e => {
             this.$message.error(e.msg || '')
+            this.spinnerLoading = false
           })
         }
       },