fix：DEFECT-621 DEFECT-622 DEFECT-613 修复时间段显示为一样的时间 设备未填入属性提示修改 编辑报表配置,先设置自定义周期,再…

…编辑为固定周期,时间周期和间隔时间回显为0,并且可以编辑成功

@@ -13,6 +13,7 @@
     <BasicForm @register="registerForm">
     <BasicForm @register="registerForm">
       <template #devices="{ model, field }">
       <template #devices="{ model, field }">
         <p style="display: none">{{ field }}</p>
         <p style="display: none">{{ field }}</p>
+        <p>{{ queryModeFunc(model['queryMode']) }}</p>
         <p>{{ orgFunc(model['organizationId']) }}</p>
         <p>{{ orgFunc(model['organizationId']) }}</p>
         <Select
         <Select
           placeholder="请选择设备"
           placeholder="请选择设备"
@@ -81,9 +82,23 @@
   let editResData: any = reactive({});
   let editResData: any = reactive({});
   const editDeviceAttr: any = ref([]);
   const editDeviceAttr: any = ref([]);
   const orgFuncId = ref('');
   const orgFuncId = ref('');
+  const queryModeStr = ref('');
   const orgFunc = (e) => {
   const orgFunc = (e) => {
     orgFuncId.value = e;
     orgFuncId.value = e;
   };
   };
+  const queryModeFunc = (e) => {
+    queryModeStr.value = e;
+  };
+  watch(
+    () => queryModeStr.value,
+    (newValue: string) => {
+      if (newValue == 'latest') {
+        setFieldsValue({ startTs: 1000 });
+        setFieldsValue({ interval: 1000 });
+      } else {
+      }
+    }
+  );
   watch(
   watch(
     () => orgFuncId.value,
     () => orgFuncId.value,
     async (newValue: string) => {
     async (newValue: string) => {
@@ -335,15 +350,25 @@
       const values = await validate();
       const values = await validate();
       if (!values) return;
       if (!values) return;
       getFormValueFunc();
       getFormValueFunc();
+      let hasAttr = false;
       if (!unref(isUpdate)) {
       if (!unref(isUpdate)) {
         if (getAttrDevice.value.length === 0) {
         if (getAttrDevice.value.length === 0) {
           return createMessage.error('请选择设备及其属性');
           return createMessage.error('请选择设备及其属性');
+        } else {
+          getAttrDevice.value.forEach((f: any) => {
+            if (f.attributes == undefined) hasAttr = true;
+          });
         }
         }
       } else {
       } else {
         if (getAttrDevice.value.length === 0) {
         if (getAttrDevice.value.length === 0) {
           return createMessage.error('请选择设备及其属性');
           return createMessage.error('请选择设备及其属性');
+        } else {
+          getAttrDevice.value.forEach((f: any) => {
+            if (f.attributes == undefined) hasAttr = true;
+          });
         }
         }
       }
       }
+      if (hasAttr) return createMessage.error('请选择设备属性');
       if (values.executeWay == 0) {
       if (values.executeWay == 0) {
         executeContent = null;
         executeContent = null;
       } else {
       } else {
@@ -368,6 +393,11 @@
         },
         },
         queryMode: values?.queryMode === 'latest' ? 0 : 1,
         queryMode: values?.queryMode === 'latest' ? 0 : 1,
       };
       };
+      if (queryCondition.queryMode === 1) {
+        if (queryCondition.startTs == queryCondition.endTs) {
+          return createMessage.error('自定义周期时间不能选择一样');
+        }
+      }
 
 
       delete values.devices;
       delete values.devices;
       delete values.agg;
       delete values.agg;

@@ -407,13 +407,13 @@ export const formSchema: QFormSchema[] = [
     componentProps({ formActionType }) {
     componentProps({ formActionType }) {
       const { setFieldsValue } = formActionType;
       const { setFieldsValue } = formActionType;
       return {
       return {
-        getPopupContainer: () => document.body,
         placeholder: '请选择查询周期',
         placeholder: '请选择查询周期',
         options: [
         options: [
           { label: '固定周期', value: QueryWay.LATEST },
           { label: '固定周期', value: QueryWay.LATEST },
           { label: '自定义周期', value: QueryWay.TIME_PERIOD },
           { label: '自定义周期', value: QueryWay.TIME_PERIOD },
         ],
         ],
         onChange(value) {
         onChange(value) {
+          console.log(value)
           value === QueryWay.LATEST
           value === QueryWay.LATEST
             ? setFieldsValue({
             ? setFieldsValue({
                 [SchemaFiled.DATE_RANGE]: [],
                 [SchemaFiled.DATE_RANGE]: [],