Merge branch 'main' into f-dev

@@ -84,7 +84,6 @@ export const defaultSchemas: FormSchema[] = [
       return {
         showTime: true,
         onCalendarChange(value: Moment[]) {
-          console.log('enter ');
           dates = value;
         },
         disabledDate(current: Moment) {
@@ -108,7 +107,7 @@ export const defaultSchemas: FormSchema[] = [
     field: SchemaFiled.AGG,
     label: '数据聚合功能',
     component: 'Select',
-    defaultValue: AggregateDataEnum.NONE,
+    // defaultValue: AggregateDataEnum.NONE,
     componentProps: {
       getPopupContainer: () => document.body,
       options: [
@@ -128,12 +127,14 @@ export const defaultSchemas: FormSchema[] = [
     ifShow({ values }) {
       return values[SchemaFiled.AGG] !== AggregateDataEnum.NONE;
     },
-    componentProps({ formModel }) {
+    componentProps({ formModel, formActionType }) {
       const options =
         formModel[SchemaFiled.WAY] === QueryWay.LATEST
           ? getPacketIntervalByValue(formModel[SchemaFiled.START_TS])
           : getPacketIntervalByRange(formModel[SchemaFiled.DATE_RANGE]);
-
+      if (formModel[SchemaFiled.AGG] !== AggregateDataEnum.NONE) {
+        formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
+      }
       return {
         options,
       };
@@ -143,13 +144,15 @@ export const defaultSchemas: FormSchema[] = [
     field: SchemaFiled.LIMIT,
     label: '最大值',
     component: 'InputNumber',
-    defaultValue: 7,
+    // defaultValue: 7,
     ifShow({ values }) {
       return values[SchemaFiled.AGG] === AggregateDataEnum.NONE;
     },
-    componentProps: {
-      max: 50000,
-      min: 7,
+    componentProps() {
+      return {
+        max: 50000,
+        min: 7,
+      };
     },
   },
 ];

@@ -55,7 +55,7 @@
   import { formSchema, columns } from './config.data';
   import { BasicTable, useTable } from '/@/components/Table';
   import { devicePage } from '/@/api/alarm/contact/alarmContact';
-  import { Tag, Empty, message } from 'ant-design-vue';
+  import { Tag, Empty } from 'ant-design-vue';
   import { DeviceState } from '/@/api/device/model/deviceModel';
   import { BAI_DU_MAP_URL } from '/@/utils/fnUtils';
   import { useModal, BasicModal } from '/@/components/Modal';
@@ -80,7 +80,7 @@
   import { selectDeviceAttrSchema, eChartOptions } from './config.data';
   import { defaultSchemas } from './cpns/TimePeriodForm/config';
   import { QueryWay, SchemaFiled, AggregateDataEnum } from './cpns/TimePeriodForm/config';
-  import { formatToDateTime } from '/@/utils/dateUtil';
+  import { dateUtil } from '/@/utils/dateUtil';
   export default defineComponent({
     name: 'BaiduMap',
     components: {
@@ -108,7 +108,7 @@
       const wrapRef = ref<HTMLDivElement | null>(null);
       const chartRef = ref<HTMLDivElement | null>(null);
       const deviceAttrs = ref<string[]>([]);
-      const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
+      const { setOptions, getInstance } = useECharts(chartRef as Ref<HTMLDivElement>);
       const isNull = ref(true);
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
@@ -299,6 +299,8 @@
 
         method.setFieldsValue({
           [SchemaFiled.START_TS]: 1 * 24 * 60 * 60 * 1000,
+          [SchemaFiled.LIMIT]: 7,
+          [SchemaFiled.AGG]: AggregateDataEnum.NONE,
         });
 
         if (!hasDeviceAttr()) return;
@@ -335,7 +337,7 @@
         for (const key in data) {
           for (const item1 of data[key]) {
             let { ts, value } = item1;
-            const time = formatToDateTime(ts);
+            const time = dateUtil(ts).format('YYYY-MM-DD HH:mm:ss');
             value = Number(value).toFixed(2);
             dataArray.push([time, value, key]);
           }
@@ -361,6 +363,7 @@
           [SchemaFiled.LIMIT]: 7,
           [SchemaFiled.AGG]: AggregateDataEnum.NONE,
         });
+        getInstance()?.clear();
       };
 
       onMounted(() => {