lind 3 лет назад
Родитель
Сommit
19a5014aea

+ 7 - 3
src/pages/rule-engine/Alarm/Configuration/Save/index.tsx

@@ -196,6 +196,13 @@ const Save = (props: Props) => {
             message: '请选择关联触发场景',
           },
         ],
+        'x-component-props': {
+          placeholder: '请选择关联触发场景',
+          showSearch: true,
+          showArrow: true,
+          filterOption: (input: string, option: any) =>
+            option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+        },
         'x-decorator-props': {
           gridSpan: 1,
           addonAfter: (
@@ -225,9 +232,6 @@ const Save = (props: Props) => {
             </PermissionButton>
           ),
         },
-        'x-component-props': {
-          placeholder: '请选择关联触发场景',
-        },
       },
       description: {
         title: '说明',

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

@@ -43,7 +43,7 @@ const TabComponent = observer((props: Props) => {
   const columns: ProColumns<any>[] = [
     {
       title: '名称',
-      dataIndex: 'name',
+      dataIndex: 'alarmName',
     },
     {
       title: '最近告警时间',

+ 1 - 1
src/pages/rule-engine/Scene/Save/trigger/index.tsx

@@ -185,7 +185,7 @@ export default observer((props: TriggerProps) => {
                       { label: '固定设备', value: 'fixed' },
                       { label: '按部门', value: 'org' },
                     ]}
-                    fieldNames={{ label: 'name', value: 'id' }}
+                    // fieldNames={{ label: 'name', value: 'id' }}
                     style={{ width: 120 }}
                   />
                 </Form.Item>

+ 15 - 0
src/pages/rule-engine/Scene/index.tsx

@@ -174,6 +174,21 @@ const Scene = () => {
         defaultMessage: '触发方式',
       }),
       width: 120,
+      valueType: 'select',
+      valueEnum: {
+        manual: {
+          text: '手动触发',
+          status: 'manual',
+        },
+        timer: {
+          text: '定时触发',
+          status: 'timer',
+        },
+        device: {
+          text: '设备触发',
+          status: 'device',
+        },
+      },
       renderText: (record) => TriggerWayType[record],
     },
     {