diff --git a/src/api/modules/api.js b/src/api/modules/api.js index d6eb60c..fd0f20f 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -580,9 +580,90 @@ export function equipmentZxOnDelete(query) { }) } // 设备状态监控列表 -export function equipmentZxOnFindByPage(data) { +export function equipmentZxOnFindByPage(query) { return request({ url: 'autoSR/zk/equipment/findByPage', + method:'get', + params:query + }) +} + +//楼盘获取顾问列表 +export function getUserByHouseId(query) { + return request({ + url: '/admin/user/getUserByHouseId', + method:'get', + params:query + }) +} +//设备领用 +export function equipmentReceiving(data) { + return request({ + url: 'autoSR/zk/equipment/receiving', + method:'post', + data + }) +} +//设备指示灯 +export function batchOperateIndicator(data) { + return request({ + url: 'autoSR/zk/equipment/batchOperateIndicator', + method:'post', + data + }) +} +//状态检测绑定 +export function zkequipmentBind(data) { + return request({ + url: 'autoSR/zk/equipment/bind', + method:'post', + data + }) +} +//状态检测绑定 +export function zkequipmentUnbind(data) { + return request({ + url: 'autoSR/zk/equipment/unbind', + method:'post', + data + }) +} +//状态检测批量归还 +export function zkequipmentEquipmentBack(data) { + return request({ + url: 'autoSR/zk/equipment/equipmentBack', + method:'post', + data + }) +} +//批量绑定批次号 +export function zkequipmentBindBatchId(data) { + return request({ + url: 'autoSR/zk/equipment/bindBatchId', + method:'post', + data + }) +} +// WiFi管理 +export function wifiFindById(query) { + return request({ + url: '/autoSR/equipment/wifi/findById', + method:'get', + params:query + }) +} +//Wifi修改 +export function wifiUpdate(data) { + return request({ + url: '/autoSR/equipment/wifi/update', + method:'post', + data + }) +} +//Wifi添加 +export function wifiInsert(data) { + return request({ + url: '/autoSR/equipment/wifi/insert', method:'post', data }) diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue index 0341f46..a70b50f 100644 --- a/src/views/Equipment/index.vue +++ b/src/views/Equipment/index.vue @@ -174,20 +174,28 @@
-
+
批量转移批量绑定 +
+
+ 批量解绑
@@ -544,15 +552,21 @@ title="批量绑定批次号" width="40%" :visible.sync="dialogVisible4" + @close="resetBatch" > - + { + if (valid) { + let arr = []; + this.multipleSelection.map((item) => arr.push(item.imei)); + let obj = { + batchId: this.batchForm.batchId, + imeis: arr.join(","), + }; + this.$api.api.zkequipmentBindBatchId(obj).then((res) => { + console.log(res); + this.$message.success("绑定成功"); + this.equipmentManagement(); + this.dialogVisible5 = false; + }); + } + }); this.dialogVisible4 = false; }, //批量转移 infoMasstransfer() { this.dialogVisible5 = true; }, + zkequipmentUnbind() { + this.$confirm("确认批量解绑吗?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + let str = []; + this.multipleSelection.map((item) => { + if (item.receiveType != 2) { + str.push(item.imei); + } + }); + console.log(str); + this.$api.api + .zkequipmentUnbind({ + imeis: str.join(","), + }) + .then((res) => { + this.$message({ + type: "success", + message: "操作成功!", + }); + this.getTableList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, //批量转移确认 Masstransfer() { this.$refs.allbindForm.validate((valid) => { @@ -974,7 +1052,7 @@ export default { }, //批量归还 Batchreturn() { - this.$confirm("确认批量归还吗?", "提示", { + this.$confirm("确认批量解绑吗?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", @@ -993,7 +1071,7 @@ export default { .then((res) => { this.$message({ type: "success", - message: "批量归还成功!", + message: "操作成功!", }); this.equipmentManagement(); }); @@ -1001,7 +1079,7 @@ export default { .catch(() => { this.$message({ type: "info", - message: "已取消批量归还", + message: "已取消操作", }); }); }, diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue index 22992f2..c9414e3 100644 --- a/src/views/Equipment/state.vue +++ b/src/views/Equipment/state.vue @@ -90,7 +90,7 @@ class="div-inp" clearable collapse-tags - v-model="searchForm.online" + v-model="searchForm.onLine" placeholder="请选择" >
- 筛选
- 清空筛选条件 + 清空筛选条件
- 批量开启指示灯 + 批量开启指示灯 +
+
+ 批量关闭指示灯
- 批量关闭指示灯 + 批量归还 +
+
+ 批量转移 +
+
+ 批量解绑
-
在线数量：0 离线数量：279
+
+ 在线设备：{{ onLineCount || 0 }} 正在工作设备：{{ + workingCount || 0 + }} + 离线设备：{{ offLineCount || 0 }} +
@@ -221,48 +259,84 @@ -