Merge branch 'dev-fix-ww' into 'main_dev'

fix: 修复teambition中BUG

See merge request yunteng/thingskit-front!548

@@ -704,9 +704,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: [
@@ -746,7 +743,7 @@ export const CommandSchemas = (transportType: TransportTypeEnum): FormSchema[] =
       },
       },
       component: 'InputTextArea',
       component: 'InputTextArea',
       componentProps: {
       componentProps: {
-        autosize: {
+        autoSize: {
           minRows: 6,
           minRows: 6,
         },
         },
       },
       },

@@ -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
         ),
         ),

@@ -212,7 +212,6 @@
     const { deviceProfileId } = props.deviceDetail;
     const { deviceProfileId } = props.deviceDetail;
     const value = await getDeviceAttrs({ deviceProfileId });
     const value = await getDeviceAttrs({ deviceProfileId });
     socketInfo.attrKeys = isArray(value) ? value : [];
     socketInfo.attrKeys = isArray(value) ? value : [];
-    console.log(socketInfo);
     setDataSource();
     setDataSource();
     open();
     open();
   });
   });

 <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="h('div')"
+  >
+    <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,

@@ -212,9 +212,9 @@
         :title="`最后运行时间: ${dateUtil(getRecord.lastExecuteTime).format(DEFAULT_DATE_FORMAT)}`"
         :title="`最后运行时间: ${dateUtil(getRecord.lastExecuteTime).format(DEFAULT_DATE_FORMAT)}`"
       >
       >
         <div class="text-gray-400 text-xs truncate">
         <div class="text-gray-400 text-xs truncate">
-          <span class="mr-2">间隔时间重复</span>
+          <span class="mr-2">最近执行</span>
           <span>{{
           <span>{{
-            getLastExecuteTime.value
+            getLastExecuteTime.value > 0
               ? `${getLastExecuteTime.value}${getLastExecuteTime.unitName}前`
               ? `${getLastExecuteTime.value}${getLastExecuteTime.unitName}前`
               : '刚刚'
               : '刚刚'
           }}</span>
           }}</span>

@@ -19,7 +19,6 @@
   import { RunTaskModal } from './components/RunTaskModal';
   import { RunTaskModal } from './components/RunTaskModal';
   import { DetailDrawer } from './components/DetailDrawer';
   import { DetailDrawer } from './components/DetailDrawer';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
-  import { CardLayoutButton } from '/@/components/Widget';
 
 
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [registerDrawer, { openDrawer }] = useDrawer();
@@ -42,12 +41,10 @@
     getDataSource();
     getDataSource();
   };
   };
 
 
-  const colNumber = ref(5);
   const pagination = reactive({
   const pagination = reactive({
     current: 1,
     current: 1,
     total: 0,
     total: 0,
-    pageSize: unref(colNumber) * 2,
-    showQuickJumper: true,
+    pageSize: 10,
     size: 'small',
     size: 'small',
     showSizeChanger: false,
     showSizeChanger: false,
     showTotal: (total: number) => `共 ${total} 条数据`,
     showTotal: (total: number) => `共 ${total} 条数据`,
@@ -61,15 +58,13 @@
     try {
     try {
       loading.value = true;
       loading.value = true;
       const params = getFieldsValue();
       const params = getFieldsValue();
-      const pageSize = unref(colNumber) * 2;
       const { items, total } = await getTaskCenterList({
       const { items, total } = await getTaskCenterList({
         page: pagination.current,
         page: pagination.current,
-        pageSize,
+        pageSize: pagination.pageSize,
         ...params,
         ...params,
       });
       });
       dataSource.value = items;
       dataSource.value = items;
       pagination.total = total;
       pagination.total = total;
-      pagination.pageSize = pageSize;
     } catch (error) {
     } catch (error) {
       throw error;
       throw error;
     } finally {
     } finally {
@@ -154,7 +149,7 @@
               <span class="text-lg font-medium">任务列表</span>
               <span class="text-lg font-medium">任务列表</span>
             </div>
             </div>
             <Space>
             <Space>
-              <CardLayoutButton v-model:value="colNumber" @change="reload" />
+              <!-- <CardLayoutButton v-model:value="colNumber" :max="4" :min="1" @change="reload" /> -->
               <Tooltip v-if="dataSource.length" title="刷新">
               <Tooltip v-if="dataSource.length" title="刷新">
                 <Button type="primary" @click="getDataSource">
                 <Button type="primary" @click="getDataSource">
                   <ReloadOutlined :spin="loading" />
                   <ReloadOutlined :spin="loading" />

 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref, onMounted, unref, computed } from 'vue';
+  import { ref, computed } from 'vue';
   import { FrontComponent } from '../../../const/const';
   import { FrontComponent } from '../../../const/const';
-  import { DataSourceField, dataSourceSchema } from '../../config/basicConfiguration';
-  import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
+  import { dataSourceSchema } from '../../config/basicConfiguration';
   import { FormActionType } from '/@/components/Form';
   import { FormActionType } from '/@/components/Form';
   import BasicForm from '/@/components/Form/src/BasicForm.vue';
   import BasicForm from '/@/components/Form/src/BasicForm.vue';
   const formEl = ref<Nullable<FormActionType>>(null);
   const formEl = ref<Nullable<FormActionType>>(null);
@@ -19,10 +18,6 @@
     if (!frontId) return [];
     if (!frontId) return [];
     return dataSourceSchema(isEdit, frontId);
     return dataSourceSchema(isEdit, frontId);
   });
   });
-
-  onMounted(() => {
-    unref(formEl)?.setFieldsValue({ [DataSourceField.DEVICE_TYPE]: DeviceTypeEnum.SENSOR });
-  });
 </script>
 </script>
 
 
 <template>
 <template>

@@ -128,7 +128,6 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
       label: '设备类型',
       label: '设备类型',
       colProps: { span: 8 },
       colProps: { span: 8 },
       rules: [{ message: '请选择设备类型', required: true }],
       rules: [{ message: '请选择设备类型', required: true }],
-      // defaultValue: DeviceTypeEnum.SENSOR,
       componentProps: ({ formActionType }) => {
       componentProps: ({ formActionType }) => {
         const { setFieldsValue } = formActionType;
         const { setFieldsValue } = formActionType;
         return {
         return {