Merge remote-tracking branch 'upstream/branch-1.0.2' into branch-1.0.2-up

Author: baoliang

Diff for: escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java

@@ -102,6 +102,7 @@ public class ErrorCommand {
 
 
     public ErrorCommand(Command command, String message){
+        this.id = command.getId();
         this.commandType = command.getCommandType();
         this.executorId = command.getExecutorId();
         this.processDefinitionId = command.getProcessDefinitionId();

Diff for: escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue

@@ -59,7 +59,6 @@
         this._handleDefineUser(res)
         this.isSpin = false
       }).catch(e => {
-        this.msg = e.msg || 'error'
         this.isSpin = false
       })
     },

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

@@ -2,7 +2,7 @@
   <m-list-construction :title="$t('Project Home')">
     <template slot="content">
       <div class="perject-home-content">
-        <div class="time-model" v-show="searchParams.projectId !== 0">
+        <div class="time-model">
           <x-datepicker
                   :panel-num="2"
                   placement="bottom-end"
@@ -153,4 +153,4 @@
       display: block;
     }
   }
-</style>
+</style>