Merge branch 'main' into ft_local_dev

@@ -44,3 +44,6 @@ VITE_CONTENT_SECURITY_POLICY = false
 
 
 # Alarm Notify Polling Interval Time
 # Alarm Notify Polling Interval Time
 VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 5000
 VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 5000
+
+# Alarm Notify Auto Close Time
+VITE_ALARM_NOTIFY_DURATION = 5000

@@ -45,3 +45,6 @@ VITE_CONTENT_SECURITY_POLICY = false
 
 
 # Alarm Notify Polling Interval Time
 # Alarm Notify Polling Interval Time
 VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 60000
 VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 60000
+
+# Alarm Notify Auto Close Time
+VITE_ALARM_NOTIFY_DURATION = 5000

@@ -9,12 +9,14 @@ interface UseAlarmNotifyParams {
   alarmNotifyStatus?: AlarmStatus;
   alarmNotifyStatus?: AlarmStatus;
   interval?: number;
   interval?: number;
   color?: string;
   color?: string;
+  duration?: number;
 }
 }
 
 
 export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
 export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
   const {
   const {
     alarmNotifyStatus = AlarmStatus.ACTIVE_UN_ACK,
     alarmNotifyStatus = AlarmStatus.ACTIVE_UN_ACK,
     interval = import.meta.env.VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
     interval = import.meta.env.VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
+    duration = import.meta.env.VITE_ALARM_NOTIFY_DURATION,
     color = 'orange',
     color = 'orange',
   } = params;
   } = params;
   const alarmNotifyStatusMean = AlarmStatusMean[alarmNotifyStatus];
   const alarmNotifyStatusMean = AlarmStatusMean[alarmNotifyStatus];
@@ -40,10 +42,9 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
 
 
         const severityMean = alarmLevel(severity);
         const severityMean = alarmLevel(severity);
 
 
-        console.log('enter');
         notification.open({
         notification.open({
           message: '设备告警',
           message: '设备告警',
-          duration: null,
+          duration,
           key,
           key,
           description: h('div', {}, [
           description: h('div', {}, [
             h('div', { style: { marginRight: '5px' } }, [
             h('div', { style: { marginRight: '5px' } }, [
@@ -61,8 +62,6 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
           ]),
           ]),
           icon: h(ExclamationCircleOutlined, { style: { color: '#faa22d' } }),
           icon: h(ExclamationCircleOutlined, { style: { color: '#faa22d' } }),
           onClose: () => {
           onClose: () => {
-            console.log('enter close');
-            // currentNotifyId = null;
             key = null;
             key = null;
           },
           },
           btn: h(
           btn: h(

@@ -279,9 +279,12 @@ const handleValue = (value: any) => {
 
 
 export const update_instrument_1_value = (params: DashBoardValue) => {
 export const update_instrument_1_value = (params: DashBoardValue) => {
   const { value = 0, unit = '°C', fontColor } = params;
   const { value = 0, unit = '°C', fontColor } = params;
+  let max = value > 1 ? Number(1 + Array(String(value).length).fill(0).join('')) / 2 : 100 / 2;
+  max = value > max ? max * 2 : max;
   return {
   return {
     series: [
     series: [
       {
       {
+        max: max < 100 ? 100 : max,
         data: [{ value: handleValue(value) }],
         data: [{ value: handleValue(value) }],
         detail: {
         detail: {
           formatter: `{value} ${unit ?? ''}`,
           formatter: `{value} ${unit ?? ''}`,
@@ -289,6 +292,7 @@ export const update_instrument_1_value = (params: DashBoardValue) => {
         },
         },
       },
       },
       {
       {
+        max: max < 100 ? 100 : max,
         data: [{ value: handleValue(value) }],
         data: [{ value: handleValue(value) }],
       },
       },
     ],
     ],

@@ -73,6 +73,7 @@ declare global {
     VITE_GENERATE_UI: string;
     VITE_GENERATE_UI: string;
     VITE_CONTENT_SECURITY_POLICY: boolean;
     VITE_CONTENT_SECURITY_POLICY: boolean;
     VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME: number;
     VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME: number;
+    VITE_ALARM_NOTIFY_DURATION: number;
   }
   }
 
 
   declare function parseInt(s: string | number, radix?: number): number;
   declare function parseInt(s: string | number, radix?: number): number;