点位管理设备类型

src/api/equipmentAdmin/EquipmentAccount.js

@@ -102,4 +102,11 @@ export default class EquipmentAccount {
       params: { 'equipmentNo': equipmentNo}
       params: { 'equipmentNo': equipmentNo}
     });
     });
   }
   }
+  updateStatus(data) {
+    return request({
+      url: "/facility/equipment/updateStatus",
+      method: "post",
+      data,
+    });
+  }
 }
 }

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

@@ -69,6 +69,15 @@
           <vxe-column field="equipmentNo" title="设备ID" align="center" width="100px"></vxe-column>
           <vxe-column field="equipmentNo" title="设备ID" align="center" width="100px"></vxe-column>
           <vxe-column field="name" title="设备名称" align="center" width="180px"></vxe-column>
           <vxe-column field="name" title="设备名称" align="center" width="180px"></vxe-column>
           <vxe-column field="equipmentModel" title="设备型号" align="center" width="100px"></vxe-column>
           <vxe-column field="equipmentModel" title="设备型号" align="center" width="100px"></vxe-column>
+          <vxe-column sortable field="pointStatus" title="空闲状态" align="center" width="130px">
+            <template slot-scope="scope">
+              <span v-if="scope.row.freeStatus === '1'" style="color: #249601">占用<i class="pointStatus el-icon-refresh"
+                                                                                     @click="changePointStatus(scope.row)"></i>
+              </span>
+              <span v-else-if="scope.row.freeStatus === '0'" style="color: #FF0000">空闲<i
+                class="pointStatus el-icon-refresh" @click="changePointStatus(scope.row)"></i></span>
+            </template>
+          </vxe-column>
           <vxe-column field="ipAddr" title="IP地址" align="center" width="100px"></vxe-column>
           <vxe-column field="ipAddr" title="IP地址" align="center" width="100px"></vxe-column>
           <vxe-column field="groupName" title="分组" align="center" width="100px"></vxe-column>
           <vxe-column field="groupName" title="分组" align="center" width="100px"></vxe-column>
           <vxe-column field="mapId_dictText" title="工作地图" align="center" width="100px"></vxe-column>
           <vxe-column field="mapId_dictText" title="工作地图" align="center" width="100px"></vxe-column>
@@ -150,6 +159,7 @@ export default {
         name: '',
         name: '',
         onlineStatus: '',
         onlineStatus: '',
         runStatus: '',
         runStatus: '',
+        freeStatus: '',
         sort: '0'
         sort: '0'
       },
       },
       loading: false,
       loading: false,
@@ -222,6 +232,27 @@ export default {
       })
       })
 
 
     },
     },
+    // 切换空闲状态
+    changePointStatus (row) {
+
+      const can = {
+        id: row.id,
+        freeStatus: row.freeStatus=='1'?'0':'1'
+      }
+      this.EquipmentAccount.updateStatus(can).then((res) => {
+        if (res.status === 200) {
+          if (row.freeStatus == 0) {
+            this.$set(row, 'freeStatus', '1')
+          } else {
+            this.$set(row, 'freeStatus', '0')
+          }
+          this.$message({
+            type: 'success',
+            message: res.data
+          });
+        }
+      })
+    },
     // 查看详情
     // 查看详情
     accountDetails (row) {
     accountDetails (row) {
       this.dialogConfig = {
       this.dialogConfig = {

src/views/modules/siteAdmin/positionAdmin/add.vue

@@ -21,6 +21,9 @@
       <el-form-item label="点位别名：">
       <el-form-item label="点位别名：">
         <el-input v-model="formData.pointAlias" maxlength="30"></el-input>
         <el-input v-model="formData.pointAlias" maxlength="30"></el-input>
       </el-form-item>
       </el-form-item>
+      <el-form-item label="主题编码：">
+        <el-input v-model="formData.topic" maxlength="30"></el-input>
+      </el-form-item>
       <el-form-item label="备注：">
       <el-form-item label="备注：">
         <el-input type="textarea" v-model="formData.remark" :rows="3"></el-input>
         <el-input type="textarea" v-model="formData.remark" :rows="3"></el-input>
       </el-form-item>
       </el-form-item>

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

@@ -8,8 +8,8 @@
           </el-option>
           </el-option>
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
-      <el-form-item :prop="`taskId`" label="任务编号：">
-        <el-input size="small" v-model="searchForm.taskId" clearable placeholder="请选输入任务编号"></el-input>
+      <el-form-item :prop="`taskType`" label="任务类型：">
+        <el-input size="small" v-model="searchForm.taskType" clearable placeholder="请选输入任务类型"></el-input>
       </el-form-item>
       </el-form-item>
       <el-form-item prop="task_name" label="任务名称：">
       <el-form-item prop="task_name" label="任务名称：">
         <el-input size="small" v-model="searchForm.task_name" clearable placeholder="请选输入任务名称"></el-input>
         <el-input size="small" v-model="searchForm.task_name" clearable placeholder="请选输入任务名称"></el-input>