点位管理设备类型

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

@@ -48,11 +48,11 @@
           <vxe-column field="taskStatus" title="任务状态" align="center">
           <vxe-column field="taskStatus" title="任务状态" align="center">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <span v-if="scope.row.taskStatus === '2'" style="color: #333333;font-weight: bold;">已暂停</span>
               <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;">AGV执行中</span>
+              <span v-else-if="scope.row.taskStatus === '1'" style="color: #e1750f;font-weight: bold;">执行中</span>
               <span v-else-if="scope.row.taskStatus === '4'" style="color: #999999;font-weight: bold;">已取消</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 === '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 === '5'" style="color: #249601;font-weight: bold;">队列中</span>
-              <span v-else-if="scope.row.taskStatus === '6'" style="color: #249601;font-weight: bold;">AGV排队中</span>
+              <span v-else-if="scope.row.taskStatus === '6'" style="color: #249601;font-weight: bold;">排队中</span>
             </template>
             </template>
           </vxe-column>
           </vxe-column>
 
 
@@ -76,9 +76,7 @@
               </el-tooltip>
               </el-tooltip>
             </template>
             </template>
           </vxe-column>
           </vxe-column>
-          <vxe-column field="priority" title="优先级" align="center">
 
 
-          </vxe-column>
 
 
           <vxe-column title="优先级" field="priority" width="170px" align="center">
           <vxe-column title="优先级" field="priority" width="170px" align="center">
             <template slot-scope="scope">
             <template slot-scope="scope">
@@ -132,7 +130,7 @@
               <el-divider direction="vertical"
               <el-divider direction="vertical"
                 v-if="scope.row.taskStatus === '1' && hasPermission('taskChainList:cancel')"></el-divider>
                 v-if="scope.row.taskStatus === '1' && hasPermission('taskChainList:cancel')"></el-divider>
               <el-button type="text" size="mini"
               <el-button type="text" size="mini"
-                v-if="scope.row.taskStatus === '1' && hasPermission('taskChainList:cancel')"
+                v-if="(scope.row.taskStatus === '1' || scope.row.taskStatus === '6') && hasPermission('taskChainList:cancel')"
                 @click="setTaskStatus(scope.row,'4')">取消
                 @click="setTaskStatus(scope.row,'4')">取消
               </el-button>
               </el-button>
               <el-divider direction="vertical"
               <el-divider direction="vertical"

src/views/modules/taskPlan/taskPlanTemplate/add.vue

@@ -34,6 +34,12 @@
           <el-radio label="1">是</el-radio>
           <el-radio label="1">是</el-radio>
         </el-radio-group>
         </el-radio-group>
       </el-form-item>
       </el-form-item>
+      <el-form-item label="是否心跳任务：">
+        <el-radio-group v-model="formData.heartBeat">
+          <el-radio label="0">否</el-radio>
+          <el-radio label="1">是</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="是/否包含变量：" prop="variableStatus">
       <el-form-item label="是/否包含变量：" prop="variableStatus">
         <el-radio-group v-model="formData.variableStatus" @change="changeStatus">
         <el-radio-group v-model="formData.variableStatus" @change="changeStatus">
           <el-radio label="0">否</el-radio>
           <el-radio label="0">否</el-radio>
@@ -104,6 +110,7 @@ export default {
       formData: {
       formData: {
         variableStatus: '0',
         variableStatus: '0',
         errorTask: '0',
         errorTask: '0',
+        heartBeat: '0',
         remark: '',
         remark: '',
         sort: '0',
         sort: '0',
         status: '1',
         status: '1',