Merge branch 'f-dev' into 'main'

wip：报表功能开发中

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

@@ -42,3 +42,15 @@ export const getDeviceActiveTime = (entityId: string) => {
     }
   );
 };
+
+// 获取设备属性
+export const getDeviceAttribute = (entityId: string) => {
+  return defHttp.get(
+    {
+      url: `/plugins/telemetry/DEVICE/${entityId}/values/attributes?keys`,
+    },
+    {
+      joinPrefix: false,
+    }
+  );
+};

@@ -8,116 +8,138 @@
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm">
-      <template #deviceAttr="{ model, field }">
-        <deviceAttrColumn
+      <template #devices>
+        <Select
+          placeholder="请选择设备"
+          v-model:value="selectDevice"
+          style="width: 100%"
+          :options="selectOptions"
+          @change="handleDeviceChange"
+          mode="multiple"
+        />
+        <div style="margin-top: 1.5vh"></div>
+        <DeviceAttrCpns
+          ref="deviceAttrRef"
           @change="handleChange"
-          :orgId="!isUpdate ? model['organizationId'] : orgId"
-          :value="!isUpdate ? model['devices'] : deviceAttrData"
-          :isEdit="!isUpdate ? false : true"
+          :value="deviceList"
+          :orgId="organizationId"
         />
-        <p style="display: none">{{ field }}</p>
       </template>
     </BasicForm>
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, unref, reactive } from 'vue';
+  import { ref, computed, unref, reactive, watch } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema } from './config.data';
+  import { formSchema, organizationId } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { createOrEditReportManage, putReportConfigManage } from '/@/api/report/reportManager';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import deviceAttrColumn from './cpns/MappingsForm.vue';
   import moment from 'moment';
   import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
+  import { Select } from 'ant-design-vue';
+  import DeviceAttrCpns from './cpns/DeviceAttrCpns.vue';
 
   const emit = defineEmits(['success', 'register']);
+  const deviceAttrRef: any = ref(null);
   const isUpdate = ref(true);
   const editId = ref('');
   const orgId = ref('');
   let deviceAttrData: any = ref([]);
-  const [registerForm, { validate, setFieldsValue, resetFields, updateSchema }] = useForm({
+  const selectOptions: any = ref([]);
+  const selectDevice = ref([]);
+  const deviceList = ref([]);
+  watch(organizationId, async (newValue: string) => {
+    if (!newValue) return;
+    //获取设备
+    const { items } = await screenLinkPageByDeptIdGetDevice({
+      organizationId: newValue,
+    });
+    selectOptions.value = items.map((item) => {
+      if (item.deviceType !== 'GATEWAY')
+        return {
+          label: item.name,
+          value: item.tbDeviceId,
+        };
+    });
+  });
+  const handleDeviceChange = (e) => {
+    console.log('e', e);
+    deviceList.value = e;
+  };
+  const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,
     fieldMapToTime: [['timeZone', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
   });
-
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     await resetFields();
     setDrawerProps({ confirmLoading: false });
     isUpdate.value = !!data?.isUpdate;
     if (unref(isUpdate)) {
-      //回显
+      //回显基础数据
       editId.value = data.record.id;
       await setFieldsValue(data.record);
-      //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) => {
+      selectOptions.value = items.map((item) => {
         if (item.deviceType !== 'GATEWAY')
           return {
             label: item.name,
             value: item.tbDeviceId,
           };
       });
-      updateSchema({
-        field: 'devices',
-        componentProps: {
-          options,
-        },
-      });
-      //TODO 回显设备属性 模拟的数据 待服务端返回
+      //TODO 模拟的数据 待服务端返回
+      const deviceIds: any = [
+        '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
+        '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
+        '54e199d0-f1f7-11ec-98ad-a9680487d1e0',
+        '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
+      ];
+      selectDevice.value = deviceIds;
+      //回显设备属性 TODO 模拟的数据 待服务端返回
       deviceAttrData.value = [
         {
           device: '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
           attribute: 'CO2',
-          name: '奥迪网关子设备',
+          name: '宝马默认设备',
         },
         {
-          device: '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
+          device: '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
           attribute: 'co',
-          name: '宝马默认设备',
+          name: '新增奥迪测试设备',
         },
         {
-          device: '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
+          device: '54e199d0-f1f7-11ec-98ad-a9680487d1e0',
           attribute: 'hot',
-          name: '奔驰默认设备',
+          name: '奥迪默认设备',
         },
         {
-          device: '54e199d0-f1f7-11ec-98ad-a9680487d1e0',
+          device: '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
           attribute: 'wet',
-          name: '新增奥迪测试设备',
+          name: '奔驰默认设备',
         },
       ];
+      deviceAttrRef.value?.echoDynamicInputFunc(deviceAttrData.value);
     } else {
       editId.value = '';
-      updateSchema({
-        field: 'devices',
-        componentProps: {
-          options: [],
-        },
-      });
+      selectDevice.value = [];
+      selectOptions.value = [];
+      deviceList.value = [];
     }
   });
-
   const getAttrDevice: any = ref([]);
   const getTitle = computed(() => (!unref(isUpdate) ? '新增报表配置' : '编辑报表配置'));
-
   const handleChange = (e) => (getAttrDevice.value = e);
   let postObj: any = reactive({});
   let queryCondition: any = reactive({});
@@ -129,6 +151,9 @@
       const { createMessage } = useMessage();
       const values = await validate();
       if (!values) return;
+      if (getAttrDevice.value.length === 0) {
+        return createMessage.error('请选择设备及其属性');
+      }
       if (values.executeWay == 0) {
         executeContent = null;
       } else {

+import { ref } from 'vue';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import type { FormSchema as QFormSchema } from '/@/components/Form/index';
 import moment from 'moment';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
-import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
 import { findDictItemByCode } from '/@/api/system/dict';
 import {
   optionsConfig,
@@ -19,6 +19,8 @@ import {
   isCountAll,
 } from './timeConfig';
 import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
+// import { JCronValidator } from '/@/components/Form';
+
 export enum SchemaFiled {
   WAY = 'way',
   TIME_PERIOD = 'timePeriod',
@@ -31,7 +33,7 @@ export enum SchemaFiled {
   AGG = 'agg',
   ORDER_BY = 'orderBy',
 }
-
+export const organizationId = ref('');
 // 表格配置
 export const columns: BasicColumn[] = [
   {
@@ -159,30 +161,8 @@ export const formSchema: QFormSchema[] = [
     colProps: { span: 24 },
     component: 'ApiTreeSelect',
     required: true,
-    componentProps: ({ formActionType }) => {
-      const { updateSchema } = formActionType;
+    componentProps: () => {
       return {
-        async onChange(e) {
-          if (e) {
-            //获取该组织下的设备--排除网关设备
-            const { items } = await screenLinkPageByDeptIdGetDevice({
-              organizationId: e,
-            });
-            const options = items.map((item) => {
-              if (item.deviceType !== 'GATEWAY')
-                return {
-                  label: item.name,
-                  value: item.tbDeviceId,
-                };
-            });
-            updateSchema({
-              field: 'devices',
-              componentProps: {
-                options,
-              },
-            });
-          }
-        },
         maxLength: 250,
         placeholder: '请选择所属组织',
         api: async () => {
@@ -190,6 +170,9 @@ export const formSchema: QFormSchema[] = [
           copyTransFun(data as any as any[]);
           return data;
         },
+        onChange(e) {
+          organizationId.value = e;
+        },
       };
     },
   },
@@ -225,6 +208,13 @@ export const formSchema: QFormSchema[] = [
       ],
     },
   },
+  // {
+  //   field: 'cronExpression',
+  //   label: 'Cron表达式',
+  //   component: 'JEasyCron',
+  //   defaultValue: '* * * * * ? *',
+  //   rules: [{ required: true, message: '请输入Cron表达式' }, { validator: JCronValidator }],
+  // },
   {
     field: 'timeWeek',
     component: 'Select',
@@ -299,13 +289,13 @@ export const formSchema: QFormSchema[] = [
   {
     field: 'devices',
     label: '设备',
-    required: true,
     helpMessage: ['报表配置只对拥有"数值型"属性的设备才能配置'],
     component: 'Select',
     componentProps: {
       placeholder: '请选择设备',
       mode: 'multiple',
     },
+    slot: 'devices',
     colProps: { span: 24 },
   },
   {
@@ -364,16 +354,16 @@ export const formSchema: QFormSchema[] = [
       };
     },
   },
-  {
-    field: 'devices1',
-    label: '设备属性',
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择设备属性',
-    },
-    colProps: { span: 24 },
-    slot: 'deviceAttr',
-  },
+  // {
+  //   field: 'deviceAttr',
+  //   label: '设备属性',
+  //   component: 'Select',
+  //   componentProps: {
+  //     placeholder: '请选择设备属性',
+  //   },
+  //   colProps: { span: 24 },
+  //   slot: 'deviceAttr',
+  // },
   {
     field: 'dataCompare',
     label: '数据类型',

@@ -6,7 +6,6 @@
   >
     <a-input
       :disabled="true"
-      placeholder="设备"
       v-model:value="param.device"
       style="width: 38%; margin-bottom: 5px; margin-left: 1vh"
       @change="emitChange"
@@ -21,132 +20,121 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, UnwrapRef, watchEffect, ref } from 'vue';
+  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 { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
+  // import { getDeviceAttribute } from '/@/api/alarm/position';
 
   interface Params {
     [x: string]: string;
     attribute: string;
     device: string;
   }
-
-  export default defineComponent({
-    name: 'JAddInput',
-    components: {
-      Select,
-    },
-    //--------------不继承Antd Design Vue Input的所有属性 否则控制台报大片警告--------------
-    inheritAttrs: false,
-    props: {
-      value: propTypes.array.def([]),
-      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: [] });
-      //监听传入数据value
-      watchEffect(() => {
-        initVal();
-      });
-      /**
-       * 初始化数值
-       */
-      async function initVal() {
-        dynamicInput.params = [];
-        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 {
-                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({
-                attribute: item.attribute,
-                device: item.label,
-                value: item.value,
-              });
+  const props = defineProps({
+    value: propTypes.array.def([]),
+    orgId: propTypes.string.def(''),
+  });
+  const emits = defineEmits(['change', 'update:value', 'dynamicReduceHeight', 'dynamicAddHeight']);
+  const selectOptions = ref<SelectTypes['options']>([]);
+  //动态数据
+  const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
+  //监听传入数据value
+  watchEffect(() => {
+    initVal();
+  });
+  //获取属性
+  const getAttr = async (orgId, value) => {
+    const res = await getAttribute(orgId, value.join(','));
+    selectOptions.value = res.map((o) => {
+      return {
+        label: o,
+        value: o,
+      };
+    });
+  };
+  //获取设备
+  const deviceOptions: any = ref([]);
+  const getDevice = async (orgId) => {
+    const { items } = await screenLinkPageByDeptIdGetDevice({
+      organizationId: orgId,
+    });
+    deviceOptions.value = items.map((item) => {
+      return {
+        label: item.name,
+        value: item.tbDeviceId,
+      };
+    });
+  };
+  /**
+   * 初始化数值
+   */
+  async function initVal() {
+    dynamicInput.params = [];
+    if (props.value && props.orgId) {
+      const getPropsDevice = props.value;
+      const getPropsOrgId = props.orgId;
+      await getAttr(getPropsOrgId, getPropsDevice);
+      await getDevice(getPropsOrgId);
+      const temp: any = [];
+      deviceOptions.value.forEach((f) => {
+        getPropsDevice.forEach((f1) => {
+          if (f1 == f.value) {
+            temp.push({
+              label: f.label,
+              value: f.value,
             });
           }
-        }
-      }
-      /**
-       * 数值改变
-       */
-      function emitChange() {
-        let obj: any = [];
-        if (dynamicInput.params.length > 0) {
-          dynamicInput.params.forEach((item: Params) => {
-            obj.push({
-              attribute: item.attribute,
-              device: item.value,
-            });
-          });
-        }
-        emit('change', obj);
-        emit('update:value', obj);
-      }
+        });
+      });
+      temp.forEach((item: Params) => {
+        dynamicInput.params.push({
+          attribute: item.attribute,
+          device: item.label,
+          value: item.value,
+        });
+      });
+    }
+  }
+  /**
+   * 数值改变
+   */
+  function emitChange() {
+    let obj: any = [];
+    if (dynamicInput.params.length > 0) {
+      dynamicInput.params.forEach((item: Params) => {
+        obj.push({
+          attribute: item.attribute,
+          device: item.value,
+        });
+      });
+    }
+    emits('change', obj);
+    emits('update:value', obj);
+  }
+  //回显
+  const echoDynamicInputFunc = (o) => {
+    dynamicInput.params = [];
+    dynamicInput.params = o.map((m) => {
       return {
-        dynamicInput,
-        emitChange,
-        selectOptions,
+        device: m.name,
+        attribute: m.attribute,
+        value: m.device,
       };
-    },
+    });
+  };
+  defineExpose({
+    echoDynamicInputFunc,
   });
 </script>
-<style scoped>
+<style scoped lang="css">
   .dynamic-delete-button {
     cursor: pointer;
     position: relative;

@@ -44,6 +44,26 @@
               },
             },
           ]"
+          :dropDownActions="[
+              {
+                label: '执行一次',
+                popConfirm: {
+                  title: '是否执行一次？',
+                },
+              },
+              {
+                label: '任务详细',
+                popConfirm: {
+                  title: '任务详细',
+                },
+              },
+              {
+                label: '调度日志',
+                popConfirm: {
+                  title: '调度日志',
+                },
+              },
+            ]"
         />
       </template>
       <template #status="{ record }">

@@ -72,7 +72,7 @@
                 class="ant-upload-text flex"
                 style="width: 280px; height: 130px; align-items: center; font-size: 0.5625rem"
               >
-                支持.PNG、.JPG格式，建议尺寸为1920*1080px以上，大小不超过2M</div
+                支持.PNG、.JPG格式，建议尺寸为1920*1080px以上，大小不超过5M</div
               >
             </div>
           </Upload>

@@ -21,7 +21,7 @@
                 class="ant-upload-text flex"
                 style="width: 180px; height: 100px; align-items: center; font-size: 0.5625rem"
               >
-                支持.PNG、.JPG格式，建议尺寸为300*300px，大小不超过2M</div
+                支持.PNG、.JPG格式，建议尺寸为300*300px，大小不超过5M</div
               >
             </div>
           </Upload>