perf: 设备命令下发放入命令下发记录中

@@ -719,9 +719,6 @@ export const CommandSchemas = (transportType: TransportTypeEnum): FormSchema[] =
       field: 'commandType',
       field: 'commandType',
       component: 'RadioGroup',
       component: 'RadioGroup',
       label: '下发类型',
       label: '下发类型',
-      colProps: {
-        span: 8,
-      },
       defaultValue: 'OneWay',
       defaultValue: 'OneWay',
       componentProps: {
       componentProps: {
         options: [
         options: [

@@ -25,9 +25,9 @@
       <TabPane key="7" tab="历史数据" v-if="deviceDetail?.deviceType !== 'GATEWAY'">
       <TabPane key="7" tab="历史数据" v-if="deviceDetail?.deviceType !== 'GATEWAY'">
         <HistoryData :deviceDetail="deviceDetail" />
         <HistoryData :deviceDetail="deviceDetail" />
       </TabPane> -->
       </TabPane> -->
-      <TabPane key="5" tab="命令下发" v-if="deviceDetail?.deviceType !== 'SENSOR'">
+      <!-- <TabPane key="5" tab="命令下发" v-if="deviceDetail?.deviceType !== 'SENSOR'">
         <CommandIssuance :deviceDetail="deviceDetail" />
         <CommandIssuance :deviceDetail="deviceDetail" />
-      </TabPane>
+      </TabPane> -->
       <TabPane key="3" tab="告警"><Alarm :id="deviceDetail.id" /></TabPane>
       <TabPane key="3" tab="告警"><Alarm :id="deviceDetail.id" /></TabPane>
       <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'GATEWAY'">
       <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'GATEWAY'">
         <ChildDevice
         <ChildDevice
@@ -36,7 +36,7 @@
         />
         />
       </TabPane>
       </TabPane>
       <TabPane key="7" tab="命令下发记录">
       <TabPane key="7" tab="命令下发记录">
-        <CommandRecord :fromId="deviceDetail?.tbDeviceId" />
+        <CommandRecord :deviceDetail="deviceDetail" :fromId="deviceDetail?.tbDeviceId" />
       </TabPane>
       </TabPane>
       <!-- 网关设备并且场家是TBox -->
       <!-- 网关设备并且场家是TBox -->
       <TabPane
       <TabPane
@@ -67,7 +67,6 @@
   import Alarm from '../tabs/Alarm.vue';
   import Alarm from '../tabs/Alarm.vue';
   import ChildDevice from '../tabs/ChildDevice.vue';
   import ChildDevice from '../tabs/ChildDevice.vue';
   import TBoxDetail from '../tabs/TBoxDetail.vue';
   import TBoxDetail from '../tabs/TBoxDetail.vue';
-  import CommandIssuance from '../tabs/CommandIssuance.vue';
   import { CommandRecord } from '../tabs/commandRecord/index';
   import { CommandRecord } from '../tabs/commandRecord/index';
   import { getDeviceDetail } from '/@/api/device/deviceManager';
   import { getDeviceDetail } from '/@/api/device/deviceManager';
   // import HistoryData from '../tabs/HistoryData.vue';
   // import HistoryData from '../tabs/HistoryData.vue';
@@ -86,7 +85,6 @@
       // RealTimeData,
       // RealTimeData,
       Alarm,
       Alarm,
       ChildDevice,
       ChildDevice,
-      CommandIssuance,
       TBoxDetail,
       TBoxDetail,
       // HistoryData,
       // HistoryData,
       ModelOfMatter,
       ModelOfMatter,

@@ -12,10 +12,10 @@
           </div>
           </div>
         </template>
         </template>
       </BasicForm>
       </BasicForm>
-      <div>
+      <Space class="w-full justify-end" justify="end">
         <Button :disabled="disable" type="primary" @click="handleOk" class="mr-2">确定</Button>
         <Button :disabled="disable" type="primary" @click="handleOk" class="mr-2">确定</Button>
         <Button type="default" @click="handleCancel" class="mr-2">重置</Button>
         <Button type="default" @click="handleCancel" class="mr-2">重置</Button>
-      </div>
+      </Space>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -29,7 +29,7 @@
   import jsoneditor from 'jsoneditor';
   import jsoneditor from 'jsoneditor';
   import 'jsoneditor/dist/jsoneditor.min.css';
   import 'jsoneditor/dist/jsoneditor.min.css';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
-  import { Tooltip } from 'ant-design-vue';
+  import { Space, Tooltip } from 'ant-design-vue';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { TransportTypeEnum } from '../../../profiles/components/TransportDescript/const';
   import { TransportTypeEnum } from '../../../profiles/components/TransportDescript/const';
 
 
@@ -42,7 +42,7 @@
   }
   }
 
 
   export default defineComponent({
   export default defineComponent({
-    components: { BasicForm, Button, QuestionCircleOutlined, Tooltip },
+    components: { BasicForm, Button, QuestionCircleOutlined, Tooltip, Space },
     props: {
     props: {
       deviceDetail: {
       deviceDetail: {
         type: Object as PropType<DeviceRecord>,
         type: Object as PropType<DeviceRecord>,
@@ -56,7 +56,7 @@
       const disable = ref(false);
       const disable = ref(false);
 
 
       const [registerForm, { getFieldsValue, validate, resetFields }] = useForm({
       const [registerForm, { getFieldsValue, validate, resetFields }] = useForm({
-        labelWidth: 100,
+        labelWidth: 120,
         schemas: CommandSchemas(
         schemas: CommandSchemas(
           props.deviceDetail.deviceProfile.transportType as TransportTypeEnum
           props.deviceDetail.deviceProfile.transportType as TransportTypeEnum
         ),
         ),

 <template>
 <template>
   <BasicTable class="command-record-table" @register="registerTable">
   <BasicTable class="command-record-table" @register="registerTable">
+    <template #toolbar>
+      <Space>
+        <Button type="primary" @click="openModal(true)">命令下发</Button>
+      </Space>
+    </template>
     <template #recordContent="{ record }">
     <template #recordContent="{ record }">
-      <a-button type="link" class="ml-2" @click="handleRecordContent(record)"> 查看 </a-button>
+      <Button type="link" class="ml-2" @click="handleRecordContent(record)"> 查看 </Button>
     </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-else type="link" class="ml-2" @click="handleRecordResponseContent(record)">
+        <Button v-if="record?.response === null" type="text" class="ml-2"> 未响应 </Button>
+        <Button v-else type="link" class="ml-2" @click="handleRecordResponseContent(record)">
           查看
           查看
-        </a-button>
+        </Button>
       </div>
       </div>
       <div v-else>--</div>
       <div v-else>--</div>
     </template>
     </template>
   </BasicTable>
   </BasicTable>
+
+  <BasicModal
+    @register="registerCommandIssuanceModal"
+    width="600px"
+    title="命令下发"
+    :showOkBtn="false"
+    cancelText="关闭"
+    footer=""
+  >
+    <CommandIssuance :deviceDetail="deviceDetail" />
+  </BasicModal>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { h } from 'vue';
   import { h } from 'vue';
   import { configColumns, searchFormSchema } 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 { Button, Modal, Space } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { JsonPreview } from '/@/components/CodeEditor';
+  import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import { BasicModal, useModal } from '/@/components/Modal';
+  import CommandIssuance from '../CommandIssuance.vue';
 
 
   const props = defineProps({
   const props = defineProps({
     fromId: {
     fromId: {
       type: String,
       type: String,
       default: '',
       default: '',
     },
     },
+    deviceDetail: {
+      type: Object as PropType<DeviceRecord>,
+      required: true,
+    },
   });
   });
+
+  const [registerCommandIssuanceModal, { openModal }] = useModal();
+
   const [registerTable] = useTable({
   const [registerTable] = useTable({
     api: deviceCommandRecordGetQuery,
     api: deviceCommandRecordGetQuery,
     columns: configColumns,
     columns: configColumns,