点位管理设备类型

src/api/siteAdmin/SiteConfig.js

@@ -66,4 +66,13 @@ export default class SiteConfig {
       responseType: "blob",
       responseType: "blob",
     });
     });
   }
   }
+
+  // 获取库位开关选项
+  getEquipOptions(data) {
+    return request({
+      url: "/facility/equipment/getList",
+      method: "post",
+      data
+    });
+  }
 }
 }

src/views/modules/equipmentAdmin/equipmentAccount/add.vue

@@ -30,8 +30,8 @@
           </el-option>
           </el-option>
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
-      <el-form-item label="等待点位：" prop="pointId"  :rules="[{ message: '请选择等待点位', trigger: 'change' },]">
-        <el-select v-model="formData.pointId" filterable placeholder="等待点位">
+      <el-form-item label="点位：" prop="pointId"  :rules="[{ message: '请选择点位', trigger: 'change' },]">
+        <el-select v-model="formData.pointId" filterable placeholder="点位">
           <el-option v-for="item in formData.pointOptions" :key="item.id" :label="item.name" :value="item.id">
           <el-option v-for="item in formData.pointOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
           </el-option>
         </el-select>
         </el-select>

src/views/modules/equipmentAdmin/equipmentAccount/index.vue

@@ -103,7 +103,7 @@
                 @click="accountDelete(scope.row)">删除
                 @click="accountDelete(scope.row)">删除
               </el-button>
               </el-button>
               <el-divider direction="vertical"></el-divider>
               <el-divider direction="vertical"></el-divider>
-              <el-button v-if="hasPermission('equipmentAccount:edit') && scope.row.equipmentType === '4'" type="text" size="small" @click="showRight(scope.row)">管理主题</el-button>
+              <el-button v-if="hasPermission('equipmentAccount:edit') && (scope.row.equipmentType === '4' || scope.row.equipmentType === '5' || scope.row.equipmentType === '6')" type="text" size="small" @click="showRight(scope.row)">管理主题</el-button>
             </template>
             </template>
           </vxe-column>
           </vxe-column>
         </vxe-table>
         </vxe-table>

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

@@ -51,6 +51,7 @@
               <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;">执行中</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>
             </template>
             </template>
           </vxe-column>
           </vxe-column>
           <vxe-column field="source_dictText" title="来源" align="center"></vxe-column>
           <vxe-column field="source_dictText" title="来源" align="center"></vxe-column>