fix：修复场景联动新增数据重复问题，fix：修复场景联动编辑数据重复问题

fengtao
1 parent a5b42b0f
Showing 1 changed file with 105 additions and 38 deletions
src/views/ruleengine/scenelinkage/useDrawer.vue
--- a/src/views/ruleengine/scenelinkage/useDrawer.vue
View file @d695431
+++ b/src/views/ruleengine/scenelinkage/useDrawer.vue
View file @d695431
@@ -167,7 +167,7 @@
   import AddTriggerForm from './addForm/trigger.vue';
   import AddConditiForm from './addForm/condition.vue';
   import AddActionForm from './addForm/doaction.vue';
-  import { IAddTrigger, IAddCondition, IAddAction } from './index';
+  import { IAddTrigger } from './index';
   import { Button } from '/@/components/Button';
   export default defineComponent({
@@ -184,8 +184,6 @@
     setup(_, { emit }) {
       const { proxy } = getCurrentInstance();
       const lastEditRefTriggerChildDataArray = ref<[]>([]);
-      const lastEditRefConditionChildDataArray = ref<[]>([]);
-      const lastEditRefActionChildDataArray = ref<[]>([]);
       const lastRefTriggerChildDataArray = ref<[]>([]);
       const lastRefConditionChildDataArray = ref<[]>([]);
       const lastRefActionChildDataArray = ref<[]>([]);
@@ -200,20 +198,6 @@
         compare: '',
         value: '',
       });
-      const addConditionData = reactive<IAddCondition>({
-        triggerType: '',
-        entityId: '',
-        createTime: '',
-        updateTime: '',
-        compare: '',
-        value: '',
-      });
-      const addActionData = reactive<IAddAction>({
-        outTarget: '',
-        deviceId: '',
-        command: '',
-        sceneLinkageId: '',
-      });
       const addTriggerPushData = ref<[]>([]);
       const addConditionPushData = ref<[]>([]);
       const addActionPushData = ref<[]>([]);
@@ -240,8 +224,8 @@
       const newActionFilterMap = ref<[]>([]);
       let filterNewConditionArr = [];
       const pushEditArray = ref<any>([{}]);
-      const pushEditConditionArray = [];
-      const pushEditActionArray = [];
+      const pushEditConditionArray = ref<any>([{}]);
+      const pushEditActionArray = ref<any>([{}]);
       let filterArrayTrigger = [];
       const filterArrayCondition = ref<[]>([]);
       const filterArrayAction = ref<[]>([]);
@@ -316,6 +300,10 @@
           try {
             pushEditArray.value = [];
             pushEditArray.value.length = 0;
+            pushEditConditionArray.value.length = 0;
+            pushEditConditionArray.value = [];
+            pushEditActionArray.value = [];
+            pushEditActionArray.value.length = 0;
             newFilterMap.value = [];
             newConditionFilterMap.value = [];
             newActionFilterMap.value = [];
@@ -377,6 +365,8 @@
       const getTitle = computed(() => (!unref(isUpdate) ? '新增场景联动' : '编辑场景联动'));
       const handleClose = () => {
         pushEditArray.value.length = 0;
+        pushEditConditionArray.value.length = 0;
+        pushEditActionArray.value.length = 0;
         lastRefTriggerChildDataArray.value.length = 0;
         lastRefTriggerChildDataArray.value = [];
         lastRefConditionChildDataArray.value.length = 0;
@@ -484,10 +474,20 @@
           Object.assign(getAllFormData, triggersObj, conditionsObj, actionsObj);
         } else {
           let kongTriggerObj = {};
+          let kongConditionObj = {};
+          let kongActionObj = {};
           editTriggerPushData.value.forEach((f) => {
             kongTriggerObj = f;
             pushEditArray.value.push(kongTriggerObj);
           });
+          editConditionPushData.value.forEach((f) => {
+            kongConditionObj = f;
+            pushEditConditionArray.value.push(kongConditionObj);
+          });
+          editActionPushData.value.forEach((f) => {
+            kongActionObj = f;
+            pushEditActionArray.value.push(kongActionObj);
+          });
           refTriggerChildDataFunc();
           let newTriggerArray = pushEditArray.value.concat(refTriggerChildData);
           newTriggerArray = newTriggerArray.filter((f) => Object.keys(f).length !== 0);
@@ -495,13 +495,20 @@
           triggersObj = {
             triggers: isNoChange.value ? editTriggerPushData.value : newTriggerArray,
           };
-          console.log(triggersObj);
-          // conditionsObj = {
-          //   doConditions: newConditionArray,
-          // };
-          // actionsObj = {
-          //   doActions: newActionArray,
-          // };
+          refConditionChildDataFunc();
+          let newConditionArray = pushEditConditionArray.value.concat(refConditionChildData);
+          newConditionArray = newConditionArray.filter((f) => Object.keys(f).length !== 0);
+          newConditionArray.shift();
+          conditionsObj = {
+            doConditions: newConditionArray,
+          };
+          refActionChildDataFunc();
+          let newActionArray = pushEditActionArray.value.concat(refActionChildData);
+          newActionArray = newActionArray.filter((f) => Object.keys(f).length !== 0);
+          newActionArray.shift();
+          actionsObj = {
+            doActions: newActionArray,
+          };
           Object.assign(getAllFormData, triggersObj, conditionsObj, actionsObj);
         }
       };
@@ -525,10 +532,13 @@
           getAllFormData.tenantId = getTenantId.value;
           refTriggerChildData = {};
           pushEditArray.value.length = 0;
-          // await screenLinkPageUpdateApi(getAllFormData);
-          // createMessage.success('场景联动编辑成功');
-          // closeDrawer();
-          // emit('success');
+          pushEditConditionArray.value.length = 0;
+          pushEditActionArray.value.length = 0;
+          console.log('edit data', getAllFormData);
+          await screenLinkPageUpdateApi(getAllFormData);
+          createMessage.success('场景联动编辑成功');
+          closeDrawer();
+          emit('success');
         }
       };
       //新增触发器
@@ -604,8 +614,6 @@
               },
             };
           });
-          console.log(pushEditArray.value);
-
           try {
             setTimeout(() => {
               proxy.$refs.refTriggerChild.updateFieldDeviceId(optionsItemArray.value);
@@ -688,9 +696,61 @@
             return e;
           }
         } else {
+          isNoChange.value = false;
+          unref(editConditionPushData).push(refConditionChildData as never);
           refConditionChildDataFunc();
-          pushEditConditionArray.push(refConditionChildData as never);
-          unref(editConditionPushData).push(addConditionData as never);
+          pushEditConditionArray.value.push(refConditionChildData);
+          pushEditConditionArray.value = pushEditConditionArray.value.map((m) => {
+            return {
+              triggerType: m?.triggerType,
+              entityId: m?.entityId,
+              triggerCondition: {
+                condition: [
+                  {
+                    key: {
+                      type: 'TIME_SERIES',
+                      key: 'CO2',
+                    },
+                    valueType:
+                      m.type == 'NUMERIC1'
+                        ? 'NUMERIC'
+                        : m.type == 'NUMERIC2'
+                        ? 'NUMERIC'
+                        : 'NUMERIC',
+                    value: {},
+                    predicate: {
+                      type:
+                        m.type == 'NUMERIC1'
+                          ? 'NUMERIC'
+                          : m.type == 'NUMERIC2'
+                          ? 'NUMERIC'
+                          : 'NUMERIC',
+                      value: {
+                        defaultValue:
+                          Number(m.value1) == null
+                            ? 0
+                            : Number(m.value1) || Number(m.value2) == null
+                            ? 0
+                            : Number(m.value2),
+                      },
+                      operation: m.operation1 || m.operatio2,
+                    },
+                  },
+                ],
+                spec: {
+                  type: 'SIMPLE',
+                },
+              },
+            };
+          });
+          try {
+            setTimeout(() => {
+              proxy.$refs.refConditionChild.updateFieldDeviceId(optionsItemArray.value);
+            }, 150);
+          } catch (e) {
+            return e;
+          }
+          refConditionChildData = {};
         }
       };
       const removeCondition = () => {
@@ -703,7 +763,6 @@
         } else {
           try {
             unref(editConditionPushData).splice(0, 1);
-            lastEditRefConditionChildDataArray.value.pop();
           } catch (e) {
             return e;
           }
@@ -729,9 +788,18 @@
             return e;
           }
         } else {
+          isNoChange.value = false;
+          unref(editActionPushData).push(refActionChildData as never);
           refActionChildDataFunc();
-          pushEditActionArray.push(refActionChildData as never);
-          unref(editActionPushData).push(addActionData as never);
+          pushEditActionArray.value.push(refActionChildData);
+          try {
+            setTimeout(() => {
+              proxy.$refs.refActionChild.updateFieldDeviceId(optionsItemArray.value);
+            }, 150);
+          } catch (e) {
+            return e;
+          }
+          refActionChildData = {};
         }
       };
       const removeAction = () => {
@@ -744,7 +812,6 @@
         } else {
           try {
             unref(editActionPushData).splice(0, 1);
-            lastEditRefActionChildDataArray.value.pop();
           } catch (e) {
             return e;
           }