Merge branch 'f-dev' into 'main'

F dev

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

@@ -16,7 +16,7 @@ export {
   JEasyCron,
   JEasyCron,
   JEasyCronInner,
   JEasyCronInner,
   JEasyCronModal,
   JEasyCronModal,
-} from '/@/components/Form/src/jeecg/components/JEasyCron';
+} from '/@/components/Form/src/externalCompns/components/JEasyCron';
 // Jeecg自定义校验
 // Jeecg自定义校验
-export { JCronValidator } from '/@/components/Form/src/jeecg/components/JEasyCron';
+export { JCronValidator } from '/@/components/Form/src/externalCompns/components/JEasyCron';
 export { BasicForm };
 export { BasicForm };

@@ -29,8 +29,8 @@ import { IconPicker } from '/@/components/Icon';
 import { CountdownInput } from '/@/components/CountDown';
 import { CountdownInput } from '/@/components/CountDown';
 import ApiRadioGroup from './components/ApiRadioGroup.vue';
 import ApiRadioGroup from './components/ApiRadioGroup.vue';
 //自定义组件
 //自定义组件
-import JAddInput from './jeecg/components/JAddInput.vue';
-import { JEasyCron } from './jeecg/components/JEasyCron';
+import JAddInput from './externalCompns/components/JAddInput.vue';
+import { JEasyCron } from './externalCompns/components/JEasyCron';
 
 
 const componentMap = new Map<ComponentType, Component>();
 const componentMap = new Map<ComponentType, Component>();
 
 

 <template>
 <template>
-  <BasicDrawer
-    v-bind="$attrs"
-    @register="registerDrawer"
-    showFooter
-    :title="getTitle"
-    width="30%"
-    @ok="handleSubmit"
-  >
+  <BasicDrawer v-bind="$attrs" @register="registerDrawer" showFooter :title="getTitle" width="30%" @ok="handleSubmit">
     <BasicForm @register="registerForm">
     <BasicForm @register="registerForm">
       <template #devices>
       <template #devices>
-        <Select
-          placeholder="请选择设备"
-          v-model:value="selectDevice"
-          style="width: 100%"
-          :options="selectOptions"
-          @change="handleDeviceChange"
-          mode="multiple"
-          labelInValue
-          allowClear
-          @deselect="handleDeSelect"
-          notFoundContent="请选择设备"
-        />
+        <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 style="margin-top: 1.5vh"></div>
-        <DeviceAttrCpns
-          ref="deviceAttrRef"
-          @change="handleChange"
-          :value="deviceList"
-          :orgId="organizationId || orgId"
-          :deSelectValue="deSelectValue"
-        />
+        <div v-for="(item, index) in deviceList" :key="index">
+          <DeviceAttrCpns ref="deviceAttrRef" @change="handleChange" :value="item" :orgId="organizationId || orgId" />
+        </div>
       </template>
       </template>
     </BasicForm>
     </BasicForm>
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref, computed, unref, reactive, watch } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema, organizationId } from './config.data';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { createOrEditReportManage, putReportConfigManage } from '/@/api/report/reportManager';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import moment from 'moment';
-  import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
-  import { Select } from 'ant-design-vue';
-  import DeviceAttrCpns from './cpns/DeviceAttrCpns.vue';
+import { ref, computed, unref, reactive, watch, nextTick, Ref } from 'vue';
+import { BasicForm, useForm } from '/@/components/Form';
+import { formSchema, organizationId } from './config.data';
+import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+import { createOrEditReportManage, putReportConfigManage } from '/@/api/report/reportManager';
+import { useMessage } from '/@/hooks/web/useMessage';
+import moment from 'moment';
+import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
+import { Select } from 'ant-design-vue';
+import DeviceAttrCpns from './cpns/DeviceAttrCpns.vue';
+import { SelectTypes } from 'ant-design-vue/es/select';
 
 
-  const emit = defineEmits(['success', 'register']);
-  const deviceAttrRef: any = ref(null);
-  const isUpdate = ref(true);
-  const editId = ref('');
-  const orgId = ref('');
-  let deviceAttrData: any = ref([]);
-  const selectOptions: any = ref([]);
-  const selectDevice = ref([]);
-  const deviceList = ref([]);
-  watch(organizationId, async (newValue: string) => {
-    if (!newValue) return;
-    //获取设备
+type TDeviceList = {
+  key?: string,
+  value?: string,
+  label?: string,
+  attribute?: string,
+  device?: string
+}
+const emit = defineEmits(['success', 'register']);
+const deviceAttrRef: any = ref(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([]);
+
+watch(organizationId, async (newValue: string) => {
+  if (!newValue) return;
+  //获取设备
+  const { items } = await screenLinkPageByDeptIdGetDevice({
+    organizationId: newValue,
+  });
+  selectOptions.value = items.map((item) => {
+    if (item.deviceType !== 'GATEWAY')
+      return {
+        label: item.name,
+        value: item.tbDeviceId,
+      };
+  });
+});
+const handleDeviceChange = (e) => {
+  deviceList.value = e;
+};
+const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
+  labelWidth: 120,
+  schemas: formSchema,
+  showActionButtonGroup: false,
+  fieldMapToTime: [['timeZone', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+});
+const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+  await resetFields();
+  setDrawerProps({ confirmLoading: false });
+  isUpdate.value = !!data?.isUpdate;
+  if (unref(isUpdate)) {
+    //回显基础数据
+    editId.value = data.record.id;
+    await setFieldsValue(data.record);
+    //回显嵌套数据
+    setFieldsValue({
+      agg: queryCondition?.agg,
+      interval: queryCondition?.interval,
+    });
+    //回显设备
+    orgId.value = data.record.organizationId;
+    //获取该组织下的设备--排除网关设备
     const { items } = await screenLinkPageByDeptIdGetDevice({
     const { items } = await screenLinkPageByDeptIdGetDevice({
-      organizationId: newValue,
+      organizationId: data.record.organizationId,
     });
     });
     selectOptions.value = items.map((item) => {
     selectOptions.value = items.map((item) => {
       if (item.deviceType !== 'GATEWAY')
       if (item.deviceType !== 'GATEWAY')
@@ -67,154 +90,118 @@
           value: item.tbDeviceId,
           value: item.tbDeviceId,
         };
         };
     });
     });
+    //TODO 模拟的数据 待服务端返回
+    const deviceIds: any = [
+      {
+        label: '奥迪网关子设备',
+        key: '8a4cc9a0-f201-11ec-98ad-a9680487d1e0',
+      },
+      {
+        label: '宝马默认设备',
+        key: '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
+      },
+      {
+        label: '奔驰默认设备',
+        key: '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
+      },
+      {
+        label: '新增奥迪测试设备',
+        key: '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
+      },
+    ];
+    selectDevice.value = deviceIds;
+    //回显设备属性 TODO 模拟的数据 待服务端返回
+    deviceList.value = [
+      {
+        value: '8a4cc9a0-f201-11ec-98ad-a9680487d1e0',
+        attribute: 'CO2',
+        label: '奥迪网关子设备',
+      },
+      {
+        value: '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
+        attribute: 'co',
+        label: '宝马默认设备',
+      },
+      {
+        value: '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
+        attribute: 'hot',
+        label: '奔驰默认设备',
+      },
+      {
+        value: '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
+        attribute: 'wet',
+        label: '新增奥迪测试设备',
+      },
+    ];
+    nextTick(() => { });
+  } else {
+    editId.value = '';
+    orgId.value = '';
+    selectDevice.value = [];
+    selectOptions.value = [];
+    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
   });
   });
-  const handleDeviceChange = (e) => {
-    deviceList.value = e;
-  };
-  const deSelectValue = ref('');
-  const handleDeSelect = ({ key }) => {
-    //取消选中的key
-    deSelectValue.value = key;
-  };
-  const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
-    labelWidth: 120,
-    schemas: formSchema,
-    showActionButtonGroup: false,
-    fieldMapToTime: [['timeZone', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
-  });
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    await resetFields();
-    setDrawerProps({ confirmLoading: false });
-    isUpdate.value = !!data?.isUpdate;
-    if (unref(isUpdate)) {
-      //回显基础数据
-      editId.value = data.record.id;
-      await setFieldsValue(data.record);
-      //回显嵌套数据
-      setFieldsValue({
-        agg: queryCondition?.agg,
-        interval: queryCondition?.interval,
-      });
-      //回显设备
-      orgId.value = data.record.organizationId;
-      //获取该组织下的设备--排除网关设备
-      const { items } = await screenLinkPageByDeptIdGetDevice({
-        organizationId: data.record.organizationId,
-      });
-      selectOptions.value = items.map((item) => {
-        if (item.deviceType !== 'GATEWAY')
-          return {
-            label: item.name,
-            value: item.tbDeviceId,
-          };
-      });
-      //TODO 模拟的数据 待服务端返回
-      const deviceIds: any = [
-        {
-          label: '奥迪网关子设备',
-          key: '8a4cc9a0-f201-11ec-98ad-a9680487d1e0',
-        },
-        {
-          label: '宝马默认设备',
-          key: '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
-        },
-        {
-          label: '奔驰默认设备',
-          key: '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
-        },
-        {
-          label: '新增奥迪测试设备',
-          key: '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
-        },
-      ];
-      selectDevice.value = deviceIds;
-      //回显设备属性 TODO 模拟的数据 待服务端返回
-      deviceAttrData.value = [
-        {
-          device: '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
-          attribute: 'CO2',
-          name: '宝马默认设备',
-        },
-        {
-          device: '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
-          attribute: 'co',
-          name: '新增奥迪测试设备',
-        },
-        {
-          device: '54e199d0-f1f7-11ec-98ad-a9680487d1e0',
-          attribute: 'hot',
-          name: '奥迪默认设备',
-        },
-        {
-          device: '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
-          attribute: 'wet',
-          name: '奔驰默认设备',
-        },
-      ];
-      deviceAttrRef.value?.echoDynamicInputFunc(deviceAttrData.value);
+};
+let postObj: any = reactive({});
+let queryCondition: any = reactive({});
+let executeContent: any = reactive({});
+const endTs = ref(0);
+async function handleSubmit() {
+  setDrawerProps({ confirmLoading: true });
+  try {
+    const { createMessage } = useMessage();
+    const values = await validate();
+    if (!values) return;
+    if (getAttrDevice.value.length === 0) {
+      return createMessage.error('请选择设备及其属性');
+    }
+    if (values.executeWay == 0) {
+      executeContent = null;
     } else {
     } else {
-      editId.value = '';
-      orgId.value = '';
-      selectDevice.value = [];
-      selectOptions.value = [];
-      deviceList.value = [];
+      executeContent = {};
     }
     }
-  });
-  const getAttrDevice: any = ref([]);
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增报表配置' : '编辑报表配置'));
-  const handleChange = (e) => (getAttrDevice.value = e);
-  let postObj: any = reactive({});
-  let queryCondition: any = reactive({});
-  let executeContent: any = reactive({});
-  const endTs: any = ref(0);
-  async function handleSubmit() {
-    setDrawerProps({ confirmLoading: true });
-    try {
-      const { createMessage } = useMessage();
-      const values = await validate();
-      if (!values) return;
-      if (getAttrDevice.value.length === 0) {
-        return createMessage.error('请选择设备及其属性');
-      }
-      if (values.executeWay == 0) {
-        executeContent = null;
-      } else {
-        executeContent = {};
-      }
-      if (values.timeZone) {
-        const getTime = JSON.stringify(values.timeZone);
-        endTs.value = moment(JSON.parse(getTime)[0]).valueOf() || 1659424160000;
-      }
-      queryCondition = {
-        agg: values.agg,
-        interval: values.interval,
-        limit: values.limit,
-      };
-      delete values.devices;
-      delete values.agg;
-      delete values.interval;
-      delete values.timeZone;
-      postObj = {
-        ...values,
-        ...{ executeAttributes: getAttrDevice.value },
-        ...{ queryCondition },
-        ...{ endTs: endTs.value },
-        ...{ executeContent },
-        ...{ id: editId.value !== '' ? editId.value : '' },
-      };
-      let saveMessage = '添加成功';
-      let updateMessage = '修改成功';
-      editId.value !== ''
-        ? await putReportConfigManage(postObj)
-        : await createOrEditReportManage(postObj);
-
-      closeDrawer();
-      emit('success');
-      createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
-    } finally {
-      setTimeout(() => {
-        setDrawerProps({ confirmLoading: false });
-      }, 300);
+    if (values.timeZone) {
+      const getTime = JSON.stringify(values.timeZone);
+      endTs.value = moment(JSON.parse(getTime)[0]).valueOf() || 1659424160000;
     }
     }
+    queryCondition = {
+      agg: values.agg,
+      interval: values.interval,
+      limit: values.limit,
+    };
+    delete values.devices;
+    delete values.agg;
+    delete values.interval;
+    delete values.timeZone;
+    postObj = {
+      ...values,
+      ...{ executeAttributes: getAttrDevice.value },
+      ...{ queryCondition },
+      ...{ endTs: endTs.value },
+      ...{ executeContent },
+      ...{ id: editId.value !== '' ? editId.value : '' },
+    };
+    let saveMessage = '添加成功';
+    let updateMessage = '修改成功';
+    editId.value !== ''
+      ? await putReportConfigManage(postObj)
+      : await createOrEditReportManage(postObj);
+
+    closeDrawer();
+    emit('success');
+    createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
+  } finally {
+    setTimeout(() => {
+      setDrawerProps({ confirmLoading: false });
+    }, 300);
   }
   }
+}
 </script>
 </script>

@@ -5,17 +5,19 @@ import moment from 'moment';
 import { getOrganizationList } from '/@/api/system/system';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
-import {
-  optionsConfig,
-  isTiming,
-  isWeek,
-  isMonth,
-  isEmpty,
-  isDefultWeek,
-  isFixedWeek,
-} from './timeConfig';
+import { isTiming, isWeek, isMonth } from './timeConfig';
 import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
 import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
+import { Moment } from 'moment';
+import {
+  getPacketIntervalByRange,
+  getPacketIntervalByValue,
+  intervalOption,
+} from '../../device/localtion/cpns/TimePeriodForm/helper';
 
 
+export enum QueryWay {
+  LATEST = 'latest',
+  TIME_PERIOD = 'timePeriod',
+}
 export enum SchemaFiled {
 export enum SchemaFiled {
   WAY = 'way',
   WAY = 'way',
   TIME_PERIOD = 'timePeriod',
   TIME_PERIOD = 'timePeriod',
@@ -360,10 +362,11 @@ export const formSchema: QFormSchema[] = [
   {
   {
     field: SchemaFiled.AGG,
     field: SchemaFiled.AGG,
     label: '聚合条件',
     label: '聚合条件',
-    required: true,
     component: 'Select',
     component: 'Select',
+    required: true,
     componentProps: {
     componentProps: {
       placeholder: '请选择聚合条件',
       placeholder: '请选择聚合条件',
+      getPopupContainer: () => document.body,
       options: [
       options: [
         { label: '最小值', value: AggregateDataEnum.MIN },
         { label: '最小值', value: AggregateDataEnum.MIN },
         { label: '最大值', value: AggregateDataEnum.MAX },
         { label: '最大值', value: AggregateDataEnum.MAX },
@@ -373,205 +376,130 @@ export const formSchema: QFormSchema[] = [
         { label: '空', value: AggregateDataEnum.NONE },
         { label: '空', value: AggregateDataEnum.NONE },
       ],
       ],
     },
     },
-    colProps: { span: 24 },
   },
   },
   {
   {
     field: SchemaFiled.LIMIT,
     field: SchemaFiled.LIMIT,
-    component: 'InputNumber',
     label: '最大值',
     label: '最大值',
+    component: 'InputNumber',
     required: true,
     required: true,
-    defaultValue: 200,
-    colProps: { span: 22 },
-    componentProps: {
-      min: 7,
-      max: 50000,
+    ifShow({ values }) {
+      return values[SchemaFiled.AGG] === AggregateDataEnum.NONE;
+    },
+    // defaultValue: 200,
+    componentProps() {
+      return {
+        max: 50000,
+        min: 7,
+      };
     },
     },
-    ifShow: ({ values }) => isEmpty(values.agg),
   },
   },
   {
   {
-    field: 'defaultWeek',
-    component: 'ApiRadioGroup',
+    field: SchemaFiled.WAY,
     label: '查询周期',
     label: '查询周期',
+    component: 'RadioGroup',
+    defaultValue: QueryWay.LATEST,
     required: true,
     required: true,
-    colProps: {
-      span: 24,
-    },
-    defaultValue: '2',
-    componentProps: {
-      placeholder: '请选择查询周期',
-      options: [
-        {
-          label: '自定义周期',
-          value: 'defaultIsWeek',
-        },
-        {
-          label: '固定周期',
-          value: '2',
+    componentProps({ formActionType }) {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择查询周期',
+        options: [
+          { label: '固定周期', value: QueryWay.LATEST },
+          { label: '自定义周期', value: QueryWay.TIME_PERIOD },
+        ],
+        onChange(value) {
+          value === QueryWay.LATEST
+            ? setFieldsValue({
+                [SchemaFiled.DATE_RANGE]: [],
+                [SchemaFiled.START_TS]: null,
+                [SchemaFiled.END_TS]: null,
+              })
+            : setFieldsValue({ [SchemaFiled.START_TS]: null });
         },
         },
-      ],
+      };
     },
     },
   },
   },
   {
   {
-    field: 'timeZone',
+    field: SchemaFiled.DATE_RANGE,
     label: '时间段',
     label: '时间段',
     component: 'RangePicker',
     component: 'RangePicker',
-    componentProps: {
-      format: 'YYYY-MM-DD HH:mm:ss',
-      placeholder: ['开始时间', '结束时间'],
-      showTime: { format: 'HH:mm:ss' },
+    required: true,
+    ifShow({ values }) {
+      return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD;
+    },
+    componentProps({ formActionType }) {
+      const { setFieldsValue } = formActionType;
+      let dates: Moment[] = [];
+      return {
+        placeholder: '请选择时间段',
+        showTime: true,
+        onCalendarChange(value: Moment[]) {
+          dates = value;
+        },
+        disabledDate(current: Moment) {
+          if (!dates || dates.length === 0 || !current) {
+            return false;
+          }
+          const diffDate = current.diff(dates[0], 'years', true);
+          return Math.abs(diffDate) > 1;
+        },
+        onChange() {
+          dates = [];
+          setFieldsValue({ [SchemaFiled.INTERVAL]: null });
+        },
+      };
+    },
+    colProps: {
+      span: 10,
     },
     },
-    colProps: { span: 24 },
-    ifShow: ({ values }) => isDefultWeek(values.defaultWeek),
   },
   },
   {
   {
-    field: 'startTs',
+    field: SchemaFiled.START_TS,
     label: '时间周期',
     label: '时间周期',
+    component: 'Select',
+    // defaultValue: 1000,
     required: true,
     required: true,
-    component: 'ApiSelect',
-    defaultValue: 1000,
-    componentProps: ({ formActionType }) => {
-      const { updateSchema } = formActionType;
+    ifShow({ values }) {
+      return (
+        values[SchemaFiled.AGG] !== AggregateDataEnum.NONE &&
+        values[SchemaFiled.WAY] == QueryWay.LATEST
+      );
+    },
+    componentProps({ formActionType }) {
+      const { setFieldsValue } = formActionType;
       return {
       return {
-        api: async () => {
-          const data: any = await findDictItemByCode({ dictCode: 'query_week' });
-          const option = data.map((item) => {
-            return {
-              label: item.itemText,
-              value: Number(item.itemValue),
-            };
-          });
-          return option;
-        },
-        async onChange(e) {
-          if (Number(e) <= 30000) {
-            //30秒以内 ->  1秒
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(0, 1),
-              },
-            });
-          } else if (Number(e) == 60000) {
-            //1分钟以内 ->  1秒 5秒
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(0, 2),
-              },
-            });
-          } else if (Number(e) == 120000) {
-            //2分钟以内 ->  1秒 5秒 10 15
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(0, 4),
-              },
-            });
-          } else if (Number(e) == 300000) {
-            //5分钟以内 ->  1秒 5秒 10 15 30
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(0, 5),
-              },
-            });
-          } else if (Number(e) == 600000) {
-            //10分钟以内 ->   5秒 10 15 30 1分钟
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(1, 2).concat(optionsConfig.slice(2, 6)),
-              },
-            });
-          } else if (Number(e) == 900000 || Number(e) == 1800000) {
-            //15 30 分钟以内 ->   5秒 10 15 30 1分钟 2分钟
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(1, 2).concat(optionsConfig.slice(2, 7)),
-              },
-            });
-          } else if (Number(e) == 3600000) {
-            //1小时以内 ->  10秒 15 30 1分钟 2分钟 5分钟
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(2, 8),
-              },
-            });
-          } else if (Number(e) == 7200000) {
-            //2小时以内 ->  15秒  30 1分钟 2分钟 5分钟 10 15
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(3, 10),
-              },
-            });
-          } else if (Number(e) == 18000000) {
-            //5小时以内 ->  1分钟 2分钟 5分钟 10 15 30
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(5, 11),
-              },
-            });
-          } else if (Number(e) == 36000000 || Number(e) == 43200000) {
-            //10 12小时以内 -> 2分钟 5分钟 10 15 30 1小时
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(6, 12),
-              },
-            });
-          } else if (Number(e) == 86400000) {
-            //1天以内 ->  5分钟 10 15 30 1小时 2
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(7, 13),
-              },
-            });
-          } else if (Number(e) == 604800000) {
-            //7天以内 ->  30分钟 1小时 2 5 10 12 1天
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(10, 17),
-              },
-            });
-          } else if (Number(e) == 2592000000) {
-            //30天以内 -> 2小时 5 10 12 1天
-            updateSchema({
-              field: 'interval',
-              componentProps: {
-                options: optionsConfig.slice(12, 17),
-              },
-            });
-          }
+        placeholder: '请选择时间周期',
+        options: intervalOption,
+        onChange() {
+          setFieldsValue({ [SchemaFiled.INTERVAL]: null });
         },
         },
-        maxLength: 250,
-        placeholder: '请选择查询周期',
       };
       };
     },
     },
-    colProps: { span: 24 },
-    ifShow: ({ values }) => isFixedWeek(values.defaultWeek) && !isEmpty(values.agg),
   },
   },
   {
   {
-    field: 'interval',
+    field: SchemaFiled.INTERVAL,
     label: '间隔时间',
     label: '间隔时间',
-    required: true,
     component: 'Select',
     component: 'Select',
-    colProps: { span: 24 },
-    defaultValue: 1000,
-    componentProps: {
-      placeholder: '请选择间隔时间',
-      options: [
-        {
-          label: '1秒',
-          value: 1000,
-        },
-      ],
+    required: true,
+    // defaultValue: 1000,
+    ifShow({ values }) {
+      return (
+        values[SchemaFiled.AGG] !== AggregateDataEnum.NONE &&
+        values[SchemaFiled.WAY] == QueryWay.LATEST
+      );
+    },
+    componentProps({ formModel, formActionType }) {
+      const options =
+        formModel[SchemaFiled.WAY] === QueryWay.LATEST
+          ? getPacketIntervalByValue(formModel[SchemaFiled.START_TS])
+          : getPacketIntervalByRange(formModel[SchemaFiled.DATE_RANGE]);
+      if (formModel[SchemaFiled.AGG] !== AggregateDataEnum.NONE) {
+        formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
+      }
+      return {
+        placeholder: '请选择间隔时间',
+        options,
+      };
     },
     },
-    ifShow: ({ values }) => isFixedWeek(values.defaultWeek) && !isEmpty(values.agg),
   },
   },
 ];
 ];

@@ -7,13 +7,13 @@
     <a-input
     <a-input
       :disabled="true"
       :disabled="true"
       v-model:value="param.device"
       v-model:value="param.device"
-      style="width: 38%; margin-bottom: 5px; margin-left: 1vh"
+      style="width: 50%; margin-bottom: 5px; margin-left: 0vh"
       @change="emitChange"
       @change="emitChange"
     />
     />
     <Select
     <Select
       placeholder="请选择设备属性"
       placeholder="请选择设备属性"
       v-model:value="param.attribute"
       v-model:value="param.attribute"
-      style="width: 160px; margin-left: 1.8vw"
+      style="width: 50%; margin-left: 1.8vw"
       :options="selectOptions"
       :options="selectOptions"
       @change="emitChange"
       @change="emitChange"
       allowClear
       allowClear
@@ -38,14 +38,14 @@
     device: string;
     device: string;
   }
   }
   const props = defineProps({
   const props = defineProps({
-    value: propTypes.array.def([]),
+    value: propTypes.object.def({}),
     orgId: propTypes.string.def(''),
     orgId: propTypes.string.def(''),
   });
   });
   const emits = defineEmits(['change', 'update:value']);
   const emits = defineEmits(['change', 'update:value']);
   const selectOptions = ref<SelectTypes['options']>([]);
   const selectOptions = ref<SelectTypes['options']>([]);
   //获取属性
   //获取属性
   const getAttr = async (orgId, deviceId) => {
   const getAttr = async (orgId, deviceId) => {
-    const res = await getAttribute(orgId, deviceId.join(','));
+    const res = await getAttribute(orgId, deviceId);
     selectOptions.value = res.map((o) => {
     selectOptions.value = res.map((o) => {
       return {
       return {
         label: o,
         label: o,
@@ -55,25 +55,20 @@
   };
   };
   //动态数据
   //动态数据
   const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
   const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
-  //监听传入数据value
-  watchEffect(() => {
+  const rEffect = watchEffect(() => {
     initVal();
     initVal();
   });
   });
+  rEffect();
   /**
   /**
    * 初始化数值
    * 初始化数值
    */
    */
   async function 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);
-      jsonObj.forEach((item: any) => {
-        dynamicInput.params.push({
-          attribute: '',
-          device: item.label,
-          value: item.value,
-        });
+    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,
       });
       });
     }
     }
   }
   }
@@ -81,32 +76,12 @@
    * 数值改变
    * 数值改变
    */
    */
   function emitChange() {
   function emitChange() {
-    let obj: any = [];
-    if (dynamicInput.params.length > 0) {
-      dynamicInput.params.forEach((item: Params) => {
-        obj.push({
-          attribute: item.attribute,
-          device: item.value,
-        });
-      });
-    }
-    console.log('emitChange', obj);
+    let obj: any = dynamicInput.params[0];
     emits('change', obj);
     emits('change', obj);
     emits('update:value', obj);
     emits('update:value', obj);
   }
   }
-  //回显
-  const echoDynamicInputFunc = (o) => {
-    dynamicInput.params = [];
-    o.forEach((m: any) => {
-      dynamicInput.params.push({
-        device: m.name,
-        attribute: m.attribute,
-        value: m.device,
-      });
-    });
-  };
   defineExpose({
   defineExpose({
-    echoDynamicInputFunc,
+    getAttr,
   });
   });
 </script>
 </script>
 <style scoped lang="css">
 <style scoped lang="css">

@@ -162,7 +162,7 @@ export const modeKafkaForm: FormSchema[] = [
   {
   {
     field: 'keySerializer',
     field: 'keySerializer',
     label: '键序列化',
     label: '键序列化',
-    colProps: { span: 12 },
+    colProps: { span: 24 },
     required: true,
     required: true,
     component: 'Input',
     component: 'Input',
     defaultValue: 'org.apache.kafka.common.serialization.StringSerializer',
     defaultValue: 'org.apache.kafka.common.serialization.StringSerializer',
@@ -174,7 +174,7 @@ export const modeKafkaForm: FormSchema[] = [
   {
   {
     field: 'valueSerializer',
     field: 'valueSerializer',
     label: '值序列化',
     label: '值序列化',
-    colProps: { span: 12 },
+    colProps: { span: 24 },
     required: true,
     required: true,
     component: 'Input',
     component: 'Input',
     defaultValue: 'org.apache.kafka.common.serialization.StringSerializer',
     defaultValue: 'org.apache.kafka.common.serialization.StringSerializer',

@@ -4,13 +4,24 @@ import moment from 'moment';
 import { h } from 'vue';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { Tag } from 'ant-design-vue';
 
 
+///任务组名Enum
+export enum EJobGroup {
+  DEFAULT = 'DEFAULT',
+  SYSTEM = 'SYSTEM',
+  REPORT = 'REPORT',
+}
+
 //任务详细配置
 //任务详细配置
 export const personSchema: DescItem[] = [
 export const personSchema: DescItem[] = [
   {
   {
     field: 'jobGroup',
     field: 'jobGroup',
     label: '任务分组：',
     label: '任务分组：',
     render: (_, data) => {
     render: (_, data) => {
-      return data.jobGroup == 'Default' ? '默认' : data.jobGroup == 'System' ? '系统' : '报表';
+      return data.jobGroup == EJobGroup.DEFAULT
+        ? '默认'
+        : data.jobGroup == EJobGroup.SYSTEM
+        ? '系统'
+        : '报表';
     },
     },
   },
   },
   {
   {
@@ -62,9 +73,9 @@ export const columnSchedue: BasicColumn[] = [
     dataIndex: 'jobGroup',
     dataIndex: 'jobGroup',
     width: 120,
     width: 120,
     format: (_text: string, record: Recordable) => {
     format: (_text: string, record: Recordable) => {
-      return record.jobGroup === 'Default'
+      return record.jobGroup === EJobGroup.DEFAULT
         ? '默认'
         ? '默认'
-        : record.jobGroup === 'System'
+        : record.jobGroup === EJobGroup.SYSTEM
         ? '系统'
         ? '系统'
         : '报表';
         : '报表';
     },
     },
@@ -121,15 +132,15 @@ export const searchSchedueFormSchema: FormSchema[] = [
       options: [
       options: [
         {
         {
           label: '默认',
           label: '默认',
-          value: 'Default',
+          value: EJobGroup.DEFAULT,
         },
         },
         {
         {
           label: '系统',
           label: '系统',
-          value: 'System',
+          value: EJobGroup.SYSTEM,
         },
         },
         {
         {
           label: '报表',
           label: '报表',
-          value: 'Report',
+          value: EJobGroup.REPORT,
         },
         },
       ],
       ],
       placeholder: '请选择任务组名',
       placeholder: '请选择任务组名',
@@ -176,7 +187,11 @@ export const scheduleLogDetailSchema: DescItem[] = [
     field: 'jobGroup',
     field: 'jobGroup',
     label: '任务组名：',
     label: '任务组名：',
     render: (_, data) => {
     render: (_, data) => {
-      return data.jobGroup == 'Default' ? '默认' : data.jobGroup == 'System' ? '系统' : '报表';
+      return data.jobGroup == EJobGroup.DEFAULT
+        ? '默认'
+        : data.jobGroup == EJobGroup.SYSTEM
+        ? '系统'
+        : '报表';
     },
     },
   },
   },
   {
   {

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import type { FormSchema as QFormSchema } from '/@/components/Form/index';
 import type { FormSchema as QFormSchema } from '/@/components/Form/index';
 import { JCronValidator } from '/@/components/Form';
 import { JCronValidator } from '/@/components/Form';
+import { EJobGroup } from './config.data';
 
 
 // 定时任务表格配置
 // 定时任务表格配置
 export const columnSchedue: BasicColumn[] = [
 export const columnSchedue: BasicColumn[] = [
@@ -14,9 +15,9 @@ export const columnSchedue: BasicColumn[] = [
     dataIndex: 'jobGroup',
     dataIndex: 'jobGroup',
     width: 120,
     width: 120,
     format: (_text: string, record: Recordable) => {
     format: (_text: string, record: Recordable) => {
-      return record.jobGroup === 'Default'
+      return record.jobGroup === EJobGroup.DEFAULT
         ? '默认'
         ? '默认'
-        : record.jobGroup === 'System'
+        : record.jobGroup === EJobGroup.SYSTEM
         ? '系统'
         ? '系统'
         : '报表';
         : '报表';
     },
     },
@@ -60,15 +61,15 @@ export const searchSchedueFormSchema: FormSchema[] = [
       options: [
       options: [
         {
         {
           label: '默认',
           label: '默认',
-          value: 'Default',
+          value: EJobGroup.DEFAULT,
         },
         },
         {
         {
           label: '系统',
           label: '系统',
-          value: 'System',
+          value: EJobGroup.SYSTEM,
         },
         },
         {
         {
           label: '报表',
           label: '报表',
-          value: 'Report',
+          value: EJobGroup.REPORT,
         },
         },
       ],
       ],
       placeholder: '请选择任务组名',
       placeholder: '请选择任务组名',
@@ -120,15 +121,15 @@ export const formSchema: QFormSchema[] = [
       options: [
       options: [
         {
         {
           label: '默认',
           label: '默认',
-          value: 'Default',
+          value: EJobGroup.DEFAULT,
         },
         },
         {
         {
           label: '系统',
           label: '系统',
-          value: 'System',
+          value: EJobGroup.SYSTEM,
         },
         },
         {
         {
           label: '报表',
           label: '报表',
-          value: 'Report',
+          value: EJobGroup.REPORT,
         },
         },
       ],
       ],
     },
     },

 <template>
 <template>
   <div class="drawer-class">
   <div class="drawer-class">
-    <BasicDrawer
-      v-bind="$attrs"
-      @register="registerDrawer"
-      showFooter
-      :title="getTitle"
-      width="700px"
-      @ok="handleSubmit"
-    >
+    <BasicDrawer v-bind="$attrs" @register="registerDrawer" showFooter :title="getTitle" width="700px"
+      @ok="handleSubmit">
       <BasicForm @register="registerForm" />
       <BasicForm @register="registerForm" />
       <CpnsTenantSet ref="getChildData" :parentData="parentSetData" />
       <CpnsTenantSet ref="getChildData" :parentData="parentSetData" />
     </BasicDrawer>
     </BasicDrawer>
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, getCurrentInstance, reactive } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema } from './config';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import CpnsTenantSet from './cpns/index.vue';
-  import { saveTenantProfileApi } from '/@/api/tenant/tenantApi';
-  import { useMessage } from '/@/hooks/web/useMessage';
+import { defineComponent, ref, computed, unref, getCurrentInstance, reactive } from 'vue';
+import { BasicForm, useForm } from '/@/components/Form';
+import { formSchema } from './config';
+import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+import CpnsTenantSet from './cpns/index.vue';
+import { saveTenantProfileApi } from '/@/api/tenant/tenantApi';
+import { useMessage } from '/@/hooks/web/useMessage';
 
 
-  export default defineComponent({
-    name: 'ConfigDrawer',
-    components: { BasicDrawer, BasicForm, CpnsTenantSet },
-    emits: ['success', 'register'],
-    setup(_, { emit }) {
-      const { createMessage } = useMessage();
-      const isUpdate = ref(true);
-      let postAllData: any = reactive({});
-      const parentSetData: any = ref(null);
-      let getValuesFormData: any = reactive({});
-      const { proxy } = getCurrentInstance() as any;
-      const getChildData = ref(null);
-      const editGetId: any = ref('');
-      const [registerForm, { validate, resetFields, setFieldsValue }] = useForm({
-        schemas: formSchema,
-        showActionButtonGroup: false,
-      });
-      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        //清除表单值
-        proxy.$refs.getChildData.funcResetFields();
-        await resetFields();
-        setDrawerProps({ confirmLoading: false });
-        isUpdate.value = !!data?.isUpdate;
-        if (!unref(isUpdate)) {
-          editGetId.value = '';
-        }
-        //编辑
-        if (unref(isUpdate)) {
-          parentSetData.value = { ...data.record.profileData.configuration };
-          proxy.$refs.getChildData.setFieldsValueFunc(parentSetData.value);
-          editGetId.value = data.record.id;
-          await setFieldsValue({
-            ...data.record,
-          });
-        }
-      });
-      const getTitle = computed(() => (!unref(isUpdate) ? '新增租户配置' : '编辑租户配置'));
-
-      const getAllFieldsFunc = async () => {
-        getValuesFormData = await validate();
-        if (!getValuesFormData) return;
-        let getChildValues = proxy.$refs.getChildData.getAllFields();
-        let profileData1 = {
-          configuration: getChildValues,
-        };
-        const id: any = {
-          id: unref(isUpdate) ? editGetId.value : '',
-        };
+export default defineComponent({
+  name: 'ConfigDrawer',
+  components: { BasicDrawer, BasicForm, CpnsTenantSet },
+  emits: ['success', 'register'],
+  setup(_, { emit }) {
+    const { createMessage } = useMessage();
+    const isUpdate = ref(true);
+    let postAllData: any = reactive({});
+    const parentSetData: any = ref(null);
+    let getValuesFormData: any = reactive({});
+    const { proxy } = getCurrentInstance() as any;
+    const getChildData = ref(null);
+    const editGetId: any = ref('');
+    const [registerForm, { validate, resetFields, setFieldsValue }] = useForm({
+      schemas: formSchema,
+      showActionButtonGroup: false,
+    });
+    const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+      //清除表单值
+      proxy.$refs.getChildData.funcResetFields();
+      await resetFields();
+      setDrawerProps({ confirmLoading: false });
+      isUpdate.value = !!data?.isUpdate;
+      if (!unref(isUpdate)) {
+        editGetId.value = '';
+      }
+      //编辑
+      if (unref(isUpdate)) {
+        parentSetData.value = { ...data.record.profileData.configuration };
+        proxy.$refs.getChildData.setFieldsValueFunc(parentSetData.value);
+        editGetId.value = data.record.id;
+        await setFieldsValue({
+          ...data.record,
+        });
+      }
+    });
+    const getTitle = computed(() => (!unref(isUpdate) ? '新增租户配置' : '编辑租户配置'));
 
 
-        const createTime = {
-          createdTime: Date.now(),
-        };
+    const getAllFieldsFunc = async () => {
+      getValuesFormData = await validate();
+      if (!getValuesFormData) return;
+      let getChildValues = proxy.$refs.getChildData.getAllFields();
+      let profileData1 = {
+        configuration: getChildValues,
+      };
+      const id: any = {
+        id: unref(isUpdate) ? editGetId.value : '',
+      };
 
 
-        Object.assign(
-          postAllData,
-          {
-            profileData: profileData1,
-          },
-          getValuesFormData,
-          id,
-          createTime
-        );
-        if (!unref(isUpdate)) {
-          delete postAllData.id;
-        }
+      const createTime = {
+        createdTime: Date.now(),
       };
       };
 
 
-      async function handleSubmit() {
-        setDrawerProps({ confirmLoading: true });
-        try {
-          if (!unref(isUpdate)) {
-            getAllFieldsFunc();
-            await saveTenantProfileApi(postAllData);
-            createMessage.success('租户配置新增成功');
-            closeDrawer();
-            emit('success');
-            resetFields();
-          } else {
-            getAllFieldsFunc();
-            await saveTenantProfileApi(postAllData);
-            createMessage.success('租户配置编辑成功');
-            closeDrawer();
-            emit('success');
-          }
-        } catch (e) {
-        } finally {
-          setTimeout(() => {
-            setDrawerProps({ confirmLoading: false });
-          }, 300);
+      Object.assign(
+        postAllData,
+        {
+          profileData: profileData1,
+        },
+        getValuesFormData,
+        id,
+        createTime
+      );
+      if (!unref(isUpdate)) {
+        delete postAllData.id;
+      }
+    };
+
+    async function handleSubmit() {
+      setDrawerProps({ confirmLoading: true });
+      try {
+        if (!unref(isUpdate)) {
+          await getAllFieldsFunc();
+          await saveTenantProfileApi(postAllData);
+          createMessage.success('租户配置新增成功');
+          closeDrawer();
+          emit('success');
+          resetFields();
+        } else {
+          await getAllFieldsFunc();
+          await saveTenantProfileApi(postAllData);
+          createMessage.success('租户配置编辑成功');
+          closeDrawer();
+          emit('success');
         }
         }
+      } catch (e) {
+      } finally {
+        setTimeout(() => {
+          setDrawerProps({ confirmLoading: false });
+        }, 300);
       }
       }
-      return {
-        parentSetData,
-        getChildData,
-        registerDrawer,
-        registerForm,
-        getTitle,
-        handleSubmit,
-      };
-    },
-  });
+    }
+    return {
+      parentSetData,
+      getChildData,
+      registerDrawer,
+      registerForm,
+      getTitle,
+      handleSubmit,
+    };
+  },
+});
 </script>
 </script>
 
 
 <style lang="less">
 <style lang="less">
-  .drawer-class {
-    .ant-row {
-      .ant-col {
-        :deep .ant-input-number {
-          width: 34vw !important;
-        }
+.drawer-class {
+  .ant-row {
+    .ant-col {
+      :deep .ant-input-number {
+        width: 34vw !important;
       }
       }
     }
     }
   }
   }
+}
 </style>
 </style>

@@ -21,6 +21,7 @@
     "typeRoots": ["./node_modules/@types/", "./types"],
     "typeRoots": ["./node_modules/@types/", "./types"],
     "noImplicitAny": false,
     "noImplicitAny": false,
     "skipLibCheck": true,
     "skipLibCheck": true,
+    "removeComments": true,
     "paths": {
     "paths": {
       "/@/*": ["src/*"],
       "/@/*": ["src/*"],
       "/#/*": ["types/*"]
       "/#/*": ["types/*"]