Merge branch 'sqy_dev' into 'main'

feat:新增场景联动的启用规则功能

See merge request huang/yun-teng-iot-front!190

@@ -98,7 +98,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, reactive, onMounted } from 'vue';
+  import { ref, reactive } from 'vue';
   import { Card, DatePicker } from 'ant-design-vue';
   import VisitAnalysis from './VisitAnalysis.vue';
   import VisitAnalysisBar from './VisitAnalysisBar.vue';
@@ -451,10 +451,6 @@
       send(sendValue);
     }
   }
-  onMounted(() => {
-    console.log(props.role);
-  });
-
   const {
     tenantDateValue,
     customerDateValue,

@@ -2,8 +2,7 @@
   <div class="step2">
     <BasicForm @register="registerForm">
       <template #addAgree="{ model, field }">
-        <Checkbox v-model:checked="model[field]" @change="checkedChange" />
-        <span class="ml-2">添加协议</span>
+        <Checkbox v-model:checked="model[field]" @change="checkedChange">添加协议</Checkbox>
       </template>
     </BasicForm>
     <div>

@@ -181,9 +181,21 @@
         setEditAlarmConfig(skipUnwrap.actionItemRefs, editAlarmConfigData);
       });
 
+      const map = {
+        ANY_TIME: 0,
+        SPECIFIC_TIME: 1,
+        CUSTOM: 2,
+      };
       // 回显触发器数据---此处是个闭包!
       triggers.forEach((trigger, index) => {
         nextTick(async () => {
+          // 回显启用规则
+          unref(skipUnwrap.triggerItemRefs)[index].currentIndex =
+            map[trigger.triggerCondition.schedule.type];
+          unref(skipUnwrap.triggerItemRefs)[index].scheduleData = trigger.triggerCondition.schedule;
+          unref(skipUnwrap.triggerItemRefs)[index].isUpdate = true;
+          unref(skipUnwrap.triggerItemRefs)[index].alarmScheduleRef.scheduleData =
+            trigger.triggerCondition.schedule;
           unref(skipUnwrap.triggerItemRefs)[index].setFieldsFormValueFun({
             triggered: trigger?.triggerCondition?.condition?.spec?.type,
             device: trigger?.entityType,
@@ -235,6 +247,14 @@
 
       doConditions.forEach((condition, index) => {
         nextTick(async () => {
+          // 回显启用规则
+          unref(skipUnwrap.conditionItemRefs)[index].currentIndex =
+            map[condition.triggerCondition.schedule.type];
+          unref(skipUnwrap.conditionItemRefs)[index].scheduleData =
+            condition.triggerCondition.schedule;
+          unref(skipUnwrap.conditionItemRefs)[index].isUpdate = true;
+          unref(skipUnwrap.conditionItemRefs)[index].alarmScheduleRef.scheduleData =
+            condition.triggerCondition.schedule;
           unref(skipUnwrap.conditionItemRefs)[index].setFieldsFormValueFun({
             triggered: condition?.triggerCondition?.condition?.spec?.type,
             device: condition?.entityType,
@@ -311,6 +331,13 @@
             nextTick(async () => {
               unref(skipUnwrap.actionItemRefs)[index].refItem.clearRuleRefs.value.map(
                 (item, index) => {
+                  // 回显启用规则
+                  item.currentIndex =
+                    map[action.doContext.clearRule[index].triggerCondition.schedule.type];
+                  item.scheduleData = action.doContext.clearRule[index].triggerCondition.schedule;
+                  item.isUpdate = true;
+                  item.alarmScheduleRef.scheduleData =
+                    action.doContext.clearRule[index].triggerCondition.schedule;
                   item.setFieldsFormValueFun({
                     triggered:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.type,
@@ -459,15 +486,15 @@
    * 获取触发器、执行条件、执行动作表单值--多个
    */
   const getFormValueFunc = () => {
-    getTriggerFormValue.value = unref(skipUnwrap.triggerItemRefs)?.map((item) => {
-      return genTriggerOrConditionData(item.getFieldsValueFunc());
-    });
-    getConditionFormValue.value = unref(skipUnwrap.conditionItemRefs).map((item) => {
-      return genTriggerOrConditionData(item.getFieldsValueFunc());
-    });
-    getActionFormValue.value = unref(skipUnwrap.actionItemRefs).map((item) => {
-      return genActionData(item.getFieldsValueFunc());
-    });
+    getTriggerFormValue.value = unref(skipUnwrap.triggerItemRefs)?.map((item) =>
+      genTriggerOrConditionData(item.getFieldsValueFunc())
+    );
+    getConditionFormValue.value = unref(skipUnwrap.conditionItemRefs).map((item) =>
+      genTriggerOrConditionData(item.getFieldsValueFunc())
+    );
+    getActionFormValue.value = unref(skipUnwrap.actionItemRefs).map((item) =>
+      genActionData(item.getFieldsValueFunc())
+    );
   };
   const handleSubmit = async () => {
     let basicFormValue = await validate();

 import { ref } from 'vue';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { screenLinkOrganizationGetApi } from '/@/api/ruleengine/ruleengineApi';
+import { scheduleOptions } from './formatData';
 
 import { copyTransFun } from '/@/utils/fnUtils';
 
@@ -392,3 +393,79 @@ export const actionSchema: FormSchema[] = [
     slot: 'clearAlarm',
   },
 ];
+
+export const alarmScheduleSchemas: FormSchema[] = [
+  {
+    field: 'schedule',
+    label: '',
+    component: 'Select',
+    componentProps({ formActionType }) {
+      const { resetFields } = formActionType;
+      return {
+        options: scheduleOptions,
+        allowClear: false,
+        onChange(value) {
+          console.log(value);
+          resetFields();
+        },
+      };
+    },
+  },
+  {
+    field: 'timezone',
+    label: '时区',
+    component: 'Select',
+    defaultValue: 'Asia/Shanghai',
+    componentProps: {
+      options: [
+        {
+          label: 'Asia/Shanghai',
+          value: 'Asia/Shanghai',
+        },
+      ],
+      allowClear: false,
+    },
+    ifShow: ({ values }) => values.schedule !== 'ANY_TIME',
+  },
+  {
+    field: 'daysOfWeek',
+    label: '天',
+    component: 'CheckboxGroup',
+    rules: [
+      {
+        message: '请至少选择一天',
+        required: true,
+      },
+    ],
+    componentProps: {
+      options: [
+        { label: '星期一', value: 1 },
+        { label: '星期二', value: 2 },
+        { label: '星期三', value: 3 },
+        { label: '星期四', value: 4 },
+        { label: '星期五', value: 5 },
+        { label: '星期六', value: 6 },
+        { label: '星期日', value: 7 },
+      ],
+    },
+    colProps: {
+      span: 24,
+    },
+    ifShow: ({ values }) => values.schedule === 'SPECIFIC_TIME',
+  },
+  {
+    field: 'time',
+    label: '时间',
+    labelWidth: 40,
+    component: 'RangePicker',
+    ifShow: ({ values }) => values.schedule === 'SPECIFIC_TIME',
+    slot: 'timing',
+  },
+  {
+    field: 'day',
+    label: '天',
+    component: 'CheckboxGroup',
+    slot: 'customEnable',
+    ifShow: ({ values }) => values.schedule === 'CUSTOM',
+  },
+];

@@ -60,13 +60,7 @@ export const genTriggerOrConditionData = (triggerData) => {
           },
         },
       },
-      schedule: {
-        type: schedule,
-        // timezone: 'Asia/Shanghai',
-        // daysOfWeek: [2, 3],
-        // startsOn: 8700000,
-        // endsOn: 30300000,
-      },
+      schedule,
     },
   };
 };
@@ -81,6 +75,7 @@ export const genActionData = (actionData) => {
     device,
     deviceId,
   } = actionData;
+  console.log(actionData);
   const clearRule = clearRules.map((item) => {
     const mapPredicate = item.predicate.map((pred) => {
       return {
@@ -117,13 +112,7 @@ export const genActionData = (actionData) => {
             },
           },
         },
-        schedule: {
-          type: item.schedule,
-          // timezone: 'Asia/Shanghai',
-          // daysOfWeek: [2, 3],
-          // startsOn: 8700000,
-          // endsOn: 30300000,
-        },
+        schedule: item.schedule,
       },
     };
   });

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    :width="600"
+    title="编辑报警日程"
+    centered
+    @register="registerModal"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <BasicForm @register="registerForm" ref="basicFormRef">
+      <template #customEnable>
+        <template v-for="(item, optionIndex) in options" :key="item.flag">
+          <div :class="optionIndex >= 1 ? 'mt-4' : ''">
+            <Checkbox v-model:checked="item.enabled">星期{{ item.flag }}</Checkbox>
+            <TimePicker
+              size="small"
+              placeholder="开始时间"
+              v-model:value="item.startsOn"
+              value-format="x"
+              format="HH:mm"
+              :disabled="!item.enabled"
+            />
+            ~
+            <TimePicker
+              size="small"
+              placeholder="结束时间"
+              v-model:value="item.endsOn"
+              value-format="x"
+              format="HH:mm"
+              :disabled="!item.enabled"
+            /> </div
+        ></template>
+      </template>
+      <template #timing>
+        <TimePicker
+          size="small"
+          placeholder="开始时间"
+          v-model:value="timeState.startsOn"
+          value-format="x"
+          format="HH:mm"
+        />
+        ~
+        <TimePicker
+          size="small"
+          placeholder="结束时间"
+          v-model:value="timeState.endsOn"
+          value-format="x"
+          format="HH:mm"
+        />
+      </template>
+    </BasicForm>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { reactive, ref, watch, nextTick } from 'vue';
+  import { useModalInner, BasicModal } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { alarmScheduleSchemas } from '../config/config.data.ts';
+  import { Checkbox, TimePicker } from 'ant-design-vue';
+  const emit = defineEmits(['register', 'cancel']);
+  const [registerForm, { setFieldsValue, getFieldsValue }] = useForm({
+    showActionButtonGroup: false,
+    schemas: alarmScheduleSchemas,
+  });
+  const timeState = reactive({
+    startsOn: null,
+    endsOn: null,
+  });
+
+  const options = ref([
+    {
+      enabled: false,
+      dayOfWeek: 1,
+      flag: '一',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 2,
+      flag: '二',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 3,
+      flag: '三',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 4,
+      flag: '四',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 5,
+      flag: '五',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 6,
+      flag: '六',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 7,
+      flag: '日',
+      endsOn: null,
+      startsOn: null,
+    },
+  ]);
+  const basicFormRef = ref<InstanceType<typeof BasicForm>>();
+  let index = ref(null);
+  watch(
+    options,
+    (newValue) => {
+      const arr = [];
+      for (let item of newValue) {
+        if (item.enabled && item.startsOn && item.endsOn) {
+          arr.push(true);
+        } else if ((!item.enabled && item.startsOn && item.endsOn) || item.enabled) {
+          arr.push(false);
+        }
+      }
+      console.log(arr);
+      const flag = arr.length ? !arr.every((item) => item) : true;
+      console.log(flag);
+      nextTick(() => {
+        setModalProps({
+          okButtonProps: {
+            disabled: flag,
+          },
+        });
+      });
+    },
+    {
+      deep: true,
+    }
+  );
+
+  const [registerModal, { closeModal, setModalProps }] = useModalInner((data) => {
+    watch([timeState, basicFormRef.value.formModel], ([timeState, formModel]) => {
+      setModalProps({
+        okButtonProps: {
+          disabled:
+            timeState.startsOn === null ||
+            timeState.endsOn === null ||
+            !formModel.daysOfWeek?.length,
+        },
+      });
+      watch(
+        () => formModel.schedule,
+        () => {
+          timeState.startsOn = null;
+          timeState.endsOn = null;
+        }
+      );
+    });
+    const { value, currentIndex, isUpdate, scheduleData } = data;
+    index.value = currentIndex;
+    const dayZenoTime = Math.round(new Date(new Date().toLocaleDateString()).getTime());
+    // 编辑
+    setFieldsValue({
+      schedule: value,
+    });
+    if (isUpdate) {
+      nextTick(() => {
+        // 回显定时启用
+        if (scheduleData.type === 'SPECIFIC_TIME') {
+          setFieldsValue({
+            daysOfWeek: scheduleData.daysOfWeek,
+          });
+          timeState.startsOn = scheduleData.startsOn + dayZenoTime + '';
+          timeState.endsOn = scheduleData.endsOn + dayZenoTime + '';
+        }
+        // 回显自定义启用
+        if (scheduleData.type === 'CUSTOM') {
+          for (let [index, item] of scheduleData?.items.entries()) {
+            if (item.enabled) {
+              options.value[index].enabled = item.enabled;
+              options.value[index].startsOn = item.startsOn + dayZenoTime + '';
+              options.value[index].endsOn = item.endsOn + dayZenoTime + '';
+            }
+          }
+        }
+      });
+    }
+  });
+  const scheduleData = ref({
+    type: 'ANY_TIME',
+  });
+  const handleOk = () => {
+    const { schedule: type, timezone, daysOfWeek } = getFieldsValue();
+    // 获取当天0时时间戳
+    const dayZenoTime = Math.round(new Date(new Date().toLocaleDateString()).getTime());
+    if (type === 'CUSTOM') {
+      const items = options.value.map((item) => {
+        return {
+          startsOn: item.startsOn ? item.startsOn - dayZenoTime : 0,
+          endsOn: item.endsOn ? item.endsOn - dayZenoTime : 0,
+          dayOfWeek: item.dayOfWeek,
+          enabled: item.enabled,
+        };
+      });
+      scheduleData.value = {
+        type,
+        timezone,
+        items,
+      };
+    } else if (type === 'SPECIFIC_TIME') {
+      scheduleData.value = {
+        type,
+        timezone,
+        daysOfWeek,
+        startsOn: timeState.startsOn - dayZenoTime,
+        endsOn: timeState.endsOn - dayZenoTime,
+      };
+    }
+    closeModal();
+  };
+  const handleCancel = () => {
+    emit('cancel', index.value);
+  };
+
+  defineExpose({
+    scheduleData,
+  });
+</script>
+
+<style lang="less" scoped></style>

@@ -2,9 +2,18 @@
   <div>
     <CollapseContainer style="background-color: #f2f2f2" title="清除告警" :canExpan="false">
       <template #action>
-        <div>
-          <span class="mr-2">启用规则</span>
-          <RadioGroup v-model:value="schedule" :options="scheduleOptions" />
+        <div class="flex">
+          <div class="flex">
+            <span class="mr-2">启用规则:</span>
+            <template v-for="(item, scheduleIndex) in scheduleOptions" :key="item.label">
+              <div
+                :class="{ 'ml-4': scheduleIndex >= 1, active: scheduleIndex === currentIndex }"
+                class="cursor-pointer"
+                @click="handleScheduleChange(item.value)"
+                >{{ item.label }}</div
+              >
+            </template>
+          </div>
           <Tooltip title="移除" class="ml-4">
             <Icon
               icon="fluent:delete-off-20-regular"
@@ -45,19 +54,22 @@
         />
       </Card>
     </CollapseContainer>
+    <AlarmSchedule ref="alarmScheduleRef" @register="registerModal" @cancel="handleCancel" />
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, provide } from 'vue';
+  import { ref, provide, nextTick } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Radio, Card, Select, Input, Tooltip } from 'ant-design-vue';
+  import { Card, Select, Input, Tooltip } from 'ant-design-vue';
   import { trigger_condition_schema } from '../config/config.data.ts';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
   import { scheduleOptions, timeUnitOptions, options } from '../config/formatData.ts';
-
   import { Icon } from '/@/components/Icon';
+  import AlarmSchedule from './AlarmSchedule.vue';
+  import { useModal } from '/@/components/Modal';
+
   defineProps({
     index: {
       type: Number,
@@ -69,13 +81,21 @@
     },
   });
   const emit = defineEmits(['delete']);
-  const RadioGroup = Radio.Group;
-
+  const isUpdate = ref(false);
+  const conditionScreeningRef = ref();
   const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
     schemas: trigger_condition_schema,
     showActionButtonGroup: false,
   });
 
+  const alarmScheduleRef = ref<InstanceType<typeof AlarmSchedule>>();
+  const getFieldsValueFunc = () => {
+    const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
+      (item) => item.getFieldsValue()
+    );
+    return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
+  };
+
   const updateFieldDeviceId = (deviceList: any[]) => {
     updateSchema({
       field: 'entityId',
@@ -89,7 +109,7 @@
       },
     });
   };
-  const conditionScreeningRef = ref();
+
   const resetFieldsValueFunc = () => resetFields();
   // 回显数据函数
   const setFieldsFormValueFun = (fieldsValue) => {
@@ -115,10 +135,50 @@
   const operationType = ref<string>('');
   provide('operationType', operationType);
 
-  const childGetFieldsValue = () => getFieldsValue();
   const handleDelete = (index: number) => {
     emit('delete', index);
   };
+
+  // 子组件获取父组件的值
+  const childGetFieldsValue = () => getFieldsValue();
+
+  // 获取conditionScreeningForm的组件
+  const getRefItemConditionScreeningRefs = async () => {
+    await nextTick();
+    return conditionScreeningRef.value.refItem.conditionScreeningRefs;
+  };
+
+  const setConditionScreeningList = (list) => {
+    conditionScreeningRef.value.conditionScreeningList = list;
+  };
+  const setRichText = (list) => {
+    conditionScreeningRef.value.otherAttribute = list;
+  };
+
+  const currentIndex = ref(0);
+  const [registerModal, { openModal }] = useModal();
+  const handleScheduleChange = (value) => {
+    const index = scheduleOptions.findIndex((item) => item.value === value);
+    // 报警日程弹窗
+    if (index !== 0) {
+      openModal(true, {
+        isUpdate: isUpdate.value,
+        value,
+        currentIndex: currentIndex.value,
+        scheduleData,
+      });
+    } else {
+      alarmScheduleRef.value.scheduleData = {
+        type: value,
+      };
+      console.log(value);
+    }
+    currentIndex.value = index;
+  };
+  const handleCancel = (index) => {
+    currentIndex.value = index;
+  };
+  const scheduleData = ref(null);
   defineExpose({
     getFieldsValue,
     updateFieldDeviceId,
@@ -128,5 +188,18 @@
     conditionScreeningRef,
     schedule,
     operationType,
+    getFieldsValueFunc,
+    getRefItemConditionScreeningRefs,
+    setConditionScreeningList,
+    setRichText,
+    currentIndex,
+    scheduleData,
+    isUpdate,
+    alarmScheduleRef,
   });
 </script>
+<style>
+  .active {
+    color: #377dff;
+  }
+</style>

@@ -54,6 +54,7 @@
         label: '和',
         component: 'Input',
         slot: 'and',
+        labelWidth: 50,
         colProps: { span: 3 },
       },
       'value'

@@ -74,7 +74,4 @@
     padding: 1rem 0 0.5rem;
     border-radius: 0.25rem;
   }
-  .ant-input-number {
-    width: 200px;
-  }
 </style>

@@ -3,13 +3,16 @@
     <CollapseContainer style="background-color: #f2f2f2" :title="`${title} ${index + 1}`">
       <template #action>
         <div class="flex">
-          <div>
-            <span class="mr-2">启用规则</span>
-            <RadioGroup
-              v-model:value="schedule"
-              :options="scheduleOptions"
-              @change="handleRadioGroupChange"
-            />
+          <div class="flex">
+            <span class="mr-2">启用规则:</span>
+            <template v-for="(item, scheduleIndex) in scheduleOptions" :key="item.label">
+              <div
+                :class="{ 'ml-4': scheduleIndex >= 1, active: scheduleIndex === currentIndex }"
+                class="cursor-pointer"
+                @click="handleScheduleChange(item.value)"
+                >{{ item.label }}</div
+              >
+            </template>
           </div>
           <Tooltip title="移除" class="ml-4">
             <Icon
@@ -50,6 +53,7 @@
         />
       </Card>
     </CollapseContainer>
+    <AlarmSchedule ref="alarmScheduleRef" @register="registerModal" @cancel="handleCancel" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -57,12 +61,13 @@
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Icon } from '/@/components/Icon';
-  import { Tooltip, Radio, Card, Select, Input } from 'ant-design-vue';
+  import { Tooltip, Card, Select, Input } from 'ant-design-vue';
   import { trigger_condition_schema } from '../config/config.data.ts';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
   import { scheduleOptions, timeUnitOptions, options } from '../config/formatData.ts';
-  const RadioGroup = Radio.Group;
+  import AlarmSchedule from './AlarmSchedule.vue';
+  import { useModal } from '/@/components/Modal';
 
   defineProps({
     title: {
@@ -75,19 +80,20 @@
     },
   });
   const emit = defineEmits(['delete']);
+  const isUpdate = ref(false);
   const conditionScreeningRef = ref();
   const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
     schemas: trigger_condition_schema,
     showActionButtonGroup: false,
   });
 
+  const alarmScheduleRef = ref<InstanceType<typeof AlarmSchedule>>();
   const getFieldsValueFunc = () => {
     const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
-      (item) => {
-        return item.getFieldsValue();
-      }
+      (item) => item.getFieldsValue()
     );
-    return { ...getFieldsValue(), predicate, schedule: schedule.value };
+
+    return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
   };
   const updateFieldDeviceId = (deviceList: any[]) => {
     updateSchema({
@@ -108,8 +114,8 @@
     setFieldsValue(fieldsValue);
   };
   const updateFieldAttributeFunc = async () => {
-    const data1 = await getAttribute();
-    const options = data1.map((m) => {
+    const data = await getAttribute();
+    const options = data.map((m) => {
       return {
         label: m,
         value: m,
@@ -127,8 +133,6 @@
   const handleDelete = (params: { index: number; title: string }) => {
     emit('delete', params);
   };
-
-  const schedule = ref('ANY_TIME');
   const operationType = ref<string>('');
   provide('operationType', operationType);
 
@@ -148,16 +152,30 @@
     conditionScreeningRef.value.otherAttribute = list;
   };
 
-  const handleRadioGroupChange = (e) => {
-    const { value } = e.target;
-    if (value === 'SPECIFIC_TIME') {
-      console.log('定时启用');
-      // 定时启用
-    } else if (value === 'CUSTOM') {
-      console.log('自定义启用');
-      // 自定义启用
+  const [registerModal, { openModal }] = useModal();
+  const currentIndex = ref(0);
+  const handleScheduleChange = (value) => {
+    const index = scheduleOptions.findIndex((item) => item.value === value);
+    // 报警日程弹窗
+    if (index !== 0) {
+      openModal(true, {
+        isUpdate: isUpdate.value,
+        value,
+        currentIndex: currentIndex.value,
+        scheduleData,
+      });
+    } else {
+      alarmScheduleRef.value.scheduleData = {
+        type: value,
+      };
+      console.log(value);
     }
+    currentIndex.value = index;
+  };
+  const handleCancel = (index) => {
+    currentIndex.value = index;
   };
+  const scheduleData = ref(null);
   defineExpose({
     getFieldsValueFunc,
     updateFieldDeviceId,
@@ -168,6 +186,15 @@
     getRefItemConditionScreeningRefs,
     setConditionScreeningList,
     setRichText,
-    setFormList,
+    currentIndex,
+    scheduleData,
+    isUpdate,
+    alarmScheduleRef,
   });
 </script>
+
+<style>
+  .active {
+    color: #377dff;
+  }
+</style>

@@ -123,19 +123,19 @@
       const predicate = item.conditionScreeningRef?.refItem?.conditionScreeningRefs?.value?.map(
         (item) => item.getFieldsValue()
       );
-
       return {
         ...item.getFieldsValue(),
         predicate,
-        schedule: item?.schedule,
+        schedule: item.alarmScheduleRef.scheduleData,
       };
     });
     return {
       ...getFieldsValue(),
-      doContext: unref(jsonInstance.value).get(),
+      doContext: unref(jsonInstance.value)?.get(),
       clearRule,
     };
   };
+
   const setFieldsFormValueFun = (fieldsValue) => {
     setFieldsValue(fieldsValue);
   };
@@ -163,7 +163,6 @@
         options: alarmConfigList,
       },
     });
-    hasDisabled.value = false;
     userStore.setOutTarget('DEVICE_OUT');
   };