fix:重构后修复场景联动选择组织没设备问题

fengtao
1 parent 69358c3c
Showing 5 changed files with 111 additions and 62 deletions
src/views/ruleengine/scenelinkage/addForm/condition.vue
src/views/ruleengine/scenelinkage/addForm/doaction.vue
src/views/ruleengine/scenelinkage/addForm/trigger.vue
src/views/ruleengine/scenelinkage/index.vue
src/views/ruleengine/scenelinkage/useDrawer.vue
--- a/src/views/ruleengine/scenelinkage/addForm/condition.vue
View file @d85b5ce
+++ b/src/views/ruleengine/scenelinkage/addForm/condition.vue
View file @d85b5ce
 <template>
-  <CollapseContainer title="执行条件" style="background-color: #eeeeee">
+  <CollapseContainer style="background-color: #eeeeee">
     <div style="position: relative">
       <BasicForm
         :labelWidth="100"
--- a/src/views/ruleengine/scenelinkage/addForm/doaction.vue
View file @d85b5ce
+++ b/src/views/ruleengine/scenelinkage/addForm/doaction.vue
View file @d85b5ce
 <template>
-  <CollapseContainer class="prefixRedDot" title="执行动作" style="background-color: #eeeeee">
+  <CollapseContainer class="prefixRedDot" style="background-color: #eeeeee">
     <div style="position: relative">
       <BasicForm
         :labelWidth="100"
@@ -87,7 +87,7 @@
     vertical-align: middle;
     display: inline-block;
     position: relative;
-    top: 33px;
+    top: 25px;
     left: 5px;
   }
 </style>
--- a/src/views/ruleengine/scenelinkage/addForm/trigger.vue
View file @d85b5ce
+++ b/src/views/ruleengine/scenelinkage/addForm/trigger.vue
View file @d85b5ce
 <template>
   <div>
-    <CollapseContainer title="触发器" style="background-color: #eeeeee">
+    <CollapseContainer style="background-color: #eeeeee">
       <div>
         <BasicForm
           :labelWidth="100"
@@ -38,9 +38,7 @@
       watch(
         () => props.deviceInfo,
         async (newV) => {
-          console.log(newV);
           const options = await screenLinkPageByDeptIdGetDevice({ organizationId: newV });
-          console.log(options);
           options.items.forEach((v) => {
             return (v.value = v.id), (v.label = v.name);
           });
--- a/src/views/ruleengine/scenelinkage/index.vue
View file @d85b5ce
+++ b/src/views/ruleengine/scenelinkage/index.vue
View file @d85b5ce
@@ -119,10 +119,14 @@
         echoEditData = record;
       }
       async function handleDelete(record: Recordable) {
-        let ids = [record.id];
-        await screenLinkPageDeleteApi(ids);
-        createMessage.success('删除成功');
-        reload();
+        try {
+          let ids = [record.id];
+          await screenLinkPageDeleteApi(ids);
+          createMessage.success('删除成功');
+          reload();
+        } catch (e) {
+          return e;
+        }
       }
       function handleSuccess() {
         reload();
--- a/src/views/ruleengine/scenelinkage/useDrawer.vue
View file @d85b5ce
+++ b/src/views/ruleengine/scenelinkage/useDrawer.vue
View file @d85b5ce
@@ -11,6 +11,8 @@
     <!-- 触发器 -->
     <div>
       <template v-for="(item, index) in addTriggerPushData" :key="index">
+        <span style="display: none">{{ item + index }}</span>
+        <span style="position: relative; top: 3.2vh; left: 0.3vw">触发器{{ index + 1 }}</span>
         <div>
           <AddTriggerForm :deviceInfo="getDeviceInfo" ref="refTriggerChild" />
         </div>
@@ -19,7 +21,7 @@
       <div
         style="
           display: flex;
-          width: 13vw;
+          width: 11vw;
           height: 4vh;
           flex-direction: row;
           justify-content: space-between;
@@ -27,12 +29,17 @@
       >
         <div style="display: flex; width: 4vw; height: 4vh">
           <Button type="primary" style="border-radius: 10px" class="mt-5" @click="addTrigger"
-            ><PlusCircleOutlined />新增触发器</Button
+            >新增触发器</Button
           >
         </div>
         <div style="display: flex; width: 4vw; height: 4vh">
-          <Button type="error" style="border-radius: 10px" class="mt-5" @click="removeTrigger"
-            ><PlusCircleOutlined />删除</Button
+          <Button
+            type="default"
+            style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
+            class="mt-5"
+            @click="removeTrigger"
+          >
+            <span style="color: white">删除</span></Button
           >
         </div>
       </div>
@@ -41,6 +48,9 @@
     <!-- 执行条件 -->
     <div>
       <template v-for="(item, index) in addConditionPushData" :key="index">
+        <span style="display: none">{{ item + index }}</span>
+        <span style="position: relative; top: 3.2vh; left: 0.3vw">执行条件{{ index + 1 }}</span>
+
         <div>
           <AddConditiForm :deviceInfo1="getDeviceInfo1" ref="refConditionChild" />
         </div>
@@ -49,7 +59,7 @@
       <div
         style="
           display: flex;
-          width: 13vw;
+          width: 11vw;
           height: 4vh;
           flex-direction: row;
           justify-content: space-between;
@@ -57,12 +67,17 @@
       >
         <div style="display: flex; width: 4vw; height: 4vh">
           <Button type="primary" style="border-radius: 10px" class="mt-5" @click="addCondition"
-            ><PlusCircleOutlined />新增执行条件</Button
+            >新增执行条件</Button
           >
         </div>
         <div style="display: flex; width: 4vw; height: 4vh">
-          <Button type="error" style="border-radius: 10px" class="mt-5" @click="removeCondition"
-            ><PlusCircleOutlined />删除</Button
+          <Button
+            style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
+            type="default"
+            class="mt-5"
+            @click="removeCondition"
+          >
+            <span style="color: white">删除</span></Button
           >
         </div>
       </div>
@@ -71,6 +86,9 @@
     <div style="height: 5vh"></div>
     <div>
       <template v-for="(item, index) in addActionPushData" :key="index">
+        <span style="display: none">{{ item + index }}</span>
+        <span style="position: relative; top: 4.2vh; left: 0.65vw">执行动作{{ index + 1 }}</span>
+
         <div>
           <AddActionForm :deviceInfo2="getDeviceInfo2" ref="refActionChild" />
         </div>
@@ -79,7 +97,7 @@
       <div
         style="
           display: flex;
-          width: 13vw;
+          width: 11vw;
           height: 4vh;
           flex-direction: row;
           justify-content: space-between;
@@ -87,15 +105,21 @@
       >
         <div style="display: flex; width: 4vw; height: 4vh">
           <Button type="primary" style="border-radius: 10px" class="mt-5" @click="addAction"
-            ><PlusCircleOutlined />新增执行动作</Button
+            >新增执行动作</Button
           >
         </div>
         <div style="display: flex; width: 4vw; height: 4vh">
-          <Button type="error" style="border-radius: 10px" class="mt-5" @click="removeAction"
-            ><PlusCircleOutlined />删除</Button
+          <Button
+            style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
+            type="default"
+            class="mt-5"
+            @click="removeAction"
+          >
+            <span style="color: white">删除</span></Button
           >
         </div>
       </div>
+      <div style="height: 5vh"></div>
     </div>
   </BasicDrawer>
 </template>
@@ -104,11 +128,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema, getData } from './config';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import {
-    screenLinkPageAddApi,
-    // screenLinkPageUpdateApi,
-    // screenLinkPageByDeptIdGetDevice,
-  } from '/@/api/ruleengine/ruleengineApi';
+  import { screenLinkPageAddApi, screenLinkPageUpdateApi } from '/@/api/ruleengine/ruleengineApi';
   import { useMessage } from '/@/hooks/web/useMessage';
   import AddTriggerForm from './addForm/trigger.vue';
   import AddConditiForm from './addForm/condition.vue';
@@ -118,9 +138,17 @@
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { BasicDrawer, BasicForm, AddTriggerForm, AddConditiForm, AddActionForm, Button },
+    components: {
+      BasicDrawer,
+      BasicForm,
+      AddTriggerForm,
+      AddConditiForm,
+      AddActionForm,
+      Button,
+    },
     emits: ['success', 'register', 'registerForm'],
     setup(_, { emit }) {
+      const { proxy } = getCurrentInstance();
       const lastRefTriggerChildDataArray = ref<[]>([]);
       const lastRefConditionChildDataArray = ref<[]>([]);
       const lastRefActionChildDataArray = ref<[]>([]);
@@ -159,7 +187,6 @@
       const addTriggerPushData = ref<[]>([]);
       const addConditionPushData = ref<[]>([]);
       const addActionPushData = ref<[]>([]);
-      const { proxy } = getCurrentInstance();
       const getChildData = ref(null);
       const refTriggerChild = ref(null);
       const refConditionChild = ref(null);
@@ -167,13 +194,13 @@
       const getConditionChildData = ref(null);
       const { createMessage } = useMessage();
       const isUpdate = ref(true);
-      let getAllFormData: any = reactive({});
+      const getAllFormData: any = reactive({});
       let getValuesFormData: any = reactive({});
-      let getId = ref('');
-      let getTenantId = ref('');
-      let getDeviceInfo = ref(null);
-      let getDeviceInfo1 = ref(null);
-      let getDeviceInfo2 = ref(null);
+      const getId = ref('');
+      const getTenantId = ref('');
+      const getDeviceInfo = ref(null);
+      const getDeviceInfo1 = ref(null);
+      const getDeviceInfo2 = ref(null);
       const [registerForm, { resetFields, setFieldsValue, validateFields }] = useForm({
         labelWidth: 120,
@@ -194,9 +221,8 @@
           } catch (e) {
             return e;
           }
-        }
-        //编辑
-        if (unref(isUpdate)) {
+        } else {
+          //编辑
           getId.value = data.record.id;
           getTenantId.value = data.record.tenantId;
           await setFieldsValue({
@@ -259,14 +285,17 @@
         }
       };
-      const getDefaultValue = async () => {
-        getValuesFormData = await validateFields();
+      const getDefaultValue = () => {
         refTriggerChildDataFunc();
         refConditionChildDataFunc();
         refActionChildDataFunc();
-        lastRefTriggerChildDataArray.value.push(refTriggerChildData.value);
-        lastRefConditionChildDataArray.value.push(refConditionChildData.value);
-        lastRefActionChildDataArray.value.push(refActionChildData.value);
+        lastRefTriggerChildDataArray.value.push(refTriggerChildData.value as never);
+        lastRefConditionChildDataArray.value.push(refConditionChildData.value as never);
+        lastRefActionChildDataArray.value.push(refActionChildData.value as never);
+        //删除第一个
+        lastRefTriggerChildDataArray.value.shift();
+        lastRefConditionChildDataArray.value.shift();
+        lastRefActionChildDataArray.value.shift();
         const triggersObj = {
           triggers: lastRefTriggerChildDataArray.value,
         };
@@ -276,52 +305,66 @@
         const actionsObj = {
           actions: lastRefActionChildDataArray.value,
         };
-        Object.assign(getAllFormData, getValuesFormData, triggersObj, conditionsObj, actionsObj);
+        Object.assign(getAllFormData, triggersObj, conditionsObj, actionsObj);
         if (!unref(isUpdate)) {
           delete getAllFormData.id;
           delete getAllFormData.getTenantId;
         }
       };
-      async function handleSubmit() {
+      const handleSubmit = async () => {
         if (!unref(isUpdate)) {
           getDefaultValue();
-          console.log(getAllFormData);
+          getValuesFormData = await validateFields();
+          if (!getValuesFormData) return;
+          Object.assign(getAllFormData, getValuesFormData);
           await screenLinkPageAddApi(getAllFormData);
           createMessage.success('场景联动新增成功');
           closeDrawer();
           emit('success');
         } else {
           getDefaultValue();
+          getAllFormData.id = getId.value;
+          getAllFormData.tenantId = getTenantId.value;
+          await screenLinkPageUpdateApi(getAllFormData);
           createMessage.success('场景联动编辑成功');
           closeDrawer();
           emit('success');
         }
-      }
+      };
+
       //新增触发器
       const addTrigger = () => {
-        unref(addTriggerPushData).push(addTriggerData);
+        unref(addTriggerPushData).push(addTriggerData as never);
         refTriggerChildDataFunc();
         lastRefTriggerChildData.value = refTriggerChildData.value;
-        lastRefTriggerChildDataArray.value.push(lastRefTriggerChildData.value);
+        lastRefTriggerChildDataArray.value.push(lastRefTriggerChildData.value as never);
       };
       const removeTrigger = () => {
-        unref(addTriggerPushData).splice(0, 1);
-        lastRefTriggerChildDataArray.value.splice(0, 1);
-        getAllFormData.triggers.splice(0, 1);
+        try {
+          unref(addTriggerPushData).splice(0, 1);
+          lastRefTriggerChildDataArray.value.splice(0, 1);
+          getAllFormData.triggers.splice(0, 1);
+        } catch (e) {
+          return e;
+        }
       };
       //新增执行条件
       const addCondition = () => {
-        unref(addConditionPushData).push(addConditionData);
+        unref(addConditionPushData).push(addConditionData as never);
         refConditionChildDataFunc();
         lastRefConditionChildData.value = refConditionChildData.value;
-        lastRefConditionChildDataArray.value.push(lastRefConditionChildData.value);
+        lastRefConditionChildDataArray.value.push(lastRefConditionChildData.value as never);
       };
       const removeCondition = () => {
-        unref(addConditionPushData).splice(0, 1);
-        lastRefConditionChildDataArray.value.splice(0, 1);
-        getAllFormData.conditions.splice(0, 1);
+        try {
+          unref(addConditionPushData).splice(0, 1);
+          lastRefConditionChildDataArray.value.splice(0, 1);
+          getAllFormData.conditions.splice(0, 1);
+        } catch (e) {
+          return e;
+        }
       };
       //新增执行动作
@@ -331,15 +374,19 @@
         }
       };
       const addAction = () => {
-        unref(addActionPushData).push(addActionData);
+        unref(addActionPushData).push(addActionData as never);
         refActionChildDataFunc();
         lastRefActionChildData.value = refActionChildData.value;
-        lastRefActionChildDataArray.value.push(lastRefActionChildData.value);
+        lastRefActionChildDataArray.value.push(lastRefActionChildData.value as never);
       };
       const removeAction = () => {
-        unref(addActionPushData).splice(0, 1);
-        lastRefActionChildDataArray.value.splice(0, 1);
-        getAllFormData.actions.splice(0, 1);
+        try {
+          unref(addActionPushData).splice(0, 1);
+          lastRefActionChildDataArray.value.splice(0, 1);
+          getAllFormData.actions.splice(0, 1);
+        } catch (e) {
+          return e;
+        }
       };
       return {