设备指令发送添加提示

jnpf-java-boot/jnpf-web/src/api/device.js

@@ -22,7 +22,7 @@ export function cmdChange(deviceCode) {
     optTime: "",
     remark: "配置更新"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 重启设备
 export function cmdReboot(deviceCode) {
@@ -34,7 +34,7 @@ export function cmdReboot(deviceCode) {
     optTime: "",
     remark: "重启设备"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 重启应用
 export function cmdRestart(deviceCode) {
@@ -46,7 +46,7 @@ export function cmdRestart(deviceCode) {
     optTime: "",
     remark: "重启应用"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 更新应用
 export function cmdUpdate(deviceCode) {
@@ -58,7 +58,7 @@ export function cmdUpdate(deviceCode) {
     optTime: "",
     remark: "更新应用"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 抓拍
 export function cmdSnapshot(deviceCode) {
@@ -70,7 +70,7 @@ export function cmdSnapshot(deviceCode) {
     optTime: "",
     remark: "抓拍"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 获取状态
 export function cmdStatus(deviceCode) {
@@ -82,28 +82,28 @@ export function cmdStatus(deviceCode) {
     optTime: "",
     remark: "获取状态"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 设备指令
 export function cmdDevice(cmd, deviceCode) {
   switch (cmd) {
     case "change":
-      cmdChange(deviceCode);
+      return cmdChange(deviceCode);
       break;
     case "reboot":
-      cmdReboot(deviceCode);
+      return cmdReboot(deviceCode);
       break;
     case "restart":
-      cmdRestart(deviceCode);
+      return cmdRestart(deviceCode);
       break;
     case "update":
-      cmdUpdate(deviceCode);
+      return cmdUpdate(deviceCode);
       break;
     case "snapshot":
-      cmdSnapshot(deviceCode);
+      return cmdSnapshot(deviceCode);
       break;
     case "status":
-      cmdStatus(deviceCode);
+      return cmdStatus(deviceCode);
       break;
     default:
       break;
@@ -122,7 +122,7 @@ export function cmdDeliveryOpen(deviceCode, bucketCode) {
     optTime: "",
     remark: "投递开门"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 投递关门
 export function cmdDeliveryClose(deviceCode, bucketCode) {
@@ -134,7 +134,7 @@ export function cmdDeliveryClose(deviceCode, bucketCode) {
     optTime: "",
     remark: "投递关门"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 清运开门
 export function cmdCleanOpen(deviceCode, bucketCode) {
@@ -146,7 +146,7 @@ export function cmdCleanOpen(deviceCode, bucketCode) {
     optTime: "",
     remark: "清运开门"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 远程校准
 export function cmdAdjust(deviceCode, bucketCode) {
@@ -158,7 +158,7 @@ export function cmdAdjust(deviceCode, bucketCode) {
     optTime: "",
     remark: "远程校准"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 远程清零
 export function cmdClear(deviceCode, bucketCode) {
@@ -170,25 +170,25 @@ export function cmdClear(deviceCode, bucketCode) {
     optTime: "",
     remark: "远程清零"
   };
-  recycleDeviceCmd(data);
+  return recycleDeviceCmd(data);
 }
 // 桶指令
 export function cmdBucket(cmd, deviceCode, bucketCode) {
   switch (cmd) {
     case "deliveryOpen":
-      cmdDeliveryOpen(deviceCode, bucketCode);
+      return cmdDeliveryOpen(deviceCode, bucketCode);
       break;
     case "deliveryClose":
-      cmdDeliveryClose(deviceCode, bucketCode);
+      return cmdDeliveryClose(deviceCode, bucketCode);
       break;
     case "cleanOpen":
-      cmdCleanOpen(deviceCode, bucketCode);
+      return cmdCleanOpen(deviceCode, bucketCode);
       break;
     case "adjust":
-      cmdAdjust(deviceCode, bucketCode);
+      return cmdAdjust(deviceCode, bucketCode);
       break;
     case "clear":
-      cmdClear(deviceCode, bucketCode);
+      return cmdClear(deviceCode, bucketCode);
       break;
     default:
       break;

jnpf-java-boot/jnpf-web/src/views/recycledevice/DeviceInfo.vue

@@ -174,10 +174,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  cmdDevice,
-  cmdBucket
-} from "@/api/device";
+import { cmdDevice, cmdBucket } from "@/api/device";
 export default {
   components: {},
   props: [],
@@ -195,10 +192,34 @@ export default {
   mounted() {},
   methods: {
     fnCmdDeviceDo(cmdName) {
-      cmdDevice(cmdName,this.row.deviceCode)
+      cmdDevice(cmdName, this.row.deviceCode).then(res => {
+        if (res.code == 200) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+        } else {
+          this.$message({
+            message: res.msg,
+            type: "warning"
+          });
+        }
+      });
     },
-    fnCmdBucketDo(cmd,deviceCode,bucketCode) {
-      cmdBucket(cmd,deviceCode,bucketCode)
+    fnCmdBucketDo(cmd, deviceCode, bucketCode) {
+      cmdBucket(cmd, deviceCode, bucketCode).then(res => {
+        if (res.code == 200) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+        } else {
+          this.$message({
+            message: res.msg,
+            type: "warning"
+          });
+        }
+      });
     },
     init(row) {
       this.row = row;