feat(merge): merge sc

feat: 创建告警目录

src/pages/media/Cascade/Channel/BindChannel/index.tsx

@@ -14,8 +14,6 @@ interface Props {
 
 const BindChannel = (props: Props) => {
   const [param, setParam] = useState<any>({
-    pageIndex: 0,
-    pageSize: 10,
     terms: [
       {
         column: 'id',
@@ -124,9 +122,9 @@ const BindChannel = (props: Props) => {
         columns={columns}
         search={false}
         headerTitle={'通道列表'}
-        request={async (params) =>
-          service.queryChannel({ ...params, sorts: [{ name: 'name', order: 'desc' }] })
-        }
+        request={async (params) => {
+          return service.queryChannel({ ...params, sorts: [{ name: 'name', order: 'desc' }] });
+        }}
         rowKey="id"
         rowSelection={{
           selectedRowKeys: selectedRowKey,

src/pages/media/Cascade/Channel/index.tsx

@@ -192,12 +192,12 @@ const Channel = () => {
         columns={columns}
         search={false}
         headerTitle={'通道列表'}
-        request={async (params) =>
-          service.queryBindChannel(id, {
+        request={async (params) => {
+          return service.queryBindChannel(id, {
             ...params,
             sorts: [{ name: 'createTime', order: 'desc' }],
-          })
-        }
+          });
+        }}
         rowKey="channelId"
         rowSelection={{
           selectedRowKeys: selectedRowKey,

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

@@ -0,0 +1,37 @@
+import { PageContainer } from '@ant-design/pro-layout';
+import { observer } from '@formily/reactive-react';
+import { AlarmLogModel } from './model';
+
+const Log = observer(() => {
+  const list = [
+    {
+      key: 'product',
+      tab: '产品',
+    },
+    {
+      key: 'device',
+      tab: '设备',
+    },
+    {
+      key: 'department',
+      tab: '部门',
+    },
+    {
+      key: 'other',
+      tab: '其他',
+    },
+  ];
+  return (
+    <PageContainer
+      // onTabChange={(key: 'product' | 'device' | 'department' | 'other') => {
+      //     AlarmLogModel.tab = key
+      // }}
+      tabList={list}
+      tabActiveKey={AlarmLogModel.tab}
+    >
+      test
+    </PageContainer>
+  );
+});
+
+export default Log;

src/pages/rule-engine/Alarm/Log/model.ts

@@ -0,0 +1,7 @@
+import { model } from '@formily/reactive';
+
+export const AlarmLogModel = model<{
+  tab: 'product' | 'device' | 'department' | 'other';
+}>({
+  tab: 'product',
+});