fix：修改报表配置设备取消删除问题

@@ -23,7 +23,6 @@
           @deselect="handleDeselect"
           mode="multiple"
           labelInValue
-          allowClear
           notFoundContent="请选择设备"
         />
         <div style="margin-top: 1.5vh"></div>
@@ -66,6 +65,7 @@
     attribute?: string;
     device?: string;
     name?: string;
+    attributes?: string | undefined;
   };
   const emit = defineEmits(['success', 'register']);
   const bindDeviceRefObj = {
@@ -105,8 +105,10 @@
   //设备Select选中
   const handleDeviceChange = (e) => {
     if (unref(isUpdate)) {
+      //编辑
+      let temp: any = [];
       editDeviceAttr.value.forEach((f) => {
-        deviceList.value = [f, ...e];
+        temp = [f, ...e];
       });
       let deWeightThree = () => {
         let map = new Map();
@@ -117,7 +119,11 @@
         }
         return [...map.values()];
       };
-      deviceList.value = deWeightThree();
+      temp = deWeightThree();
+      deviceList.value = temp;
+      if (e.length !== 0) {
+        deviceList.value = e;
+      }
     } else {
       deviceList.value = e;
     }
@@ -125,7 +131,7 @@
   //设备取消删除
   const handleDeselect = (e) => {
     if (unref(isUpdate)) {
-      const eEditDevice = e.key || e.value;
+      //编辑
       let deWeightThree = () => {
         let map = new Map();
         for (let item of deviceList.value) {
@@ -136,8 +142,13 @@
         return [...map.values()];
       };
       deviceList.value = deWeightThree();
-      const findEditValue = deviceList.value.findIndex((f) => f.value == eEditDevice);
+      const findEditValue = deviceList.value.findIndex((f) => f.value == e.value);
       if (findEditValue !== -1) deviceList.value.splice(findEditValue, 1);
+      // try {
+      //   if (deviceList.value[0]?.attributes.length > 0) {
+      //     deviceList.value.splice(0, 1);
+      //   }
+      // } catch {}
     } else {
       const eDevice = e.key || e.value;
       const findValue = deviceList.value.findIndex((f) => f.value == eDevice);
@@ -179,12 +190,29 @@
       await setFieldsValue({
         agg: editResData.data.queryCondition?.agg,
         interval: editResData.data.queryCondition?.interval,
-        limit1: editResData.data.queryCondition?.limit,
+        limit: editResData.data.queryCondition?.limit,
         orderBy: editResData.data.queryCondition?.orderBy,
         useStrictDataTypes: editResData.data.queryCondition?.useStrictDataTypes,
         startTs: editResData.data.queryCondition?.startTs,
         endTs: editResData.data.queryCondition?.endTs,
+        way: editResData.data?.way,
+        queryMode: editResData.data.queryCondition?.queryMode === 0 ? 'latest' : 'timePeriod',
+      });
+      const endTsTime = editResData.data.queryCondition?.endTs;
+      const startTsTime = editResData.data.queryCondition?.startTs;
+      const mathFloor = (endTsTime - startTsTime) / 10;
+      const multTen = Math.floor(mathFloor) * 10;
+      await setFieldsValue({
+        startTs: multTen,
       });
+      if (editResData.data.queryCondition?.queryMode == 1) {
+        await setFieldsValue({
+          dataRange: [
+            editResData.data.queryCondition?.startTs,
+            editResData.data.queryCondition?.endTs,
+          ],
+        });
+      }
       //回显聚合条件
       const dataCompareOpions = [
         { label: '最小值', value: AggregateDataEnum.MIN },
@@ -248,6 +276,10 @@
       deviceList.value = editDeviceAttr.value;
       editDeviceList.value = editResData.data.executeAttributes;
     } else {
+      setFieldsValue({
+        startTs: 1000,
+        interval: 1000,
+      });
       editId.value = '';
       orgId.value = '';
       selectDevice.value = [];
@@ -312,13 +344,17 @@
         if (getAttrDevice.value.length === 0) {
           return createMessage.error('请选择设备及其属性');
         }
+      } else {
+        if (getAttrDevice.value.length === 0) {
+          return createMessage.error('请选择设备及其属性');
+        }
       }
       if (values.executeWay == 0) {
         executeContent = null;
       } else {
         executeContent = values.cronTime;
       }
-      if (values.way === QueryWay.LATEST) {
+      if (values.queryMode === QueryWay.LATEST) {
         startTs.value = moment().subtract(values.startTs, 'ms').valueOf();
         endTs.value = Date.now();
       } else {
@@ -335,6 +371,7 @@
         ...{
           endTs: endTs.value,
         },
+        queryMode: values?.queryMode === 'latest' ? 0 : 1,
       };
 
       delete values.devices;
@@ -347,6 +384,7 @@
       delete values.cronYear;
       delete values.limit1;
       delete values.startTs;
+      delete values.queryMode;
       postObj = {
         ...values,
         ...{

@@ -21,7 +21,7 @@ export enum QueryWay {
   TIME_PERIOD = 'timePeriod',
 }
 export enum SchemaFiled {
-  WAY = 'way',
+  WAY = 'queryMode',
   TIME_PERIOD = 'timePeriod',
   KEYS = 'keys',
   DATE_RANGE = 'dataRange',
@@ -214,8 +214,12 @@ export const formSchema: QFormSchema[] = [
         placeholder: '请选择执行方式',
         onChange(e) {
           let dataCompareOpions: any = [];
+          setFieldsValue({
+            startTs: 1000,
+            interval: 1000,
+          });
           if (e.target.value == 0) {
-            setFieldsValue({ way: QueryWay.LATEST });
+            setFieldsValue({ queryMode: QueryWay.LATEST });
             dataCompareOpions = [
               { label: '固定周期', value: QueryWay.LATEST },
               { label: '自定义周期', value: QueryWay.TIME_PERIOD },
@@ -227,7 +231,7 @@ export const formSchema: QFormSchema[] = [
               },
             });
           } else {
-            setFieldsValue({ way: QueryWay.LATEST });
+            setFieldsValue({ queryMode: QueryWay.LATEST });
             dataCompareOpions = [{ label: '固定周期', value: QueryWay.LATEST }];
             updateSchema({
               defaultValue: QueryWay.LATEST,
@@ -492,7 +496,6 @@ export const formSchema: QFormSchema[] = [
         formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
       }
       return {
-        // defaultValue: 1000,
         placeholder: '请选择间隔时间',
         options,
       };

@@ -20,8 +20,11 @@
               label: '报表导出',
               icon: 'ant-design:dot-chart-outlined',
               auth: 'api:yt:reportExport:export',
-              onClick: handleExport.bind(null, record),
               ifShow: record.executeStatus === 1,
+              popConfirm: {
+                title: '是否需要导出',
+                confirm: handleExport.bind(null, record),
+              },
             },
             {
               label: '报表查看',
@@ -99,7 +102,7 @@
   });
 
   const [registerModal, { openModal }] = useModal();
-  const handleView = (_, record) => {
+  const handleView = (record) => {
     openModal(true, {
       isUpdate: true,
       record,