Merge branch 'f-dev' into 'main'

fix：修改报表配置相关

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

 <template>
-  <BasicDrawer :maskClosable="false" @close="handleClose" destroyOnClose 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="请选择设备" />
+      <template #devices="{ model, field }">
+        <p style="display: none">{{ field }}</p>
+        <p>{{ orgFunc(model['organizationId']) }}</p>
+        <Select
+          placeholder="请选择设备"
+          v-model:value="selectDevice"
+          style="width: 100%"
+          :options="selectOptions"
+          @change="handleDeviceChange"
+          @deselect="handleDeselect"
+          mode="multiple"
+          labelInValue
+          allowClear
+          notFoundContent="请选择设备"
+        />
         <div style="margin-top: 1.5vh"></div>
-        <DeviceAttrCpns ref="deviceAttrRef" @change="handleChange" :value="deviceList"
-          :orgId="organizationId || orgId" />
+        <template v-for="(item, index) in deviceList" :key="item.value">
+          <p style="display: none">{{ index }}</p>
+          <DeviceAttrCpns
+            :ref="bindDeviceRefObj.deviceAttrRef"
+            :value="item"
+            :orgId="organizationId || orgId"
+          />
+        </template>
       </template>
     </BasicForm>
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-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';
-import { createOrEditReportManage, putReportConfigManage, reportEditDetailPage } 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';
-import { SchemaFiled } from './config.data';
-import { QueryWay } from '../../device/localtion/cpns/TimePeriodForm/config';
-import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
+  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';
+  import {
+    createOrEditReportManage,
+    putReportConfigManage,
+    reportEditDetailPage,
+  } 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';
+  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,
-  value?: string,
-  label?: string,
-  attribute?: string,
-  device?: string,
-  name?: string
-}
-const emit = defineEmits(['success', 'register']);
-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,
-  });
-  selectOptions.value = items.map((item) => {
-    if (item.deviceType !== 'GATEWAY')
-      return {
-        label: item.name,
-        value: item.tbDeviceId,
-      };
-  });
-});
-const handleDeviceChange = (e) => {
-  console.log(e)
-  deviceList.value = e;
-};
-const [registerForm, { validate, setFieldsValue, resetFields, updateSchema, getFieldsValue }] = useForm({
-  labelWidth: 120,
-  schemas: formSchema,
-  showActionButtonGroup: false,
-  fieldMapToTime: [[SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS]]],
-});
-const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-  await resetFields();
-  setDrawerProps({ confirmLoading: false });
-  isUpdate.value = !!data?.isUpdate;
-  if (unref(isUpdate)) {
-    //编辑回显数据
-    editResData = await reportEditDetailPage(data.record.id)
-    //回显基础数据
-    editId.value = editResData.data.id;
-    await setFieldsValue(editResData.data);
-    //回显嵌套数据
-    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,
-        },
-      });
+  type TDeviceList = {
+    key?: string;
+    value?: string;
+    label?: string;
+    attribute?: string;
+    device?: string;
+    name?: string;
+  };
+  const emit = defineEmits(['success', 'register']);
+  const bindDeviceRefObj = {
+    deviceAttrRef: ref([]),
+  };
+  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 editDeviceAttr: any = ref([]);
+  const orgFuncId = ref('');
+  const orgFunc = (e) => {
+    orgFuncId.value = e;
+  };
+  watch(
+    () => orgFuncId.value,
+    async (newValue: string) => {
+      if (newValue) {
+        //获取设备
+        const { items } = await screenLinkPageByDeptIdGetDevice({
+          organizationId: newValue,
+        });
+        selectOptions.value = items.map((item) => {
+          if (item.deviceType !== 'GATEWAY')
+            return {
+              label: item.name,
+              value: item.tbDeviceId,
+            };
+        });
+      }
     }
-    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,
-        },
+  );
+  //设备Select选中
+  const handleDeviceChange = (e) => {
+    if (unref(isUpdate)) {
+      editDeviceAttr.value.forEach((f) => {
+        deviceList.value = [f, ...e];
       });
+      let deWeightThree = () => {
+        let map = new Map();
+        for (let item of deviceList.value) {
+          if (!map.has(item.value)) {
+            map.set(item.value, item);
+          }
+        }
+        return [...map.values()];
+      };
+      deviceList.value = deWeightThree();
+    } else {
+      deviceList.value = e;
+    }
+  };
+  //设备取消删除
+  const handleDeselect = (e) => {
+    if (unref(isUpdate)) {
+      const eEditDevice = e.key || e.value;
+      let deWeightThree = () => {
+        let map = new Map();
+        for (let item of deviceList.value) {
+          if (!map.has(item.value)) {
+            map.set(item.value, item);
+          }
+        }
+        return [...map.values()];
+      };
+      deviceList.value = deWeightThree();
+      const findEditValue = deviceList.value.findIndex((f) => f.value == eEditDevice);
+      if (findEditValue !== -1) deviceList.value.splice(findEditValue, 1);
+    } else {
+      const eDevice = e.key || e.value;
+      const findValue = deviceList.value.findIndex((f) => f.value == eDevice);
+      if (findValue !== -1) deviceList.value.splice(findValue, 1);
     }
-    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,
+  };
+  const [registerForm, { validate, setFieldsValue, resetFields, updateSchema, getFieldsValue }] =
+    useForm({
+      labelWidth: 120,
+      schemas: formSchema,
+      showActionButtonGroup: false,
+      fieldMapToTime: [[SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS]]],
     });
-    selectOptions.value = items.map((item) => {
-      if (item.deviceType !== 'GATEWAY')
+  const isViewDetail = ref(false);
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    await resetFields();
+    setDrawerProps({ confirmLoading: false });
+    isUpdate.value = !!data?.isUpdate;
+    isViewDetail.value = !!data?.isView;
+    if (unref(isViewDetail)) {
+      setDrawerProps({ showFooter: true });
+      if (unref(isUpdate)) {
+        setDrawerProps({ title: '编辑报表配置' });
+      } else {
+        setDrawerProps({ title: '新增报表配置' });
+      }
+    } else {
+      setDrawerProps({ showFooter: false });
+      setDrawerProps({ title: '查看报表配置' });
+    }
+    if (unref(isUpdate)) {
+      //编辑回显数据
+      editResData = await reportEditDetailPage(data.record.id);
+      //回显基础数据
+      editId.value = editResData.data.id;
+      await setFieldsValue(editResData.data);
+      //回显嵌套数据
+      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,
+        startTs: editResData.data.queryCondition?.startTs,
+        endTs: editResData.data.queryCondition?.endTs,
+      });
+      //回显聚合条件
+      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,
+      });
+      selectOptions.value = items.map((item) => {
+        if (item.deviceType !== 'GATEWAY')
+          return {
+            label: item.name,
+            value: item.tbDeviceId,
+          };
+      });
+      const deviceIds = editResData.data.executeAttributes.map((m) => {
+        return {
+          label: m.name,
+          key: m.device,
+        };
+      });
+      selectDevice.value = deviceIds;
+      //回显设备属性
+      editDeviceAttr.value = editResData.data.executeAttributes?.map((item) => {
         return {
           label: item.name,
-          value: item.tbDeviceId,
+          value: item.device,
+          attributes: item.attributes,
         };
-    });
-    const deviceIds = editResData.data.executeAttributes.map(m => {
-      return {
-        label: m.name,
-        key: m.device
-      }
-    })
-    selectDevice.value = deviceIds;
-    //回显设备属性
-    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: {}) => {
+      });
+      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.WAY,
+        field: SchemaFiled.AGG,
         componentProps: {
-          options,
+          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);
     }
-    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 = e
-};
-let postObj: any = reactive({});
-let queryCondition: any = reactive({});
-let executeContent: any = reactive({});
-const startTs = ref(0)
-const endTs = ref(0);
-async function handleSubmit() {
-  setDrawerProps({ confirmLoading: true });
-  try {
-    const { createMessage } = useMessage();
-    const values = await validate();
-    if (!values) return;
-    if (!unref(isUpdate)) {
-      if (getAttrDevice.value.length === 0) {
-        return createMessage.error('请选择设备及其属性');
+  });
+  const handleClose = () => {
+    deviceList.value = [];
+    editId.value = '';
+    orgId.value = '';
+    selectDevice.value = [];
+    selectOptions.value = [];
+    getAttrDevice.value = [];
+    editDeviceList.value = [];
+    editDeviceAttr.value = [];
+  };
+  const getAttrDevice: Ref<TDeviceList[]> = ref([]);
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增报表配置' : '编辑报表配置'));
+  let postObj: any = reactive({});
+  let queryCondition: any = reactive({});
+  let executeContent: any = reactive({});
+  const startTs = ref(0);
+  const endTs = ref(0);
+
+  const getFormValueFunc = () => {
+    const item: any = unref(bindDeviceRefObj.deviceAttrRef)?.map((item: any) => item.emitChange());
+    getAttrDevice.value = item;
+  };
+
+  async function handleSubmit() {
+    setDrawerProps({ confirmLoading: true });
+    try {
+      const { createMessage } = useMessage();
+      const values = await validate();
+      if (!values) return;
+      getFormValueFunc();
+      if (!unref(isUpdate)) {
+        if (getAttrDevice.value.length === 0) {
+          return createMessage.error('请选择设备及其属性');
+        }
       }
-    }
-    if (values.executeWay == 0) {
-      executeContent = null;
-    } else {
-      executeContent = values.cronTime
-    }
-    queryCondition = {
-      agg: values.agg,
-      interval: values.interval,
-      limit: values.limit1,
-    };
-    if (values.way === QueryWay.LATEST) {
-      startTs.value = moment().subtract(values.startTs, 'ms').valueOf()
-      endTs.value = Date.now()
-    } else {
-      startTs.value = moment(values.startTs).valueOf()
-      endTs.value = moment(values.endTs).valueOf()
-    }
-    delete values.devices;
-    delete values.agg;
-    delete values.interval;
-    delete values.timeZone;
-    delete values.timeWeek;
-    delete values.cronTime;
-    delete values.cronWeek;
-    delete values.cronYear;
-    delete values.limit1;
-    postObj = {
-      ...values,
-      ...{ executeAttributes: getAttrDevice.value.length == 0 ? editDeviceList.value : getAttrDevice.value },
-      ...{ queryCondition },
-      ...{
-        startTs: startTs.value
-      },
-      ...{
-        endTs: endTs.value
-      },
-      ...{ executeContent },
-      ...{ id: editId.value !== '' ? editId.value : '' },
-    };
-    let saveMessage = '添加成功';
-    let updateMessage = '修改成功';
-    editId.value !== ''
-      ? await putReportConfigManage(postObj)
-      : await createOrEditReportManage(postObj);
+      if (values.executeWay == 0) {
+        executeContent = null;
+      } else {
+        executeContent = values.cronTime;
+      }
+      if (values.way === QueryWay.LATEST) {
+        startTs.value = moment().subtract(values.startTs, 'ms').valueOf();
+        endTs.value = Date.now();
+      } else {
+        startTs.value = moment(values.startTs).valueOf();
+        endTs.value = moment(values.endTs).valueOf();
+      }
+      queryCondition = {
+        agg: values.agg,
+        interval: values.interval,
+        limit: values.limit1,
+        ...{
+          startTs: startTs.value,
+        },
+        ...{
+          endTs: endTs.value,
+        },
+      };
+
+      delete values.devices;
+      delete values.agg;
+      delete values.interval;
+      delete values.timeZone;
+      delete values.timeWeek;
+      delete values.cronTime;
+      delete values.cronWeek;
+      delete values.cronYear;
+      delete values.limit1;
+      delete values.startTs;
+      postObj = {
+        ...values,
+        ...{
+          executeAttributes:
+            getAttrDevice.value.length == 0 ? editDeviceList.value : getAttrDevice.value,
+        },
+        ...{ queryCondition },
+
+        ...{ 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);
+      closeDrawer();
+      emit('success');
+      createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
+      handleClose();
+    } finally {
+      setTimeout(() => {
+        setDrawerProps({ confirmLoading: false });
+      }, 300);
+    }
   }
-}
 </script>

@@ -173,7 +173,7 @@ export const formSchema: QFormSchema[] = [
           copyTransFun(data as any as any[]);
           return data;
         },
-        onChange(e) {
+        async onChange(e) {
           organizationId.value = e;
         },
       };
@@ -318,11 +318,6 @@ export const formSchema: QFormSchema[] = [
     label: '设备',
     helpMessage: ['报表配置只对拥有"数值型"属性的设备才能配置'],
     component: 'Select',
-    // required: true,
-    componentProps: {
-      placeholder: '请选择设备',
-      mode: 'multiple',
-    },
     slot: 'devices',
     colProps: { span: 24 },
   },

 <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: 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
+    v-for="param in dynamicInput.params"
+    :key="param.key"
+    style="display: flex; margin-top: 0.25vh"
+  >
+    <a-input
+      :disabled="true"
+      v-model:value="param.name"
+      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"
+      mode="multiple"
+      allowClear
+    />
   </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;
-  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,
-    };
+  interface Params {
+    [x: string]: string;
+    attributes: any;
+    device: string;
+  }
+  const props = defineProps({
+    value: propTypes.object.def({}),
+    orgId: propTypes.string.def(''),
   });
-};
-//动态数据
-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) => {
+  const selectOptions = ref<SelectTypes['options']>([]);
+  //获取属性
+  const getAttr = async (orgId, deviceId) => {
+    const res = await getAttribute(orgId, deviceId);
+    selectOptions.value = res.map((o) => {
       return {
-        attributes: item.attributes,
-        device: item.label,
-        value: item.value,
-      }
-    })
-  }
-}
-/**
- * 数值改变
- */
-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
-      });
+        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({
+        name: props.value.label,
+        device: props.value.value,
+        attributes: props.value.attributes == [] ? [] : props.value.attributes,
+      });
+    }
+  }
+  /**
+   * 数值改变
+   */
+  function emitChange() {
+    return dynamicInput.params[0];
   }
-  emits('change', obj);
-  emits('update:value', obj);
-}
+  defineExpose({
+    emitChange,
+  });
 </script>
 <style scoped lang="css">
-@import './deviceAttrCpns.css';
+  @import './deviceAttrCpns.css';
 </style>

@@ -9,7 +9,12 @@
           <a-button type="primary" @click="go('/report/export')"> 下载报表 </a-button>
         </Authority>
         <Authority value="api:yt:report:delete">
-          <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
+          <Popconfirm
+            title="您确定要批量删除数据"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="handleDeleteOrBatchDelete(null)"
+          >
             <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
           </Popconfirm>
         </Authority>
@@ -20,30 +25,44 @@
         </a-button>
       </template>
       <template #action="{ record }">
-        <TableAction :actions="[
-          {
-            label: '编辑',
-            icon: 'clarity:note-edit-line',
-            auth: 'api:yt:report:update',
-            onClick: handleCreateOrEdit.bind(null, record),
-            ifShow: record.status === 0,
-          },
-          {
-            label: '删除',
-            icon: 'ant-design:delete-outlined',
-            auth: 'api:yt:report:delete',
-            color: 'error',
-            ifShow: record.status === 0,
-            popConfirm: {
-              title: '是否确认删除',
-              confirm: handleDeleteOrBatchDelete.bind(null, record),
+        <TableAction
+          :actions="[
+            {
+              label: '查看',
+              icon: 'clarity:note-edit-line',
+              onClick: handleViewDetail.bind(null, record),
+              ifShow: record.status === 1,
             },
-          },
-        ]" />
+            {
+              label: '编辑',
+              icon: 'clarity:note-edit-line',
+              auth: 'api:yt:report:update',
+              onClick: handleCreateOrEdit.bind(null, record),
+              ifShow: record.status === 0,
+            },
+            {
+              label: '删除',
+              icon: 'ant-design:delete-outlined',
+              auth: 'api:yt:report:delete',
+              color: 'error',
+              ifShow: record.status === 0,
+              popConfirm: {
+                title: '是否确认删除',
+                confirm: handleDeleteOrBatchDelete.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>
     <ReportConfigDrawer @register="registerDrawer" @success="handleSuccess" />
@@ -52,114 +71,125 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, nextTick, ref } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useDrawer } from '/@/components/Drawer';
-import ReportConfigDrawer from './ReportConfigDrawer.vue';
-import DevicePreviewModal from './DevicePreviewModal.vue';
-import {
-  reportPage,
-  deleteReportManage,
-  putReportByidAndStatusManage,
-} from '/@/api/report/reportManager';
-import { searchFormSchema, columns } from './config.data';
-import { Authority } from '/@/components/Authority';
-import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-import { Popconfirm, Switch } from 'ant-design-vue';
-import { useModal } from '/@/components/Modal';
-import { useGo } from '/@/hooks/web/usePage';
-import { useMessage } from '/@/hooks/web/useMessage';
+  import { reactive, nextTick, ref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useDrawer } from '/@/components/Drawer';
+  import ReportConfigDrawer from './ReportConfigDrawer.vue';
+  import DevicePreviewModal from './DevicePreviewModal.vue';
+  import {
+    reportPage,
+    deleteReportManage,
+    putReportByidAndStatusManage,
+  } from '/@/api/report/reportManager';
+  import { searchFormSchema, columns } from './config.data';
+  import { Authority } from '/@/components/Authority';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { Popconfirm, Switch } from 'ant-design-vue';
+  import { useModal } from '/@/components/Modal';
+  import { useGo } from '/@/hooks/web/usePage';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
-const searchInfo = reactive<Recordable>({});
-const disabledSwitch = ref(false);
+  const searchInfo = reactive<Recordable>({});
+  const disabledSwitch = ref(false);
 
-const [registerTable, { reload, setProps }] = useTable({
-  title: '报表列表',
-  api: reportPage,
-  columns,
-  showIndexColumn: false,
-  clickToRowSelect: false,
-  formConfig: {
-    labelWidth: 120,
-    schemas: searchFormSchema,
-    fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
-  },
-  useSearchForm: true,
-  showTableSetting: true,
-  bordered: true,
-  rowKey: 'id',
-  actionColumn: {
-    width: 200,
-    title: '操作',
-    dataIndex: 'action',
-    slots: { customRender: 'action' },
-    fixed: 'right',
-  },
-});
+  const [registerTable, { reload, setProps }] = useTable({
+    title: '报表列表',
+    api: reportPage,
+    columns,
+    showIndexColumn: false,
+    clickToRowSelect: false,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+      fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'x']],
+    },
+    useSearchForm: true,
+    showTableSetting: true,
+    bordered: true,
+    rowKey: 'id',
+    actionColumn: {
+      width: 200,
+      title: '操作',
+      dataIndex: 'action',
+      slots: { customRender: 'action' },
+      fixed: 'right',
+    },
+  });
 
-// 弹框
-const [registerDrawer, { openDrawer }] = useDrawer();
-const { createMessage } = useMessage();
+  // 弹框
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const { createMessage } = useMessage();
+
+  // 刷新
+  const handleSuccess = () => {
+    reload();
+  };
 
-// 刷新
-const handleSuccess = () => {
-  reload();
-};
+  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+    deleteReportManage,
+    handleSuccess,
+    setProps
+  );
 
-const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-  deleteReportManage,
-  handleSuccess,
-  setProps
-);
+  nextTick(() => {
+    setProps(selectionOptions);
+  });
 
-nextTick(() => {
-  setProps(selectionOptions);
-});
+  // 新增或编辑
+  const handleCreateOrEdit = (record: Recordable | null) => {
+    if (record) {
+      openDrawer(true, {
+        isUpdate: true,
+        record,
+        isView: true,
+      });
+    } else {
+      openDrawer(true, {
+        isUpdate: false,
+        isView: true,
+      });
+    }
+  };
+  const handleViewDetail = (record: Recordable) => {
+    if (record) {
+      openDrawer(true, {
+        isUpdate: true,
+        record,
+        isView: false,
+      });
+    }
+  };
 
-// 新增或编辑
-const handleCreateOrEdit = (record: Recordable | null) => {
-  if (record) {
-    openDrawer(true, {
+  //查看设备
+  const [registerModal, { openModal }] = useModal();
+  const handleDeviceView = (record) => {
+    openModal(true, {
       isUpdate: true,
       record,
     });
-  } else {
-    openDrawer(true, {
-      isUpdate: false,
-    });
-  }
-};
-
-//查看设备
-const [registerModal, { openModal }] = useModal();
-const handleDeviceView = (record) => {
-  openModal(true, {
-    isUpdate: true,
-    record,
-  });
-};
-const statusChange = async (checked, record) => {
-  try {
-    setProps({
-      loading: true,
-    });
-    disabledSwitch.value = true;
-    const newStatus = checked ? 1 : 0;
-    const res = await putReportByidAndStatusManage(record.id, newStatus);
-    if (res && newStatus) {
-      createMessage.success(`启用成功`);
-    } else {
-      createMessage.success('禁用成功');
-    }
-  } finally {
-    setTimeout(() => {
+  };
+  const statusChange = async (checked, record) => {
+    try {
       setProps({
-        loading: false,
+        loading: true,
       });
-      disabledSwitch.value = false;
-    }, 500);
-    reload();
-  }
-};
-const go = useGo();
+      disabledSwitch.value = true;
+      const newStatus = checked ? 1 : 0;
+      const res = await putReportByidAndStatusManage(record.id, newStatus);
+      if (res && newStatus) {
+        createMessage.success(`启用成功`);
+      } else {
+        createMessage.success('禁用成功');
+      }
+    } finally {
+      setTimeout(() => {
+        setProps({
+          loading: false,
+        });
+        disabledSwitch.value = false;
+      }, 500);
+      reload();
+    }
+  };
+  const go = useGo();
 </script>

@@ -85,7 +85,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'executeTime',
+    field: 'sendTime',
     label: '执行时间',
     component: 'RangePicker',
     componentProps: {

@@ -18,7 +18,7 @@
           :actions="[
             {
               label: '报表导出',
-              icon: 'clarity:note-edit-line',
+              icon: 'ant-design:dot-chart-outlined',
               auth: 'api:yt:reportExport:export',
               onClick: handleExport.bind(null, record),
               ifShow: record.executeStatus === 1,
@@ -69,6 +69,7 @@
     formConfig: {
       labelWidth: 120,
       schemas: searchFormSchema,
+      fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'x']],
     },
     useSearchForm: true,
     showTableSetting: true,
@@ -104,11 +105,18 @@
       record,
     });
   };
+  const exportUrlsFunc = (fUrl) => {
+    const options: any = {
+      url: fUrl,
+    };
+    downloadByUrl(options);
+  };
   const handleExport = (record) => {
-    const url = record.reportPath;
-    downloadByUrl({
-      url,
-      target: '_self',
-    });
+    if (record.reportPath) {
+      const urls = record.reportPath.split(',');
+      urls.forEach((f: string) => {
+        exportUrlsFunc(f);
+      });
+    }
   };
 </script>

@@ -21,7 +21,7 @@
   const emit = defineEmits(['success', 'register']);
   const isUpdate = ref(true);
   const editId = ref('');
-  const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
+  const [registerForm, { validate, setFieldsValue, resetFields, updateSchema }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -34,9 +34,21 @@
     if (unref(isUpdate)) {
       //回显基础数据
       editId.value = data.record.id;
+      updateSchema({
+        field: 'invokeTarget',
+        componentProps: {
+          disabled: true,
+        },
+      });
       await setFieldsValue(data.record);
     } else {
       editId.value = '';
+      updateSchema({
+        field: 'invokeTarget',
+        componentProps: {
+          disabled: false,
+        },
+      });
     }
   });
   const getTitle = computed(() => (!unref(isUpdate) ? '新增定时任务' : '编辑定时任务'));

@@ -37,7 +37,7 @@ export const personSchema: DescItem[] = [
     label: 'cron表达式：',
   },
   {
-    field: 'b6',
+    field: 'updateTime',
     label: '下次执行时间：',
   },
   {
@@ -52,12 +52,22 @@ export const personSchema: DescItem[] = [
     },
   },
   {
-    field: 'b9',
+    field: 'concurrent',
     label: '是否并发：',
+    render: (_, data) => {
+      return data.concurrent == 0 ? '允许' : '禁止';
+    },
   },
   {
-    field: 'b10',
+    field: 'misfirePolicy',
     label: '执行策略：',
+    render: (_, data) => {
+      return data.misfirePolicy == 0
+        ? '立即执行'
+        : data.misfirePolicy == 1
+        ? '执行一次'
+        : '放弃执行';
+    },
   },
 ];
 

@@ -67,10 +67,6 @@ export const searchSchedueFormSchema: FormSchema[] = [
           label: '系统',
           value: EJobGroup.SYSTEM,
         },
-        {
-          label: '报表',
-          value: EJobGroup.REPORT,
-        },
       ],
       placeholder: '请选择任务组名',
     },
@@ -159,47 +155,47 @@ export const formSchema: QFormSchema[] = [
     rules: [{ required: true, message: '请输入Cron表达式' }, { validator: JCronValidator }],
   },
   {
-    field: 'field10',
+    field: 'misfirePolicy',
     component: 'RadioButtonGroup',
     label: '执行策略',
     colProps: {
       span: 24,
     },
-    defaultValue: '1',
+    defaultValue: 1,
     componentProps: {
       options: [
         {
           label: '立即执行',
-          value: '1',
+          value: 0,
         },
         {
           label: '执行一次',
-          value: '2',
+          value: 1,
         },
         {
           label: '放弃执行',
-          value: '3',
+          value: 2,
         },
       ],
     },
   },
   {
-    field: 'field11',
+    field: 'concurrent',
     component: 'RadioButtonGroup',
     label: '是否并发',
     colProps: {
       span: 24,
     },
-    defaultValue: '2',
+    defaultValue: 1,
     componentProps: {
       options: [
         {
           label: '允许',
-          value: '1',
+          value: 0,
         },
         {
           label: '禁止',
-          value: '2',
+          value: 1,
         },
       ],
     },
@@ -215,11 +211,11 @@ export const formSchema: QFormSchema[] = [
     componentProps: {
       options: [
         {
-          label: '正常',
+          label: '启用',
           value: 1,
         },
         {
-          label: '暂停',
+          label: '禁用',
           value: 0,
         },
       ],