Merge branch 'local_dev_ft' into 'main'

pref:优化命令下发记录

See merge request yunteng/thingskit-front!484

-import { Rule } from 'ant-design-vue/lib/form/interface';
-/**
- * 常用表单自定义验证规则
- *
- */
-
-export const validatorLongitude = (_rule: Rule, value: string) => {
-  const reg =
-    /^(\-|\+)?(((\d|[1-9]\d|1[0-7]\d|0{1,3})\.\d{0,20})|(\d|[1-9]\d|1[0-7]\d|0{1,3})|180\.0{0,20}|180)$/;
-  if (!value) {
-    return Promise.reject('请输入经度');
-  } else if (!reg.test(value)) {
-    return Promise.reject('经度整数部分为0-180,小数部分为0到6位!');
-  }
-  return Promise.resolve();
-};
-export const validatorLatitude = (_rule: Rule, value: string) => {
-  const reg = /^(\-|\+)?([0-8]?\d{1}\.\d{0,20}|90\.0{0,20}|[0-8]?\d{1}|90)$/;
-  if (value === '') {
-    return Promise.reject('请输入维度');
-  } else if (!reg.test(value)) {
-    return Promise.reject('纬度整数部分为0-90,小数部分为0到6位!');
-  }
-
-  return Promise.resolve();
-};
-
-//正整数并且可以是英文
-export const numberAndEngLishRule: Rule[] = [
-  {
-    validator: (_, value: string) => {
-      const reg1 = /^[0-9]*[1-9][0-9]*$/;
-      const reg2 = /^[A-Za-z0-9]+$/;
-      if (!reg1.test(value) && !reg2.test(value)) {
-        return Promise.reject('不能为负数');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-//数字和非负数
-export const numberAndNonegativeRule: Rule[] = [
-  {
-    validator: (_, value: string) => {
-      const reg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/;
-      if (!reg.test(value)) {
-        return Promise.reject('不能为负数或者不能输入非数字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-// 数字验证
-export const numberRule: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      const reg = /^[0-9]{8}$/;
-      if (!reg.test(value)) {
-        return Promise.reject('只能输入数字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-export const phoneRegexp = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-
-//中英文正则
-export const chineseAndEnlishRule: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      const reg = /^[a-zA-Z\u4e00-\u9fa5]+$/;
-      if (value === '' || value === undefined) {
-        return Promise.reject('请输入');
-      } else if (!reg.test(value)) {
-        return Promise.reject('格式不正确');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-// 手机号验证
-export const phoneRule: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-      if (value === '') {
-        return Promise.reject('请输入手机号码');
-      } else if (!reg.test(value)) {
-        return Promise.reject('手机号格式不正确');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-// 电子邮箱验证
-export const emailRule: Rule[] = [
-  {
-    validator: (_, value: string) => {
-      const reg = /^\w{3,}(\.\w+)*@[A-z0-9]+(\.[A-z]{2,5}){1,2}$/;
-      if (!value) {
-        return Promise.resolve();
-      } else if (!reg.test(value)) {
-        return Promise.reject('电子邮箱格式不正确');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-// 中文正则
-export const ChineseRegexp = /[\u4E00-\u9FA5]/;
-
-//字母或者数字正则
-export const allowLetterAndNumberRegExp = /^[A-Za-z0-9]+$/;
-
-// 电子邮箱正则
-export const EmailRegexp = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
-
-// 手机号正则
-export const PhoneRegexp = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-
-//中文正则
-export const ChineseRegVerify: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      const ChineseRegexp = /[\u4E00-\u9FA5]/;
-      if (!ChineseRegexp.test(value)) {
-        return Promise.reject('用户名只能是中文');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-/**
- * 视频管理
- */
-export const CameraMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 50) {
-        return Promise.reject('视频标题长度不超过200字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const CameraVideoUrl: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      const ChineseRegexp = /[\u4E00-\u9FA5]/;
-      if (ChineseRegexp.test(value)) {
-        return Promise.reject('输入内容不能是中文');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const CameraVideoStreamUrl: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      const ChineseRegexp =
-        /^https?:\/\/(.+\/)+.+(\.(swf|avi|flv|mpg|rm|mov|wav|asf|3gp|mkv|rmvb|mp4|m3u8))$/i;
-      if (!ChineseRegexp.test(value)) {
-        return Promise.reject('请输入正确格式的视频地址');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-export const CameraNumberUrl: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      const ChineseRegexp = /^[A-Za-z0-9]+$/;
-      if (!ChineseRegexp.test(value)) {
-        return Promise.reject('请输入正确格式的视频编号');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-//站内通知
-export const NotificationTitleMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 50) {
-        return Promise.reject('标题长度不超过200字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const NotificationContentMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 50) {
-        return Promise.reject('内容长度不超过50字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const DeviceNameMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 30) {
-        return Promise.reject('设备名称长度不超过30字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const DeviceProfileIdMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 36) {
-        return Promise.reject('所属产品长度不超过36字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const DeviceOrgIdMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 36) {
-        return Promise.reject('组织长度不超过36字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const DeviceLabelMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 255) {
-        return Promise.reject('设备标签不超过255字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-export const DeviceDescriptionlMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 500) {
-        return Promise.reject('备注不超过500字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-export const DeviceIdMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 36) {
-        return Promise.reject('id不超过36字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const DeviceTenantIdMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 36) {
-        return Promise.reject('租户Code不超过36字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const DeviceTbDeviceIdMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 36) {
-        return Promise.reject('tbDeviceId不超过36字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const DeviceUserNameMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 50) {
-        return Promise.reject('用户名长度不超过50字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const DeviceQueryUserNameMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 50) {
-        return Promise.reject('设备名称长度不超过50字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-export const DeviceProfileQueryUserNameMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (String(value).length > 255) {
-        return Promise.reject('配置名称长度不超过255字');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
-
-enum MediaType {
-  MP4 = 'mp4',
-  M3U8 = 'm3u8',
-}
-
-export const MediaTypeValidate: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      const reg = /(?:.*)(?<=\.)/;
-      const type = (value || '').replace(reg, '');
-      if (type !== MediaType.M3U8) {
-        return Promise.reject('视频流只支持m3u8格式');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
+import { Rule } from 'ant-design-vue/lib/form/interface';
+/**
+ * 常用表单自定义验证规则
+ *
+ */
+
+export const validatorLongitude = (_rule: Rule, value: string) => {
+  const reg =
+    /^(\-|\+)?(((\d|[1-9]\d|1[0-7]\d|0{1,3})\.\d{0,20})|(\d|[1-9]\d|1[0-7]\d|0{1,3})|180\.0{0,20}|180)$/;
+  if (!value) {
+    return Promise.reject('请输入经度');
+  } else if (!reg.test(value)) {
+    return Promise.reject('经度整数部分为0-180,小数部分为0到6位!');
+  }
+  return Promise.resolve();
+};
+export const validatorLatitude = (_rule: Rule, value: string) => {
+  const reg = /^(\-|\+)?([0-8]?\d{1}\.\d{0,20}|90\.0{0,20}|[0-8]?\d{1}|90)$/;
+  if (value === '') {
+    return Promise.reject('请输入维度');
+  } else if (!reg.test(value)) {
+    return Promise.reject('纬度整数部分为0-90,小数部分为0到6位!');
+  }
+
+  return Promise.resolve();
+};
+
+//正整数并且可以是英文
+export const numberAndEngLishRule: Rule[] = [
+  {
+    validator: (_, value: string) => {
+      const reg1 = /^[0-9]*[1-9][0-9]*$/;
+      const reg2 = /^[A-Za-z0-9]+$/;
+      if (!reg1.test(value) && !reg2.test(value)) {
+        return Promise.reject('不能为负数');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+//数字和非负数
+export const numberAndNonegativeRule: Rule[] = [
+  {
+    validator: (_, value: string) => {
+      const reg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/;
+      if (!reg.test(value)) {
+        return Promise.reject('不能为负数或者不能输入非数字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+// 数字验证
+export const numberRule: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const reg = /^[0-9]{8}$/;
+      if (!reg.test(value)) {
+        return Promise.reject('只能输入数字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+export const phoneRegexp = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+
+//中英文正则
+export const chineseAndEnlishRule: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const reg = /^[a-zA-Z\u4e00-\u9fa5]+$/;
+      if (value === '' || value === undefined) {
+        return Promise.reject('请输入');
+      } else if (!reg.test(value)) {
+        return Promise.reject('格式不正确');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+// 手机号验证
+export const phoneRule: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+      if (value === '') {
+        return Promise.reject('请输入手机号码');
+      } else if (!reg.test(value)) {
+        return Promise.reject('手机号格式不正确');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+// 电子邮箱验证
+export const emailRule: Rule[] = [
+  {
+    validator: (_, value: string) => {
+      const reg = /^\w{3,}(\.\w+)*@[A-z0-9]+(\.[A-z]{2,5}){1,2}$/;
+      if (!value) {
+        return Promise.resolve();
+      } else if (!reg.test(value)) {
+        return Promise.reject('电子邮箱格式不正确');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+// 中文正则
+export const ChineseRegexp = /[\u4E00-\u9FA5]/;
+
+//字母或者数字正则
+export const allowLetterAndNumberRegExp = /^[A-Za-z0-9]+$/;
+
+// 电子邮箱正则
+export const EmailRegexp = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
+
+// 手机号正则
+export const PhoneRegexp = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+
+//中文正则
+export const ChineseRegVerify: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const ChineseRegexp = /[\u4E00-\u9FA5]/;
+      if (!ChineseRegexp.test(value)) {
+        return Promise.reject('用户名只能是中文');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+/**
+ * 视频管理
+ */
+export const CameraMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('视频标题长度不超过200字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const CameraVideoUrl: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const ChineseRegexp = /[\u4E00-\u9FA5]/;
+      if (ChineseRegexp.test(value)) {
+        return Promise.reject('输入内容不能是中文');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const CameraVideoStreamUrl: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const ChineseRegexp =
+        /^https?:\/\/(.+\/)+.+(\.(swf|avi|flv|mpg|rm|mov|wav|asf|3gp|mkv|rmvb|mp4|m3u8))$/i;
+      if (!ChineseRegexp.test(value)) {
+        return Promise.reject('请输入正确格式的视频地址');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+export const CameraNumberUrl: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const ChineseRegexp = /^[A-Za-z0-9]+$/;
+      if (!ChineseRegexp.test(value)) {
+        return Promise.reject('请输入正确格式的视频编号');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+//站内通知
+export const NotificationTitleMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('标题长度不超过200字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const NotificationContentMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('内容长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 30) {
+        return Promise.reject('设备名称长度不超过30字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceProfileIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('所属产品长度不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceOrgIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('组织长度不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceLabelMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 255) {
+        return Promise.reject('设备标签不超过255字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+export const DeviceDescriptionlMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 500) {
+        return Promise.reject('备注不超过500字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+export const DeviceIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('id不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceTenantIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('租户Code不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceTbDeviceIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('tbDeviceId不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceUserNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('用户名长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceQueryUserNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('设备名称长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceProfileQueryUserNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 255) {
+        return Promise.reject('配置名称长度不超过255字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+// enum MediaType {
+//   MP4 = 'mp4',
+//   M3U8 = 'm3u8',
+// }
+
+export const MediaTypeValidate: Rule[] = [
+  {
+    required: true,
+    // validator: (_, value: string) => {
+    //   // const reg = /(?:.*)(?<=\.)/;
+    //   // const type = (value || '').replace(reg, '');
+    //   // if (type !== MediaType.M3U8) {
+    //   //   return Promise.reject('视频流只支持m3u8格式');
+    //   // }
+    //   return Promise.resolve();
+    // },
+    validateTrigger: 'blur',
+  },
+];

@@ -88,24 +88,43 @@
         unref(jsonInstance).set({});
         unref(jsonInstance).set({});
       };
       };
       const handleOk = async () => {
       const handleOk = async () => {
+        disable.value = true;
         try {
         try {
-          disable.value = true;
           // 验证
           // 验证
           const valid = await validate();
           const valid = await validate();
           if (!valid) return;
           if (!valid) return;
           // 收集表单数据
           // 收集表单数据
           const field = getFieldsValue();
           const field = getFieldsValue();
+          let passStatus = false;
           if (field.valueType === 'json') {
           if (field.valueType === 'json') {
             const getJson = unref(jsonInstance).get();
             const getJson = unref(jsonInstance).get();
+            if (Object.prototype.isPrototypeOf(getJson) && Object.keys(getJson).length === 0) {
+              createMessage.error('命令内容不能为空');
+              passStatus = true;
+            }
+            if (getJson === '') {
+              passStatus = true;
+              createMessage.error('命令内容不能为空');
+            }
             jsonData.value.params = getJson;
             jsonData.value.params = getJson;
           } else {
           } else {
             jsonData.value.params = field.commandText;
             jsonData.value.params = field.commandText;
+            if (!jsonData.value.params) {
+              createMessage.error('命令内容不能为空');
+              passStatus = true;
+            }
+            if (
+              jsonData.value.params == '""' ||
+              jsonData.value.params == "''" ||
+              jsonData.value.params == '“”'
+            ) {
+              createMessage.error('命令内容不能为空');
+              passStatus = true;
+            }
           }
           }
           jsonData.value.persistent = true;
           jsonData.value.persistent = true;
-          // jsonData.value.additionalInfo = {
-          //   cmdType: 'API',
-          // };
           jsonData.value.method = 'methodThingskit';
           jsonData.value.method = 'methodThingskit';
+          if (passStatus) return;
           commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value)
           commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value)
             .then((res) => {
             .then((res) => {
               if (!res) return;
               if (!res) return;
@@ -126,8 +145,8 @@
               }, 300);
               }, 300);
             });
             });
         } catch (e) {
         } catch (e) {
+        } finally {
           //这里捕获json插件的错误
           //这里捕获json插件的错误
-          createMessage.error('请填写正确的json格式数据');
           disable.value = false;
           disable.value = false;
         }
         }
       };
       };

@@ -14,6 +14,15 @@ export const configColumns: BasicColumn[] = [
   {
   {
     title: '命令类型',
     title: '命令类型',
     dataIndex: 'additionalInfo.cmdType',
     dataIndex: 'additionalInfo.cmdType',
+    format: (text) => {
+      return h(
+        Tag,
+        {
+          color: Number(text) === 0 ? 'blue' : 'green',
+        },
+        () => (Number(text) === 0 ? '自定义' : '服务')
+      );
+    },
   },
   },
   {
   {
     title: '响应类型',
     title: '响应类型',
@@ -50,16 +59,8 @@ export const configColumns: BasicColumn[] = [
   },
   },
   {
   {
     title: '响应结果',
     title: '响应结果',
-    dataIndex: 'response',
-    customRender: (text) => {
-      return h(
-        Tag,
-        {
-          color: text?.status === 'SUCCESS' ? 'green' : 'red',
-        },
-        () => (text?.status === 'SUCCESS' ? '成功' : '失败')
-      );
-    },
+    dataIndex: 'response111',
+    slots: { customRender: 'responseContent' },
   },
   },
   {
   {
     title: '响应失败内容',
     title: '响应失败内容',

@@ -4,6 +4,13 @@
       <template #recordContent="{ record }">
       <template #recordContent="{ record }">
         <a-button type="link" class="ml-2" @click="handleRecordContent(record)"> 查看 </a-button>
         <a-button type="link" class="ml-2" @click="handleRecordContent(record)"> 查看 </a-button>
       </template>
       </template>
+      <template #responseContent="{ record }">
+        <Tag
+          v-if="!record.request?.oneway"
+          :color="record.request?.response?.status === 'SUCCESS' ? 'green' : 'red'"
+          >{{ record.request?.response?.status === 'SUCCESS' ? '成功' : '失败' }}</Tag
+        >
+      </template>
     </BasicTable>
     </BasicTable>
   </div>
   </div>
 </template>
 </template>
@@ -12,7 +19,7 @@
   import { configColumns } from './config';
   import { configColumns } from './config';
   import { deviceCommandRecordGetQuery } from '/@/api/device/deviceConfigApi';
   import { deviceCommandRecordGetQuery } from '/@/api/device/deviceConfigApi';
   import { BasicTable, useTable } from '/@/components/Table';
   import { BasicTable, useTable } from '/@/components/Table';
-  import { Modal } from 'ant-design-vue';
+  import { Modal, Tag } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { JsonPreview } from '/@/components/CodeEditor';
 
 
   const props = defineProps({
   const props = defineProps({
@@ -42,6 +49,9 @@
     });
     });
   };
   };
   const handleRecordContent = (record) => {
   const handleRecordContent = (record) => {
-    commonModalInfo('命令下发内容', JSON.parse(record?.request?.body?.params));
+    if (!record?.request?.body?.params) return;
+    //如果是正常格式则返回params，否则输入什么内容则显示什么内容
+    const jsonParams = JSON.parse(record?.request?.body?.params);
+    commonModalInfo('命令下发内容', jsonParams?.params ? jsonParams?.params : jsonParams);
   };
   };
 </script>
 </script>