Merge remote-tracking branch 'origin/master'

src/views/modules/taskPlan/taskChainList/index.vue

@@ -48,10 +48,11 @@
           <vxe-column field="taskStatus" title="任务状态" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.taskStatus === '2'" style="color: #333333;font-weight: bold;">已暂停</span>
-              <span v-else-if="scope.row.taskStatus === '1'" style="color: #e1750f;font-weight: bold;">执行中</span>
+              <span v-else-if="scope.row.taskStatus === '1'" style="color: #e1750f;font-weight: bold;">AGV执行中</span>
               <span v-else-if="scope.row.taskStatus === '4'" style="color: #999999;font-weight: bold;">已取消</span>
               <span v-else-if="scope.row.taskStatus === '3'" style="color: #249601;font-weight: bold;">已完成</span>
               <span v-else-if="scope.row.taskStatus === '5'" style="color: #249601;font-weight: bold;">队列中</span>
+              <span v-else-if="scope.row.taskStatus === '6'" style="color: #249601;font-weight: bold;">AGV排队中</span>
             </template>
           </vxe-column>