'fix:修改告警时间只能选择一个问题'

@@ -53,12 +53,11 @@ export const alarmSearchSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'endTime',
+    field: 'alarmTime',
     label: '告警时间',
-    component: 'DatePicker',
+    component: 'RangePicker',
     componentProps: {
-      valueFormat: 'x',
-      showTime: { defaultValue: moment('23:59:59', 'HH:mm:ss') },
+      showTime: { defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')] },
     },
     colProps: { span: 6 },
   },

@@ -37,11 +37,12 @@
         title: '告警记录列表',
         api: getDeviceAlarm,
         columns: alarmColumns,
+        useSearchForm: true,
         formConfig: {
           labelWidth: 120,
           schemas: alarmSearchSchemas,
+          fieldMapToTime: [['alarmTime', ['startTime', 'endTime'], 'x']],
         },
-        useSearchForm: true,
         bordered: true,
         showIndexColumn: false,
         showTableSetting: true,
@@ -51,9 +52,9 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
-        beforeFetch: (data) => {
-          Reflect.set(data, 'startTime', null);
-        },
+        // beforeFetch: (data) => {
+        //   Reflect.set(data, 'startTime', null);
+        // },
       });
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
       const handleDetail = (record: Recordable) => {

@@ -104,12 +104,11 @@ export const alarmSearchSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'endTime',
+    field: 'alarmTime',
     label: '告警时间',
-    component: 'DatePicker',
+    component: 'RangePicker',
     componentProps: {
-      valueFormat: 'x',
-      showTime: { defaultValue: moment('23:59:59', 'HH:mm:ss') },
+      showTime: { defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')] },
     },
     colProps: { span: 6 },
   },

@@ -44,13 +44,13 @@
         formConfig: {
           labelWidth: 100,
           schemas: alarmSearchSchemas,
+          fieldMapToTime: [['alarmTime', ['startTime', 'endTime'], 'x']],
         },
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,
         beforeFetch: (data) => {
           Reflect.set(data, 'deviceId', props.id);
-          Reflect.set(data, 'startTime', null);
         },
         actionColumn: {
           width: 200,

@@ -244,10 +244,11 @@
               <div style="font-size:16px;font-weight:bold">${name}</div>
               ${
                 deviceState === 'INACTIVE'
-                  ? `<div style="display:flex;align-items:center"><img style="width:15px;height:15px" src="${djh}">待激活</div>`
+                  ? `<div style="display:flex;align-items:center;"><img style="width:15px;height:15px" src="${djh}" class="mr-1">待激活</div>`
                   : deviceState === 'ONLINE'
-                  ? `<div style="display:flex;align-items:center"><img style="width:15px;height:15px" src="${online}">在线</div>`
-                  : `<div style="display:flex;align-items:center"><img style="width:15px;height:15px" src="${lx1}">离线</div>`
+                  ? `<div style="display:flex;align-items:center; ">
+                  <img style="width:15px;height:15px" src="${online}" class="mr-1">在线</div>`
+                  : `<div style="display:flex;align-items:center;"><img style="width:15px;height:15px" src="${lx1}" class="mr-1">离线</div>`
               }
             </div>
             <div>所属组织：${organizationDTO.name}</div>

@@ -344,5 +344,3 @@
     },
   });
 </script>
-
-<style lang="less" scoped></style>