Merge branch 'local_dev_ft' into 'main'

feat:设备列表命令下发记录新增查询条件

See merge request yunteng/thingskit-front!493

-import { BasicColumn } from '/@/components/Table';
+import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
 import moment from 'moment';
 import { Tag } from 'ant-design-vue';
 import { Tag } from 'ant-design-vue';
 import { h } from 'vue';
 import { h } from 'vue';
@@ -18,9 +18,9 @@ export const configColumns: BasicColumn[] = [
       return h(
       return h(
         Tag,
         Tag,
         {
         {
-          color: Number(text) === 0 ? 'blue' : 'green',
+          color: Number(text) === 1 ? 'green' : 'blue',
         },
         },
-        () => (Number(text) === 0 ? '自定义' : '服务')
+        () => (Number(text) === 1 ? '服务' : '自定义')
       );
       );
     },
     },
   },
   },
@@ -51,27 +51,80 @@ export const configColumns: BasicColumn[] = [
               ? '#00C9A7'
               ? '#00C9A7'
               : text == 'FAILED'
               : text == 'FAILED'
               ? 'red'
               ? 'red'
-              : 'green',
+              : text == 'SUCCESSFUL'
+              ? 'green'
+              : 'red',
         },
         },
         () => record?.statusName
         () => record?.statusName
       );
       );
     },
     },
   },
   },
   {
   {
-    title: '响应结果',
+    title: '响应内容',
     dataIndex: 'response111',
     dataIndex: 'response111',
     slots: { customRender: 'responseContent' },
     slots: { customRender: 'responseContent' },
   },
   },
-  // {
-  //   title: '响应失败内容',
-  //   dataIndex: 'response.error',
-  //   format: (_, record) => {
-  //     return record?.response === null ? '无' : record?.response?.error;
-  //   },
-  // },
   {
   {
     title: '命令内容',
     title: '命令内容',
     dataIndex: 'request.body',
     dataIndex: 'request.body',
     slots: { customRender: 'recordContent' },
     slots: { customRender: 'recordContent' },
   },
   },
 ];
 ];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'status',
+    label: '命令状态',
+    component: 'Select',
+    colProps: { span: 6 },
+    componentProps: {
+      options: [
+        {
+          label: '队列中',
+          value: 'QUEUED',
+        },
+        {
+          label: '已发送',
+          value: 'SENT',
+        },
+        {
+          label: '发送成功',
+          value: 'DELIVERED',
+        },
+
+        {
+          label: '响应成功',
+          value: 'SUCCESSFUL',
+        },
+        {
+          label: '超时',
+          value: 'TIMEOUT',
+        },
+        {
+          label: '已过期',
+          value: 'EXPIRED',
+        },
+        {
+          label: '响应失败',
+          value: 'FAILED',
+        },
+        {
+          label: '已删除',
+          value: 'DELETED',
+        },
+      ],
+      placeholder: '请选择命令状态',
+    },
+  },
+  {
+    field: 'sendTime',
+    label: '命令下发时间',
+    component: 'RangePicker',
+    componentProps: {
+      showTime: {
+        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+      },
+    },
+    colProps: { span: 6 },
+  },
+];

@@ -5,17 +5,18 @@
     </template>
     </template>
     <template #responseContent="{ record }">
     <template #responseContent="{ record }">
       <div v-if="!record.request?.oneway">
       <div v-if="!record.request?.oneway">
-        <a-button v-if="record?.response === null" type="text" class="ml-2"> 无 </a-button>
+        <a-button v-if="record?.response === null" type="text" class="ml-2"> 未响应 </a-button>
         <a-button v-else type="link" class="ml-2" @click="handleRecordResponseContent(record)">
         <a-button v-else type="link" class="ml-2" @click="handleRecordResponseContent(record)">
           查看
           查看
         </a-button>
         </a-button>
       </div>
       </div>
+      <div v-else>--</div>
     </template>
     </template>
   </BasicTable>
   </BasicTable>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { h } from 'vue';
   import { h } from 'vue';
-  import { configColumns } from './config';
+  import { configColumns, searchFormSchema } 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 } from 'ant-design-vue';
@@ -39,6 +40,12 @@
     showTableSetting: true,
     showTableSetting: true,
     bordered: true,
     bordered: true,
     showIndexColumn: false,
     showIndexColumn: false,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+      fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'x']],
+    },
+    useSearchForm: true,
   });
   });
   const commonModalInfo = (title, value) => {
   const commonModalInfo = (title, value) => {
     Modal.info({
     Modal.info({
@@ -55,7 +62,7 @@
   };
   };
   const handleRecordResponseContent = (record) => {
   const handleRecordResponseContent = (record) => {
     const jsonParams = record?.response;
     const jsonParams = record?.response;
-    commonModalInfo('响应结果', jsonParams);
+    commonModalInfo('响应内容', jsonParams);
   };
   };
 </script>
 </script>