Merge branch 'sqy_dev' into 'main'

'fix:调整场景联动逻辑,加入访问统计' See merge request huang/yun-teng-iot-front!181

Merge branch 'sqy_dev' into 'main'
'fix:调整场景联动逻辑,加入访问统计' See merge request huang/yun-teng-iot-front!181
xp.Huang
2 parents 7a23bc0a 509576d5
Showing 10 changed files with 345 additions and 293 deletions
src/hooks/web/useBatchDelete.ts
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/rule/linkedge/config/config.data.ts
src/views/rule/linkedge/config/formatData.ts
src/views/rule/linkedge/cpns/ClearAlarm.vue
src/views/rule/linkedge/cpns/ConditionScreeningForm.vue
src/views/rule/linkedge/cpns/Trigger-Condition.vue
src/views/rule/linkedge/cpns/action.vue
src/views/rule/linkedge/index.vue
src/views/sys/login/LoginForm.vue
--- a/src/hooks/web/useBatchDelete.ts
View file @4ba1ffc
+++ b/src/hooks/web/useBatchDelete.ts
View file @4ba1ffc
@@ -11,12 +11,11 @@ import { useMessage } from '/@/hooks/web/useMessage';
  * }
  *
  */
-export interface selectionOptions {
+interface selectionOptions {
   rowKey: string;
   clickToRowSelect: boolean;
   rowSelection: {
     onSelect: (_, __, selectedRowKeys: string[]) => void;
-    getCheckboxProps: (record: Recordable) => void;
     type: 'radio' | 'checkbox';
   };
 }
@@ -27,8 +26,8 @@ export const useBatchDelete = (
   const { createMessage } = useMessage();
   const selectedRowIds = ref<string[]>([]);
   const hasBatchDelete = computed(() => selectedRowIds.value.length <= 0);
-  // 复选框事件
-  const onSelectRow = (_, __, selectedRows) => {
+  // 复选框选择事件
+  const onSelect = (_, __, selectedRows) => {
     const selectedRowKeys = selectedRows.map((item) => item.id);
     selectedRowIds.value = selectedRowKeys;
   };
@@ -49,20 +48,13 @@ export const useBatchDelete = (
       selectedRowIds.value = [];
     }
   };
+
   const selectionOptions: selectionOptions = {
     rowKey: 'id',
     clickToRowSelect: false,
     rowSelection: {
-      onSelect: onSelectRow,
+      onSelect,
       type: 'checkbox',
-      getCheckboxProps(record: Recordable) {
-        // Demo:status为1的选择框禁用
-        if (record.status === 1) {
-          return { disabled: true };
-        } else {
-          return { disabled: false };
-        }
-      },
     },
   };
   return { hasBatchDelete, selectionOptions, handleDeleteOrBatchDelete };
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @4ba1ffc
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @4ba1ffc
@@ -4,7 +4,7 @@
       v-bind="$attrs"
       @register="registerDrawer"
       @ok="handleSubmit"
-      width="100%"
+      width="50%"
       showFooter
       @close="handleClose"
       :title="title"
@@ -65,6 +65,7 @@
               :actionData="actionData"
               :triggerData="triggerData"
               :ref="skipUnwrap.actionItemRefs"
+              :deviceList="deviceList"
               @deleteAction="deleteAction"
             />
           </template>
@@ -172,6 +173,7 @@
           label: item.name,
         };
       });
+      deviceList.value = editEntryIdData.value;
       nextTick(() => {
         setEditFields(skipUnwrap.triggerItemRefs, editEntryIdData);
         setEditFields(skipUnwrap.conditionItemRefs, editEntryIdData);
@@ -285,6 +287,7 @@
       doActions.forEach((action, index) => {
         nextTick(() => {
+          // 设置执行动作外层值
           unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({
             outTarget: action.outTarget,
             device: action.entityType,
@@ -292,76 +295,92 @@
             alarm_config: action.alarmProfileId,
             alarm_level: action.doContext.alarmLevel,
           });
+          // 如果是设备输出设置脚本值
           if (action.outTarget === 'DEVICE_OUT') {
             unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params);
           }
-          if (action.doContext.clearRule) {
+          // 清除告警有值?{数组}
+          if (action?.doContext?.clearRule?.length) {
             unref(skipUnwrap.actionItemRefs)[index].checked = true;
+            // 生成对应清除告警的数组长度
+            unref(skipUnwrap.actionItemRefs)[index].clearRuleList = [
+              ...new Array(action?.doContext?.clearRule?.length).keys(),
+            ];
+            // 推迟执行时机-DOM渲染完毕在执行
             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,
-                entityId: action?.doContext?.clearRule?.entityId,
-                replaceValue:
-                  action?.doContext?.clearRule?.triggerCondition?.condition?.spec?.predicate
-                    ?.defaultValue,
-                time: action?.doContext?.clearRule?.triggerCondition?.condition?.spec?.predicate
-                  ?.defaultValue,
-                timeUnit: action?.doContext?.clearRule?.triggerCondition?.condition?.spec?.unit,
-              });
-              // 设置值operationType
-
-              unref(skipUnwrap.actionItemRefs)[index].clearAlarmRef.operationType =
-                action.doContext.clearRule.triggerCondition.condition.condition[0].valueType;
+              unref(skipUnwrap.actionItemRefs)[index].refItem.clearRuleRefs.value.map(
+                (item, index) => {
+                  item.setFieldsFormValueFun({
+                    triggered:
+                      action.doContext.clearRule[index].triggerCondition.condition.spec.type,
+                    device: action.doContext.clearRule[index].entityType,
+                    triggerType: action.doContext.clearRule[index].triggerType,
+                    type1:
+                      action.doContext.clearRule[index].triggerCondition.condition.condition[0].key
+                        .type,
+                    type2:
+                      action.doContext.clearRule[index].triggerCondition.condition.condition[0].key
+                        .key,
+                    operationType:
+                      action.doContext.clearRule[index].triggerCondition.condition.condition[0]
+                        .valueType,
+                    detail: action.doContext.clearRule[index].triggerCondition.alarmDetails,
+                    entityId: action.doContext.clearRule[index].entityId,
+                    replaceValue:
+                      action.doContext.clearRule[index].triggerCondition.condition.spec.predicate
+                        .defaultValue,
+                    time: action.doContext.clearRule[index].triggerCondition.condition.spec
+                      .predicate.defaultValue,
+                    timeUnit:
+                      action.doContext.clearRule[index].triggerCondition.condition.spec.unit,
+                  });
+                  // 单独设置operationType值 操作符类型 NUMERIC|String|Boolean|DATE_TIME
+                  item.operationType =
+                    action.doContext.clearRule[
+                      index
+                    ].triggerCondition.condition.condition[0].valueType;
+                }
+              );
               const ConditionScreeningForm = await unref(skipUnwrap.actionItemRefs)[
                 index
               ].getRefItemConditionScreeningRefs();
-              // // 设置对应条件筛选的个数
-              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) => {
+              action.doContext.clearRule.map((rule, ruleIndex) => {
+                // 生成对应条件筛选的数组个数
+                unref(skipUnwrap.actionItemRefs)[index].setConditionScreeningList([
+                  ...new Array(
+                    action.doContext.clearRule[
+                      ruleIndex
+                    ].triggerCondition.condition.condition.length
+                  ).keys(),
+                ]);
+                nextTick(() => {
+                  const richTextList = [];
+                  rule.triggerCondition.condition.condition.forEach((item, conditionIndex) => {
                     const formItem = {
                       operation: item.predicate.operation,
                       value: String(item.predicate.value.defaultValue),
                     };
                     richTextList.push({
                       // 查询中文操作符
-                      operation: findOperation(valueType, item.predicate.operation).label,
+                      operation: findOperation(item.valueType, item.predicate.operation).label,
                       value: String(item.predicate.value.defaultValue),
-                      attribute:
-                        action.doContext.clearRule.triggerCondition?.condition.condition[0]?.key
-                          ?.key,
+                      attribute: item?.key?.key,
                     });
-                    ConditionScreeningForm.value[index].setFieldsValue(formItem);
-                  }
-                );
-                unref(skipUnwrap.actionItemRefs)[index].setRichText(richTextList);
+                    ConditionScreeningForm[ruleIndex].value[conditionIndex].setFieldsValue(
+                      formItem
+                    );
+                  });
+                  unref(skipUnwrap.actionItemRefs)[index].setRichText(richTextList, ruleIndex);
+                });
               });
             });
           }
+          nextTick(() => {
+            setEditFields(skipUnwrap.actionItemRefs, editEntryIdData);
+          });
         });
       });
     }
--- a/src/views/rule/linkedge/config/config.data.ts
View file @4ba1ffc
+++ b/src/views/rule/linkedge/config/config.data.ts
View file @4ba1ffc
-import { ref, h } from 'vue';
+import { ref } from 'vue';
 import { BasicColumn, FormSchema } from '/@/components/Table';
-import {
-  screenLinkOrganizationGetApi,
-  screenLinkPagePutApi,
-} from '/@/api/ruleengine/ruleengineApi';
-import { Switch } from 'ant-design-vue';
-import { useMessage } from '/@/hooks/web/useMessage';
+import { screenLinkOrganizationGetApi } from '/@/api/ruleengine/ruleengineApi';
+
 import { copyTransFun } from '/@/utils/fnUtils';
 /**
@@ -53,34 +49,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     dataIndex: 'status',
     width: 120,
-    customRender: ({ record }) => {
-      if (!Reflect.has(record, 'pendingStatus')) {
-        record.pendingStatus = false;
-      }
-      return h(Switch, {
-        checked: record.status === 1,
-        checkedChildren: '启用',
-        unCheckedChildren: '禁用',
-        loading: record.pendingStatus,
-        onChange(checked: boolean) {
-          record.pendingStatus = true;
-          const newStatus = checked ? 1 : 0;
-          const { createMessage } = useMessage();
-          screenLinkPagePutApi({ id: record.id, status: newStatus })
-            .then(() => {
-              record.status = newStatus;
-              if (record.status == 1) {
-                createMessage.success(`启用成功`);
-              } else {
-                createMessage.success('禁用成功');
-              }
-            })
-            .finally(() => {
-              record.pendingStatus = false;
-            });
-        },
-      });
-    },
+    slots: { customRender: 'status' },
   },
   {
     title: '描述',
--- a/src/views/rule/linkedge/config/formatData.ts
View file @4ba1ffc
+++ b/src/views/rule/linkedge/config/formatData.ts
View file @4ba1ffc
@@ -17,7 +17,6 @@ export const genTriggerOrConditionData = (triggerData) => {
     timeUnit,
     replaceValue,
   } = triggerData;
-  console.log(time, timeUnit, replaceValue);
   const mapPredicate = predicate?.map((item) => {
     return {
       key: {
@@ -72,42 +71,58 @@ export const genTriggerOrConditionData = (triggerData) => {
   };
 };
-export const genActionData = (conditionData) => {
+export const genActionData = (actionData) => {
   const {
     alarm_config,
     alarm_level,
-    detail,
-    device,
-    doContext,
-    operationType,
     outTarget,
-    predicate,
-    triggerType,
-    triggered,
-    type1,
-    type2,
-    schedule,
-    entityId,
+    clearRule: clearRules,
+    doContext,
+    device,
     deviceId,
-    time,
-    timeUnit,
-  } = conditionData;
-
-  const mapPredicate = predicate?.map((item) => {
+  } = actionData;
+  const clearRule = clearRules.map((item) => {
+    const mapPredicate = item.predicate.map((pred) => {
+      return {
+        key: {
+          type: item.type1,
+          key: item.type2,
+        },
+        valueType: item.operationType,
+        // value: null,
+        predicate: {
+          type: item.operationType,
+          operation: pred.operation,
+          value: {
+            defaultValue: pred.value,
+            // userValue: null,
+            // dynamicValue: null,
+          },
+        },
+      };
+    });
     return {
-      key: {
-        type: type1,
-        key: type2,
-      },
-      valueType: operationType,
-      // value: null,
-      predicate: {
-        type: operationType,
-        operation: item.operation,
-        value: {
-          defaultValue: item.value,
-          // userValue: null,
-          // dynamicValue: null,
+      triggerType: item.triggerType,
+      entityType: item.device,
+      entityId: item.device === 'PART' ? item.entityId : null,
+      triggerCondition: {
+        alarmDetails: item.detail,
+        condition: {
+          condition: mapPredicate,
+          spec: {
+            type: item.triggered,
+            unit: item.timeUnit,
+            predicate: {
+              defaultValue: item.time,
+            },
+          },
+        },
+        schedule: {
+          type: item.schedule,
+          // timezone: 'Asia/Shanghai',
+          // daysOfWeek: [2, 3],
+          // startsOn: 8700000,
+          // endsOn: 30300000,
         },
       },
     };
@@ -116,36 +131,12 @@ export const genActionData = (conditionData) => {
     {
       alarmProfileId: alarm_config,
       outTarget,
-      entityType: device,
-      deviceId: entityId?.length ? entityId : null,
-      doContext: mapPredicate?.length
+      entityType: device ?? 'ALL',
+      deviceId: device === 'PART' ? deviceId : null,
+      doContext: clearRule?.length
         ? {
             alarmLevel: alarm_level,
-            clearRule: {
-              triggerType,
-              triggerCondition: {
-                alarmDetails: detail,
-                condition: {
-                  condition: mapPredicate,
-                  spec: {
-                    type: triggered,
-                    unit: timeUnit,
-                    predicate: {
-                      defaultValue: time,
-                      // userValue: null,
-                      // dynamicValue: null,
-                    },
-                  },
-                },
-                schedule: {
-                  type: schedule,
-                  // timezone: 'Asia/Shanghai',
-                  // daysOfWeek: [2, 3],
-                  // startsOn: 8700000,
-                  // endsOn: 30300000,
-                },
-              },
-            },
+            clearRule,
           }
         : {
             ...doContext,
@@ -178,6 +169,48 @@ export const operationBoolean = [
   { label: '不等于', value: Boolean_Operation.NOT_EQUAL },
 ];
+export const scheduleOptions = [
+  { label: '始终启用', value: 'ANY_TIME' },
+  { label: '定时启用', value: 'SPECIFIC_TIME' },
+  { label: '自定义启用', value: 'CUSTOM' },
+];
+export const timeUnitOptions = [
+  {
+    label: '秒',
+    value: 'SECONDS',
+  },
+  {
+    label: '分',
+    value: 'MINUTES',
+  },
+  {
+    label: '时',
+    value: 'HOURS',
+  },
+  {
+    label: '天',
+    value: 'DAYS',
+  },
+];
+export const options = [
+  {
+    label: '数字',
+    value: 'NUMERIC',
+  },
+  {
+    label: '布尔值',
+    value: 'BOOLEAN',
+  },
+  {
+    label: '字符串',
+    value: 'STRING',
+  },
+  {
+    label: '时间',
+    value: 'DATE_TIME',
+  },
+];
+
 // 查找操作符
 export function findOperation(valueType, operation) {
   switch (valueType) {
--- a/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @4ba1ffc
+++ b/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @4ba1ffc
@@ -5,6 +5,15 @@
         <div>
           <span class="mr-2">启用规则</span>
           <RadioGroup v-model:value="schedule" :options="scheduleOptions" />
+          <Tooltip title="移除" class="ml-4">
+            <Icon
+              icon="fluent:delete-off-20-regular"
+              size="20"
+              class="mr-2 cursor-pointer"
+              @click="handleDelete(index)"
+              v-if="clearRuleList.length > 1"
+            />
+          </Tooltip>
         </div>
       </template>
       <BasicForm @register="registerForm">
@@ -29,7 +38,7 @@
           </Input>
         </template>
       </BasicForm>
-      <Card size="small" :bordered="false" style="border: 2px dashed #797979" v-if="operationType">
+      <Card size="small" :bordered="false" style="border: 2px dashed #d9d9d9" v-if="operationType">
         <ConditionScreening
           :childGetFieldsValue="childGetFieldsValue"
           ref="conditionScreeningRef"
@@ -42,11 +51,24 @@
   import { ref, provide } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Radio, Card, Select, Input } from 'ant-design-vue';
+  import { Radio, 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';
+  defineProps({
+    index: {
+      type: Number,
+      required: true,
+    },
+    clearRuleList: {
+      type: Array,
+      default: () => [],
+    },
+  });
+  const emit = defineEmits(['delete']);
   const RadioGroup = Radio.Group;
   const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
@@ -90,52 +112,13 @@
     });
   };
   const schedule = ref('ANY_TIME');
-  const scheduleOptions = [
-    { label: '始终启用', value: 'ANY_TIME' },
-    { label: '定时启用', value: 'SPECIFIC_TIME' },
-    { label: '自定义启用', value: 'SPECIFIC_TIME' },
-  ];
   const operationType = ref<string>('');
-  const options = [
-    {
-      label: '数字',
-      value: 'NUMERIC',
-    },
-    {
-      label: '布尔值',
-      value: 'BOOLEAN',
-    },
-    {
-      label: '字符串',
-      value: 'STRING',
-    },
-    {
-      label: '时间',
-      value: 'DATE_TIME',
-    },
-  ];
-
-  const timeUnitOptions = [
-    {
-      label: '秒',
-      value: 'SECONDS',
-    },
-    {
-      label: '分',
-      value: 'MINUTES',
-    },
-    {
-      label: '时',
-      value: 'HOURS',
-    },
-    {
-      label: '天',
-      value: 'DAYS',
-    },
-  ];
-  const childGetFieldsValue = () => getFieldsValue();
   provide('operationType', operationType);
+  const childGetFieldsValue = () => getFieldsValue();
+  const handleDelete = (index: number) => {
+    emit('delete', index);
+  };
   defineExpose({
     getFieldsValue,
     updateFieldDeviceId,
--- a/src/views/rule/linkedge/cpns/ConditionScreeningForm.vue
View file @4ba1ffc
+++ b/src/views/rule/linkedge/cpns/ConditionScreeningForm.vue
View file @4ba1ffc
@@ -70,7 +70,7 @@
   .basicStyle {
     margin-top: 0.5rem;
     width: 80%;
-    border: 2px dashed #797979;
+    border: 1px dashed #d9d9d9;
     padding: 1rem 0 0.5rem;
     border-radius: 0.25rem;
   }
--- a/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @4ba1ffc
+++ b/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @4ba1ffc
@@ -43,7 +43,7 @@
           </Input>
         </template>
       </BasicForm>
-      <Card size="small" :bordered="false" style="border: 2px dashed #797979" v-if="operationType">
+      <Card size="small" :bordered="false" style="border: 2px dashed #d9d9d9" v-if="operationType">
         <ConditionScreening
           :childGetFieldsValue="childGetFieldsValue"
           ref="conditionScreeningRef"
@@ -61,6 +61,7 @@
   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;
   defineProps({
@@ -128,53 +129,12 @@
   };
   const schedule = ref('ANY_TIME');
-  const scheduleOptions = [
-    { label: '始终启用', value: 'ANY_TIME' },
-    { label: '定时启用', value: 'SPECIFIC_TIME' },
-    { label: '自定义启用', value: 'CUSTOM' },
-  ];
   const operationType = ref<string>('');
-  const timeUnitOptions = [
-    {
-      label: '秒',
-      value: 'SECONDS',
-    },
-    {
-      label: '分',
-      value: 'MINUTES',
-    },
-    {
-      label: '时',
-      value: 'HOURS',
-    },
-    {
-      label: '天',
-      value: 'DAYS',
-    },
-  ];
-  const options = [
-    {
-      label: '数字',
-      value: 'NUMERIC',
-    },
-    {
-      label: '布尔值',
-      value: 'BOOLEAN',
-    },
-    {
-      label: '字符串',
-      value: 'STRING',
-    },
-    {
-      label: '时间',
-      value: 'DATE_TIME',
-    },
-  ];
+  provide('operationType', operationType);
+
   // 子组件获取父组件的值
   const childGetFieldsValue = () => getFieldsValue();
-  provide('operationType', operationType);
-
   // 获取conditionScreeningForm的组件
   const getRefItemConditionScreeningRefs = async () => {
     await nextTick();
--- a/src/views/rule/linkedge/cpns/action.vue
View file @4ba1ffc
+++ b/src/views/rule/linkedge/cpns/action.vue
View file @4ba1ffc
@@ -32,17 +32,30 @@
         </div>
       </template>
       <template #clearAlarm>
-        <Checkbox v-model:checked="checked"> 清除告警 </Checkbox>
+        <Checkbox v-model:checked="checked" @change="handleCheckedChange"> 清除告警 </Checkbox>
+        <Tooltip title="清除告警与触发器一一对应">
+          <QuestionCircleOutlined />
+        </Tooltip>
       </template>
     </BasicForm>
-    <Card
-      v-if="checked"
-      :bordered="false"
-      style="border: 2px dashed #797979"
-      :bodyStyle="{ padding: 0 }"
+    <template v-for="(item, index) in clearRuleList" :key="item">
+      <Card
+        :bordered="false"
+        style="border: 2px dashed #d9d9d9; margin-top: 1rem"
+        :bodyStyle="{ padding: 0 }"
+      >
+        <ClearAlarm
+          :clearRuleList="clearRuleList"
+          :index="index"
+          :ref="refItem.clearRuleRefs"
+          @delete="deleteClearRule"
+        />
+      </Card>
+    </template>
+
+    <a-button v-if="checked && isAddClearRule" class="mt-4" type="primary" @click="addClearRule"
+      >新增清除告警</a-button
     >
-      <ClearAlarm ref="clearAlarmRef" />
-    </Card>
   </CollapseContainer>
 </template>
 <script lang="ts" setup>
@@ -57,6 +70,7 @@
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { useUserStore } from '/@/store/modules/user';
   import ClearAlarm from './ClearAlarm.vue';
+
   const props = defineProps({
     actionIndex: {
       type: Number,
@@ -70,20 +84,25 @@
       type: Array,
       default: () => [],
     },
+    deviceList: {
+      type: Array,
+      required: true,
+    },
   });
-
+  const isAddClearRule = computed(() => clearRuleList.value.length < props.triggerData.length);
+  const refItem = {
+    clearRuleRefs: ref([]),
+  };
   const emit = defineEmits(['deleteAction']);
   const userStore = useUserStore();
-  const options = computed(() => {
-    return [
-      { label: '设备输出', value: 'DEVICE_OUT' },
-      {
-        label: '告警输出',
-        value: 'MSG_NOTIFY',
-        disabled: userStore.getOutTarget === 'MSG_NOTIFY' || !props.triggerData.length,
-      },
-    ];
-  });
+  const options = computed(() => [
+    { label: '设备输出', value: 'DEVICE_OUT' },
+    {
+      label: '告警输出',
+      value: 'MSG_NOTIFY',
+      disabled: userStore.getOutTarget === 'MSG_NOTIFY' || !props.triggerData.length,
+    },
+  ]);
   const hasDisabled = ref(false);
   const outTarget = ref('');
   const changeOutTarget = (value: string) => {
@@ -101,18 +120,21 @@
   // 获取整个执行动作表单值
   const getFieldsValueFunc = () => {
-    const predicate =
-      clearAlarmRef?.value?.conditionScreeningRef?.refItem?.conditionScreeningRefs?.value?.map(
+    const clearRule = refItem.clearRuleRefs.value.map((item) => {
+      const predicate = item.conditionScreeningRef?.refItem?.conditionScreeningRefs?.value?.map(
         (item) => item.getFieldsValue()
       );
+      return {
+        ...item.getFieldsValue(),
+        predicate,
+        schedule: item?.schedule,
+      };
+    });
     return {
       ...getFieldsValue(),
-      ...clearAlarmRef?.value?.getFieldsValue(),
-      predicate,
       doContext: unref(jsonInstance.value).get(),
-      schedule: clearAlarmRef?.value?.schedule,
-      checked: checked.value,
+      clearRule,
     };
   };
   const setFieldsFormValueFun = (fieldsValue) => {
@@ -155,6 +177,30 @@
     emit('deleteAction', { actionIndex, outTarget });
   };
+  const clearRuleList = ref([]);
+  const handleCheckedChange = (e: Event) => {
+    if (!e.target.checked) {
+      clearRuleList.value = [];
+    } else {
+      addClearRule();
+    }
+  };
+  const addClearRule = () => {
+    unref(clearRuleList).push(Date.now());
+    nextTick(() => {
+      setFields(refItem.clearRuleRefs);
+    });
+  };
+
+  function setFields(refs) {
+    unref(refs).map((item) => {
+      item.updateFieldDeviceId(props.deviceList);
+    });
+  }
+  const deleteClearRule = (index) => {
+    unref(clearRuleList).splice(index, 1);
+  };
+
   // json 以及初始化JSON
   const jsoneditorRef = ref();
   const jsonValue = ref({});
@@ -180,20 +226,24 @@
   };
   const operationType = ref<string>('');
-  const clearAlarmRef = ref();
+  provide('operationType', operationType);
   const getRefItemConditionScreeningRefs = async () => {
     await nextTick();
-    return clearAlarmRef.value.conditionScreeningRef.refItem.conditionScreeningRefs;
+    return refItem.clearRuleRefs.value.map(
+      (item) => item.conditionScreeningRef.refItem.conditionScreeningRefs
+    );
   };
   const setConditionScreeningList = (list) => {
-    clearAlarmRef.value.conditionScreeningRef.conditionScreeningList = list;
+    refItem.clearRuleRefs.value.map((item) => {
+      item.conditionScreeningRef.conditionScreeningList = list;
+    });
   };
-  const setRichText = (list) => {
-    clearAlarmRef.value.conditionScreeningRef.otherAttribute = list;
+  const setRichText = (list, index) => {
+    refItem.clearRuleRefs.value[index].conditionScreeningRef.otherAttribute = list;
   };
-  provide('operationType', operationType);
+
   defineExpose({
     getFieldsValueFunc,
     setFieldsFormValueFun,
@@ -206,10 +256,11 @@
     jsonInstance,
     updateEditFieldAlarmConfig,
     checked,
-    clearAlarmRef,
     getRefItemConditionScreeningRefs,
     setConditionScreeningList,
     setRichText,
+    refItem,
+    clearRuleList,
   });
 </script>
--- a/src/views/rule/linkedge/index.vue
View file @4ba1ffc
+++ b/src/views/rule/linkedge/index.vue
View file @4ba1ffc
@@ -34,44 +34,60 @@
           ]"
         />
       </template>
+
+      <template #status="{ record }">
+        <Switch
+          :checked="record.status === 1"
+          :loading="record.pendingStatus"
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          @change="(checked:boolean)=>statusChange(checked,record)"
+        />
+      </template>
     </BasicTable>
-    <SceneLinkAgeDrawer
-      @register="registerDrawer"
-      @success="handleSuccess"
-      ref="sceneLinkAgeDrawerRef"
-    />
+    <SceneLinkAgeDrawer @register="registerDrawer" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
-  import { screenLinkPageGetApi, screenLinkPageDeleteApi } from '/@/api/ruleengine/ruleengineApi';
+  import {
+    screenLinkPageGetApi,
+    screenLinkPageDeleteApi,
+    screenLinkPagePutApi,
+  } from '/@/api/ruleengine/ruleengineApi';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-
+  import { Switch } from 'ant-design-vue';
   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';
   import SceneLinkAgeDrawer from './SceneLinkAgeDrawer.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
     name: 'LinkEdge',
-    components: { BasicTable, SceneLinkAgeDrawer, TableAction },
+    components: { BasicTable, SceneLinkAgeDrawer, TableAction, Switch },
     setup() {
-      const sceneLinkAgeDrawerRef: any = ref(null);
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
         screenLinkPageDeleteApi,
         handleSuccess
       );
-      const handleLog = (log) => {
-        console.log(log);
+      selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
+        // Demo:status为1的选择框禁用
+        if (record.status === 1) {
+          return { disabled: true };
+        } else {
+          return { disabled: false };
+        }
       };
+
       const userInfo: any = getAuthCache(USER_INFO_KEY);
       const userId = userInfo.userId;
       const role: string = userInfo.roles[0];
       const [registerDrawer, { openDrawer }] = useDrawer();
-      const [registerTable, { reload }] = useTable({
+      const [registerTable, { reload, setProps }] = useTable({
         title: '场景联动列表',
         api: screenLinkPageGetApi,
         columns,
@@ -114,8 +130,29 @@
       function handleSuccess() {
         reload();
       }
+
+      const statusChange = async (checked, record) => {
+        // record.pendingStatus = true;
+        setProps({
+          loading: true,
+        });
+        const newStatus = checked ? 1 : 0;
+        const { createMessage } = useMessage();
+        try {
+          await screenLinkPagePutApi({ id: record.id, status: newStatus });
+          if (newStatus) {
+            createMessage.success(`启用成功`);
+          } else {
+            createMessage.success('禁用成功');
+          }
+        } finally {
+          setProps({
+            loading: false,
+          });
+          reload();
+        }
+      };
       return {
-        sceneLinkAgeDrawerRef,
         registerTable,
         registerDrawer,
         handleAdd,
@@ -127,7 +164,7 @@
         authBtn,
         role,
         userId,
-        handleLog,
+        statusChange,
       };
     },
   });
--- a/src/views/sys/login/LoginForm.vue
View file @4ba1ffc
+++ b/src/views/sys/login/LoginForm.vue
View file @4ba1ffc
@@ -135,6 +135,14 @@
       link.rel = 'shortcut icon';
       link.href = res.icon ?? '/favicon.ico';
       document.getElementsByTagName('head')[0].appendChild(link);
+
+      var _hmt = _hmt || [];
+      (function () {
+        var hm = document.createElement('script');
+        hm.src = 'https://hm.baidu.com/hm.js?909f8e22a361b08e4f5ea3918500aede';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(hm, s);
+      })();
     }
     loading.value = false;
   }