Merge branch 'f-dev' into 'main'

fix：修改调度日志分页

See merge request huang/yun-teng-iot-front!275

@@ -9,6 +9,7 @@ export type SchedueParam = {
   orderType: string;
   data?: any;
   code?: number;
+  jobId?: string;
 };
 
 export interface ReportModel {

 <template>
   <div>
-    <BasicModal
-      v-bind="$attrs"
-      width="55rem"
-      :height="heightNum"
-      @register="register"
-      title="执行设备及属性"
-      @cancel="handleCancel"
-      :showOkBtn="false"
-    >
+    <BasicModal v-bind="$attrs" width="55rem" :height="heightNum" @register="register" title="执行设备及属性"
+      @cancel="handleCancel" :showOkBtn="false">
       <div>
         <BasicTable @register="registerTable" :dataSource="tableData" />
       </div>
@@ -16,35 +9,38 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { ref, nextTick } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicTable, useTable } from '/@/components/Table';
-  import { viewDeviceColumn } from './config.data';
+import { ref, nextTick } from 'vue';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { BasicTable, useTable } from '/@/components/Table';
+import { viewDeviceColumn } from './config.data';
+import { reportEditDetailPage } from '/@/api/report/reportManager';
 
-  const heightNum = ref(800);
-  const tableData: any = ref([]);
-  const [registerTable] = useTable({
-    title: '执行设备及属性',
-    columns: viewDeviceColumn,
-    showIndexColumn: false,
-    clickToRowSelect: false,
-    showTableSetting: false,
-    bordered: true,
-  });
-  const [register] = useModalInner((data) => {
-    console.log(data);
-    const getTableData = () => {
-      for (let i = 0; i < 100; i++) {
-        tableData.value.push({
-          device: `设备${i}`,
-          attribute: `CO${i}、Temp${i}`,
-        });
+const heightNum = ref(800);
+const tableData: any = ref([]);
+const [registerTable] = useTable({
+  title: '执行设备及属性',
+  columns: viewDeviceColumn,
+  showIndexColumn: false,
+  clickToRowSelect: false,
+  showTableSetting: false,
+  bordered: true,
+});
+const [register] = useModalInner((data) => {
+  const getTableData = async () => {
+    const res: any = await reportEditDetailPage(data.record.id)
+    const resMap = res.data.executeAttributes.map(d => {
+      return {
+        device: d.name,
+        attribute: d.attributes.join(',')
       }
-    };
-    nextTick(() => {
-      getTableData();
-    });
+    })
+    tableData.value = resMap
+  };
+  nextTick(() => {
+    getTableData();
   });
-  const handleCancel = () => {};
+});
+const handleCancel = () => { };
 </script>
-<style></style>
+<style>
+</style>

 <template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" showFooter :title="getTitle" width="30%" @ok="handleSubmit">
+  <BasicDrawer :maskClosable="false" @close="handleClose" destroyOnClose v-bind="$attrs" @register="registerDrawer"
+    showFooter :title="getTitle" width="30%" @ok="handleSubmit">
     <BasicForm @register="registerForm">
       <template #devices>
         <Select placeholder="请选择设备" v-model:value="selectDevice" style="width: 100%" :options="selectOptions"
           @change="handleDeviceChange" mode="multiple" labelInValue allowClear notFoundContent="请选择设备" />
         <div style="margin-top: 1.5vh"></div>
-        <div v-for="(item, index) in deviceList" :key="index">
-          <DeviceAttrCpns ref="deviceAttrRef" @change="handleChange" :value="item" :orgId="organizationId || orgId" />
-        </div>
+        <DeviceAttrCpns ref="deviceAttrRef" @change="handleChange" :value="deviceList"
+          :orgId="organizationId || orgId" />
       </template>
     </BasicForm>
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-import { ref, computed, unref, reactive, watch, nextTick, Ref } from 'vue';
+import { ref, computed, unref, reactive, watch, Ref } from 'vue';
 import { BasicForm, useForm } from '/@/components/Form';
 import { formSchema, organizationId } from './config.data';
 import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -26,6 +26,7 @@ import DeviceAttrCpns from './cpns/DeviceAttrCpns.vue';
 import { SelectTypes } from 'ant-design-vue/es/select';
 import { SchemaFiled } from './config.data';
 import { QueryWay } from '../../device/localtion/cpns/TimePeriodForm/config';
+import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
 
 type TDeviceList = {
   key?: string,
@@ -36,17 +37,22 @@ type TDeviceList = {
   name?: string
 }
 const emit = defineEmits(['success', 'register']);
-const deviceAttrRef: any = ref(null);
+const deviceAttrRef = ref<InstanceType<typeof DeviceAttrCpns> | null>(null)
 const isUpdate = ref(true);
 const editId = ref('');
 const orgId = ref('');
 const selectOptions: Ref<SelectTypes['options']> = ref([]);
 const selectDevice = ref([]);
 const deviceList: Ref<TDeviceList[]> = ref([]);
+const editDeviceList: Ref<TDeviceList[]> = ref([]);
+let editResData: any = reactive({})
+const watchOrgId = ref('')
+const editDeviceAttr: any = ref([])
 
 watch(organizationId, async (newValue: string) => {
   if (!newValue) return;
   //获取设备
+  watchOrgId.value = newValue
   const { items } = await screenLinkPageByDeptIdGetDevice({
     organizationId: newValue,
   });
@@ -59,9 +65,10 @@ watch(organizationId, async (newValue: string) => {
   });
 });
 const handleDeviceChange = (e) => {
+  console.log(e)
   deviceList.value = e;
 };
-const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
+const [registerForm, { validate, setFieldsValue, resetFields, updateSchema, getFieldsValue }] = useForm({
   labelWidth: 120,
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -73,19 +80,53 @@ const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (
   isUpdate.value = !!data?.isUpdate;
   if (unref(isUpdate)) {
     //编辑回显数据
-    const editResData: any = await reportEditDetailPage(data.record.id)
-    console.log(editResData.data)
-    // //回显基础数据
+    editResData = await reportEditDetailPage(data.record.id)
+    //回显基础数据
     editId.value = editResData.data.id;
     await setFieldsValue(editResData.data);
     //回显嵌套数据
-    setFieldsValue({
+    await setFieldsValue({
       agg: editResData.data.queryCondition?.agg,
       interval: editResData.data.queryCondition?.interval,
+      limit1: editResData.data.queryCondition?.limit,
+      orderBy: editResData.data.queryCondition?.orderBy,
+      useStrictDataTypes: editResData.data.queryCondition?.useStrictDataTypes
     });
+    //回显聚合条件
+    const dataCompareOpions = [
+      { label: '最小值', value: AggregateDataEnum.MIN },
+      { label: '最大值', value: AggregateDataEnum.MAX },
+      { label: '平均值', value: AggregateDataEnum.AVG },
+      { label: '求和', value: AggregateDataEnum.SUM },
+      { label: '空', value: AggregateDataEnum.NONE }
+    ]
+    const updateSchemaAgg = (options: {}) => {
+      updateSchema({
+        field: SchemaFiled.AGG,
+        componentProps: {
+          options,
+        },
+      });
+    }
+    if (editResData.data.dataType == 1) updateSchemaAgg(dataCompareOpions.slice(0, 4))
+    else updateSchemaAgg(dataCompareOpions.slice(4, 5))
+    //回显执行方式和查询周期
+    const dataQueryOpions = [
+      { label: '固定周期', value: QueryWay.LATEST },
+      { label: '自定义周期', value: QueryWay.TIME_PERIOD },
+    ];
+    const updateSchemaQuery = (options: {}) => {
+      updateSchema({
+        field: SchemaFiled.WAY,
+        componentProps: {
+          options,
+        },
+      });
+    }
+    if (editResData.data.executeWay == 0) updateSchemaQuery(dataQueryOpions)
+    else updateSchemaQuery(dataQueryOpions.slice(0, 1))
     //回显设备
     orgId.value = editResData.data.organizationId;
-    //获取该组织下的设备--排除网关设备
     const { items } = await screenLinkPageByDeptIdGetDevice({
       organizationId: editResData.data.organizationId,
     });
@@ -103,25 +144,54 @@ const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (
       }
     })
     selectDevice.value = deviceIds;
-    //回显设备属性 TODO 模拟的数据 待服务端返回
-    deviceList.value = editResData.data.executeAttributes
-    nextTick(() => { });
+    //回显设备属性
+    editDeviceAttr.value = editResData.data.executeAttributes?.map(item => {
+      return {
+        label: item.name,
+        value: item.device,
+        attributes: item.attributes,
+      }
+    })
+    deviceList.value = editDeviceAttr.value
+    editDeviceList.value = editResData.data.executeAttributes
   } else {
     editId.value = '';
     orgId.value = '';
     selectDevice.value = [];
     selectOptions.value = [];
     deviceList.value = [];
+    getAttrDevice.value = []
+    editDeviceList.value = []
+    editDeviceAttr.value = []
+    updateSchema({
+      field: SchemaFiled.AGG,
+      componentProps: {
+        options: [],
+      },
+    });
+    //新增显示执行方式和查询周期
+    const dataQueryOpions = [
+      { label: '固定周期', value: QueryWay.LATEST },
+      { label: '自定义周期', value: QueryWay.TIME_PERIOD },
+    ];
+    const updateSchemaQuery = (options: {}) => {
+      updateSchema({
+        field: SchemaFiled.WAY,
+        componentProps: {
+          options,
+        },
+      });
+    }
+    if (getFieldsValue().executeWay == 0) updateSchemaQuery(dataQueryOpions)
   }
 });
+const handleClose = () => {
+  deviceList.value = [];
+}
 const getAttrDevice: Ref<TDeviceList[]> = ref([]);
 const getTitle = computed(() => (!unref(isUpdate) ? '新增报表配置' : '编辑报表配置'));
 const handleChange = (e: any) => {
-  getAttrDevice.value.push({
-    device: e.value,
-    attribute: e.attribute,
-    name: e.device
-  });
+  getAttrDevice.value = e
 };
 let postObj: any = reactive({});
 let queryCondition: any = reactive({});
@@ -134,8 +204,10 @@ async function handleSubmit() {
     const { createMessage } = useMessage();
     const values = await validate();
     if (!values) return;
-    if (getAttrDevice.value.length === 0) {
-      return createMessage.error('请选择设备及其属性');
+    if (!unref(isUpdate)) {
+      if (getAttrDevice.value.length === 0) {
+        return createMessage.error('请选择设备及其属性');
+      }
     }
     if (values.executeWay == 0) {
       executeContent = null;
@@ -145,7 +217,7 @@ async function handleSubmit() {
     queryCondition = {
       agg: values.agg,
       interval: values.interval,
-      limit: values.limit,
+      limit: values.limit1,
     };
     if (values.way === QueryWay.LATEST) {
       startTs.value = moment().subtract(values.startTs, 'ms').valueOf()
@@ -162,9 +234,10 @@ async function handleSubmit() {
     delete values.cronTime;
     delete values.cronWeek;
     delete values.cronYear;
+    delete values.limit1;
     postObj = {
       ...values,
-      ...{ executeAttributes: getAttrDevice.value },
+      ...{ executeAttributes: getAttrDevice.value.length == 0 ? editDeviceList.value : getAttrDevice.value },
       ...{ queryCondition },
       ...{
         startTs: startTs.value

@@ -5,7 +5,7 @@ import moment from 'moment';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { isTiming, isWeek, isMonth } from './timeConfig';
+import { isTiming, isWeek, isMonth, isFixedTime } from './timeConfig';
 import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
 import { Moment } from 'moment';
 import {
@@ -13,6 +13,8 @@ import {
   getPacketIntervalByValue,
   intervalOption,
 } from '../../device/localtion/cpns/TimePeriodForm/helper';
+import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+import { getAuthCache } from '/@/utils/auth';
 
 export enum QueryWay {
   LATEST = 'latest',
@@ -40,15 +42,15 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '所属组织',
-    dataIndex: 'organizationName',
+    dataIndex: 'organizationDTO.name',
     width: 120,
   },
   {
     title: '数据类型',
-    dataIndex: 'dataCompare',
+    dataIndex: 'dataType',
     width: 120,
     format: (_text: string, record: Recordable) => {
-      return record.dataCompare === 0 ? '历史数据' : record.dataCompare === 1 ? '同比' : '环比';
+      return record.dataType === 0 ? '历史数据' : record.dataType === 1 ? '同比' : '环比';
     },
   },
   {
@@ -75,6 +77,10 @@ export const columns: BasicColumn[] = [
     title: '创建人',
     dataIndex: 'creator',
     width: 180,
+    format: (_text: string, record: Recordable) => {
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      if (record.creator == userInfo.userId) return userInfo.realName || userInfo.username;
+    },
   },
   {
     title: '创建日期',
@@ -191,9 +197,9 @@ export const formSchema: QFormSchema[] = [
       span: 24,
     },
     defaultValue: 0,
-    componentProps: {
-      placeholder: '请选择执行方式',
-      options: [
+    componentProps: ({ formActionType }) => {
+      const { updateSchema, setFieldsValue } = formActionType;
+      const options = [
         {
           label: '立即执行',
           value: 0,
@@ -202,7 +208,38 @@ export const formSchema: QFormSchema[] = [
           label: '定时执行',
           value: 1,
         },
-      ],
+      ];
+      return {
+        options,
+        placeholder: '请选择执行方式',
+        onChange(e) {
+          let dataCompareOpions: any = [];
+          if (e.target.value == 0) {
+            setFieldsValue({ way: QueryWay.LATEST });
+            dataCompareOpions = [
+              { label: '固定周期', value: QueryWay.LATEST },
+              { label: '自定义周期', value: QueryWay.TIME_PERIOD },
+            ];
+            updateSchema({
+              field: SchemaFiled.WAY,
+              componentProps: {
+                options: dataCompareOpions,
+              },
+            });
+          } else {
+            setFieldsValue({ way: QueryWay.LATEST });
+            dataCompareOpions = [{ label: '固定周期', value: QueryWay.LATEST }];
+            updateSchema({
+              defaultValue: QueryWay.LATEST,
+              field: SchemaFiled.WAY,
+              componentProps: {
+                options: dataCompareOpions,
+              },
+            });
+          }
+        },
+        maxLength: 250,
+      };
     },
   },
   {
@@ -276,63 +313,6 @@ export const formSchema: QFormSchema[] = [
     },
     ifShow: ({ values }) => isTiming(values.executeWay),
   },
-
-  {
-    field: 'attributeNature',
-    component: 'RadioGroup',
-    label: '属性性质',
-    required: true,
-    colProps: {
-      span: 24,
-    },
-    defaultValue: 0,
-    componentProps: ({ formActionType }) => {
-      const { updateSchema, setFieldsValue } = formActionType;
-      const options = [
-        {
-          label: '共有',
-          value: 0,
-        },
-        {
-          label: '全部',
-          value: 1,
-        },
-      ];
-      return {
-        options,
-        async onChange(e) {
-          if (e) {
-            let dataCompareOpions: any = [];
-            if (e.target.value == 1) {
-              setFieldsValue({ dataCompare: '' });
-              dataCompareOpions = [{ label: '历史数据', value: 0 }];
-              updateSchema({
-                field: 'dataCompare',
-                componentProps: {
-                  options: dataCompareOpions,
-                },
-              });
-            } else {
-              setFieldsValue({ dataCompare: '' });
-              dataCompareOpions = [
-                { label: '历史数据', value: 0 },
-                { label: '同比', value: 1 },
-                { label: '环比', value: 2 },
-              ];
-              updateSchema({
-                field: 'dataCompare',
-                componentProps: {
-                  options: dataCompareOpions,
-                },
-              });
-            }
-          }
-        },
-        maxLength: 250,
-        placeholder: '请选择属性性质',
-      };
-    },
-  },
   {
     field: 'devices',
     label: '设备',
@@ -347,17 +327,49 @@ export const formSchema: QFormSchema[] = [
     colProps: { span: 24 },
   },
   {
-    field: 'dataCompare',
+    field: 'dataType',
     label: '数据类型',
     required: true,
     component: 'Select',
-    componentProps: {
-      placeholder: '请选择数据类型',
-      options: [
-        { label: '历史数据', value: 0 },
-        { label: '同比', value: 1 },
-        { label: '环比', value: 2 },
-      ],
+    componentProps: ({ formActionType }) => {
+      const { updateSchema, setFieldsValue } = formActionType;
+      const options = [
+        { label: '原始数据', value: 0 },
+        { label: '聚合数据', value: 1 },
+      ];
+      return {
+        options,
+        onSelect(e) {
+          let dataCompareOpions: any = [];
+          if (e == 0) {
+            setFieldsValue({ agg: 'NONE' });
+            dataCompareOpions = [{ label: '空', value: AggregateDataEnum.NONE }];
+            updateSchema({
+              field: SchemaFiled.AGG,
+              componentProps: {
+                options: dataCompareOpions,
+              },
+            });
+          } else {
+            setFieldsValue({ agg: '' });
+            dataCompareOpions = [
+              { label: '最小值', value: AggregateDataEnum.MIN },
+              { label: '最大值', value: AggregateDataEnum.MAX },
+              { label: '平均值', value: AggregateDataEnum.AVG },
+              { label: '求和', value: AggregateDataEnum.SUM },
+              { label: '计数', value: AggregateDataEnum.COUNT },
+            ];
+            updateSchema({
+              field: SchemaFiled.AGG,
+              componentProps: {
+                options: dataCompareOpions,
+              },
+            });
+          }
+        },
+        maxLength: 250,
+        placeholder: '请选择属性性质',
+      };
     },
     colProps: { span: 24 },
   },
@@ -369,30 +381,22 @@ export const formSchema: QFormSchema[] = [
     componentProps: {
       placeholder: '请选择聚合条件',
       getPopupContainer: () => document.body,
-      options: [
-        { label: '最小值', value: AggregateDataEnum.MIN },
-        { label: '最大值', value: AggregateDataEnum.MAX },
-        { label: '平均值', value: AggregateDataEnum.AVG },
-        { label: '求和', value: AggregateDataEnum.SUM },
-        { label: '计数', value: AggregateDataEnum.COUNT },
-        { label: '空', value: AggregateDataEnum.NONE },
-      ],
     },
   },
   {
-    field: SchemaFiled.LIMIT,
+    field: 'limit1',
+    required: true,
     label: '最大值',
     component: 'InputNumber',
-    required: true,
+    defaultValue: 200,
     ifShow({ values }) {
       return values[SchemaFiled.AGG] === AggregateDataEnum.NONE;
     },
-    defaultValue: 200,
-    componentProps() {
-      return {
-        max: 50000,
-        min: 7,
-      };
+    colProps: { span: 12 },
+    componentProps: {
+      placeholder: '请输入最大值',
+      min: 7,
+      max: 50000,
     },
   },
   {
@@ -404,7 +408,7 @@ export const formSchema: QFormSchema[] = [
     componentProps({ formActionType }) {
       const { setFieldsValue } = formActionType;
       return {
-      getPopupContainer: () => document.body,
+        getPopupContainer: () => document.body,
         placeholder: '请选择查询周期',
         options: [
           { label: '固定周期', value: QueryWay.LATEST },
@@ -428,13 +432,13 @@ export const formSchema: QFormSchema[] = [
     component: 'RangePicker',
     required: true,
     ifShow({ values }) {
-      return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD;
+      return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
     },
     componentProps({ formActionType }) {
       const { setFieldsValue } = formActionType;
       let dates: Moment[] = [];
       return {
-        placeholder: ['请选择开始时间','请选择结束时间'],
+        placeholder: ['请选择开始时间', '请选择结束时间'],
         showTime: true,
         onCalendarChange(value: Moment[]) {
           dates = value;
@@ -460,17 +464,14 @@ export const formSchema: QFormSchema[] = [
     field: SchemaFiled.START_TS,
     label: '时间周期',
     component: 'Select',
-    // defaultValue: 1000,
     required: true,
     ifShow({ values }) {
-      return (
-        values[SchemaFiled.AGG] !== AggregateDataEnum.NONE &&
-        values[SchemaFiled.WAY] == QueryWay.LATEST
-      );
+      return values[SchemaFiled.WAY] == QueryWay.LATEST;
     },
     componentProps({ formActionType }) {
       const { setFieldsValue } = formActionType;
       return {
+        defaultValue: 1000,
         placeholder: '请选择时间周期',
         options: intervalOption,
         onChange() {
@@ -484,12 +485,8 @@ export const formSchema: QFormSchema[] = [
     label: '间隔时间',
     component: 'Select',
     required: true,
-    // defaultValue: 1000,
     ifShow({ values }) {
-      return (
-        values[SchemaFiled.AGG] !== AggregateDataEnum.NONE &&
-        values[SchemaFiled.WAY] == QueryWay.LATEST
-      );
+      return values[SchemaFiled.WAY] == QueryWay.LATEST;
     },
     componentProps({ formModel, formActionType }) {
       const options =
@@ -500,6 +497,7 @@ export const formSchema: QFormSchema[] = [
         formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
       }
       return {
+        // defaultValue: 1000,
         placeholder: '请选择间隔时间',
         options,
       };

 <template>
-  <div
-    v-for="param in dynamicInput.params"
-    :key="param.key"
-    style="display: flex; margin-top: 0.25vh"
-  >
-    <a-input
-      :disabled="true"
-      v-model:value="param.device"
-      style="width: 50%; margin-bottom: 5px; margin-left: 0vh"
-      @change="emitChange"
-    />
-    <Select
-      placeholder="请选择设备属性"
-      v-model:value="param.attribute"
-      style="width: 50%; margin-left: 1.8vw"
-      :options="selectOptions"
-      @change="emitChange"
-      allowClear
-    />
+  <div v-for="param in dynamicInput.params" :key="param.key" style="display: flex; margin-top: 0.25vh">
+    <a-input :disabled="true" v-model:value="param.device" style="width: 38%; margin-bottom: 5px; margin-left: 1vh"
+      @change="emitChange" />
+    <Select placeholder="请选择设备属性" v-model:value="param.attributes" style="width: 160px; margin-left: 1.8vw"
+      :options="selectOptions" @change="emitChange" allowClear mode="multiple" />
   </div>
 </template>
 <script lang="ts">
-  export default {
-    inheritAttrs: false,
-  };
+export default {
+  inheritAttrs: false,
+};
 </script>
 <script lang="ts" setup>
-  import { reactive, UnwrapRef, watchEffect, ref } from 'vue';
-  import { propTypes } from '/@/utils/propTypes';
-  import { SelectTypes } from 'ant-design-vue/es/select';
-  import { Select } from 'ant-design-vue';
-  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
+import { reactive, UnwrapRef, watchEffect, ref } from 'vue';
+import { propTypes } from '/@/utils/propTypes';
+import { SelectTypes } from 'ant-design-vue/es/select';
+import { Select } from 'ant-design-vue';
+import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 
-  interface Params {
-    [x: string]: string;
-    attribute: string;
-    device: string;
-  }
-  const props = defineProps({
-    value: propTypes.object.def({}),
-    orgId: propTypes.string.def(''),
+interface Params {
+  [x: string]: string;
+  attributes: any;
+  device: string;
+}
+const props = defineProps({
+  value: propTypes.array.def([]),
+  orgId: propTypes.string.def(''),
+});
+const emits = defineEmits(['change', 'update:value']);
+const selectOptions = ref<SelectTypes['options']>([]);
+//获取属性
+const getAttr = async (orgId, deviceId) => {
+  const res = await getAttribute(orgId, deviceId.join(','));
+  selectOptions.value = res.map((o) => {
+    return {
+      label: o,
+      value: o,
+    };
   });
-  const emits = defineEmits(['change', 'update:value']);
-  const selectOptions = ref<SelectTypes['options']>([]);
-  //获取属性
-  const getAttr = async (orgId, deviceId) => {
-    const res = await getAttribute(orgId, deviceId);
-    selectOptions.value = res.map((o) => {
+};
+//动态数据
+const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
+//监听传入数据value
+watchEffect(() => {
+  initVal();
+});
+/**
+ * 初始化数值
+ */
+async function initVal() {
+  dynamicInput.params = []
+  if (props.value && props.orgId) {
+    let jsonObj = props.value;
+    const deviceId = jsonObj.map((m: any) => m.value);
+    await getAttr(props.orgId, deviceId);
+    dynamicInput.params = jsonObj.map((item: any) => {
       return {
-        label: o,
-        value: o,
-      };
-    });
-  };
-  //动态数据
-  const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
-  const rEffect = watchEffect(() => {
-    initVal();
-  });
-  rEffect();
-  /**
-   * 初始化数值
-   */
-  async function initVal() {
-    if (props.orgId && props.value.value) {
-      await getAttr(props.orgId, props.value.value);
-      dynamicInput.params.push({
-        device: props.value.label,
-        value: props.value.value,
-        attribute: props.value.attribute == '' ? '' : props.value.attribute,
-      });
-    }
+        attributes: item.attributes,
+        device: item.label,
+        value: item.value,
+      }
+    })
   }
-  /**
-   * 数值改变
-   */
-  function emitChange() {
-    let obj: any = dynamicInput.params[0];
-    emits('change', obj);
-    emits('update:value', obj);
+}
+/**
+ * 数值改变
+ */
+function emitChange() {
+  let obj: any = [];
+  if (dynamicInput.params.length > 0) {
+    dynamicInput.params.forEach((item: Params) => {
+      obj.push({
+        attributes: item.attributes,
+        device: item.value,
+        name: item.device
+      });
+    });
   }
-  defineExpose({
-    getAttr,
-  });
+  emits('change', obj);
+  emits('update:value', obj);
+}
 </script>
 <style scoped lang="css">
-  @import './deviceAttrCpns.css';
+@import './deviceAttrCpns.css';
 </style>

@@ -86,6 +86,7 @@ export enum TypeEnum {
   IS_AVG = 'AVG',
   IS_SUM = 'SUM',
   COUNT = 'COUNT',
+  IS_FIXED_TIME = 1,
 }
 
 export enum AggregateDataEnum {
@@ -96,6 +97,9 @@ export enum AggregateDataEnum {
   COUNT = 'COUNT',
   NONE = 'NONE',
 }
+export const isFixedTime = (type: string) => {
+  return type === TypeEnum.IS_FIXED_TIME;
+};
 
 export const isTiming = (type: string) => {
   return type === TypeEnum.IS_TIMING;

 <template>
   <div>
-    <BasicModal
-      v-bind="$attrs"
-      width="110rem"
-      :height="heightNum"
-      @register="register"
-      title="调度日志"
-      @cancel="handleCancel"
-      :showOkBtn="false"
-      destroyOnClose
-    >
+    <BasicModal v-bind="$attrs" width="110rem" :height="heightNum" @register="register" title="调度日志"
+      @cancel="handleCancel" :showOkBtn="false" destroyOnClose>
       <div>
         <BasicTable @register="registerTable">
           <template #toolbar>
-            <Popconfirm
-              title="您确定要清空全部数据"
-              ok-text="确定"
-              cancel-text="取消"
-              @confirm="handleClear"
-            >
+            <Popconfirm title="您确定要清空全部数据" ok-text="确定" cancel-text="取消" @confirm="handleClear">
               <a-button type="primary"> 清空 </a-button>
             </Popconfirm>
             <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消">
@@ -28,24 +15,22 @@
             </Popconfirm>
           </template>
           <template #action="{ record }">
-            <TableAction
-              :actions="[
-                {
-                  label: '查看',
-                  icon: 'clarity:note-edit-line',
-                  onClick: handleView.bind(null, record),
+            <TableAction :actions="[
+              {
+                label: '查看',
+                icon: 'clarity:note-edit-line',
+                onClick: handleView.bind(null, record),
+              },
+              {
+                label: '删除',
+                icon: 'ant-design:delete-outlined',
+                color: 'error',
+                popConfirm: {
+                  title: '是否确认删除',
+                  confirm: handleDeleteOrBatchDelete.bind(null, record),
                 },
-                {
-                  label: '删除',
-                  icon: 'ant-design:delete-outlined',
-                  color: 'error',
-                  popConfirm: {
-                    title: '是否确认删除',
-                    confirm: handleDeleteOrBatchDelete.bind(null, record),
-                  },
-                },
-              ]"
-            />
+              },
+            ]" />
           </template>
         </BasicTable>
         <ScheduleLogViewModal @register="registerModalScheduleLogView" />
@@ -54,80 +39,85 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { ref, nextTick } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { columnSchedue, searchSchedueFormSchema } from './config.data';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import {
-    deleteSchedueLogManage,
-    schedueLogPage,
-    schedueLogCleanPage,
-  } from '/@/api/schedue/schedueManager';
-  import { Popconfirm } from 'ant-design-vue';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import ScheduleLogViewModal from './ScheduleLogViewModal.vue';
-  import { useModal } from '/@/components/Modal';
+import { ref, nextTick } from 'vue';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { columnSchedue, searchSchedueFormSchema } from './config.data';
+import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+import {
+  deleteSchedueLogManage,
+  schedueLogPage,
+  schedueLogCleanPage,
+} from '/@/api/schedue/schedueManager';
+import { Popconfirm } from 'ant-design-vue';
+import { useMessage } from '/@/hooks/web/useMessage';
+import ScheduleLogViewModal from './ScheduleLogViewModal.vue';
+import { useModal } from '/@/components/Modal';
 
-  const { createMessage } = useMessage();
-  const heightNum = ref(800);
-  const [registerTable, { setProps, reload, getForm }] = useTable({
-    title: '调度日志列表',
-    api: schedueLogPage,
-    columns: columnSchedue,
-    showIndexColumn: false,
-    clickToRowSelect: false,
-    useSearchForm: true,
-    ellipsis: true,
-    showTableSetting: true,
-    bordered: true,
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchSchedueFormSchema,
-      fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
-    },
-    rowKey: 'id',
-    actionColumn: {
-      width: 200,
-      title: '操作',
-      dataIndex: 'action',
-      slots: { customRender: 'action' },
-      fixed: 'right',
-    },
-  });
-  // 刷新
-  const handleSuccess = () => {
-    reload();
-  };
-  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    deleteSchedueLogManage,
-    handleSuccess,
-    setProps
-  );
+const { createMessage } = useMessage();
+const heightNum = ref(800);
+const [registerTable, { setProps, reload, getForm, setTableData }] = useTable({
+  title: '调度日志列表',
+  // api: schedueLogPage,
+  columns: columnSchedue,
+  showIndexColumn: false,
+  clickToRowSelect: false,
+  useSearchForm: true,
+  ellipsis: true,
+  showTableSetting: true,
+  bordered: true,
+  formConfig: {
+    labelWidth: 120,
+    schemas: searchSchedueFormSchema,
+    fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+  },
+  rowKey: 'id',
+  actionColumn: {
+    width: 200,
+    title: '操作',
+    dataIndex: 'action',
+    slots: { customRender: 'action' },
+    fixed: 'right',
+  },
+});
+// 刷新
+const handleSuccess = () => {
+  reload();
+};
+const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+  deleteSchedueLogManage,
+  handleSuccess,
+  setProps
+);
 
-  const [register] = useModalInner(() => {
-    nextTick(() => {
-      setProps(selectionOptions);
-      setProps({
-        rowKey: 'id',
-      });
-      //重置清空搜索表单
-      const { resetFields } = getForm();
-      resetFields();
+const [register] = useModalInner(async (data) => {
+  console.log(data.record)
+  const res: any = await schedueLogPage({ jobId: data.record.id, page: 1, pageSize: 10 })
+  nextTick(() => {
+    console.log(res)
+    setTableData(res.items)
+    setProps(selectionOptions);
+    setProps({
+      rowKey: 'id',
     });
+    //重置清空搜索表单
+    const { resetFields } = getForm();
+    resetFields();
   });
-  const handleCancel = () => {};
-  const handleClear = async () => {
-    await schedueLogCleanPage();
-    createMessage.success(`清空成功`);
-    handleSuccess();
-  };
-  const [registerModalScheduleLogView, { openModal: openModalLogView }] = useModal();
-  const handleView = (record: Recordable) => {
-    openModalLogView(true, {
-      isUpdate: true,
-      record,
-    });
-  };
+});
+const handleCancel = () => { };
+const handleClear = async () => {
+  await schedueLogCleanPage();
+  createMessage.success(`清空成功`);
+  handleSuccess();
+};
+const [registerModalScheduleLogView, { openModal: openModalLogView }] = useModal();
+const handleView = (record: Recordable) => {
+  openModalLogView(true, {
+    isUpdate: true,
+    record,
+  });
+};
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+</style>

@@ -9,62 +9,53 @@
           <a-button type="primary"> 导出 </a-button>
         </Authority>
         <Authority value="api:yt:schedule:delete">
-          <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消">
+          <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
             <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
           </Popconfirm>
         </Authority>
       </template>
       <template #action="{ record }">
-        <TableAction
-          :actions="[
-            {
-              label: '编辑',
-              icon: 'clarity:note-edit-line',
-              auth: 'api:yt:schedule:update',
-              onClick: handleCreateOrEdit.bind(null, record),
+        <TableAction :actions="[
+          {
+            label: '编辑',
+            icon: 'clarity:note-edit-line',
+            auth: 'api:yt:schedule:update',
+            onClick: handleCreateOrEdit.bind(null, record),
+          },
+          {
+            label: '删除',
+            icon: 'ant-design:delete-outlined',
+            color: 'error',
+            auth: 'api:yt:schedule:delete',
+            popConfirm: {
+              title: '是否确认删除',
+              confirm: handleDeleteOrBatchDelete.bind(null, record),
             },
-            {
-              label: '删除',
-              icon: 'ant-design:delete-outlined',
-              color: 'error',
-              auth: 'api:yt:schedule:delete',
-              popConfirm: {
-                title: '是否确认删除',
-                confirm: handleDeleteOrBatchDelete.bind(null, record),
-              },
-            },
-          ]"
-          :dropDownActions="[
-            {
-              label: '执行一次',
-              icon: 'ant-design:caret-right-filled',
-              popConfirm: {
-                title: '确认要立即执行一次' + '“' + record.jobName + '”' + '任务吗？',
-                confirm: handleRunOne.bind(null, record),
-              },
-            },
-            {
-              label: '任务详细',
-              icon: 'ant-design:eye-outlined',
-              onClick: handleTaskDetailModal.bind(null, record),
-            },
-            {
-              label: '调度日志',
-              icon: 'ant-design:insert-row-below-outlined',
-              onClick: handleSchedulingLogFunc.bind(null, record),
-            },
-          ]"
-        />
+          },
+        ]" :dropDownActions="[
+  {
+    label: '执行一次',
+    icon: 'ant-design:caret-right-filled',
+    popConfirm: {
+      title: '确认要立即执行一次' + '“' + record.jobName + '”' + '任务吗？',
+      confirm: handleRunOne.bind(null, record),
+    },
+  },
+  {
+    label: '任务详细',
+    icon: 'ant-design:eye-outlined',
+    onClick: handleTaskDetailModal.bind(null, record),
+  },
+  {
+    label: '调度日志',
+    icon: 'ant-design:insert-row-below-outlined',
+    onClick: handleSchedulingLogFunc.bind(null, record),
+  },
+]" />
       </template>
       <template #status="{ record }">
-        <Switch
-          :disabled="disabledSwitch"
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          @change="(checked:boolean)=>statusChange(checked,record)"
-        />
+        <Switch :disabled="disabledSwitch" :checked="record.status === 1" :loading="record.pendingStatus"
+          checkedChildren="启用" unCheckedChildren="禁用" @change="(checked: boolean) => statusChange(checked, record)" />
       </template>
     </BasicTable>
     <ScheduledDrawer @register="registerDrawer" @success="handleSuccess" />
@@ -73,120 +64,121 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { nextTick, ref } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { columnSchedue, searchSchedueFormSchema } from './config.form.data';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import {
-    deleteSchedueManage,
-    scheduePage,
-    putSchedueByidAndStatusManage,
-    postRunSchedueConfigManage,
-  } from '/@/api/schedue/schedueManager';
-  import { Popconfirm, Switch } from 'ant-design-vue';
-  import { useModal } from '/@/components/Modal';
-  import TaskDetailPreviewModal from './TaskDetailPreviewModal.vue';
-  import SchedueLog from './SchedueLog.vue';
-  import ScheduledDrawer from './ScheduledDrawer.vue';
-  import { useDrawer } from '/@/components/Drawer';
-  import { Authority } from '/@/components/Authority';
-  import { useMessage } from '/@/hooks/web/useMessage';
+import { nextTick, ref } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { columnSchedue, searchSchedueFormSchema } from './config.form.data';
+import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+import {
+  deleteSchedueManage,
+  scheduePage,
+  putSchedueByidAndStatusManage,
+  postRunSchedueConfigManage,
+} from '/@/api/schedue/schedueManager';
+import { Popconfirm, Switch } from 'ant-design-vue';
+import { useModal } from '/@/components/Modal';
+import TaskDetailPreviewModal from './TaskDetailPreviewModal.vue';
+import SchedueLog from './SchedueLog.vue';
+import ScheduledDrawer from './ScheduledDrawer.vue';
+import { useDrawer } from '/@/components/Drawer';
+import { Authority } from '/@/components/Authority';
+import { useMessage } from '/@/hooks/web/useMessage';
 
-  const disabledSwitch = ref(false);
-  const { createMessage } = useMessage();
-  const [registerTable, { setProps, reload }] = useTable({
-    title: '定时任务列表',
-    api: scheduePage,
-    columns: columnSchedue,
-    showIndexColumn: false,
-    clickToRowSelect: false,
-    useSearchForm: true,
-    ellipsis: true,
-    showTableSetting: true,
-    bordered: true,
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchSchedueFormSchema,
-      fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
-    },
-    actionColumn: {
-      width: 200,
-      title: '操作',
-      dataIndex: 'action',
-      slots: { customRender: 'action' },
-      fixed: 'right',
-    },
-  });
-  // 刷新
-  const handleSuccess = () => {
-    reload();
-  };
-  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    deleteSchedueManage,
-    handleSuccess,
-    setProps
-  );
+const disabledSwitch = ref(false);
+const { createMessage } = useMessage();
+const [registerTable, { setProps, reload }] = useTable({
+  title: '定时任务列表',
+  api: scheduePage,
+  columns: columnSchedue,
+  showIndexColumn: false,
+  clickToRowSelect: false,
+  useSearchForm: true,
+  ellipsis: true,
+  showTableSetting: true,
+  bordered: true,
+  formConfig: {
+    labelWidth: 120,
+    schemas: searchSchedueFormSchema,
+    fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+  },
+  actionColumn: {
+    width: 200,
+    title: '操作',
+    dataIndex: 'action',
+    slots: { customRender: 'action' },
+    fixed: 'right',
+  },
+});
+// 刷新
+const handleSuccess = () => {
+  reload();
+};
+const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+  deleteSchedueManage,
+  handleSuccess,
+  setProps
+);
 
-  nextTick(() => {
-    setProps(selectionOptions);
+nextTick(() => {
+  setProps(selectionOptions);
+});
+const [registerDrawer, { openDrawer }] = useDrawer();
+const [registerModalTaskDetail, { openModal: openModalTaskDetail }] = useModal();
+const [registerModalSchedueLog, { openModal: openModalSchedueLog }] = useModal();
+const handleSchedulingLogFunc = (record: Recordable) => {
+  openModalSchedueLog(true, {
+    isUpdate: 2,
+    record,
   });
-  const [registerDrawer, { openDrawer }] = useDrawer();
-  const [registerModalTaskDetail, { openModal: openModalTaskDetail }] = useModal();
-  const [registerModalSchedueLog, { openModal: openModalSchedueLog }] = useModal();
-  const handleSchedulingLogFunc = (record: Recordable) => {
-    openModalSchedueLog(true, {
-      isUpdate: 2,
-      record,
-    });
-  };
-  const handleTaskDetailModal = (record: Recordable) => {
-    openModalTaskDetail(true, {
+};
+const handleTaskDetailModal = (record: Recordable) => {
+  openModalTaskDetail(true, {
+    isUpdate: true,
+    record,
+  });
+};
+// 新增或编辑
+const handleCreateOrEdit = (record: Recordable | null) => {
+  if (record) {
+    openDrawer(true, {
       isUpdate: true,
       record,
     });
-  };
-  // 新增或编辑
-  const handleCreateOrEdit = (record: Recordable | null) => {
-    if (record) {
-      openDrawer(true, {
-        isUpdate: true,
-        record,
-      });
+  } else {
+    openDrawer(true, {
+      isUpdate: false,
+    });
+  }
+};
+
+const statusChange = async (checked, record) => {
+  try {
+    setProps({
+      loading: true,
+    });
+    disabledSwitch.value = true;
+    const newStatus = checked ? 1 : 0;
+    const res = await putSchedueByidAndStatusManage(record.id, newStatus);
+    if (res && newStatus) {
+      createMessage.success(`启用成功`);
     } else {
-      openDrawer(true, {
-        isUpdate: false,
-      });
+      createMessage.success('禁用成功');
     }
-  };
-
-  const statusChange = async (checked, record) => {
-    try {
+  } finally {
+    setTimeout(() => {
       setProps({
-        loading: true,
+        loading: false,
       });
-      disabledSwitch.value = true;
-      const newStatus = checked ? 1 : 0;
-      const res = await putSchedueByidAndStatusManage(record.id, newStatus);
-      if (res && newStatus) {
-        createMessage.success(`启用成功`);
-      } else {
-        createMessage.success('禁用成功');
-      }
-    } finally {
-      setTimeout(() => {
-        setProps({
-          loading: false,
-        });
-        disabledSwitch.value = false;
-      }, 500);
-      reload();
-    }
-  };
-  const handleRunOne = async (record: Recordable) => {
-    const res = await postRunSchedueConfigManage(record.id);
-    if (res?.code === 200) {
-      createMessage.success(`执行一次任务"${record.jobName}"成功`);
-    }
-  };
+      disabledSwitch.value = false;
+    }, 500);
+    reload();
+  }
+};
+const handleRunOne = async (record: Recordable) => {
+  const res = await postRunSchedueConfigManage(record.id);
+  if (res?.code === 200) {
+    createMessage.success(`执行一次任务"${record.jobName}"成功`);
+  }
+};
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+</style>