'fix:修改消息记录的时间选择,告警联系人组织回显修改'

 import { alarmLevel, statusType } from '/@/views/device/manage/config/detail.config';
 import { alarmLevel, statusType } from '/@/views/device/manage/config/detail.config';
 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
-import dayjs from 'moment';
+import moment from 'moment';
 export const alarmSearchSchemas: FormSchema[] = [
 export const alarmSearchSchemas: FormSchema[] = [
   {
   {
     field: 'status',
     field: 'status',
@@ -58,7 +58,7 @@ export const alarmSearchSchemas: FormSchema[] = [
     component: 'DatePicker',
     component: 'DatePicker',
     componentProps: {
     componentProps: {
       valueFormat: 'x',
       valueFormat: 'x',
-      showTime: { defaultValue: dayjs('23:59:59', 'HH:mm:ss') },
+      showTime: { defaultValue: moment('23:59:59', 'HH:mm:ss') },
     },
     },
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },

@@ -36,9 +36,12 @@
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
         if (unref(isUpdate)) {
-          await setFieldsValue({
-            ...data.record,
-          });
+          if (data.record.organizationDTO) {
+            await setFieldsValue(data.record);
+          } else {
+            Reflect.deleteProperty(data.record, 'organizationId');
+            await setFieldsValue(data.record);
+          }
         }
         }
       });
       });
 
 

@@ -3,17 +3,17 @@ import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getCustomerList } from '/@/api/device/deviceManager';
 import { getCustomerList } from '/@/api/device/deviceManager';
-import dayjs from 'moment';
+import moment from 'moment';
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
     title: '设备名称',
     title: '设备名称',
     dataIndex: 'name',
     dataIndex: 'name',
-    width: 120,
+    width: 160,
   },
   },
   {
   {
     title: '设备标签',
     title: '设备标签',
     dataIndex: 'label',
     dataIndex: 'label',
-    width: 100,
+    width: 160,
   },
   },
   {
   {
     title: '设备配置',
     title: '设备配置',
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '描述',
     title: '描述',
     dataIndex: 'description',
     dataIndex: 'description',
-    width: 180,
+    width: 160,
   },
   },
 ];
 ];
 // 实时数据表格
 // 实时数据表格
@@ -100,7 +100,7 @@ export const alarmSearchSchemas: FormSchema[] = [
     component: 'DatePicker',
     component: 'DatePicker',
     componentProps: {
     componentProps: {
       valueFormat: 'x',
       valueFormat: 'x',
-      showTime: { defaultValue: dayjs('23:59:59', 'HH:mm:ss') },
+      showTime: { defaultValue: moment('23:59:59', 'HH:mm:ss') },
     },
     },
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },

@@ -23,7 +23,7 @@
     </div>
     </div>
     <div v-if="deviceDetail?.deviceInfo?.address" class="mt-4">
     <div v-if="deviceDetail?.deviceInfo?.address" class="mt-4">
       <p>设备位置</p>
       <p>设备位置</p>
-      <div ref="wrapRef" style="height: 400px; width: 100%"></div>
+      <div ref="wrapRef" style="height: 550px; width: 100%"></div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

@@ -3,6 +3,7 @@ import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { Tag } from 'ant-design-vue';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
+import moment from 'moment';
 const { t } = useI18n();
 const { t } = useI18n();
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
@@ -75,6 +76,11 @@ export const searchFormSchema: FormSchema[] = [
     field: 'sendTime',
     field: 'sendTime',
     label: '发送时间',
     label: '发送时间',
     component: 'RangePicker',
     component: 'RangePicker',
+    componentProps: {
+      showTime: {
+        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+      },
+    },
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
 ];
 ];

@@ -3,8 +3,7 @@ import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { Tag } from 'ant-design-vue';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
-import { phoneRule } from '/@/utils/rules';
-
+import moment from 'moment';
 const { t } = useI18n();
 const { t } = useI18n();
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
@@ -62,6 +61,11 @@ export const searchFormSchema: FormSchema[] = [
     field: 'sendTime',
     field: 'sendTime',
     label: '发送时间',
     label: '发送时间',
     component: 'RangePicker',
     component: 'RangePicker',
+    componentProps: {
+      showTime: {
+        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+      },
+    },
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
 ];
 ];