Merge branch 'f-dev' into 'main'

fix：修复Teambition上的问题  wip：报表功能开发中

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

 import { BasicPageParams } from '/@/api/model/baseModel';
-export type CameraQueryParam = BasicPageParams & CameraParam;
+export type ReportQueryParam = BasicPageParams & CameraParam;
 
 export type CameraParam = {
   status: true;
@@ -9,76 +9,38 @@ export type CameraParam = {
   orderType: string;
 };
 
-export interface CameraModel {
-  accessMode: number;
-  avatar?: string;
-  brand: string;
-  createTime?: '2022-04-19T11:33:13.113Z';
-  creator?: string;
-  defaultConfig?: string;
-  description?: string;
-  deviceInfo?: string;
-  deviceType?: string;
-  enabled?: true;
-  icon?: string;
-  id?: string;
-  name: string;
-  organizationId: string;
-  organizationName?: string;
-  roleIds?: ['string'];
-  sn: string;
-  status?: false;
-  tenantExpireTime?: '2022-04-19T11:33:13.113Z';
-  tenantId?: string;
-  tenantProfileId?: string;
-  tenantStatus?: 'DISABLED';
-  updateTime?: '2022-04-19T11:33:13.113Z';
-  updater?: string;
-  videoUrl: string;
-}
-
-export interface StreamingManageRecord {
-  id: string;
-  creator: string;
+export interface ReportModel {
+  attributeNature: number;
+  attributes: [string];
   createTime: string;
+  creator: string;
+  dataCompare: number;
+  defaultConfig: string;
+  description: string;
+  devices: [string];
+  enabled: true;
+  endTs: number;
+  executeContent: string;
+  executeWay: number;
+  icon: string;
+  id: string;
   name: string;
-  enabled: boolean;
-  tenantId: string;
-  sn: string;
   organizationId: string;
-  organizationName: string;
-  status: boolean;
-  accessMode: number;
-  playProtocol: number;
-}
-
-export interface StreamingMediaModel {
-  id: string;
-  creator: string;
-  createTime: string;
-  enabled: boolean;
+  queryCondition: {
+    agg: string;
+    interval: number;
+    limit: number;
+    orderBy: string;
+    useStrictDataTypes: false;
+  };
+  remark: string;
+  roleIds: [string];
+  startTs: number;
+  status: number;
+  tenantExpireTime: string;
   tenantId: string;
-  type: number;
-  host: string;
-  appKey: string;
-  appSecret: string;
-  ssl: number;
-}
-
-export interface StreamingQueryParam {
-  host?: string;
-}
-
-export interface StreamingSubmitParam {
-  type: number;
-  ssl: number;
-  host: string;
-  appKey: string;
-  appSecret: string;
-  id?: string;
-}
-
-export interface StreamingMediaDeleteParam {
-  tenantId?: string;
-  ids: string[];
+  tenantProfileId: string;
+  tenantStatus: string;
+  updateTime: string;
+  updater: string;
 }

 import { defHttp } from '/@/utils/http/axios';
-import {
-  CameraModel,
-  CameraQueryParam,
-  StreamingMediaDeleteParam,
-  StreamingQueryParam,
-  StreamingSubmitParam,
-} from './model/reportModel';
-
-enum CameraManagerApi {
-  CAMERA_POST_URL = '/video',
-  CAMERA_GET_URL = '/video',
-  CAMERA_DELETE_URL = '/video',
-  CAMERA_GET_DETAIL_URL = '/video',
-  STREAMING_GET_URL = '/video/platform',
-  STREAMING_POST_URL = '/video/platform',
-  STREAMING_DELETE_URL = '/video/platform',
-  STREAMING_PLAY_GET_URL = '/video/url',
+import { ReportModel, ReportQueryParam } from './model/reportModel';
+
+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',
 }
 
-export const cameraPage = (params: CameraQueryParam) => {
-  return defHttp.get<CameraQueryParam>({
-    url: CameraManagerApi.CAMERA_GET_URL,
+//分页
+export const reportPage = (params: ReportQueryParam) => {
+  return defHttp.get<ReportQueryParam>({
+    url: ReportManagerApi.GET_REPORT_API,
     params,
   });
 };
 
-/**
- * 删除视频
- * @param ids 删除的ids
- */
-export const deleteCameraManage = (ids: string[]) => {
+//删除
+export const deleteReportManage = (ids: string[]) => {
   return defHttp.delete({
-    url: CameraManagerApi.CAMERA_DELETE_URL,
+    url: ReportManagerApi.DELETE_REPORT_API,
     data: {
       ids: ids,
     },
   });
 };
 
-// 创建或编辑视频
-export const createOrEditCameraManage = (data) => {
-  return defHttp.post<CameraModel>({
-    url: CameraManagerApi.CAMERA_POST_URL,
+// 创建或编辑
+export const createOrEditReportManage = (data) => {
+  return defHttp.post<ReportModel>({
+    url: ReportManagerApi.POST_REPORT_API,
     data,
   });
 };
 
-// 查询视频详情
-export const getCameraManageDetail = (id: string) => {
-  return defHttp.get({
-    url: CameraManagerApi.CAMERA_GET_DETAIL_URL + `/${id}`,
-  });
-};
-
-/**
- * @description 获取流媒体列表
- * @param params
- * @returns
- */
-export const getStreamingMediaList = (params: StreamingQueryParam) => {
-  return defHttp.get({
-    url: CameraManagerApi.STREAMING_GET_URL,
-    params,
-  });
-};
-
-/**
- * @description 更新/新增流媒体记录
- * @param params
- * @returns
- */
-export const createOrUpdateStreamingMediaRecord = (params: StreamingSubmitParam) => {
-  return defHttp.post({
-    url: CameraManagerApi.STREAMING_POST_URL,
-    params,
-  });
-};
-
-/**
- * @description 删除流媒体记录
- * @param params
- * @returns
- */
-export const deleteStreamingMediaRecord = (params: StreamingMediaDeleteParam) => {
-  return defHttp.delete({
-    url: CameraManagerApi.STREAMING_POST_URL,
-    params,
-  });
-};
+// // 修改状态
+// export const putReportConfigManage = (data) => {
+//   return defHttp.post<ReportModel>({
+//     url: ReportManagerApi.PUT_REPORT_API,
+//     data,
+//   });
+// };
 
-/**
- * @description 获取流媒体播放地址
- * @param entityId
- * @returns
- */
-export const getStreamingPlayUrl = (entityId: string) => {
-  return defHttp.get({
-    url: `${CameraManagerApi.STREAMING_PLAY_GET_URL}/${entityId}`,
-  });
-};
+// // 修改状态
+// export const putReportByidAndStatusManage = (data) => {
+//   return defHttp.post<ReportModel>({
+//     url: ReportManagerApi.PUTID_REPORT_API,
+//     data,
+//   });
+// };

@@ -60,7 +60,7 @@
   });
   const emit = defineEmits(['expand']);
 
-  const show = ref(false);
+  const show = ref(true);
 
   const { prefixCls } = useDesign('collapse-container');
 

@@ -61,7 +61,7 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 24 },
     required: true,
     component: 'RadioGroup',
-    defaultValue:'NOTICE',
+    defaultValue: 'NOTICE',
     componentProps: {
       options: [
         {
@@ -96,6 +96,7 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 24 },
     label: '通知内容',
     required: true,
+    defaultValue: '',
     render: ({ model, field }) => {
       return h(Tinymce, {
         value: model[field],

@@ -7,7 +7,12 @@
     width="30%"
     @ok="handleSubmit"
   >
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm">
+      <template #deviceAttr="{ model, field }">
+        <deviceAttrColumn :orgId="model['organizationId']" :value="model['devices']" />
+        <p style="display: none">{{ field }}</p>
+      </template>
+    </BasicForm>
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
@@ -15,8 +20,9 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  // import { createOrEditCameraManage } from '/@/api/camera/cameraManager';
+  import { createOrEditReportManage } from '/@/api/report/reportManager';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import deviceAttrColumn from './cpns/MappingsForm.vue';
 
   const emit = defineEmits(['success', 'register']);
   const isUpdate = ref(true);
@@ -51,7 +57,7 @@
       if (!values) return;
       let saveMessage = '添加成功';
       let updateMessage = '修改成功';
-      // await createOrEditCameraManage(values);
+      await createOrEditReportManage(values);
       closeDrawer();
       emit('success');
       createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);

@@ -4,75 +4,63 @@ import moment from 'moment';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
-import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 import { findDictItemByCode } from '/@/api/system/dict';
-
-export enum TypeEnum {
-  IS_TIMING = 'TIMING',
-  IS_WEEK = 'week',
-  IS_MONTH = 'month',
-}
-export const isTiming = (type: string) => {
-  return type === TypeEnum.IS_TIMING;
-};
-export const isWeek = (type: string) => {
-  return type === TypeEnum.IS_WEEK;
-};
-
-export const isMonth = (type: string) => {
-  return type === TypeEnum.IS_MONTH;
-};
-
-export enum AggregateDataEnum {
-  MIN = 'MIN',
-  MAX = 'MAX',
-  AVG = 'AVG',
-  SUM = 'SUM',
-  COUNT = 'COUNT',
-  NONE = 'NONE',
-}
+import {
+  optionsConfig,
+  isTiming,
+  isWeek,
+  isMonth,
+  isEmpty,
+  isDefultWeek,
+  isMin,
+  isMax,
+  isAvg,
+  isSum,
+  isCountAll,
+  AggregateDataEnum,
+} from './timeConfig';
 
 // 表格配置
 export const columns: BasicColumn[] = [
   {
     title: '配置名称',
-    dataIndex: '1',
+    dataIndex: 'name',
     width: 80,
   },
   {
     title: '所属组织',
-    dataIndex: '2',
+    dataIndex: 'organizationId',
     width: 120,
   },
   {
     title: '数据类型',
-    dataIndex: '3',
+    dataIndex: 'dataCompare',
     width: 120,
   },
   {
     title: '配置状态',
-    dataIndex: '4',
+    dataIndex: 'status',
     width: 120,
   },
   {
     title: '执行方式',
-    dataIndex: '5',
+    dataIndex: 'executeWay',
     width: 160,
   },
   {
     title: '执行设备',
-    dataIndex: '6',
+    dataIndex: 'devices',
     width: 160,
     slots: { customRender: 'doDeviceSlot' },
   },
   {
     title: '创建人',
-    dataIndex: '7',
+    dataIndex: 'creator',
     width: 180,
   },
   {
     title: '创建日期',
-    dataIndex: '8',
+    dataIndex: 'createTime',
     width: 180,
   },
 ];
@@ -84,7 +72,7 @@ export const viewDeviceColumn: BasicColumn[] = [
   },
   {
     title: '属性',
-    dataIndex: 'attr',
+    dataIndex: 'attributes',
     width: 120,
   },
 ];
@@ -92,7 +80,7 @@ export const viewDeviceColumn: BasicColumn[] = [
 // 查询配置
 export const searchFormSchema: FormSchema[] = [
   {
-    field: '1',
+    field: 'name',
     label: '配置名称',
     component: 'Input',
     colProps: { span: 6 },
@@ -102,7 +90,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: '2',
+    field: 'status',
     label: '配置状态',
     component: 'Select',
     colProps: { span: 6 },
@@ -121,7 +109,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: '3',
+    field: 'createTime',
     label: '创建时间',
     component: 'RangePicker',
     componentProps: {
@@ -136,7 +124,7 @@ export const searchFormSchema: FormSchema[] = [
 // 新增编辑配置
 export const formSchema: QFormSchema[] = [
   {
-    field: '1',
+    field: 'name',
     label: '报表名称',
     colProps: { span: 24 },
     required: true,
@@ -168,26 +156,9 @@ export const formSchema: QFormSchema[] = [
               };
             });
             updateSchema({
-              field: 'entityId',
+              field: 'devices',
               componentProps: {
                 options,
-                async onChange(e1) {
-                  if (e1) {
-                    const res = await getAttribute(e, e1.join(','));
-                    const attr = res.map((item) => {
-                      return {
-                        label: item,
-                        value: item,
-                      };
-                    });
-                    updateSchema({
-                      field: 'attr',
-                      componentProps: {
-                        options: attr,
-                      },
-                    });
-                  }
-                },
               },
             });
           }
@@ -203,7 +174,7 @@ export const formSchema: QFormSchema[] = [
     },
   },
   {
-    field: '3',
+    field: 'remark',
     label: '描述',
     colProps: { span: 24 },
     component: 'InputTextArea',
@@ -213,23 +184,23 @@ export const formSchema: QFormSchema[] = [
     },
   },
   {
-    field: 'actionS',
+    field: 'executeWay',
     component: 'RadioGroup',
     label: '执行方式',
     colProps: {
       span: 24,
     },
-    defaultValue: '1',
+    defaultValue: 1,
     componentProps: {
       placeholder: '请选择执行方式',
       options: [
         {
           label: '立即执行',
-          value: '1',
+          value: 1,
         },
         {
           label: '定时执行',
-          value: 'TIMING',
+          value: 0,
         },
       ],
     },
@@ -249,7 +220,7 @@ export const formSchema: QFormSchema[] = [
         { label: '每月', value: 'month' },
       ],
     },
-    ifShow: ({ values }) => isTiming(values.actionS),
+    ifShow: ({ values }) => isTiming(values.executeWay),
   },
   {
     field: '51111',
@@ -303,10 +274,10 @@ export const formSchema: QFormSchema[] = [
       labelField: 'itemText',
       valueField: 'itemValue',
     },
-    ifShow: ({ values }) => isTiming(values.actionS),
+    ifShow: ({ values }) => isTiming(values.executeWay),
   },
   {
-    field: 'entityId',
+    field: 'devices',
     label: '设备',
     required: true,
     helpMessage: ['报表配置只对拥有数值型属性的设备才能配置'],
@@ -318,30 +289,61 @@ export const formSchema: QFormSchema[] = [
     colProps: { span: 24 },
   },
   {
-    field: '7',
+    field: 'attributeNature',
     component: 'RadioGroup',
     label: '属性性质',
     required: true,
     colProps: {
       span: 24,
     },
-    defaultValue: '1',
-    componentProps: {
-      placeholder: '请选择属性性质',
-      options: [
+    defaultValue: 0,
+    componentProps: ({ formActionType }) => {
+      const { updateSchema } = formActionType;
+      const options = [
         {
           label: '共有',
-          value: '1',
+          value: 0,
         },
         {
           label: '全部',
-          value: '2',
+          value: 1,
         },
-      ],
+      ];
+      return {
+        options,
+        async onChange(e) {
+          if (e) {
+            let dataCompareOpions: any = [];
+            if (e.target.value == 1) {
+              dataCompareOpions = [{ label: '历史数据', value: 0 }];
+              updateSchema({
+                field: 'dataCompare',
+                componentProps: {
+                  options: dataCompareOpions,
+                },
+              });
+            } else {
+              dataCompareOpions = [
+                { label: '历史数据', value: 0 },
+                { label: '同比', value: 1 },
+                { label: '环比', value: 2 },
+              ];
+              updateSchema({
+                field: 'dataCompare',
+                componentProps: {
+                  options: dataCompareOpions,
+                },
+              });
+            }
+          }
+        },
+        maxLength: 250,
+        placeholder: '请选择属性性质',
+      };
     },
   },
   {
-    field: 'attr',
+    field: 'devices1',
     label: '设备属性',
     required: true,
     component: 'Select',
@@ -349,24 +351,25 @@ export const formSchema: QFormSchema[] = [
       placeholder: '请选择设备属性',
     },
     colProps: { span: 24 },
+    slot:'deviceAttr'
   },
   {
-    field: '9',
+    field: 'dataCompare',
     label: '数据类型',
     required: true,
     component: 'Select',
     componentProps: {
       placeholder: '请选择数据类型',
       options: [
-        { label: '历史数据', value: '1' },
-        { label: '同比', value: '2' },
-        { label: '环比', value: '3' },
+        { label: '历史数据', value: 0 },
+        { label: '同比', value: 1 },
+        { label: '环比', value: 2 },
       ],
     },
     colProps: { span: 24 },
   },
   {
-    field: '10',
+    field: 'agg',
     label: '聚合条件',
     required: true,
     component: 'Select',
@@ -389,56 +392,229 @@ export const formSchema: QFormSchema[] = [
           label: '最小值',
           value: AggregateDataEnum.MIN,
         },
+        {
+          label: '计数',
+          value: AggregateDataEnum.COUNT,
+        },
+        {
+          label: '空',
+          value: AggregateDataEnum.NONE,
+        },
       ],
     },
     colProps: { span: 24 },
   },
   {
-    field: '91112',
+    field: 'limit',
+    component: 'InputNumber',
+    label: '最大值',
+    required: true,
+    defaultValue: 200,
+    colProps: { span: 22 },
+    componentProps: {
+      min: 7,
+      max: 50000,
+    },
+    ifShow: ({ values }) => isEmpty(values.agg),
+  },
+  {
+    field: 'defaultWeek',
+    component: 'ApiRadioGroup',
     label: '查询周期',
     required: true,
-    component: 'Select',
+    colProps: {
+      span: 24,
+    },
+    defaultValue: '2',
     componentProps: {
       placeholder: '请选择查询周期',
       options: [
-        { label: '1秒', value: '1000' },
-        { label: '5秒', value: '5000' },
-        { label: '10秒', value: '10000' },
-        { label: '15秒', value: '15000' },
-        { label: '30秒', value: '30000' },
-        { label: '1分', value: '60000' },
-        { label: '2分', value: '120000' },
-        { label: '5分', value: '300000' },
-        { label: '10分', value: '600000' },
-        { label: '15分', value: '900000' },
-        { label: '30分', value: '1800000' },
-        { label: '1小时', value: '3600000' },
-        { label: '2小时', value: '7200000' },
-        { label: '5小时', value: '18000000' },
-        { label: '10小时', value: '36000000' },
-        { label: '12小时', value: '43200000' },
-        { label: '1天', value: '86400000' },
-        { label: '7天', value: '604800000' },
-        { label: '30天', value: '2592000000' },
+        {
+          label: '自定义周期',
+          value: 'defaultIsWeek',
+        },
+        {
+          label: '固定周期',
+          value: '2',
+        },
       ],
     },
+  },
+  {
+    field: 'interval',
+    label: '时间段',
+    required: true,
+    component: 'RangePicker',
+    componentProps: {
+      showTime: {
+        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+      },
+      placeholder: '请选择时间段',
+    },
+    colProps: { span: 24 },
+    ifShow: ({ values }) => isDefultWeek(values.defaultWeek),
+  },
+  {
+    field: '91112',
+    label: '时间周期',
+    required: true,
+    component: 'ApiSelect',
+    defaultValue: '1000',
+    componentProps: ({ formActionType }) => {
+      const { updateSchema } = formActionType;
+      return {
+        api: async () => {
+          const data: any = await findDictItemByCode({ dictCode: 'query_week' });
+          const option = data.map((item) => {
+            return {
+              label: item.itemText,
+              value: item.itemValue,
+            };
+          });
+          return option;
+        },
+        async onChange(e) {
+          if (Number(e) <= 30000) {
+            //30秒以内 ->  1秒
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(0, 1),
+              },
+            });
+          } else if (Number(e) == 60000) {
+            //1分钟以内 ->  1秒 5秒
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(0, 2),
+              },
+            });
+          } else if (Number(e) == 120000) {
+            //2分钟以内 ->  1秒 5秒 10 15
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(0, 4),
+              },
+            });
+          } else if (Number(e) == 300000) {
+            //5分钟以内 ->  1秒 5秒 10 15 30
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(0, 5),
+              },
+            });
+          } else if (Number(e) == 600000) {
+            //10分钟以内 ->   5秒 10 15 30 1分钟
+            updateSchema({
+              field: '102121',
+              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: '102121',
+              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: '102121',
+              componentProps: {
+                options: optionsConfig.slice(2, 8),
+              },
+            });
+          } else if (Number(e) == 7200000) {
+            //2小时以内 ->  15秒  30 1分钟 2分钟 5分钟 10 15
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(3, 10),
+              },
+            });
+          } else if (Number(e) == 18000000) {
+            //5小时以内 ->  1分钟 2分钟 5分钟 10 15 30
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(5, 11),
+              },
+            });
+          } else if (Number(e) == 36000000 || Number(e) == 43200000) {
+            //10 12小时以内 -> 2分钟 5分钟 10 15 30 1小时
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(6, 12),
+              },
+            });
+          } else if (Number(e) == 86400000) {
+            //1天以内 ->  5分钟 10 15 30 1小时 2
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(7, 13),
+              },
+            });
+          } else if (Number(e) == 604800000) {
+            //7天以内 ->  30分钟 1小时 2 5 10 12 1天
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(10, 17),
+              },
+            });
+          } else if (Number(e) == 2592000000) {
+            //30天以内 -> 2小时 5 10 12 1天
+            updateSchema({
+              field: '102121',
+              componentProps: {
+                options: optionsConfig.slice(12, 17),
+              },
+            });
+          }
+        },
+        maxLength: 250,
+        placeholder: '请选择查询周期',
+      };
+    },
     colProps: { span: 24 },
+    ifShow: ({ values }) =>
+      (!isEmpty(values.agg) && !isDefultWeek(values.defaultWeek)) ||
+      isMin(values.agg) ||
+      isMax(values.agg) ||
+      isAvg(values.agg) ||
+      isSum(values.agg) ||
+      isCountAll(values.agg),
   },
   {
     field: '102121',
     label: '间隔时间',
     required: true,
     component: 'Select',
+    colProps: { span: 24 },
+    defaultValue: '1000',
     componentProps: {
       placeholder: '请选择间隔时间',
       options: [
-        { label: '2小时', value: '7200000' },
-        { label: '5小时', value: '18000000' },
-        { label: '10小时', value: '36000000' },
-        { label: '12小时', value: '43200000' },
-        { label: '1天', value: '86400000' },
+        {
+          label: '1秒',
+          value: '1000',
+        },
       ],
     },
-    colProps: { span: 24 },
+    ifShow: ({ values }) =>
+      (!isEmpty(values.agg) && !isDefultWeek(values.defaultWeek)) ||
+      isMin(values.agg) ||
+      isMax(values.agg) ||
+      isAvg(values.agg) ||
+      isSum(values.agg) ||
+      isCountAll(values.agg),
   },
 ];

+<template>
+  <div
+    v-for="(param, index) in dynamicInput.params"
+    :key="index"
+    style="display: flex; margin-top: 0.25vh"
+  >
+    <a-input
+      :disabled="true"
+      placeholder="设备"
+      v-model:value="param.key"
+      style="width: 38%; margin-bottom: 5px; margin-left: 1vh"
+      @change="emitChange"
+    />
+    <Select
+      placeholder="请选择设备属性"
+      v-model:value="param.dataType"
+      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';
+  import { Select } from 'ant-design-vue';
+  import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
+  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
+
+  interface Params {
+    [x: string]: string;
+    dataType: string;
+    key: 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(''),
+    },
+    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) {
+            const res = await getAttribute(props.orgId, props.value.join(','));
+            selectOptions.value = res.map((o) => {
+              return {
+                label: o,
+                value: o,
+              };
+            });
+            const { items } = await screenLinkPageByDeptIdGetDevice({
+              organizationId: props.orgId,
+            });
+            const options = items.map((item) => {
+              return {
+                label: item.name,
+                value: item.tbDeviceId,
+              };
+            });
+            const temp: any = [];
+            options.forEach((f) => {
+              props.value.forEach((f1) => {
+                if (f1 == f.value) {
+                  temp.push({
+                    label: f.label,
+                    value: f.value,
+                  });
+                }
+              });
+            });
+            let jsonObj = temp;
+            jsonObj.forEach((item: Params) => {
+              dynamicInput.params.push({
+                dataType: item.dataType,
+                key: item.label,
+                value: item.value,
+              });
+            });
+          }
+        }
+      }
+      /**
+       * 数值改变
+       */
+      function emitChange() {
+        let obj: any = [];
+        if (dynamicInput.params.length > 0) {
+          dynamicInput.params.forEach((item: Params) => {
+            obj.push({
+              attr: item.dataType,
+              tbDeviceId: item.value,
+            });
+          });
+        }
+        console.log('数值改变', obj);
+        emit('change', obj);
+        emit('update:value', obj);
+      }
+
+      return {
+        dynamicInput,
+        emitChange,
+        remove,
+        add,
+        selectOptions,
+      };
+    },
+  });
+</script>
+<style scoped>
+  .dynamic-delete-button {
+    cursor: pointer;
+    position: relative;
+    top: 4px;
+    font-size: 24px;
+    color: #999;
+    transition: all 0.3s;
+  }
+
+  .dynamic-delete-button:hover {
+    color: #777;
+  }
+
+  .dynamic-delete-button[disabled] {
+    cursor: not-allowed;
+    opacity: 0.5;
+  }
+</style>

@@ -58,7 +58,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import ReportConfigDrawer from './ReportConfigDrawer.vue';
   import DevicePreviewModal from './DevicePreviewModal.vue';
-  import { cameraPage, deleteCameraManage } from '/@/api/camera/cameraManager';
+  import { reportPage, deleteReportManage } from '/@/api/report/reportManager';
   import { searchFormSchema, columns } from './config.data';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
@@ -70,7 +70,7 @@
 
   const [registerTable, { reload, setProps }] = useTable({
     title: '报表列表',
-    api: cameraPage,
+    api: reportPage,
     columns,
     showIndexColumn: false,
     clickToRowSelect: false,
@@ -100,7 +100,7 @@
   };
 
   const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    deleteCameraManage,
+    deleteReportManage,
     handleSuccess,
     setProps
   );

+interface IOptionConfig {
+  label: string;
+  value: string;
+}
+
+export const optionsConfig: IOptionConfig[] = [
+  {
+    label: '1秒',
+    value: '1000',
+  },
+  {
+    label: '5秒',
+    value: '5000',
+  },
+  {
+    label: '10秒',
+    value: '10000',
+  },
+  {
+    label: '15秒',
+    value: '15000',
+  },
+  {
+    label: '30秒',
+    value: '30000',
+  },
+  {
+    label: '1分钟',
+    value: '60000',
+  },
+  {
+    label: '2分钟',
+    value: '120000',
+  },
+  {
+    label: '5分钟',
+    value: '300000',
+  },
+  {
+    label: '10分钟',
+    value: '600000',
+  },
+  {
+    label: '15分钟',
+    value: '900000',
+  },
+  {
+    label: '30分钟',
+    value: '1800000',
+  },
+  {
+    label: '1小时',
+    value: '3600000',
+  },
+  {
+    label: '2小时',
+    value: '7200000',
+  },
+  {
+    label: '5小时',
+    value: '18000000',
+  },
+  {
+    label: '10小时',
+    value: '36000000',
+  },
+  {
+    label: '12小时',
+    value: '43200000',
+  },
+  {
+    label: '1天',
+    value: '86400000',
+  },
+];
+
+export enum TypeEnum {
+  IS_TIMING = 0,
+  IS_WEEK = 'week',
+  IS_MONTH = 'month',
+  IS_EMPTY = 'NONE',
+  IS_DEFAULT_WEEK = 'defaultIsWeek',
+  IS_MIN = 'MIN',
+  IS_MAX = 'MAX',
+  IS_AVG = 'AVG',
+  IS_SUM = 'SUM',
+  COUNT = 'COUNT',
+}
+
+export enum AggregateDataEnum {
+  MIN = 'MIN',
+  MAX = 'MAX',
+  AVG = 'AVG',
+  SUM = 'SUM',
+  COUNT = 'COUNT',
+  NONE = 'NONE',
+}
+
+export const isTiming = (type: string) => {
+  return type === TypeEnum.IS_TIMING;
+};
+
+export const isWeek = (type: string) => {
+  return type === TypeEnum.IS_WEEK;
+};
+
+export const isMonth = (type: string) => {
+  return type === TypeEnum.IS_MONTH;
+};
+
+export const isEmpty = (type: string) => {
+  return type === TypeEnum.IS_EMPTY;
+};
+
+export const isDefultWeek = (type: string) => {
+  return type === TypeEnum.IS_DEFAULT_WEEK;
+};
+
+export const isMin = (type: string) => {
+  return type === TypeEnum.IS_MIN;
+};
+
+export const isMax = (type: string) => {
+  return type === TypeEnum.IS_MAX;
+};
+
+export const isAvg = (type: string) => {
+  return type === TypeEnum.IS_AVG;
+};
+export const isSum = (type: string) => {
+  return type === TypeEnum.IS_SUM;
+};
+
+export const isCountAll = (type: string) => {
+  return type === TypeEnum.COUNT;
+};

@@ -272,11 +272,15 @@
             if (isApiHeaders && Object.values(isApiHeaders).includes('')) {
               return createMessage.error('请填写属性');
             }
-            await postAddConvertApi(allPostForm);
-            createMessage.success('数据流转新增成功');
-            emit('success');
-            defineClearFunc();
-            closeModal();
+            const res = await postAddConvertApi(allPostForm);
+            if (res) {
+              closeModal();
+              createMessage.success('数据流转新增成功');
+              setTimeout(() => {
+                emit('success');
+              }, 500);
+              defineClearFunc();
+            }
           } else {
             await addOrEditFunc();
             if (!isEdit.value) {

@@ -15,7 +15,8 @@
             <img v-if="logoPic" :src="logoPic" />
             <div v-else>
               <div style="margin-top: 1.875rem">
-                <PlusOutlined style="font-size: 2.5rem" />
+                <LoadingOutlined v-if="loading" />
+                <PlusOutlined v-else style="font-size: 2.5rem" />
               </div>
               <div
                 class="ant-upload-text flex"
@@ -38,7 +39,8 @@
             <img v-if="bgPic" :src="bgPic" alt="avatar" />
             <div v-else>
               <div style="margin-top: 1.875rem">
-                <PlusOutlined style="font-size: 2.5rem" />
+                <LoadingOutlined v-if="loading1" />
+                <PlusOutlined v-else style="font-size: 2.5rem" />
               </div>
               <div
                 class="ant-upload-text flex"
@@ -93,7 +95,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Loading } from '/@/components/Loading/index';
   import { Card, Upload, Input, Modal } from 'ant-design-vue';
-  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined, LoadingOutlined } from '@ant-design/icons-vue';
   import { schemas } from '../config/AppDraw.config';
   import { FileItem, FileInfo } from '../types/index';
   import { logoUpload, bgUpload } from '/@/api/oem/index';
@@ -111,8 +113,11 @@
       Input,
       Modal,
       Authority,
+      LoadingOutlined,
     },
     setup() {
+      const loading = ref(false);
+      const loading1 = ref(false);
       const compState = ref({
         absolute: false,
         loading: false,
@@ -153,11 +158,14 @@
       const logoPic = ref();
       async function customUploadLogoPic({ file }) {
         if (beforeUploadLogoPic(file)) {
+          logoPic.value = '';
+          loading.value = true;
           const formData = new FormData();
           formData.append('file', file);
           const response = await logoUpload(formData);
           if (response.fileStaticUri) {
             logoPic.value = response.fileStaticUri;
+            loading.value = false;
           }
         }
       }
@@ -177,11 +185,14 @@
       const bgPic = ref();
       async function customUploadBgPic({ file }) {
         if (beforeUploadBgPic(file)) {
+          bgPic.value = '';
+          loading1.value = true;
           const formData = new FormData();
           formData.append('file', file);
           const response = await bgUpload(formData);
           if (response.fileStaticUri) {
             bgPic.value = response.fileStaticUri;
+            loading1.value = false;
           }
         }
       }
@@ -202,7 +213,6 @@
         if (beforeUploadHomeSwiper(file)) {
           const formData = new FormData();
           formData.append('file', file);
-
           const response = await bgUpload(formData);
           if (response.fileStaticUri) {
             fileList.value.push({
@@ -294,6 +304,8 @@
         bgPic,
         previewVisible,
         previewImage,
+        loading,
+        loading1,
       };
     },
   });

@@ -14,7 +14,8 @@
             <img v-if="logoPic" :src="logoPic" />
             <div v-else>
               <div style="margin-top: 1.875rem">
-                <PlusOutlined style="font-size: 2.5rem" />
+                <LoadingOutlined v-if="loading" />
+                <PlusOutlined v-else style="font-size: 2.5rem" />
               </div>
               <div
                 class="ant-upload-text flex"
@@ -40,7 +41,8 @@
             </div>
             <div v-else>
               <div style="margin-top: 20px">
-                <PlusOutlined style="font-size: 30px" />
+                <LoadingOutlined v-if="loading1" />
+                <PlusOutlined v-else style="font-size: 30px" />
               </div>
               <div
                 class="ant-upload-text flex"
@@ -63,7 +65,8 @@
             <img v-if="bgPic" :src="bgPic" alt="avatar" />
             <div v-else>
               <div style="margin-top: 1.875rem">
-                <PlusOutlined style="font-size: 2.5rem" />
+                <LoadingOutlined v-if="loading2" />
+                <PlusOutlined v-else style="font-size: 2.5rem" />
               </div>
               <div
                 class="ant-upload-text flex"
@@ -98,7 +101,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import type { FileItem } from '/@/components/Upload/src/typing';
   import { logoUpload, iconUpload, bgUpload, getPlatForm, updatePlatForm } from '/@/api/oem/index';
-  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined, LoadingOutlined } from '@ant-design/icons-vue';
   import { useUserStore } from '/@/store/modules/user';
   import { createLocalStorage } from '/@/utils/cache/index';
   import { Authority } from '/@/components/Authority';
@@ -112,8 +115,12 @@
       Input,
       PlusOutlined,
       Authority,
+      LoadingOutlined,
     },
     setup() {
+      const loading = ref(false);
+      const loading1 = ref(false);
+      const loading2= ref(false);
       const compState = ref({
         absolute: false,
         loading: false,
@@ -138,11 +145,14 @@
       // logo图片上传
       async function customUploadLogoPic({ file }) {
         if (beforeUploadLogoPic(file)) {
+          logoPic.value = '';
+          loading.value = true;
           const formData = new FormData();
           formData.append('file', file);
           const response = await logoUpload(formData);
           if (response.fileStaticUri) {
             logoPic.value = response.fileStaticUri;
+            loading.value = false;
           }
         }
       }
@@ -160,11 +170,14 @@
       // Icon上传
       async function customUploadIconPic({ file }) {
         if (beforeUploadIconPic(file)) {
+          iconPic.value = '';
+          loading1.value = true;
           const formData = new FormData();
           formData.append('file', file);
           const response = await iconUpload(formData);
           if (response.fileStaticUri) {
             iconPic.value = response.fileStaticUri;
+            loading1.value = false;
           }
         }
       }
@@ -182,11 +195,14 @@
       // 登录页背景上传
       async function customUploadBgPic({ file }) {
         if (beforeUploadBgPic(file)) {
+          bgPic.value = '';
+          loading2.value = true;
           const formData = new FormData();
           formData.append('file', file);
           const response = await bgUpload(formData);
           if (response.fileStaticUri) {
             bgPic.value = response.fileStaticUri;
+            loading2.value = false;
           }
         }
       }
@@ -250,6 +266,9 @@
         beforeUploadBgPic,
         compState,
         handleUpdateInfo,
+        loading,
+        loading1,
+        loading2,
       };
     },
   });

@@ -14,7 +14,8 @@
             <img v-if="qrcodePic" :src="qrcodePic" alt="avatar" />
             <div v-else>
               <div style="margin-top: 1.875rem">
-                <PlusOutlined style="font-size: 2.5rem" />
+                <LoadingOutlined v-if="loading" />
+                <PlusOutlined v-else style="font-size: 2.5rem" />
               </div>
               <div
                 class="ant-upload-text flex"
@@ -47,7 +48,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useUserStore } from '/@/store/modules/user';
   import { createLocalStorage } from '/@/utils/cache';
-  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined, LoadingOutlined } from '@ant-design/icons-vue';
   import { qrcodeUpload } from '/@/api/oem/index';
   import type { FileItem } from '/@/components/Upload/src/typing';
   import type { CityItem, Code } from '../types';
@@ -61,8 +62,10 @@
       Upload,
       PlusOutlined,
       Authority,
+      LoadingOutlined,
     },
     setup() {
+      const loading = ref(false);
       const compState = ref({
         absolute: false,
         loading: false,
@@ -98,11 +101,14 @@
       const customUploadqrcodePic = async ({ file }) => {
         clearValidate('qrcode');
         if (beforeUploadqrcodePic(file)) {
+          qrcodePic.value = '';
+          loading.value = true;
           const formData = new FormData();
           formData.append('file', file);
           const response = await qrcodeUpload(formData);
           if (response.fileStaticUri) {
             qrcodePic.value = response.fileStaticUri;
+            loading.value = false;
           }
         }
       };
@@ -132,8 +138,10 @@
           delete newFieldValue.nameCoun;
           delete newFieldValue.nameTown;
 
+          console.log(newFieldValue.qrCode);
+          console.log(newFieldValue.codeTown);
           // 表单校验
-          const values = await validate([
+          let validateArray = [
             'name',
             'abbreviation',
             'officialWebsite',
@@ -144,9 +152,26 @@
             'contacts',
             'tel',
             'id',
-            newFieldValue.qrCode == undefined ? 'prov' : '',
-            newFieldValue.codeTown == undefined ? 'qrcode' : '',
-          ]);
+          ];
+          if (newFieldValue.qrCode == undefined) {
+            validateArray.push('qrcode');
+          } else {
+            const findExistIndex = validateArray.findIndex((o) => o == 'qrcode');
+            if (findExistIndex !== -1) {
+              validateArray.splice(findExistIndex, 1);
+            }
+          }
+          if (newFieldValue.codeTown == undefined) {
+            validateArray.push('prov');
+            console.log(validateArray);
+          } else {
+            const findExistIndex1 = validateArray.findIndex((o) => o == 'prov');
+            if (findExistIndex1 !== -1) {
+              validateArray.splice(findExistIndex1, 1);
+            }
+            clearValidate('prov');
+          }
+          const values = await validate(validateArray);
           if (!values) return;
           compState.value.loading = true;
           await updateEnterPriseDetail(newFieldValue);
@@ -332,6 +357,7 @@
         customUploadqrcodePic,
         beforeUploadqrcodePic,
         registerCustomForm,
+        loading,
       };
     },
   });

 <template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" title="登陆登出日志详情" width="40%">
+  <BasicDrawer v-bind="$attrs" @register="registerDrawer" title="登录登出日志详情" width="40%">
     <BasicForm @register="registerForm" />
   </BasicDrawer>
 </template>