Merge branch 'sqy_dev' into 'main'

'fix:场景联动编辑回显', '调整配置文件'

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

@@ -88,7 +88,7 @@ export const screenLinkPageByDeptIdGetDevice = (params: ScreenByDeptIdParams) =>
 };
 
 /**
- * 获取住址下的告警配置
+ * 获取组织下的告警配置
  */
 export const getOrganizationAlarmConfig = (params: { organizationId }) => {
   return defHttp.get({

@@ -57,7 +57,7 @@
     </div>
     <Card v-else :bordered="false" :bodyStyle="{ padding: 0 }" v-bind="$attrs">
       <Skeleton active :paragraph="{ rows: 10 }" :loading="!tenantTop10">
-        <Descriptions :column="1" title="租户消息量TOP10" v-if="tenantTop10.length">
+        <Descriptions :column="1" title="租户消息量TOP10">
           <template v-for="(item, index) in tenantTop10" :key="item.name">
             <DescriptionsItem>
               <span
@@ -143,7 +143,7 @@
             </DescriptionsItem>
           </template>
         </Descriptions>
-        <Empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
+        <Empty v-if="!tenantTop10.length" :image="Empty.PRESENTED_IMAGE_SIMPLE" />
       </Skeleton>
       <h1 style="color: rgba(0, 0, 0, 0.85); font-weight: bold; font-size: 16px">
         本月即将过期租户</h1

@@ -61,6 +61,7 @@
               class="mt-4"
               :actionIndex="index"
               :actionData="actionData"
+              :triggerData="triggerData"
               :ref="skipUnwrap.actionItemRefs"
               @deleteAction="deleteAction"
             />
@@ -80,9 +81,9 @@
 <script lang="ts" setup>
   import { ref, watch, unref, computed, nextTick } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { formSchema, organizationId } from './config';
+  import { formSchema, organizationId } from './config/config.data.ts';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { genTriggerData, genConditionData, genActionData } from './cpns/format-data';
+  import { genTriggerOrConditionData, genActionData } from './config/formatData.ts';
   import { Divider } from 'ant-design-vue';
   import { PlusOutlined } from '@ant-design/icons-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -95,6 +96,7 @@
   import Condition from './cpns/Condition.vue';
   import Action from './cpns/Action.vue';
   import { useUserStore } from '/@/store/modules/user';
+  import { findOperation } from './config/formatData.ts';
 
   const emit = defineEmits(['register', 'success']);
 
@@ -114,6 +116,7 @@
   let getConditionFormValue = ref([]);
   let getActionFormValue = ref([]);
   const editEntryIdData = ref([]);
+  const editAlarmConfigData = ref([]);
   const isUpdate = ref(false);
   const id = ref(undefined);
   const tenantId = ref(undefined);
@@ -148,62 +151,206 @@
       const options = await screenLinkPageByDeptIdGetDevice({
         organizationId,
       });
+      // 获取当前组织下的告警配置
+      const alarmConfig = await getOrganizationAlarmConfig({ organizationId });
+
       // 生成回显时对应得组件数量
       triggerData.value = [...new Array(triggers.length).keys()];
       conditionData.value = [...new Array(doConditions.length).keys()];
       actionData.value = [...new Array(doActions.length).keys()];
       // 回显设备列表
-      editEntryIdData.value = options.items.map((v) => {
+      editEntryIdData.value = options.items.map((item) => {
+        return {
+          value: item.tbDeviceId,
+          label: item.name,
+        };
+      });
+      editAlarmConfigData.value = alarmConfig.map((item) => {
         return {
-          value: v.tbDeviceId,
-          label: v.name,
+          value: item.id,
+          label: item.name,
         };
       });
       nextTick(() => {
         setEditFields(skipUnwrap.triggerItemRefs, editEntryIdData);
         setEditFields(skipUnwrap.conditionItemRefs, editEntryIdData);
         setEditFields(skipUnwrap.actionItemRefs, editEntryIdData);
+        setEditAlarmConfig(skipUnwrap.actionItemRefs, editAlarmConfigData);
       });
 
       // 回显触发器数据---此处是个闭包!
       triggers.forEach((trigger, index) => {
-        nextTick(() => {
+        nextTick(async () => {
           unref(skipUnwrap.triggerItemRefs)[index].setFieldsFormValueFun({
+            triggered: trigger.triggerCondition.condition.spec.type,
+            device: trigger.entityType,
             triggerType: trigger.triggerType,
-            entityId: trigger.entityId,
-            type1: trigger.triggerCondition?.condition[0]?.key?.type,
-            type2: trigger.triggerCondition?.condition[0]?.key?.key,
-            operation: trigger.triggerCondition?.condition[0]?.predicate?.operation,
-            value: trigger.triggerCondition?.condition[0]?.predicate?.value?.defaultValue,
+            type1: trigger.triggerCondition?.condition.condition[0]?.key?.type,
+            type2: trigger.triggerCondition?.condition.condition[0]?.key?.key,
+            operationType: trigger.triggerCondition?.condition.condition[0].valueType,
+            detail: trigger.triggerCondition?.alarmDetails,
+          });
+          // 设置值operationType
+          unref(skipUnwrap.triggerItemRefs)[index].operationType =
+            trigger.triggerCondition?.condition.condition[0].valueType;
+
+          const ConditionScreeningForm = await unref(skipUnwrap.triggerItemRefs)[
+            index
+          ].getRefItemConditionScreeningRefs();
+          triggerData.value = [...new Array(triggers.length).keys()];
+
+          // 设置对应条件筛选的个数
+          unref(skipUnwrap.triggerItemRefs)[index].setConditionScreeningList([
+            ...new Array(trigger.triggerCondition.condition.condition.length).keys(),
+          ]);
+          // 操作符类型 NUMERIC|String|Boolean|DATE_TIME
+          const valueType = trigger.triggerCondition?.condition.condition[0].valueType;
+
+          // 循环设置条件筛选值。TODO:此处设置顺序有问题
+          nextTick(() => {
+            const richTextList = [];
+            trigger.triggerCondition.condition.condition.forEach(async (item, index) => {
+              const formItem = {
+                operation: item.predicate.operation,
+                value: String(item.predicate.value.defaultValue),
+              };
+              richTextList.push({
+                // 查询中文操作符
+                operation: findOperation(valueType, item.predicate.operation).label,
+                value: String(item.predicate.value.defaultValue),
+                attribute: trigger.triggerCondition?.condition.condition[0]?.key?.key,
+              });
+              ConditionScreeningForm.value[index].setFieldsValue(formItem);
+            });
+
+            unref(skipUnwrap.triggerItemRefs)[index].setRichText(richTextList);
           });
         });
       });
 
-      doConditions.forEach((item, index) => {
-        nextTick(() => {
+      doConditions.forEach((condition, index) => {
+        nextTick(async () => {
           unref(skipUnwrap.conditionItemRefs)[index].setFieldsFormValueFun({
-            triggerType: item?.triggerType,
-            entityId: item?.entityId,
-            type: item.triggerCondition?.condition[0].key.key,
-            operation: item?.triggerCondition?.condition[0]?.predicate?.operation,
-            value: item?.triggerCondition?.condition[0]?.predicate?.value?.defaultValue,
+            triggered: condition.triggerCondition.condition.spec.type,
+            device: condition.entityType,
+            triggerType: condition.triggerType,
+            type1: condition.triggerCondition?.condition.condition[0]?.key?.type,
+            type2: condition.triggerCondition?.condition.condition[0]?.key?.key,
+            operationType: condition.triggerCondition?.condition.condition[0].valueType,
+            detail: condition.triggerCondition?.alarmDetails,
+          });
+          // 设置值operationType
+          unref(skipUnwrap.conditionItemRefs)[index].operationType =
+            condition.triggerCondition?.condition.condition[0].valueType;
+
+          const ConditionScreeningForm = await unref(skipUnwrap.conditionItemRefs)[
+            index
+          ].getRefItemConditionScreeningRefs();
+          triggerData.value = [...new Array(condition.length).keys()];
+
+          // 设置对应条件筛选的个数
+          unref(skipUnwrap.conditionItemRefs)[index].setConditionScreeningList([
+            ...new Array(condition.triggerCondition.condition.condition.length).keys(),
+          ]);
+          // 操作符类型 NUMERIC|String|Boolean|DATE_TIME
+          const valueType = condition.triggerCondition?.condition.condition[0].valueType;
+
+          // 循环设置条件筛选值。TODO:此处设置顺序有问题
+          nextTick(() => {
+            const richTextList = [];
+            condition.triggerCondition.condition.condition.forEach(async (item, index) => {
+              const formItem = {
+                operation: item.predicate.operation,
+                value: String(item.predicate.value.defaultValue),
+              };
+              richTextList.push({
+                // 查询中文操作符
+                operation: findOperation(valueType, item.predicate.operation).label,
+                value: String(item.predicate.value.defaultValue),
+                attribute: condition.triggerCondition?.condition.condition[0]?.key?.key,
+              });
+              ConditionScreeningForm.value[index].setFieldsValue(formItem);
+            });
+            unref(skipUnwrap.conditionItemRefs)[index].setRichText(richTextList);
           });
         });
       });
 
-      doActions.forEach((item, index) => {
+      doActions.forEach((action, index) => {
         nextTick(() => {
           unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({
-            outTarget: item.outTarget,
-            deviceId: item.deviceId,
+            outTarget: action.outTarget,
+            device: action.entityType,
+            deviceId: action.deviceId,
+            alarm_config: action.alarmProfileId,
+            alarm_level: action.doContext.alarmLevel,
           });
-          unref(skipUnwrap.actionItemRefs)[index].setJsonValue(item.doContext.params);
+          if (action.outTarget === 'DEVICE_OUT') {
+            unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params);
+          }
+          if (action.doContext.clearRule) {
+            unref(skipUnwrap.actionItemRefs)[index].checked = true;
+            nextTick(async () => {
+              unref(skipUnwrap.actionItemRefs)[index].clearAlarmRef.setFieldsFormValueFun({
+                triggered: action.doContext?.clearRule?.triggerCondition?.condition.spec.type,
+                device: action.entityType,
+                triggerType: action.doContext?.clearRule.triggerType,
+                type1: action.doContext.clearRule.triggerCondition.condition.condition[0].key.type,
+                type2: action.doContext.clearRule.triggerCondition.condition.condition[0].key.key,
+                operationType:
+                  action.doContext.clearRule.triggerCondition.condition.condition[0].valueType,
+                detail: action.doContext.clearRule.triggerCondition?.alarmDetails,
+              });
+              // 设置值operationType
+
+              unref(skipUnwrap.actionItemRefs)[index].clearAlarmRef.operationType =
+                action.doContext.clearRule.triggerCondition.condition.condition[0].valueType;
+
+              const ConditionScreeningForm = await unref(skipUnwrap.actionItemRefs)[
+                index
+              ].getRefItemConditionScreeningRefs();
+              triggerData.value = [...new Array(action.length).keys()];
+
+              // // 设置对应条件筛选的个数
+              unref(skipUnwrap.actionItemRefs)[index].setConditionScreeningList([
+                ...new Array(
+                  action.doContext.clearRule.triggerCondition.condition.condition.length
+                ).keys(),
+              ]);
+              // 操作符类型 NUMERIC|String|Boolean|DATE_TIME
+              const valueType =
+                action.doContext.clearRule.triggerCondition?.condition.condition[0].valueType;
+
+              // 循环设置条件筛选值。TODO:此处设置顺序有问题
+              nextTick(() => {
+                const richTextList = [];
+                action.doContext.clearRule.triggerCondition.condition.condition.forEach(
+                  (item, index) => {
+                    const formItem = {
+                      operation: item.predicate.operation,
+                      value: String(item.predicate.value.defaultValue),
+                    };
+                    richTextList.push({
+                      // 查询中文操作符
+                      operation: findOperation(valueType, item.predicate.operation).label,
+                      value: String(item.predicate.value.defaultValue),
+                      attribute:
+                        action.doContext.clearRule.triggerCondition?.condition.condition[0]?.key
+                          ?.key,
+                    });
+                    ConditionScreeningForm.value[index].setFieldsValue(formItem);
+                  }
+                );
+                unref(skipUnwrap.actionItemRefs)[index].setRichText(richTextList);
+              });
+            });
+          }
         });
       });
     }
     if (unref(isUpdate) === 3) isView.value = false;
     setDrawerProps({
-      showFooter: isView.value,
+      showFooter: unref(isView),
       loading: false,
     });
   });
@@ -214,6 +361,12 @@
       item.updateFieldDeviceId(deviceList);
     });
   };
+  // 设置告警配置options
+  const setEditAlarmConfig = (linkAge, alarmConfigList) => {
+    unref(linkAge).map((item) => {
+      item.updateEditFieldAlarmConfig(alarmConfigList);
+    });
+  };
   // 监听组织变化更新设备列表
   const deviceList = ref([]);
   const alarmConfigList = ref([]);
@@ -271,16 +424,14 @@
    */
   const getFormValueFunc = () => {
     getTriggerFormValue.value = unref(skipUnwrap.triggerItemRefs)?.map((item) => {
-      return genTriggerData(item.getFieldsValueFunc());
+      return genTriggerOrConditionData(item.getFieldsValueFunc());
     });
     getConditionFormValue.value = unref(skipUnwrap.conditionItemRefs).map((item) => {
-      return genConditionData(item.getFieldsValueFunc());
+      return genTriggerOrConditionData(item.getFieldsValueFunc());
     });
     getActionFormValue.value = unref(skipUnwrap.actionItemRefs).map((item) => {
-      console.log(item.jsonInstance.get());
       return genActionData(item.getFieldsValueFunc());
     });
-    console.log(getActionFormValue.value);
   };
   const handleSubmit = async () => {
     let basicFormValue = await validate();
@@ -300,7 +451,7 @@
         id: unref(id),
         tenantId: unref(tenantId),
       };
-      console.log(postAddOrEditData);
+
       await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
       createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
       closeDrawer();
@@ -319,7 +470,6 @@
     unref(conditionData).splice(conditionIndex, 1);
   };
   const deleteAction = ({ actionIndex, outTarget }) => {
-    // console.log(actionIndex, outTarget.value);
     unref(actionData).splice(actionIndex, 1);
     if (unref(outTarget) === 'MSG_NOTIFY') {
       userStore.setOutTarget('DEVICE_OUT');

@@ -359,7 +359,7 @@ export const actionSchema: FormSchema[] = [
       placeholder: '请选择设备',
       mode: 'multiple',
     },
-    ifShow: ({ values }) => isPart(values.device),
+    ifShow: ({ values }) => isPart(values.device) && isDeviceOut(values.outTarget),
     colProps: { span: 6 },
   },
   {
@@ -392,7 +392,7 @@ export const actionSchema: FormSchema[] = [
       options: [
         {
           label: '紧急',
-          value: ' CRITICAL',
+          value: 'CRITICAL',
         },
         {
           label: '重要',
@@ -427,209 +427,3 @@ export const actionSchema: FormSchema[] = [
     slot: 'clearAlarm',
   },
 ];
-import { Number_Operation, String_Operation, Boolean_Operation } from '/@/enums/operationEnum';
-export function isType(operationType) {
-  switch (operationType) {
-    case 'NUMERIC':
-      return [
-        {
-          field: 'operation',
-          label: '执行操作',
-          component: 'Select',
-          required: true,
-          componentProps: {
-            options: [
-              { label: '等于', value: Number_Operation.EQUAL },
-              { label: '不等于', value: Number_Operation.NOT_EQUAL },
-              { label: '小于', value: Number_Operation.LESS },
-              { label: '小于等于', value: Number_Operation.LESS_OR_EQUAL },
-              { label: '大于', value: Number_Operation.GREATER },
-              { label: '大于等于', value: Number_Operation.GREATER_OR_EQUAL },
-            ],
-          },
-          colProps: {
-            span: 8,
-          },
-        },
-        {
-          field: 'value',
-          label: '操作值',
-          required: true,
-          component: 'InputNumber',
-          colProps: {
-            span: 8,
-          },
-        },
-      ];
-    case 'STRING':
-      return [
-        {
-          field: 'ignoreCase',
-          label: '忽略大小写',
-          component: 'Checkbox',
-          labelWidth: 150,
-          colProps: {
-            span: 7,
-          },
-        },
-        {
-          field: 'operation',
-          label: '执行操作',
-          component: 'Select',
-          required: true,
-          componentProps: {
-            options: [
-              { label: '等于', value: String_Operation.EQUAL },
-              { label: '不等于', value: String_Operation.NOT_EQUAL },
-              { label: '开始于', value: String_Operation.BEGAN_IN },
-              { label: '结束于', value: String_Operation.END_IN },
-              { label: '包含', value: String_Operation.INCLUDE },
-              { label: '不包含', value: String_Operation.NOT_INCLUDE },
-            ],
-          },
-          colProps: {
-            span: 7,
-          },
-        },
-        {
-          field: 'value',
-          label: '操作值',
-          required: true,
-          component: 'Input',
-          colProps: {
-            span: 7,
-          },
-        },
-      ];
-    case 'BOOLEAN':
-      return [
-        {
-          field: 'operation',
-          label: '执行操作',
-          component: 'Select',
-          required: true,
-          componentProps: {
-            options: [
-              { label: '等于', value: Boolean_Operation.EQUAL },
-              { label: '不等于', value: Boolean_Operation.NOT_EQUAL },
-            ],
-          },
-          colProps: {
-            span: 8,
-          },
-        },
-        {
-          field: 'value',
-          label: '操作值',
-          component: 'Select',
-          required: true,
-          componentProps: {
-            options: [
-              {
-                label: '真',
-                value: 'true',
-              },
-              {
-                label: '假',
-                value: 'false',
-              },
-            ],
-          },
-          colProps: {
-            span: 8,
-          },
-        },
-      ];
-    case 'TIME':
-      return [
-        {
-          field: 'operation',
-          label: '执行操作',
-          required: true,
-          component: 'Select',
-          componentProps: {
-            options: [
-              { label: '等于', value: Number_Operation.EQUAL },
-              { label: '不等于', value: Number_Operation.NOT_EQUAL },
-              { label: '小于', value: Number_Operation.LESS },
-              { label: '小于等于', value: Number_Operation.LESS_OR_EQUAL },
-              { label: '大于', value: Number_Operation.GREATER },
-              { label: '大于等于', value: Number_Operation.GREATER_OR_EQUAL },
-            ],
-          },
-          colProps: {
-            span: 8,
-          },
-        },
-        {
-          field: 'value',
-          label: '操作值',
-          required: true,
-          component: 'DatePicker',
-          componentProps: {
-            showTime: true,
-          },
-          colProps: {
-            span: 8,
-          },
-        },
-      ];
-  }
-}
-export function conditionPreView(data, operationType) {
-  if (operationType === 'NUMERIC' || operationType === 'TIME') {
-    const { EQUAL, NOT_EQUAL, LESS, LESS_OR_EQUAL, GREATER, GREATER_OR_EQUAL } = Number_Operation;
-    return data.map((item) => {
-      return {
-        operation:
-          item?.operation === EQUAL
-            ? '等于'
-            : item?.operation === NOT_EQUAL
-            ? '不等于'
-            : item?.operation === LESS
-            ? '小于'
-            : item?.operation === LESS_OR_EQUAL
-            ? '小于等于'
-            : item?.operation === GREATER
-            ? '大于'
-            : item?.operation === GREATER_OR_EQUAL
-            ? '大于等于'
-            : '',
-        value: item.value,
-        attribute: item.attribute,
-      };
-    });
-  } else if (operationType === 'STRING') {
-    const { EQUAL, NOT_EQUAL, BEGAN_IN, END_IN, INCLUDE, NOT_INCLUDE } = String_Operation;
-    return data.map((item) => {
-      return {
-        operation:
-          item?.operation === EQUAL
-            ? '等于'
-            : item?.operation === NOT_EQUAL
-            ? '不等于'
-            : item?.operation === BEGAN_IN
-            ? '开始于'
-            : item?.operation === END_IN
-            ? '结束于'
-            : item?.operation === INCLUDE
-            ? '包含'
-            : item?.operation === NOT_INCLUDE
-            ? '不包含'
-            : '',
-        value: item.value,
-        attribute: item.attribute,
-      };
-    });
-  } else if (operationType === 'BOOLEAN') {
-    const { EQUAL, NOT_EQUAL } = Boolean_Operation;
-    return data.map((item) => {
-      return {
-        operation:
-          item?.operation === EQUAL ? '等于' : item?.operation === NOT_EQUAL ? '不等于' : '',
-        value: item.value,
-        attribute: item.attribute,
-      };
-    });
-  }
-}

-export const genTriggerData = (triggerData) => {
-  const {
-    triggerType,
-    entityId,
-    type1,
-    type2,
-    device,
-    detail,
-    predicate,
-    operationType,
-    triggered,
-    schedule,
-  } = triggerData;
-  const mapPredicate = predicate.map((item) => {
-    return {
-      key: {
-        type: type1,
-        key: type2,
-      },
-      valueType: operationType,
-      value: null,
-      predicate: {
-        type: operationType,
-        operation: item.operation,
-        value: {
-          defaultValue: item.value,
-          userValue: null,
-          dynamicValue: null,
-        },
-      },
-    };
-  });
-  return {
-    triggerType,
-    entityType: device,
-    entityId: entityId?.length ? entityId : null,
-    triggerCondition: {
-      alarmDetails: detail,
-      condition: {
-        condition: mapPredicate,
-        spec: {
-          type: triggered,
-          // unit: 'SECONDS',
-          // predicate: {
-          //   defaultValue: 30,
-          //   userValue: null,
-          //   dynamicValue: null,
-          // },
-        },
-      },
-      schedule: {
-        type: schedule,
-        // timezone: 'Asia/Shanghai',
-        // daysOfWeek: [2, 3],
-        // startsOn: 8700000,
-        // endsOn: 30300000,
-      },
-    },
-  };
-};
+import { formatToDateTime } from '/@/utils/dateUtil';
 
-export const genConditionData = (actionData) => {
+// 生成触发器或执行条件JSON数据
+export const genTriggerOrConditionData = (triggerData) => {
   const {
     triggerType,
     entityId,
@@ -71,8 +13,8 @@ export const genConditionData = (actionData) => {
     operationType,
     triggered,
     schedule,
-  } = actionData;
-  const mapPredicate = predicate.map((item) => {
+  } = triggerData;
+  const mapPredicate = predicate?.map((item) => {
     return {
       key: {
         type: type1,
@@ -81,10 +23,11 @@ export const genConditionData = (actionData) => {
       valueType: operationType,
       value: null,
       predicate: {
-        type: operationType,
+        type: operationType === 'DATE_TIME' ? 'NUMERIC' : operationType,
         operation: item.operation,
         value: {
-          defaultValue: item.value,
+          defaultValue:
+            operationType === 'DATE_TIME' ? Number(formatToDateTime(item.value, 'x')) : item.value,
           userValue: null,
           dynamicValue: null,
         },
@@ -137,8 +80,8 @@ export const genActionData = (conditionData) => {
     schedule,
     entityId,
     deviceId,
+    checked,
   } = conditionData;
-
   const mapPredicate = predicate?.map((item) => {
     return {
       key: {
@@ -158,7 +101,6 @@ export const genActionData = (conditionData) => {
       },
     };
   });
-  console.log(doContext);
   return [
     {
       alarmProfileId: alarm_config,
@@ -195,7 +137,229 @@ export const genActionData = (conditionData) => {
               },
             },
           }
-        : doContext,
+        : {
+            ...doContext,
+            alarmLevel: outTarget === 'MSG_NOTIFY' ? alarm_level : undefined,
+          },
     },
   ];
 };
+
+import { Number_Operation, String_Operation, Boolean_Operation } from '/@/enums/operationEnum';
+
+export const operationNumber_OR_TIME = [
+  { label: '等于', value: Number_Operation.EQUAL },
+  { label: '不等于', value: Number_Operation.NOT_EQUAL },
+  { label: '小于', value: Number_Operation.LESS },
+  { label: '小于等于', value: Number_Operation.LESS_OR_EQUAL },
+  { label: '大于', value: Number_Operation.GREATER },
+  { label: '大于等于', value: Number_Operation.GREATER_OR_EQUAL },
+];
+
+export const operationString = [
+  { label: '等于', value: String_Operation.EQUAL },
+  { label: '不等于', value: String_Operation.NOT_EQUAL },
+  { label: '开始于', value: String_Operation.BEGAN_IN },
+  { label: '结束于', value: String_Operation.END_IN },
+  { label: '包含', value: String_Operation.INCLUDE },
+  { label: '不包含', value: String_Operation.NOT_INCLUDE },
+];
+
+export const operationBoolean = [
+  { label: '等于', value: Boolean_Operation.EQUAL },
+  { label: '不等于', value: Boolean_Operation.NOT_EQUAL },
+];
+
+// 查找操作符
+export function findOperation(valueType, operation) {
+  switch (valueType) {
+    case 'NUMERIC' || 'DATE_TIME':
+      return operationNumber_OR_TIME.find((item) => item.value === operation);
+    case 'STRING':
+      return operationString.find((item) => item.value === operation);
+    case 'BOOLEAN':
+      return operationBoolean.find((item) => item.value === operation);
+  }
+}
+
+export function isType(operationType) {
+  switch (operationType) {
+    case 'NUMERIC':
+      return [
+        {
+          field: 'operation',
+          label: '执行操作',
+          component: 'Select',
+          required: true,
+          componentProps: {
+            options: operationNumber_OR_TIME,
+          },
+          colProps: {
+            span: 8,
+          },
+        },
+        {
+          field: 'value',
+          label: '操作值',
+          required: true,
+          component: 'InputNumber',
+          colProps: {
+            span: 8,
+          },
+        },
+      ];
+    case 'STRING':
+      return [
+        {
+          field: 'ignoreCase',
+          label: '忽略大小写',
+          component: 'Checkbox',
+          labelWidth: 150,
+          colProps: {
+            span: 7,
+          },
+        },
+        {
+          field: 'operation',
+          label: '执行操作',
+          component: 'Select',
+          required: true,
+          componentProps: {
+            options: operationString,
+          },
+          colProps: {
+            span: 7,
+          },
+        },
+        {
+          field: 'value',
+          label: '操作值',
+          required: true,
+          component: 'Input',
+          colProps: {
+            span: 7,
+          },
+        },
+      ];
+    case 'BOOLEAN':
+      return [
+        {
+          field: 'operation',
+          label: '执行操作',
+          component: 'Select',
+          required: true,
+          componentProps: {
+            options: operationBoolean,
+          },
+          colProps: {
+            span: 8,
+          },
+        },
+        {
+          field: 'value',
+          label: '操作值',
+          component: 'Select',
+          required: true,
+          componentProps: {
+            options: [
+              {
+                label: '真',
+                value: 'true',
+              },
+              {
+                label: '假',
+                value: 'false',
+              },
+            ],
+          },
+          colProps: {
+            span: 8,
+          },
+        },
+      ];
+    case 'DATE_TIME':
+      return [
+        {
+          field: 'operation',
+          label: '执行操作',
+          required: true,
+          component: 'Select',
+          componentProps: {
+            options: operationNumber_OR_TIME,
+          },
+          colProps: {
+            span: 8,
+          },
+        },
+        {
+          field: 'value',
+          label: '操作值',
+          required: true,
+          component: 'DatePicker',
+          componentProps: {
+            showTime: true,
+          },
+          colProps: {
+            span: 8,
+          },
+        },
+      ];
+  }
+}
+export function conditionPreView(data, operationType) {
+  if (operationType === 'NUMERIC' || operationType === 'DATE_TIME') {
+    const { EQUAL, NOT_EQUAL, LESS, LESS_OR_EQUAL, GREATER, GREATER_OR_EQUAL } = Number_Operation;
+    return data.map((item) => {
+      return {
+        operation:
+          item?.operation === EQUAL
+            ? '等于'
+            : item?.operation === NOT_EQUAL
+            ? '不等于'
+            : item?.operation === LESS
+            ? '小于'
+            : item?.operation === LESS_OR_EQUAL
+            ? '小于等于'
+            : item?.operation === GREATER
+            ? '大于'
+            : item?.operation === GREATER_OR_EQUAL
+            ? '大于等于'
+            : '',
+        value: item.value,
+        attribute: item.attribute,
+      };
+    });
+  } else if (operationType === 'STRING') {
+    const { EQUAL, NOT_EQUAL, BEGAN_IN, END_IN, INCLUDE, NOT_INCLUDE } = String_Operation;
+    return data.map((item) => {
+      return {
+        operation:
+          item?.operation === EQUAL
+            ? '等于'
+            : item?.operation === NOT_EQUAL
+            ? '不等于'
+            : item?.operation === BEGAN_IN
+            ? '开始于'
+            : item?.operation === END_IN
+            ? '结束于'
+            : item?.operation === INCLUDE
+            ? '包含'
+            : item?.operation === NOT_INCLUDE
+            ? '不包含'
+            : '',
+        value: item.value,
+        attribute: item.attribute,
+      };
+    });
+  } else if (operationType === 'BOOLEAN') {
+    const { EQUAL, NOT_EQUAL } = Boolean_Operation;
+    return data.map((item) => {
+      return {
+        operation:
+          item?.operation === EQUAL ? '等于' : item?.operation === NOT_EQUAL ? '不等于' : '',
+        value: item.value,
+        attribute: item.attribute,
+      };
+    });
+  }
+}

@@ -32,7 +32,7 @@
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Radio, Card, Select } from 'ant-design-vue';
-  import { trigger_condition_schema } from '../config';
+  import { trigger_condition_schema } from '../config/config.data.ts';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
 
@@ -100,7 +100,7 @@
     },
     {
       label: '时间',
-      value: 'TIME',
+      value: 'DATE_TIME',
     },
   ];
   const childGetFieldsValue = () => getFieldsValue();
@@ -114,5 +114,6 @@
     childGetFieldsValue,
     conditionScreeningRef,
     schedule,
+    operationType,
   });
 </script>

@@ -3,10 +3,7 @@
     <CollapseContainer ref="collapseContainerRef" @expand="handleExpand">
       <template #title>
         <div>条件筛选</div>
-        <RichText
-          :firstAttribute="firstAttribute"
-          :otherAttribute="otherAttribute"
-          @resetFilter="resetFilter"
+        <RichText :otherAttribute="otherAttribute" @resetFilter="resetFilter"
       /></template>
 
       <template v-for="(item, index) in conditionScreeningList" :key="item">
@@ -29,7 +26,7 @@
 <script lang="ts" setup>
   import { unref, ref } from 'vue';
   import ConditionScreeningForm from './ConditionScreeningForm.vue';
-  import { conditionPreView } from '../config.ts';
+  import { conditionPreView } from '../config/formatData.ts';
   import { CollapseContainer } from '/@/components/Container/index';
   import RichText from './RichText.vue';
   const props = defineProps({
@@ -50,53 +47,51 @@
       collapseContainerRef.value.handleExpand();
     }
     unref(conditionScreeningList).push(Date.now());
+    const lastIndex = refItem.conditionScreeningRefs.value.length - 1;
+    refItem.conditionScreeningRefs.value[lastIndex]?.appendSchemaByField(
+      {
+        field: 'AND',
+        label: '和',
+        component: 'Input',
+        slot: 'and',
+        colProps: { span: 3 },
+      },
+      'value'
+    );
   };
   const handleExpand = (show) => {
     isPreview.value = show;
   };
 
-  const firstAttribute = ref({});
   const otherAttribute = ref([]);
   // 预览条件筛选结果
   const preView = async () => {
     const attributes = [];
     const fieldsValue = props.childGetFieldsValue();
     for (let i = 0; i < unref(refItem.conditionScreeningRefs).length; i++) {
-      if (i === 0) {
-        const attr = conditionPreView(
-          [
-            {
-              ...unref(refItem.conditionScreeningRefs)[i].getFieldsValue(),
-              attribute: fieldsValue.type2,
-            },
-          ],
-          fieldsValue.operationType
-        );
-        firstAttribute.value = attr[0];
-        await unref(refItem.conditionScreeningRefs)[i].validate();
-        continue;
-      }
       const valid = await unref(refItem.conditionScreeningRefs)[i].validate();
       if (!valid) return;
-
       attributes.push({
         ...unref(refItem.conditionScreeningRefs)[i].getFieldsValue(),
         attribute: fieldsValue.type2,
       });
     }
     otherAttribute.value = conditionPreView(attributes, fieldsValue.operationType);
-
     collapseContainerRef.value.handleExpand();
   };
 
   const resetFilter = () => {
-    firstAttribute.value = {};
     otherAttribute.value = [];
   };
   const deleteConditionForm = (index) => {
     unref(conditionScreeningList).splice(index, 1);
+    const lastIndex = refItem.conditionScreeningRefs.value.length - 2;
+    refItem.conditionScreeningRefs.value[lastIndex]?.removeSchemaByFiled('AND');
   };
+
   defineExpose({
     refItem,
+    conditionScreeningList,
+    otherAttribute,
   });
 </script>

@@ -17,7 +17,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Icon } from '/@/components/Icon';
   import { Tooltip } from 'ant-design-vue';
-  import { isType } from '../config.ts';
+  import { isType } from '../config/formatData.ts';
   defineProps({
     index: {
       type: Number,

 <template>
-  <div class="flex ml-4" v-if="firstAttribute?.value && firstAttribute?.attribute">
-    <div class="text" style="color: #305680">{{ firstAttribute?.attribute }}</div>
-    {{ firstAttribute?.operation }}
-    <div class="text" style="color: #ff8c68">{{ firstAttribute?.value }}</div>
-    {{ firstAttribute?.compoundConditions ?? '' }}
-  </div>
   <div
     v-if="otherAttribute.length > 0 && otherAttribute[0].value && otherAttribute[0].operation"
     class="flex"
   >
-    <template v-for="item in otherAttribute" :key="item.value">
+    <template v-for="(item, index) in otherAttribute" :key="item.value">
       <div class="flex" v-if="item?.value && item?.attribute">
         <div class="text mr-2" style="color: #305680">{{ item.attribute }}</div>
         {{ item.operation }}
         <div class="text ml-2" style="color: #ff8c68">{{ item.value }}</div>
-        {{ item.compoundConditions ?? '' }}
+        <span v-if="otherAttribute[index + 1]">和</span>
       </div>
     </template>
   </div>
@@ -23,10 +17,6 @@
 <script lang="ts" setup>
   import { watch, inject } from 'vue';
   defineProps({
-    firstAttribute: {
-      type: Object,
-      default: () => {},
-    },
     otherAttribute: {
       type: Array,
       default: () => [],

@@ -51,13 +51,13 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Tooltip, Select, Checkbox, Card } from 'ant-design-vue';
   import { Icon } from '/@/components/Icon';
-  import { actionSchema } from '../config';
+  import { actionSchema } from '../config/config.data.ts';
   import jsoneditor from 'jsoneditor';
   import 'jsoneditor/dist/jsoneditor.min.css';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { useUserStore } from '/@/store/modules/user';
   import ClearAlarm from './ClearAlarm.vue';
-  defineProps({
+  const props = defineProps({
     actionIndex: {
       type: Number,
       required: true,
@@ -66,13 +66,22 @@
       type: Array,
       default: () => [],
     },
+    triggerData: {
+      type: Array,
+      default: () => [],
+    },
   });
+
   const emit = defineEmits(['deleteAction']);
   const userStore = useUserStore();
   const options = computed(() => {
     return [
       { label: '设备输出', value: 'DEVICE_OUT' },
-      { label: '告警输出', value: 'MSG_NOTIFY', disabled: userStore.getOutTarget === 'MSG_NOTIFY' },
+      {
+        label: '告警输出',
+        value: 'MSG_NOTIFY',
+        disabled: userStore.getOutTarget === 'MSG_NOTIFY' || !props.triggerData.length,
+      },
     ];
   });
   const hasDisabled = ref(false);
@@ -96,19 +105,14 @@
       clearAlarmRef?.value?.conditionScreeningRef?.refItem?.conditionScreeningRefs?.value?.map(
         (item) => item.getFieldsValue()
       );
-    console.log({
-      ...getFieldsValue(),
-      ...clearAlarmRef?.value?.getFieldsValue(),
-      predicate,
-      doContext: unref(jsonInstance.value).get(),
-      schedule: clearAlarmRef?.value?.schedule,
-    });
+
     return {
       ...getFieldsValue(),
       ...clearAlarmRef?.value?.getFieldsValue(),
       predicate,
       doContext: unref(jsonInstance.value).get(),
       schedule: clearAlarmRef?.value?.schedule,
+      checked: checked.value,
     };
   };
   const setFieldsFormValueFun = (fieldsValue) => {
@@ -123,6 +127,14 @@
       },
     });
   };
+  const updateEditFieldAlarmConfig = (alarmConfigList) => {
+    updateSchema({
+      field: 'alarm_config',
+      componentProps: {
+        options: alarmConfigList,
+      },
+    });
+  };
   const updateFieldAlarmConfig = (alarmConfigList) => {
     updateSchema({
       field: 'alarm_config',
@@ -169,6 +181,18 @@
 
   const operationType = ref<string>('');
   const clearAlarmRef = ref();
+
+  const getRefItemConditionScreeningRefs = async () => {
+    await nextTick();
+    return clearAlarmRef.value.conditionScreeningRef.refItem.conditionScreeningRefs;
+  };
+  const setConditionScreeningList = (list) => {
+    clearAlarmRef.value.conditionScreeningRef.conditionScreeningList = list;
+  };
+
+  const setRichText = (list) => {
+    clearAlarmRef.value.conditionScreeningRef.otherAttribute = list;
+  };
   provide('operationType', operationType);
   defineExpose({
     getFieldsValueFunc,
@@ -180,6 +204,12 @@
     getJsonValue,
     setJsonValue,
     jsonInstance,
+    updateEditFieldAlarmConfig,
+    checked,
+    clearAlarmRef,
+    getRefItemConditionScreeningRefs,
+    setConditionScreeningList,
+    setRichText,
   });
 </script>
 

 <template>
-  <CollapseContainer style="background-color: #f2f2f2" :title="`执行条件 ${conditionIndex + 1}`">
-    <template #action>
-      <div class="flex">
-        <div>
-          <span class="mr-2">启用规则</span>
-          <RadioGroup v-model:value="schedule" :options="scheduleOptions" />
+  <div>
+    <CollapseContainer style="background-color: #f2f2f2" :title="`执行条件${conditionIndex + 1}`">
+      <template #action>
+        <div class="flex">
+          <div>
+            <span class="mr-2">启用规则</span>
+            <RadioGroup v-model:value="schedule" :options="scheduleOptions" />
+          </div>
+          <Tooltip title="移除" class="ml-4">
+            <Icon
+              icon="fluent:delete-off-20-regular"
+              size="20"
+              class="mr-2 cursor-pointer"
+              @click="handleDelete(conditionIndex)"
+            />
+          </Tooltip>
         </div>
-        <Tooltip title="移除" class="ml-4">
-          <Icon
-            icon="fluent:delete-off-20-regular"
-            size="20"
-            class="mr-2 cursor-pointer"
-            @click="handleDelete(conditionIndex)"
+      </template>
+      <BasicForm @register="registerForm">
+        <template #operationType="{ model, field }">
+          <Select
+            :options="options"
+            v-model:value="model[field]"
+            @change="operationType = model[field]"
+            placeholder="请选择比较类型"
+            allowClear
           />
-        </Tooltip>
-      </div>
-    </template>
-    <BasicForm @register="registerCondition">
-      <template #operationType="{ model, field }">
-        <Select
-          :options="options"
-          v-model:value="model[field]"
-          @change="operationType = model[field]"
-          placeholder="请选择比较类型"
-          allowClear
+        </template>
+      </BasicForm>
+      <Card size="small" :bordered="false" style="border: 2px dashed #797979" v-if="operationType">
+        <ConditionScreening
+          :childGetFieldsValue="childGetFieldsValue"
+          ref="conditionScreeningRef"
         />
-      </template>
-    </BasicForm>
-    <Card size="small" :bordered="false" style="border: 2px dashed #797979" v-if="operationType">
-      <ConditionScreening :childGetFieldsValue="childGetFieldsValue" ref="conditionScreeningRef" />
-    </Card>
-  </CollapseContainer>
+      </Card>
+    </CollapseContainer>
+  </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 { Icon } from '/@/components/Icon';
   import { Tooltip, Radio, Card, Select } from 'ant-design-vue';
-
-  import { trigger_condition_schema } from '../config';
+  import { trigger_condition_schema } from '../config/config.data.ts';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
-  import { Icon } from '/@/components/Icon';
   import ConditionScreening from './ConditionScreening.vue';
   const RadioGroup = Radio.Group;
 
@@ -51,13 +55,12 @@
     },
   });
   const emit = defineEmits(['deleteCondition']);
-
-  const [registerCondition, { getFieldsValue, updateSchema, resetFields, setFieldsValue }] =
-    useForm({
-      schemas: trigger_condition_schema,
-      showActionButtonGroup: false,
-    });
   const conditionScreeningRef = ref();
+  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
+    schemas: trigger_condition_schema,
+    showActionButtonGroup: false,
+  });
+
   const getFieldsValueFunc = () => {
     const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
       (item) => {
@@ -66,7 +69,6 @@
     );
     return { ...getFieldsValue(), predicate, schedule: schedule.value };
   };
-  const resetFieldsValueFunc = () => resetFields();
   const updateFieldDeviceId = (deviceList: any[]) => {
     updateSchema({
       field: 'entityId',
@@ -80,22 +82,30 @@
       },
     });
   };
+  const resetFieldsValueFunc = () => resetFields();
+  // 回显数据函数
   const setFieldsFormValueFun = (fieldsValue) => {
     setFieldsValue(fieldsValue);
   };
   const updateFieldAttributeFunc = async () => {
     const data1 = await getAttribute();
-    const data = data1.map((m) => ({ label: m, value: m }));
+    const options = data1.map((m) => {
+      return {
+        label: m,
+        value: m,
+      };
+    });
     updateSchema({
-      field: 'type',
+      field: 'type2',
       componentProps: {
         placeholder: '请选择属性',
-        options: data,
+        options,
       },
     });
   };
-  const handleDelete = (conditionIndex) => {
-    emit('deleteCondition', conditionIndex);
+
+  const handleDelete = (triggerIndex) => {
+    emit('deleteCondition', triggerIndex);
   };
 
   const schedule = ref('ANY_TIME');
@@ -105,6 +115,7 @@
     { label: '自定义启用', value: 'CUSTOM' },
   ];
   const operationType = ref<string>('');
+
   const options = [
     {
       label: '数字',
@@ -120,19 +131,35 @@
     },
     {
       label: '时间',
-      value: 'TIME',
+      value: 'DATE_TIME',
     },
   ];
-  provide('operationType', operationType);
-
   // 子组件获取父组件的值
   const childGetFieldsValue = () => getFieldsValue();
 
+  provide('operationType', operationType);
+
+  // 获取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;
+  };
   defineExpose({
     getFieldsValueFunc,
     updateFieldDeviceId,
     resetFieldsValueFunc,
     setFieldsFormValueFun,
     childGetFieldsValue,
+    operationType,
+    getRefItemConditionScreeningRefs,
+    setConditionScreeningList,
+    setRichText,
   });
 </script>

@@ -38,12 +38,12 @@
   </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 { Icon } from '/@/components/Icon';
   import { Tooltip, Radio, Card, Select } from 'ant-design-vue';
-  import { trigger_condition_schema } from '../config';
+  import { trigger_condition_schema } from '../config/config.data.ts';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
   const RadioGroup = Radio.Group;
@@ -100,39 +100,6 @@
       componentProps: {
         placeholder: '请选择属性',
         options,
-        onChange(value) {
-          if (value) {
-            updateSchema([
-              {
-                field: 'operation',
-                ifShow: true,
-              },
-              {
-                field: 'value',
-                ifShow: true,
-              },
-            ]);
-            setFieldsValue({
-              operation: '',
-              value: '',
-            });
-            return;
-          }
-          updateSchema([
-            {
-              field: 'operation',
-              ifShow: false,
-            },
-            {
-              field: 'value',
-              ifShow: false,
-            },
-          ]);
-          setFieldsValue({
-            operation: '',
-            value: '',
-          });
-        },
       },
     });
   };
@@ -148,6 +115,7 @@
     { label: '自定义启用', value: 'CUSTOM' },
   ];
   const operationType = ref<string>('');
+
   const options = [
     {
       label: '数字',
@@ -163,7 +131,7 @@
     },
     {
       label: '时间',
-      value: 'TIME',
+      value: 'DATE_TIME',
     },
   ];
   // 子组件获取父组件的值
@@ -171,11 +139,27 @@
 
   provide('operationType', operationType);
 
+  // 获取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;
+  };
   defineExpose({
     getFieldsValueFunc,
     updateFieldDeviceId,
     resetFieldsValueFunc,
     setFieldsFormValueFun,
     childGetFieldsValue,
+    operationType,
+    getRefItemConditionScreeningRefs,
+    setConditionScreeningList,
+    setRichText,
   });
 </script>

@@ -20,13 +20,13 @@
               label: '编辑',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
-              ifShow: record.creator === userId,
+              ifShow: record.creator === userId && record.status !== 1,
             },
             {
               label: '删除',
               icon: 'ant-design:delete-outlined',
               color: 'error',
-              ifShow: record.creator === userId,
+              ifShow: record.creator === userId && record.status !== 1,
               popConfirm: {
                 title: '是否确认删除',
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
@@ -50,7 +50,7 @@
   import { screenLinkPageGetApi, screenLinkPageDeleteApi } from '/@/api/ruleengine/ruleengineApi';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
-  import { columns, searchFormSchema } from './config';
+  import { columns, searchFormSchema } from './config/config.data.ts';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
   import { authBtn } from '/@/enums/roleEnum';