fix(merge): merge sc

src/components/ProTableCard/CardItems/AlarmConfig.tsx

@@ -3,6 +3,8 @@ import { TableCard } from '@/components';
 import '@/style/common.less';
 import '../index.less';
 import { StatusColorEnum } from '@/components/BadgeStatus';
+import { Tooltip } from 'antd';
+import { Store } from 'jetlinks-store';
 
 export interface AlarmConfigProps extends ConfigurationItem {
   detail?: React.ReactNode;
@@ -31,16 +33,30 @@ export default (props: AlarmConfigProps) => {
         </div>
         <div className={'card-item-body'}>
           <div className={'card-item-header'}>
-            <span className={'card-item-header-name ellipsis'}>{props.name}</span>
+            <span className={'card-item-header-name ellipsis'}>{props?.name}</span>
           </div>
           <div className={'card-item-content'}>
             <div>
-              <label>告警名称</label>
-              <div className={'ellipsis'}>{props.name}</div>
+              <label>关联场景联动</label>
+              <div className={'ellipsis'}>
+                <Tooltip title={props?.sceneName || ''}>{props?.sceneName || ''}</Tooltip>
+              </div>
             </div>
             <div>
-              <label>说明</label>
-              <div className={'ellipsis'}>{props.description}</div>
+              <label>告警级别</label>
+              <div className={'ellipsis'}>
+                <Tooltip
+                  title={
+                    (Store.get('default-level') || []).find(
+                      (item: any) => item?.level === props?.level,
+                    )?.title || props?.level
+                  }
+                >
+                  {(Store.get('default-level') || []).find(
+                    (item: any) => item?.level === props?.level,
+                  )?.title || props?.level}
+                </Tooltip>
+              </div>
             </div>
           </div>
         </div>

src/pages/device/Instance/Detail/Diagnose/index.tsx

@@ -6,6 +6,7 @@ import Status from './Status';
 import './index.less';
 import classNames from 'classnames';
 import { Store } from 'jetlinks-store';
+import { DiagnoseStatusModel } from './Status/model';
 
 interface ListProps {
   key: string;
@@ -126,6 +127,7 @@ const Diagnose = () => {
     return () => {
       Store.set('diagnose', []);
       Store.set('diagnose-status', []);
+      DiagnoseStatusModel.model = true;
     };
   }, []);
   return (

src/pages/notice/Config/BindUser/index.tsx

@@ -90,8 +90,8 @@ const BindUser = (props: Props) => {
           [
             {
               userId: values.user,
-              providerName: props.data?.name,
-              thirdPartyUserId: props.data?.id,
+              providerName: props.data?.thirdPartyUserName,
+              thirdPartyUserId: props.data?.thirdPartyUserId,
             },
           ],
         );

src/pages/rule-engine/Alarm/Configuration/index.tsx

@@ -11,12 +11,13 @@ import {
   PlusOutlined,
 } from '@ant-design/icons';
 import { useIntl } from '@@/plugin-locale/localeExports';
-import { useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { Badge, message, Space } from 'antd';
 import ProTableCard from '@/components/ProTableCard';
 import Save from './Save';
 import Service from '@/pages/rule-engine/Alarm/Configuration/service';
 import AlarmConfig from '@/components/ProTableCard/CardItems/AlarmConfig';
+import { Store } from 'jetlinks-store';
 
 const service = new Service('alarm/config');
 
@@ -39,6 +40,12 @@ const Configuration = () => {
     {
       title: '告警级别',
       dataIndex: 'level',
+      render: (text: any) => (
+        <span>
+          {(Store.get('default-level') || []).find((item: any) => item?.level === text)?.title ||
+            text}
+        </span>
+      ),
     },
     {
       title: '关联场景联动',
@@ -167,6 +174,14 @@ const Configuration = () => {
 
   const [param, setParam] = useState({});
 
+  useEffect(() => {
+    service.queryDefaultLevel().then((resp) => {
+      if (resp.status === 200) {
+        Store.set('default-level', resp.result?.levels || []);
+      }
+    });
+  }, []);
+
   return (
     <PageContainer>
       <SearchComponent

src/pages/rule-engine/Alarm/Configuration/service.ts

@@ -45,6 +45,10 @@ class Service extends BaseService<ConfigItem> {
         ],
       },
     });
+  public queryDefaultLevel = () =>
+    request(`/${SystemConst.API_BASE}/alarm/config/default/level`, {
+      method: 'GET',
+    });
 }
 
 export default Service;

src/pages/rule-engine/Alarm/Log/SolveLog/index.tsx

@@ -36,18 +36,33 @@ const SolveLog = (props: Props) => {
 
   const columns: ProColumns<AlarmLogSolveHistoryItem>[] = [
     {
-      dataIndex: 'handleTIme',
+      dataIndex: 'handleTime',
       title: '处理时间',
+      valueType: 'dateTime',
       render: (text: any) => <span>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</span>,
     },
     {
       dataIndex: 'handleType',
       title: '处理类型',
-      render: (text: any) => <span>{typeMap.get(text) || ''}</span>,
+      render: (text: any, record: any) => (
+        <span>{typeMap.get(record?.handleType?.value) || ''}</span>
+      ),
+      valueType: 'select',
+      valueEnum: {
+        system: {
+          text: '系统',
+          status: 'system',
+        },
+        user: {
+          text: '人工',
+          status: 'user',
+        },
+      },
     },
     {
       dataIndex: 'createTime',
       title: '告警时间',
+      valueType: 'dateTime',
       render: (text: any) => <span>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</span>,
     },
     {

src/pages/rule-engine/Alarm/Log/TabComponent/index.less

@@ -66,7 +66,7 @@
           border-right: 1px solid rgba(0, 0, 0, 0.09);
 
           .alarm-type {
-            max-width: 120px;
+            width: 40px;
 
             .name {
               color: #000;

src/pages/rule-engine/Alarm/Log/TabComponent/index.tsx

@@ -46,31 +46,9 @@ const TabComponent = observer((props: Props) => {
       dataIndex: 'name',
     },
     {
-      title: '级别',
-      dataIndex: 'level',
-      valueType: 'select',
-      valueEnum: {
-        1: {
-          text: '级别一',
-          status: '1',
-        },
-        2: {
-          text: '级别二',
-          status: '2',
-        },
-        3: {
-          text: '级别三',
-          status: '3',
-        },
-        4: {
-          text: '级别四',
-          status: '4',
-        },
-        5: {
-          text: '级别五',
-          status: '5',
-        },
-      },
+      title: '最近告警时间',
+      dataIndex: 'alarmTime',
+      valueType: 'dateTime',
     },
     {
       title: '状态',
@@ -178,7 +156,7 @@ const TabComponent = observer((props: Props) => {
                         <div className="alarm-log-time">
                           <div className="log-title">最近告警时间</div>
                           <div className="context">
-                            {moment(item.alarmDate).format('YYYY-MM-DD HH:mm:ss')}
+                            {moment(item.alarmTime).format('YYYY-MM-DD HH:mm:ss')}
                           </div>
                         </div>
                         <div