fix：DEFECT-631 编辑先选择设备时,未填属性,显示请输入设备属性,然后把设备属性叉了后,再点击确认,抛提示错误

@@ -15,6 +15,7 @@
         <p style="display: none">{{ field }}</p>
         <p style="display: none">{{ field }}</p>
         <p>{{ queryModeFunc(model['queryMode']) }}</p>
         <p>{{ queryModeFunc(model['queryMode']) }}</p>
         <p>{{ orgFunc(model['organizationId']) }}</p>
         <p>{{ orgFunc(model['organizationId']) }}</p>
+        <p>{{ dataTypeFunc(model['dataType']) }}</p>
         <Select
         <Select
           placeholder="请选择设备"
           placeholder="请选择设备"
           v-model:value="selectDevice"
           v-model:value="selectDevice"
@@ -83,12 +84,25 @@
   const editDeviceAttr: any = ref([]);
   const editDeviceAttr: any = ref([]);
   const orgFuncId = ref('');
   const orgFuncId = ref('');
   const queryModeStr = ref('');
   const queryModeStr = ref('');
+  const dataTypeStr = ref(0);
   const orgFunc = (e) => {
   const orgFunc = (e) => {
     orgFuncId.value = e;
     orgFuncId.value = e;
   };
   };
   const queryModeFunc = (e) => {
   const queryModeFunc = (e) => {
     queryModeStr.value = e;
     queryModeStr.value = e;
   };
   };
+  const dataTypeFunc = (e) => {
+    dataTypeStr.value = e;
+  };
+  watch(
+    () => dataTypeStr.value,
+    (newValue) => {
+      if (newValue == 0) {
+        setFieldsValue({ limit: 200 });
+      } else {
+      }
+    }
+  );
   watch(
   watch(
     () => queryModeStr.value,
     () => queryModeStr.value,
     (newValue: string) => {
     (newValue: string) => {
@@ -207,7 +221,7 @@
         endTs: editResData.data.queryCondition?.endTs,
         endTs: editResData.data.queryCondition?.endTs,
         way: editResData.data?.way,
         way: editResData.data?.way,
         queryMode: editResData.data.queryCondition?.queryMode === 0 ? 'latest' : 'timePeriod',
         queryMode: editResData.data.queryCondition?.queryMode === 0 ? 'latest' : 'timePeriod',
-        cronTime: editResData.data?.executeContent
+        cronTime: editResData.data?.executeContent,
       });
       });
       const endTsTime = editResData.data.queryCondition?.endTs;
       const endTsTime = editResData.data.queryCondition?.endTs;
       const startTsTime = editResData.data.queryCondition?.startTs;
       const startTsTime = editResData.data.queryCondition?.startTs;
@@ -357,7 +371,7 @@
           return createMessage.error('请选择设备及其属性');
           return createMessage.error('请选择设备及其属性');
         } else {
         } else {
           getAttrDevice.value.forEach((f: any) => {
           getAttrDevice.value.forEach((f: any) => {
-            if (f.attributes == undefined) hasAttr = true;
+            if (f.attributes == undefined || f.attributes.length == 0) hasAttr = true;
           });
           });
         }
         }
       } else {
       } else {
@@ -365,7 +379,7 @@
           return createMessage.error('请选择设备及其属性');
           return createMessage.error('请选择设备及其属性');
         } else {
         } else {
           getAttrDevice.value.forEach((f: any) => {
           getAttrDevice.value.forEach((f: any) => {
-            if (f.attributes == undefined) hasAttr = true;
+            if (f.attributes == undefined || f.attributes.length == 0) hasAttr = true;
           });
           });
         }
         }
       }
       }
@@ -379,8 +393,9 @@
         startTs.value = moment().subtract(values.startTs, 'ms').valueOf();
         startTs.value = moment().subtract(values.startTs, 'ms').valueOf();
         endTs.value = Date.now();
         endTs.value = Date.now();
       } else {
       } else {
-        startTs.value = moment(values.startTs).valueOf();
-        endTs.value = moment(values.endTs).valueOf();
+        const fT = JSON.parse(JSON.stringify(values.dataRange));
+        startTs.value = moment(fT[0]).valueOf();
+        endTs.value = moment(fT[1]).valueOf();
       }
       }
       queryCondition = {
       queryCondition = {
         agg: values.agg,
         agg: values.agg,
@@ -394,12 +409,6 @@
         },
         },
         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;
       delete values.interval;
       delete values.interval;

@@ -433,28 +433,35 @@ export const formSchema: QFormSchema[] = [
     ifShow({ values }) {
     ifShow({ values }) {
       return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
       return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
     },
     },
-    componentProps({ formActionType }) {
-      const { setFieldsValue } = formActionType;
-      let dates: Moment[] = [];
-      return {
-        placeholder: ['请选择开始时间', '请选择结束时间'],
-        showTime: true,
-        onCalendarChange(value: Moment[]) {
-          dates = value;
-        },
-        disabledDate(current: Moment) {
-          if (!dates || dates.length === 0 || !current) {
-            return false;
-          }
-          const diffDate = current.diff(dates[0], 'years', true);
-          return Math.abs(diffDate) > 1;
-        },
-        onChange() {
-          dates = [];
-          setFieldsValue({ [SchemaFiled.INTERVAL]: null });
-        },
-      };
+    componentProps: {
+      showTime: {
+        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+      },
     },
     },
+    // componentProps({ formActionType }) {
+    //   const { setFieldsValue } = formActionType;
+    //   let dates: Moment[] = [];
+    //   return {
+    //     placeholder: ['请选择开始时间', '请选择结束时间'],
+    //     showTime: {
+    //       defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+    //     },
+    //     // onCalendarChange(value: Moment[]) {
+    //     //   dates = value;
+    //     // },
+    //     // disabledDate(current: Moment) {
+    //     //   if (!dates || dates.length === 0 || !current) {
+    //     //     return false;
+    //     //   }
+    //     //   const diffDate = current.diff(dates[0], 'years', true);
+    //     //   return Math.abs(diffDate) > 1;
+    //     // },
+    //     onChange() {
+    //       dates = [];
+    //       setFieldsValue({ [SchemaFiled.INTERVAL]: null });
+    //     },
+    //   };
+    // },
     colProps: {
     colProps: {
       span: 10,
       span: 10,
     },
     },