Merge branch 'f-dev' into 'main'

fix：修改Teambition上的问题 See merge request huang/yun-teng-iot-front!269

Merge branch 'f-dev' into 'main'
fix：修改Teambition上的问题 See merge request huang/yun-teng-iot-front!269
xp.Huang
2 parents 35b677d2 19159770
Showing 9 changed files with 298 additions and 175 deletions
src/api/report/reportManager.ts
src/views/device/profiles/step/cpns/mqtt/Mqtt.ts
src/views/report/config/DevicePreviewModal.vue
src/views/report/config/ReportConfigDrawer.vue
src/views/report/config/config.data.ts
src/views/report/config/cpns/MappingsForm.vue
src/views/report/config/index.vue
src/views/report/config/timeConfig.ts
src/views/system/customize/cpns/AppDraw.vue
--- a/src/api/report/reportManager.ts
View file @c2696eb
+++ b/src/api/report/reportManager.ts
View file @c2696eb
@@ -5,8 +5,8 @@ enum ReportManagerApi {
   GET_REPORT_API = '/report_form/config',
   POST_REPORT_API = '/report_form/config',
   DELETE_REPORT_API = '/report_form/config',
-  // PUT_REPORT_API = '/report_form',
-  // PUTID_REPORT_API = '/report_form',
+  PUT_REPORT_API = '/report_form/config',
+  PUTID_REPORT_API = '/report_form',
 }
 //分页
@@ -27,7 +27,7 @@ export const deleteReportManage = (ids: string[]) => {
   });
 };
-// 创建或编辑
+// 创建
 export const createOrEditReportManage = (data) => {
   return defHttp.post<ReportModel>({
     url: ReportManagerApi.POST_REPORT_API,
@@ -35,18 +35,17 @@ export const createOrEditReportManage = (data) => {
   });
 };
-// // 修改状态
-// export const putReportConfigManage = (data) => {
-//   return defHttp.post<ReportModel>({
-//     url: ReportManagerApi.PUT_REPORT_API,
-//     data,
-//   });
-// };
+// 编辑
+export const putReportConfigManage = (data) => {
+  return defHttp.put<ReportModel>({
+    url: ReportManagerApi.PUT_REPORT_API,
+    data
+  });
+};
-// // 修改状态
-// export const putReportByidAndStatusManage = (data) => {
-//   return defHttp.post<ReportModel>({
-//     url: ReportManagerApi.PUTID_REPORT_API,
-//     data,
-//   });
-// };
+// 修改状态 id status
+export const putReportByidAndStatusManage = (id, status) => {
+  return defHttp.put<ReportModel>({
+    url: ReportManagerApi.PUTID_REPORT_API + '/config/' + id + '/' + status,
+  });
+};
--- a/src/views/device/profiles/step/cpns/mqtt/Mqtt.ts
View file @c2696eb
+++ b/src/views/device/profiles/step/cpns/mqtt/Mqtt.ts
View file @c2696eb
@@ -26,7 +26,7 @@ export const MqttSchemas: FormSchema[] = [
     componentProps: {
       placeholder: '请输入遥测数据 topic 筛选器',
     },
-    colProps: { span: 11 },
+    colProps: { span: 23 },
   },
   {
     field: 'deviceAttributesTopic',
@@ -37,7 +37,7 @@ export const MqttSchemas: FormSchema[] = [
     componentProps: {
       placeholder: '请输入Attributes topic 筛选器',
     },
-    colProps: { span: 11 },
+    colProps: { span: 23 },
   },
   {
     field: 'desc',
--- a/src/views/report/config/DevicePreviewModal.vue
View file @c2696eb
+++ b/src/views/report/config/DevicePreviewModal.vue
View file @c2696eb
@@ -36,8 +36,8 @@
     const getTableData = () => {
       for (let i = 0; i < 100; i++) {
         tableData.value.push({
-          tdDevice: `设备${i}`,
-          attr: `CO${i}、Temp${i}`,
+          device: `设备${i}`,
+          attribute: `CO${i}、Temp${i}`,
         });
       }
     };
--- a/src/views/report/config/ReportConfigDrawer.vue
View file @c2696eb
+++ b/src/views/report/config/ReportConfigDrawer.vue
View file @c2696eb
@@ -9,28 +9,38 @@
   >
     <BasicForm @register="registerForm">
       <template #deviceAttr="{ model, field }">
-        <deviceAttrColumn :orgId="model['organizationId']" :value="model['devices']" />
+        <deviceAttrColumn
+          @change="handleChange"
+          :orgId="!isUpdate ? model['organizationId'] : orgId"
+          :value="!isUpdate ? model['devices'] : deviceAttrData"
+          :isEdit="!isUpdate ? false : true"
+        />
         <p style="display: none">{{ field }}</p>
       </template>
     </BasicForm>
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, unref, nextTick } from 'vue';
+  import { ref, computed, unref, reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { createOrEditReportManage } from '/@/api/report/reportManager';
+  import { createOrEditReportManage, putReportConfigManage } from '/@/api/report/reportManager';
   import { useMessage } from '/@/hooks/web/useMessage';
   import deviceAttrColumn from './cpns/MappingsForm.vue';
+  import moment from 'moment';
+  import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
   const emit = defineEmits(['success', 'register']);
   const isUpdate = ref(true);
   const editId = ref('');
-  const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
+  const orgId = ref('');
+  let deviceAttrData: any = ref([]);
+  const [registerForm, { validate, setFieldsValue, resetFields, updateSchema }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,
+    fieldMapToTime: [['timeZone', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
   });
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
@@ -38,26 +48,119 @@
     setDrawerProps({ confirmLoading: false });
     isUpdate.value = !!data?.isUpdate;
     if (unref(isUpdate)) {
-      await nextTick();
+      //回显
       editId.value = data.record.id;
       await setFieldsValue(data.record);
+      //TODO 模拟的数据 待服务端返回
+      const deviceIds: any = [
+        '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
+        '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
+        '54e199d0-f1f7-11ec-98ad-a9680487d1e0',
+        '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
+      ];
+      setFieldsValue({
+        agg: queryCondition?.agg,
+        interval: queryCondition?.interval,
+        devices: deviceIds,
+      });
+      orgId.value = data.record.organizationId;
+      //获取该组织下的设备--排除网关设备
+      const { items } = await screenLinkPageByDeptIdGetDevice({
+        organizationId: data.record.organizationId,
+      });
+      const options = items.map((item) => {
+        if (item.deviceType !== 'GATEWAY')
+          return {
+            label: item.name,
+            value: item.tbDeviceId,
+          };
+      });
+      updateSchema({
+        field: 'devices',
+        componentProps: {
+          options,
+        },
+      });
+      //TODO 回显设备属性 模拟的数据 待服务端返回
+      deviceAttrData.value = [
+        {
+          device: '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
+          attribute: 'CO2',
+          name: '奥迪网关子设备',
+        },
+        {
+          device: '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
+          attribute: 'co',
+          name: '宝马默认设备',
+        },
+        {
+          device: '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
+          attribute: 'hot',
+          name: '奔驰默认设备',
+        },
+        {
+          device: '54e199d0-f1f7-11ec-98ad-a9680487d1e0',
+          attribute: 'wet',
+          name: '新增奥迪测试设备',
+        },
+      ];
     } else {
       editId.value = '';
+      updateSchema({
+        field: 'devices',
+        componentProps: {
+          options: [],
+        },
+      });
     }
   });
+  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();
-      console.log(values);
       if (!values) return;
+      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 = '修改成功';
-      await createOrEditReportManage(values);
+      editId.value !== ''
+        ? await putReportConfigManage(postObj)
+        : await createOrEditReportManage(postObj);
+
       closeDrawer();
       emit('success');
       createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
--- a/src/views/report/config/config.data.ts
View file @c2696eb
+++ b/src/views/report/config/config.data.ts
View file @c2696eb
@@ -17,8 +17,20 @@ import {
   isAvg,
   isSum,
   isCountAll,
-  AggregateDataEnum,
 } from './timeConfig';
+import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
+export enum SchemaFiled {
+  WAY = 'way',
+  TIME_PERIOD = 'timePeriod',
+  KEYS = 'keys',
+  DATE_RANGE = 'dataRange',
+  START_TS = 'startTs',
+  END_TS = 'endTs',
+  INTERVAL = 'interval',
+  LIMIT = 'limit',
+  AGG = 'agg',
+  ORDER_BY = 'orderBy',
+}
 // 表格配置
 export const columns: BasicColumn[] = [
@@ -36,16 +48,23 @@ export const columns: BasicColumn[] = [
     title: '数据类型',
     dataIndex: 'dataCompare',
     width: 120,
+    format: (_text: string, record: Recordable) => {
+      return record.dataCompare === 0 ? '历史数据' : record.dataCompare === 1 ? '同比' : '环比';
+    },
   },
   {
     title: '配置状态',
     dataIndex: 'status',
     width: 120,
+    slots: { customRender: 'status' },
   },
   {
     title: '执行方式',
     dataIndex: 'executeWay',
     width: 160,
+    format: (_text: string, record: Recordable) => {
+      return record.executeWay === 0 ? '立即执行' : '定时执行';
+    },
   },
   {
     title: '执行设备',
@@ -67,12 +86,12 @@ export const columns: BasicColumn[] = [
 export const viewDeviceColumn: BasicColumn[] = [
   {
     title: '设备',
-    dataIndex: 'tdDevice',
+    dataIndex: 'device',
     width: 80,
   },
   {
     title: '属性',
-    dataIndex: 'attributes',
+    dataIndex: 'attribute',
     width: 120,
   },
 ];
@@ -109,7 +128,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'createTime',
+    field: 'sendTime',
     label: '创建时间',
     component: 'RangePicker',
     componentProps: {
@@ -145,15 +164,16 @@ export const formSchema: QFormSchema[] = [
       return {
         async onChange(e) {
           if (e) {
-            //获取该组织下的设备
+            //获取该组织下的设备--排除网关设备
             const { items } = await screenLinkPageByDeptIdGetDevice({
               organizationId: e,
             });
             const options = items.map((item) => {
-              return {
-                label: item.name,
-                value: item.tbDeviceId,
-              };
+              if (item.deviceType !== 'GATEWAY')
+                return {
+                  label: item.name,
+                  value: item.tbDeviceId,
+                };
             });
             updateSchema({
               field: 'devices',
@@ -190,17 +210,17 @@ export const formSchema: QFormSchema[] = [
     colProps: {
       span: 24,
     },
-    defaultValue: 1,
+    defaultValue: 0,
     componentProps: {
       placeholder: '请选择执行方式',
       options: [
         {
           label: '立即执行',
-          value: 1,
+          value: 0,
         },
         {
           label: '定时执行',
-          value: 0,
+          value: 1,
         },
       ],
     },
@@ -280,7 +300,7 @@ export const formSchema: QFormSchema[] = [
     field: 'devices',
     label: '设备',
     required: true,
-    helpMessage: ['报表配置只对拥有数值型属性的设备才能配置'],
+    helpMessage: ['报表配置只对拥有"数值型"属性的设备才能配置'],
     component: 'Select',
     componentProps: {
       placeholder: '请选择设备',
@@ -298,7 +318,7 @@ export const formSchema: QFormSchema[] = [
     },
     defaultValue: 0,
     componentProps: ({ formActionType }) => {
-      const { updateSchema } = formActionType;
+      const { updateSchema, setFieldsValue } = formActionType;
       const options = [
         {
           label: '共有',
@@ -315,6 +335,7 @@ export const formSchema: QFormSchema[] = [
           if (e) {
             let dataCompareOpions: any = [];
             if (e.target.value == 1) {
+              setFieldsValue({ dataCompare: '' });
               dataCompareOpions = [{ label: '历史数据', value: 0 }];
               updateSchema({
                 field: 'dataCompare',
@@ -323,6 +344,7 @@ export const formSchema: QFormSchema[] = [
                 },
               });
             } else {
+              setFieldsValue({ dataCompare: '' });
               dataCompareOpions = [
                 { label: '历史数据', value: 0 },
                 { label: '同比', value: 1 },
@@ -345,13 +367,12 @@ export const formSchema: QFormSchema[] = [
   {
     field: 'devices1',
     label: '设备属性',
-    required: true,
     component: 'Select',
     componentProps: {
       placeholder: '请选择设备属性',
     },
     colProps: { span: 24 },
-    slot:'deviceAttr'
+    slot: 'deviceAttr',
   },
   {
     field: 'dataCompare',
@@ -369,43 +390,25 @@ export const formSchema: QFormSchema[] = [
     colProps: { span: 24 },
   },
   {
-    field: 'agg',
+    field: SchemaFiled.AGG,
     label: '聚合条件',
     required: true,
     component: 'Select',
     componentProps: {
       placeholder: '请选择聚合条件',
       options: [
-        {
-          label: '平均值',
-          value: AggregateDataEnum.AVG,
-        },
-        {
-          label: '总和',
-          value: AggregateDataEnum.SUM,
-        },
-        {
-          label: '最大值',
-          value: AggregateDataEnum.MAX,
-        },
-        {
-          label: '最小值',
-          value: AggregateDataEnum.MIN,
-        },
-        {
-          label: '计数',
-          value: AggregateDataEnum.COUNT,
-        },
-        {
-          label: '空',
-          value: AggregateDataEnum.NONE,
-        },
+        { label: '最小值', value: AggregateDataEnum.MIN },
+        { label: '最大值', value: AggregateDataEnum.MAX },
+        { label: '平均值', value: AggregateDataEnum.AVG },
+        { label: '求和', value: AggregateDataEnum.SUM },
+        { label: '计数', value: AggregateDataEnum.COUNT },
+        { label: '空', value: AggregateDataEnum.NONE },
       ],
     },
     colProps: { span: 24 },
   },
   {
-    field: 'limit',
+    field: SchemaFiled.LIMIT,
     component: 'InputNumber',
     label: '最大值',
     required: true,
@@ -441,25 +444,23 @@ export const formSchema: QFormSchema[] = [
     },
   },
   {
-    field: 'interval',
+    field: 'timeZone',
     label: '时间段',
-    required: true,
     component: 'RangePicker',
     componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
-      placeholder: '请选择时间段',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: ['开始时间', '结束时间'],
+      showTime: { format: 'HH:mm:ss' },
     },
     colProps: { span: 24 },
     ifShow: ({ values }) => isDefultWeek(values.defaultWeek),
   },
   {
-    field: '91112',
+    field: 'startTs',
     label: '时间周期',
     required: true,
     component: 'ApiSelect',
-    defaultValue: '1000',
+    defaultValue: 1000,
     componentProps: ({ formActionType }) => {
       const { updateSchema } = formActionType;
       return {
@@ -468,7 +469,7 @@ export const formSchema: QFormSchema[] = [
           const option = data.map((item) => {
             return {
               label: item.itemText,
-              value: item.itemValue,
+              value: Number(item.itemValue),
             };
           });
           return option;
@@ -477,7 +478,7 @@ export const formSchema: QFormSchema[] = [
           if (Number(e) <= 30000) {
             //30秒以内 ->  1秒
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(0, 1),
               },
@@ -485,7 +486,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 60000) {
             //1分钟以内 ->  1秒 5秒
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(0, 2),
               },
@@ -493,7 +494,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 120000) {
             //2分钟以内 ->  1秒 5秒 10 15
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(0, 4),
               },
@@ -501,7 +502,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 300000) {
             //5分钟以内 ->  1秒 5秒 10 15 30
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(0, 5),
               },
@@ -509,7 +510,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 600000) {
             //10分钟以内 ->   5秒 10 15 30 1分钟
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(1, 2).concat(optionsConfig.slice(2, 6)),
               },
@@ -517,7 +518,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 900000 || Number(e) == 1800000) {
             //15 30 分钟以内 ->   5秒 10 15 30 1分钟 2分钟
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(1, 2).concat(optionsConfig.slice(2, 7)),
               },
@@ -525,7 +526,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 3600000) {
             //1小时以内 ->  10秒 15 30 1分钟 2分钟 5分钟
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(2, 8),
               },
@@ -533,7 +534,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 7200000) {
             //2小时以内 ->  15秒  30 1分钟 2分钟 5分钟 10 15
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(3, 10),
               },
@@ -541,7 +542,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 18000000) {
             //5小时以内 ->  1分钟 2分钟 5分钟 10 15 30
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(5, 11),
               },
@@ -549,7 +550,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 36000000 || Number(e) == 43200000) {
             //10 12小时以内 -> 2分钟 5分钟 10 15 30 1小时
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(6, 12),
               },
@@ -557,7 +558,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 86400000) {
             //1天以内 ->  5分钟 10 15 30 1小时 2
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(7, 13),
               },
@@ -565,7 +566,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 604800000) {
             //7天以内 ->  30分钟 1小时 2 5 10 12 1天
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(10, 17),
               },
@@ -573,7 +574,7 @@ export const formSchema: QFormSchema[] = [
           } else if (Number(e) == 2592000000) {
             //30天以内 -> 2小时 5 10 12 1天
             updateSchema({
-              field: '102121',
+              field: 'interval',
               componentProps: {
                 options: optionsConfig.slice(12, 17),
               },
@@ -594,18 +595,18 @@ export const formSchema: QFormSchema[] = [
       isCountAll(values.agg),
   },
   {
-    field: '102121',
+    field: 'interval',
     label: '间隔时间',
     required: true,
     component: 'Select',
     colProps: { span: 24 },
-    defaultValue: '1000',
+    defaultValue: 1000,
     componentProps: {
       placeholder: '请选择间隔时间',
       options: [
         {
           label: '1秒',
-          value: '1000',
+          value: 1000,
         },
       ],
     },
--- a/src/views/report/config/cpns/MappingsForm.vue
View file @c2696eb
+++ b/src/views/report/config/cpns/MappingsForm.vue
View file @c2696eb
@@ -7,33 +7,20 @@
     <a-input
       :disabled="true"
       placeholder="设备"
-      v-model:value="param.key"
+      v-model:value="param.device"
       style="width: 38%; margin-bottom: 5px; margin-left: 1vh"
       @change="emitChange"
     />
     <Select
       placeholder="请选择设备属性"
-      v-model:value="param.dataType"
+      v-model:value="param.attribute"
       style="width: 160px; margin-left: 1.8vw"
       :options="selectOptions"
       @change="emitChange"
     />
-    <MinusCircleOutlined
-      v-if="dynamicInput.params.length > min"
-      class="dynamic-delete-button"
-      @click="remove(param)"
-      style="width: 50px; display: none"
-    />
-  </div>
-  <div style="display: none">
-    <a-button type="text" style="width: 28%; margin-top: 0.25vh" @click="add">
-      <PlusCircleOutlined />
-      Add mapping
-    </a-button>
   </div>
 </template>
 <script lang="ts">
-  import { MinusCircleOutlined, PlusCircleOutlined } from '@ant-design/icons-vue';
   import { defineComponent, reactive, UnwrapRef, watchEffect, ref } from 'vue';
   import { propTypes } from '/@/utils/propTypes';
   import { SelectTypes } from 'ant-design-vue/es/select';
@@ -43,63 +30,60 @@
   interface Params {
     [x: string]: string;
-    dataType: string;
-    key: string;
+    attribute: string;
+    device: string;
   }
   export default defineComponent({
     name: 'JAddInput',
     components: {
-      MinusCircleOutlined,
-      PlusCircleOutlined,
       Select,
     },
     //--------------不继承Antd Design Vue Input的所有属性 否则控制台报大片警告--------------
     inheritAttrs: false,
     props: {
       value: propTypes.array.def([]),
-      //自定义删除按钮多少才会显示
-      min: propTypes.integer.def(0),
       orgId: propTypes.string.def(''),
+      isEdit: propTypes.bool.def(false),
     },
     emits: ['change', 'update:value', 'dynamicReduceHeight', 'dynamicAddHeight'],
     setup(props, { emit }) {
       const selectOptions = ref<SelectTypes['options']>([]);
-
       //input动态数据
       const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
-      //删除Input
-      const remove = (item: Params) => {
-        let index = dynamicInput.params.indexOf(item);
-        if (index !== -1) {
-          dynamicInput.params.splice(index, 1);
-        }
-        emitChange();
-        emit('dynamicReduceHeight');
-      };
-
-      //新增Input
-      const add = () => {
-        dynamicInput.params.push({
-          dataType: 'STRING',
-          key: '',
-        });
-        emitChange();
-        emit('dynamicAddHeight');
-      };
-
       //监听传入数据value
       watchEffect(() => {
         initVal();
       });
-
       /**
        * 初始化数值
        */
       async function initVal() {
         dynamicInput.params = [];
-        if (props.value) {
-          if (props.orgId) {
+        if (props.isEdit) {
+          console.log('edit');
+          let jsonObj = props.value;
+          let deviceIdArr: any = [];
+          jsonObj.forEach((item: Params) => {
+            dynamicInput.params.push({
+              attribute: item.attribute,
+              device: item.name,
+              value: item.device,
+            });
+            deviceIdArr.push(item.device);
+          });
+          if (deviceIdArr.length > 0) {
+            const res = await getAttribute(props.orgId, deviceIdArr.join(','));
+            selectOptions.value = res.map((o) => {
+              return {
+                label: o,
+                value: o,
+              };
+            });
+          }
+        } else {
+          console.log('add');
+          if (props.value && props.orgId) {
             const res = await getAttribute(props.orgId, props.value.join(','));
             selectOptions.value = res.map((o) => {
               return {
@@ -130,8 +114,8 @@
             let jsonObj = temp;
             jsonObj.forEach((item: Params) => {
               dynamicInput.params.push({
-                dataType: item.dataType,
-                key: item.label,
+                attribute: item.attribute,
+                device: item.label,
                 value: item.value,
               });
             });
@@ -146,21 +130,17 @@
         if (dynamicInput.params.length > 0) {
           dynamicInput.params.forEach((item: Params) => {
             obj.push({
-              attr: item.dataType,
-              tbDeviceId: item.value,
+              attribute: item.attribute,
+              device: item.value,
             });
           });
         }
-        console.log('数值改变', obj);
         emit('change', obj);
         emit('update:value', obj);
       }
-
       return {
         dynamicInput,
         emitChange,
-        remove,
-        add,
         selectOptions,
       };
     },
--- a/src/views/report/config/index.vue
View file @c2696eb
+++ b/src/views/report/config/index.vue
View file @c2696eb
@@ -46,6 +46,16 @@
           ]"
         />
       </template>
+      <template #status="{ 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" />
     <DevicePreviewModal @register="registerModal" />
@@ -53,21 +63,26 @@
 </template>
 <script lang="ts" setup>
-  import { reactive, nextTick } from 'vue';
+  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 } from '/@/api/report/reportManager';
+  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 } from 'ant-design-vue';
+  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 [registerTable, { reload, setProps }] = useTable({
     title: '报表列表',
     api: reportPage,
@@ -77,6 +92,7 @@
     formConfig: {
       labelWidth: 120,
       schemas: searchFormSchema,
+      fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
     },
     useSearchForm: true,
     showTableSetting: true,
@@ -93,6 +109,7 @@
   // 弹框
   const [registerDrawer, { openDrawer }] = useDrawer();
+  const { createMessage } = useMessage();
   // 刷新
   const handleSuccess = () => {
@@ -131,5 +148,28 @@
       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(() => {
+        setProps({
+          loading: false,
+        });
+        disabledSwitch.value = false;
+      }, 500);
+      reload();
+    }
+  };
   const go = useGo();
 </script>
--- a/src/views/report/config/timeConfig.ts
View file @c2696eb
+++ b/src/views/report/config/timeConfig.ts
View file @c2696eb
 interface IOptionConfig {
   label: string;
-  value: string;
+  value: number;
 }
 export const optionsConfig: IOptionConfig[] = [
   {
     label: '1秒',
-    value: '1000',
+    value: 1000,
   },
   {
     label: '5秒',
-    value: '5000',
+    value: 5000,
   },
   {
     label: '10秒',
-    value: '10000',
+    value: 10000,
   },
   {
     label: '15秒',
-    value: '15000',
+    value: 15000,
   },
   {
     label: '30秒',
-    value: '30000',
+    value: 30000,
   },
   {
     label: '1分钟',
-    value: '60000',
+    value: 60000,
   },
   {
     label: '2分钟',
-    value: '120000',
+    value: 120000,
   },
   {
     label: '5分钟',
-    value: '300000',
+    value: 300000,
   },
   {
     label: '10分钟',
-    value: '600000',
+    value: 600000,
   },
   {
     label: '15分钟',
-    value: '900000',
+    value: 900000,
   },
   {
     label: '30分钟',
-    value: '1800000',
+    value: 1800000,
   },
   {
     label: '1小时',
-    value: '3600000',
+    value: 3600000,
   },
   {
     label: '2小时',
-    value: '7200000',
+    value: 7200000,
   },
   {
     label: '5小时',
-    value: '18000000',
+    value: 18000000,
   },
   {
     label: '10小时',
-    value: '36000000',
+    value: 36000000,
   },
   {
     label: '12小时',
-    value: '43200000',
+    value: 43200000,
   },
   {
     label: '1天',
-    value: '86400000',
+    value: 86400000,
   },
 ];
 export enum TypeEnum {
-  IS_TIMING = 0,
+  IS_TIMING = 1,
   IS_WEEK = 'week',
   IS_MONTH = 'month',
   IS_EMPTY = 'NONE',
--- a/src/views/system/customize/cpns/AppDraw.vue
View file @c2696eb
+++ b/src/views/system/customize/cpns/AppDraw.vue
View file @c2696eb
@@ -201,9 +201,9 @@
         if (!isJpgOrPng) {
           createMessage.error('只能上传图片文件!');
         }
-        const isLt2M = (file.size as number) / 1024 / 1024 < 5;
+        const isLt2M = (file.size as number) / 1024 / 1024 < 2;
         if (!isLt2M) {
-          createMessage.error('图片大小不能超过5MB!');
+          createMessage.error('图片大小不能超过2MB!');
         }
         return isJpgOrPng && isLt2M;
       };
@@ -234,9 +234,9 @@
         if (!isJpgOrPng) {
           createMessage.error('只能上传图片文件!');
         }
-        const isLt2M = (file.size as number) / 1024 / 1024 < 5;
+        const isLt2M = (file.size as number) / 1024 / 1024 < 3;
         if (!isLt2M) {
-          createMessage.error('图片大小不能超过5MB!');
+          createMessage.error('图片大小不能超过3MB!');
         }
         return isJpgOrPng && isLt2M;
       };