指令格式修改，连接失败不弹出

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

@@ -1,8 +1,9 @@
 import request from "@/utils/request";
+import dayjs from 'dayjs'
 
 // 远程设备指令
 export function recycleDeviceCmd(data) {
-  data.optTime = Date.now();
+  data.optTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
   return request({
     url: `/api/scm/RecycleDevice/command`,
     method: "POST",
@@ -18,7 +19,7 @@ export function cmdApply(deviceCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "apply",
-    data: "",
+    data: {},
     optTime: "",
     remark: "申请控制"
   };
@@ -30,7 +31,7 @@ export function cmdExit(deviceCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "exit",
-    data: "",
+    data: {},
     optTime: "",
     remark: "结束控制"
   };
@@ -42,7 +43,7 @@ export function cmdChange(deviceCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "change",
-    data: "",
+    data: {},
     optTime: "",
     remark: "配置更新"
   };
@@ -54,7 +55,7 @@ export function cmdReboot(deviceCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "reboot",
-    data: "",
+    data: {},
     optTime: "",
     remark: "重启设备"
   };
@@ -66,7 +67,7 @@ export function cmdRestart(deviceCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "restart",
-    data: "",
+    data: {},
     optTime: "",
     remark: "重启应用"
   };
@@ -78,7 +79,7 @@ export function cmdUpdate(deviceCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "update",
-    data: "",
+    data: {},
     optTime: "",
     remark: "更新应用"
   };
@@ -90,7 +91,7 @@ export function cmdSnapshot(deviceCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "snapshot",
-    data: "",
+    data: {},
     optTime: "",
     remark: "抓拍"
   };
@@ -133,7 +134,9 @@ export function cmdDeliveryOpen(deviceCode, bucketCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "deliveryOpen",
-    data: bucketCode,
+    data: {
+      bucketCode: bucketCode
+    },
     optTime: "",
     remark: "投递开门"
   };
@@ -145,7 +148,9 @@ export function cmdDeliveryClose(deviceCode, bucketCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "deliveryClose",
-    data: bucketCode,
+    data: {
+      bucketCode: bucketCode
+    },
     optTime: "",
     remark: "投递关门"
   };
@@ -157,7 +162,9 @@ export function cmdCleanOpen(deviceCode, bucketCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "cleanOpen",
-    data: bucketCode,
+    data: {
+      bucketCode: bucketCode
+    },
     optTime: "",
     remark: "清运开门"
   };
@@ -169,7 +176,9 @@ export function cmdAdjust(deviceCode, bucketCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "adjust",
-    data: bucketCode,
+    data: {
+      bucketCode: bucketCode
+    },
     optTime: "",
     remark: "远程校准"
   };
@@ -181,7 +190,9 @@ export function cmdClear(deviceCode, bucketCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "clear",
-    data: bucketCode,
+    data: {
+      bucketCode: bucketCode
+    },
     optTime: "",
     remark: "远程清零"
   };
@@ -193,7 +204,9 @@ export function cmdStatus(deviceCode, bucketCode) {
     orderNo: "",
     deviceCode: deviceCode,
     cmd: "status",
-    data: bucketCode,
+    data: {
+      bucketCode: bucketCode
+    },
     optTime: "",
     remark: "获取状态"
   };

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

@@ -241,6 +241,13 @@ export default {
             message: res.msg,
             type: "warning"
           });
+          if(cmdName == 'apply'){
+            this.visible = false;
+          }
+        }
+      }).catch((err)=>{
+        if(cmdName == 'apply'){
+          this.visible = false;
         }
       });
     },