feat：修改报表配置部分代码

 <template>
   <div>
-    <BasicModal
-      v-bind="$attrs"
-      width="55rem"
-      :height="heightNum"
-      @register="register"
-      title="执行设备及属性"
-      @cancel="handleCancel"
-      :showOkBtn="false"
-    >
+    <BasicModal v-bind="$attrs" width="55rem" :height="heightNum" @register="register" title="执行设备及属性"
+      @cancel="handleCancel" :showOkBtn="false">
       <div>
         <BasicTable @register="registerTable" :dataSource="tableData" />
       </div>
@@ -16,35 +9,38 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { ref, nextTick } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicTable, useTable } from '/@/components/Table';
-  import { viewDeviceColumn } from './config.data';
+import { ref, nextTick } from 'vue';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { BasicTable, useTable } from '/@/components/Table';
+import { viewDeviceColumn } from './config.data';
+import { reportEditDetailPage } from '/@/api/report/reportManager';
 
-  const heightNum = ref(800);
-  const tableData: any = ref([]);
-  const [registerTable] = useTable({
-    title: '执行设备及属性',
-    columns: viewDeviceColumn,
-    showIndexColumn: false,
-    clickToRowSelect: false,
-    showTableSetting: false,
-    bordered: true,
-  });
-  const [register] = useModalInner((data) => {
-    console.log(data);
-    const getTableData = () => {
-      for (let i = 0; i < 100; i++) {
-        tableData.value.push({
-          device: `设备${i}`,
-          attribute: `CO${i}、Temp${i}`,
-        });
+const heightNum = ref(800);
+const tableData: any = ref([]);
+const [registerTable] = useTable({
+  title: '执行设备及属性',
+  columns: viewDeviceColumn,
+  showIndexColumn: false,
+  clickToRowSelect: false,
+  showTableSetting: false,
+  bordered: true,
+});
+const [register] = useModalInner((data) => {
+  const getTableData = async () => {
+    const res: any = await reportEditDetailPage(data.record.id)
+    const resMap = res.data.executeAttributes.map(d => {
+      return {
+        device: d.name,
+        attribute: d.attribute
       }
-    };
-    nextTick(() => {
-      getTableData();
-    });
+    })
+    tableData.value = resMap
+  };
+  nextTick(() => {
+    getTableData();
   });
-  const handleCancel = () => {};
+});
+const handleCancel = () => { };
 </script>
-<style></style>
+<style>
+</style>

@@ -5,9 +5,8 @@
         <Select placeholder="请选择设备" v-model:value="selectDevice" style="width: 100%" :options="selectOptions"
           @change="handleDeviceChange" mode="multiple" labelInValue allowClear notFoundContent="请选择设备" />
         <div style="margin-top: 1.5vh"></div>
-        <div v-for="(item, index) in deviceList" :key="index">
-          <DeviceAttrCpns ref="deviceAttrRef" @change="handleChange" :value="item" :orgId="organizationId || orgId" />
-        </div>
+        <DeviceAttrCpns ref="deviceAttrRef" @change="handleChange" :value="deviceList"
+          :orgId="organizationId || orgId" />
       </template>
     </BasicForm>
   </BasicDrawer>
@@ -36,17 +35,21 @@ type TDeviceList = {
   name?: string
 }
 const emit = defineEmits(['success', 'register']);
-const deviceAttrRef: any = ref(null);
+const deviceAttrRef = ref<InstanceType<typeof DeviceAttrCpns> | null>(null)
 const isUpdate = ref(true);
 const editId = ref('');
 const orgId = ref('');
 const selectOptions: Ref<SelectTypes['options']> = ref([]);
 const selectDevice = ref([]);
 const deviceList: Ref<TDeviceList[]> = ref([]);
+const editDeviceList: Ref<TDeviceList[]> = ref([]);
+let editResData: any = reactive({})
+const watchOrgId = ref('')
 
 watch(organizationId, async (newValue: string) => {
   if (!newValue) return;
   //获取设备
+  watchOrgId.value = newValue
   const { items } = await screenLinkPageByDeptIdGetDevice({
     organizationId: newValue,
   });
@@ -59,6 +62,7 @@ watch(organizationId, async (newValue: string) => {
   });
 });
 const handleDeviceChange = (e) => {
+  console.log(e)
   deviceList.value = e;
 };
 const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
@@ -71,21 +75,29 @@ const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (
   await resetFields();
   setDrawerProps({ confirmLoading: false });
   isUpdate.value = !!data?.isUpdate;
+  editId.value = '';
+  orgId.value = '';
+  selectDevice.value = [];
+  selectOptions.value = [];
+  deviceList.value = [];
+  getAttrDevice.value = []
+  editDeviceList.value = []
   if (unref(isUpdate)) {
     //编辑回显数据
-    const editResData: any = await reportEditDetailPage(data.record.id)
-    console.log(editResData.data)
-    // //回显基础数据
+    editResData = await reportEditDetailPage(data.record.id)
+    //回显基础数据
     editId.value = editResData.data.id;
     await setFieldsValue(editResData.data);
     //回显嵌套数据
     setFieldsValue({
       agg: editResData.data.queryCondition?.agg,
       interval: editResData.data.queryCondition?.interval,
+      limit: editResData.data.queryCondition?.limit,
+      orderBy: editResData.data.queryCondition?.orderBy,
+      useStrictDataTypes: editResData.data.queryCondition?.useStrictDataTypes
     });
     //回显设备
     orgId.value = editResData.data.organizationId;
-    //获取该组织下的设备--排除网关设备
     const { items } = await screenLinkPageByDeptIdGetDevice({
       organizationId: editResData.data.organizationId,
     });
@@ -103,25 +115,23 @@ const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (
       }
     })
     selectDevice.value = deviceIds;
-    //回显设备属性 TODO 模拟的数据 待服务端返回
-    deviceList.value = editResData.data.executeAttributes
+    //回显设备属性
+    const editDeviceAttr = editResData.data.executeAttributes?.map(item => {
+      return {
+        label: item.name,
+        value: item.device,
+        attribute: item.attribute,
+      }
+    })
+    deviceList.value = editDeviceAttr
+    editDeviceList.value = editResData.data.executeAttributes
     nextTick(() => { });
-  } else {
-    editId.value = '';
-    orgId.value = '';
-    selectDevice.value = [];
-    selectOptions.value = [];
-    deviceList.value = [];
   }
 });
 const getAttrDevice: Ref<TDeviceList[]> = ref([]);
 const getTitle = computed(() => (!unref(isUpdate) ? '新增报表配置' : '编辑报表配置'));
 const handleChange = (e: any) => {
-  getAttrDevice.value.push({
-    device: e.value,
-    attribute: e.attribute,
-    name: e.device
-  });
+  getAttrDevice.value = e
 };
 let postObj: any = reactive({});
 let queryCondition: any = reactive({});
@@ -134,8 +144,10 @@ async function handleSubmit() {
     const { createMessage } = useMessage();
     const values = await validate();
     if (!values) return;
-    if (getAttrDevice.value.length === 0) {
-      return createMessage.error('请选择设备及其属性');
+    if (!unref(isUpdate)) {
+      if (getAttrDevice.value.length === 0) {
+        return createMessage.error('请选择设备及其属性');
+      }
     }
     if (values.executeWay == 0) {
       executeContent = null;
@@ -164,7 +176,7 @@ async function handleSubmit() {
     delete values.cronYear;
     postObj = {
       ...values,
-      ...{ executeAttributes: getAttrDevice.value },
+      ...{ executeAttributes: getAttrDevice.value.length == 0 ? editDeviceList.value : getAttrDevice.value },
       ...{ queryCondition },
       ...{
         startTs: startTs.value

@@ -40,7 +40,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '所属组织',
-    dataIndex: 'organizationName',
+    dataIndex: 'organizationDTO.name',
     width: 120,
   },
   {

 <template>
-  <div
-    v-for="param in dynamicInput.params"
-    :key="param.key"
-    style="display: flex; margin-top: 0.25vh"
-  >
-    <a-input
-      :disabled="true"
-      v-model:value="param.device"
-      style="width: 50%; margin-bottom: 5px; margin-left: 0vh"
-      @change="emitChange"
-    />
-    <Select
-      placeholder="请选择设备属性"
-      v-model:value="param.attribute"
-      style="width: 50%; margin-left: 1.8vw"
-      :options="selectOptions"
-      @change="emitChange"
-      allowClear
-    />
+  <div v-for="param in dynamicInput.params" :key="param.key" style="display: flex; margin-top: 0.25vh">
+    <a-input :disabled="true" v-model:value="param.device" style="width: 38%; margin-bottom: 5px; margin-left: 1vh"
+      @change="emitChange" />
+    <Select placeholder="请选择设备属性" v-model:value="param.attribute" style="width: 160px; margin-left: 1.8vw"
+      :options="selectOptions" @change="emitChange" allowClear />
   </div>
 </template>
 <script lang="ts">
-  export default {
-    inheritAttrs: false,
-  };
+export default {
+  inheritAttrs: false,
+};
 </script>
 <script lang="ts" setup>
-  import { reactive, UnwrapRef, watchEffect, ref } from 'vue';
-  import { propTypes } from '/@/utils/propTypes';
-  import { SelectTypes } from 'ant-design-vue/es/select';
-  import { Select } from 'ant-design-vue';
-  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
+import { reactive, UnwrapRef, watchEffect, ref } from 'vue';
+import { propTypes } from '/@/utils/propTypes';
+import { SelectTypes } from 'ant-design-vue/es/select';
+import { Select } from 'ant-design-vue';
+import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 
-  interface Params {
-    [x: string]: string;
-    attribute: string;
-    device: string;
-  }
-  const props = defineProps({
-    value: propTypes.object.def({}),
-    orgId: propTypes.string.def(''),
+interface Params {
+  [x: string]: string;
+  attribute: string;
+  device: string;
+}
+const props = defineProps({
+  value: propTypes.array.def([]),
+  orgId: propTypes.string.def(''),
+});
+const emits = defineEmits(['change', 'update:value']);
+const selectOptions = ref<SelectTypes['options']>([]);
+//获取属性
+const getAttr = async (orgId, deviceId) => {
+  const res = await getAttribute(orgId, deviceId.join(','));
+  selectOptions.value = res.map((o) => {
+    return {
+      label: o,
+      value: o,
+    };
   });
-  const emits = defineEmits(['change', 'update:value']);
-  const selectOptions = ref<SelectTypes['options']>([]);
-  //获取属性
-  const getAttr = async (orgId, deviceId) => {
-    const res = await getAttribute(orgId, deviceId);
-    selectOptions.value = res.map((o) => {
+};
+//动态数据
+const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
+//监听传入数据value
+watchEffect(() => {
+  initVal();
+});
+/**
+ * 初始化数值
+ */
+async function initVal() {
+  if (props.value && props.orgId) {
+    let jsonObj = props.value;
+    const deviceId = jsonObj.map((m: any) => m.value);
+    await getAttr(props.orgId, deviceId);
+    dynamicInput.params = jsonObj.map((item: any) => {
       return {
-        label: o,
-        value: o,
-      };
-    });
-  };
-  //动态数据
-  const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
-  const rEffect = watchEffect(() => {
-    initVal();
-  });
-  rEffect();
-  /**
-   * 初始化数值
-   */
-  async function initVal() {
-    if (props.orgId && props.value.value) {
-      await getAttr(props.orgId, props.value.value);
-      dynamicInput.params.push({
-        device: props.value.label,
-        value: props.value.value,
-        attribute: props.value.attribute == '' ? '' : props.value.attribute,
-      });
-    }
+        attribute: item.attribute,
+        device: item.label,
+        value: item.value,
+      }
+    })
   }
-  /**
-   * 数值改变
-   */
-  function emitChange() {
-    let obj: any = dynamicInput.params[0];
-    emits('change', obj);
-    emits('update:value', obj);
+}
+/**
+ * 数值改变
+ */
+function emitChange() {
+  let obj: any = [];
+  if (dynamicInput.params.length > 0) {
+    dynamicInput.params.forEach((item: Params) => {
+      obj.push({
+        attribute: item.attribute,
+        device: item.value,
+        name: item.device
+      });
+    });
   }
-  defineExpose({
-    getAttr,
-  });
+  emits('change', obj);
+  emits('update:value', obj);
+}
 </script>
 <style scoped lang="css">
-  @import './deviceAttrCpns.css';
+@import './deviceAttrCpns.css';
 </style>