fix：修改设备配置告警通知和联系人为多选

fengtao
1 parent aae82259
Showing 8 changed files with 69 additions and 31 deletions
src/views/device/profile/DeviceProfileModal.vue
src/views/device/profile/cpns/config.ts
src/views/device/profile/index.vue
src/views/device/profile/step/DeviceProfileStep3.vue
src/views/device/profile/step/DeviceProfileStep4.vue
src/views/device/profile/types/index.ts → src/views/device/profile/step/index.t.ts
src/views/ruleengine/scenelinkage/addForm/trigger.vue
src/views/ruleengine/scenelinkage/useDrawer.vue
--- a/src/views/device/profile/DeviceProfileModal.vue
View file @5d13b23
+++ b/src/views/device/profile/DeviceProfileModal.vue
View file @5d13b23
@@ -8,7 +8,7 @@
     @cancel="handleCancel"
   >
     <div class="step-form-form">
-      <a-steps :current="current" @change="handleChange">
+      <a-steps :current="current">
         <a-step title="设备配置" />
         <a-step title="传输配置" />
         <a-step title="告警配置" />
@@ -79,7 +79,6 @@
       const DeviceProfileStep3Ref = ref(null);
       const DeviceProfileStep4Ref = ref(null);
       const { createMessage } = useMessage();
-      // const getStepData = ref(null);
       const { proxy } = getCurrentInstance();
       const postDeviceConfogData: any = ref({});
       const getStepOneData: any = ref({});
@@ -91,10 +90,8 @@
       const postEditId = ref('');
       const current = ref(0);
       const isUpdate = ref(true);
+
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备配置' : '编辑设备配置'));
-      const handleChange = (v) => {
-        console.log(v);
-      };
       const [register, { closeModal }] = useModalInner(async (data) => {
         isUpdate.value = !!data?.isUpdate;
         if (!unref(isUpdate)) {
@@ -277,6 +274,8 @@
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           alarmProfileData.value.alarmProfile =
             await proxy.$refs.DeviceProfileStep4Ref.getAllFields();
+          alarmProfileData.value.alarmProfile.alarmContactId.shift();
+          alarmProfileData.value.alarmProfile.messageMode.shift();
           Object.assign(
             postDeviceConfogData.value,
             getStepOneData.value,
@@ -288,8 +287,7 @@
           createMessage.success('新增设备配置成功');
           closeModal();
           emit('success');
-        }
-        if (unref(isUpdate)) {
+        } else {
           postDeviceConfogData.value.id = postEditId.value;
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           alarmProfileData.value.alarmProfile =
@@ -311,13 +309,11 @@
         closeModal();
       };
       return {
-        handleChange,
         DeviceProfileStep2Ref,
         DeviceProfileStep3Ref,
         DeviceProfileStep4Ref,
         DeviceProfileStep1Ref,
         editEchoData,
-        // getStepData,
         handleStep3Next,
         handleSubmit,
         handleCancel,
--- a/src/views/device/profile/cpns/config.ts
View file @5d13b23
+++ b/src/views/device/profile/cpns/config.ts
View file @5d13b23
@@ -8,6 +8,8 @@ export const alertContactsSchemas: FormSchema[] = [
     label: '告警通知联系人',
     component: 'ApiSelect',
     componentProps: {
+      mode: 'multiple',
+
       api: alarmContactGetPage,
       labelField: 'username',
       valueField: 'id',
@@ -20,6 +22,7 @@ export const alertContactsSchemas: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     componentProps: {
+      mode: 'multiple',
       api: findDictItemByCode,
       params: {
         dictCode: 'message_type',
--- a/src/views/device/profile/index.vue
View file @5d13b23
+++ b/src/views/device/profile/index.vue
View file @5d13b23
@@ -223,7 +223,7 @@
       function handleSuccess() {
         reload();
       }
-      return {
+      return { 
         deviceDetailRef,
         setRowClassName,
         registerModalDetail,
--- a/src/views/device/profile/step/DeviceProfileStep3.vue
View file @5d13b23
+++ b/src/views/device/profile/step/DeviceProfileStep3.vue
View file @5d13b23
@@ -207,7 +207,7 @@
 <script lang="ts">
   import { defineComponent, ref, unref, getCurrentInstance, watch } from 'vue';
-  import type { IProfileData } from '../types/index';
+  import type { IProfileData } from './index.t';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form';
   import {
--- a/src/views/device/profile/step/DeviceProfileStep4.vue
View file @5d13b23
+++ b/src/views/device/profile/step/DeviceProfileStep4.vue
View file @5d13b23
 <template>
   <div class="step-4">
-    <!-- <span>请选择告警通知联系人：</span> -->
-    <!-- <Tag v-for="(item, index) in 15" closable :key="index"> 冯涛+{{ item }}</Tag> -->
     <BasicForm :showSubmitButton="false" @register="register" />
   </div>
 </template>
 <script lang="ts">
   import { defineComponent, ref } from 'vue';
-  // import { Tag } from 'ant-design-vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { alertContactsSchemas } from '../cpns/config';
--- a/src/views/device/profile/step/index.t.ts renamed from src/views/device/profile/types/index.ts
View file @5d13b23
+++ b/src/views/device/profile/step/index.t.ts renamed from src/views/device/profile/types/index.ts
View file @5d13b23
--- a/src/views/ruleengine/scenelinkage/addForm/trigger.vue
View file @5d13b23
+++ b/src/views/ruleengine/scenelinkage/addForm/trigger.vue
View file @5d13b23
@@ -23,7 +23,7 @@
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
-    props: ['deviceInfo', 'editTriggerFather'],
+    props: ['deviceInfo', 'editTriggerFather', 'newFilterMapFather'],
     setup(props) {
       const fieldValue: any = ref({});
       const [registerTrigger, { setFieldsValue, getFieldsValue, updateSchema }] = useForm({
@@ -50,6 +50,7 @@
           });
         }
       );
+
       //回显数据
       const setFieldsFormValueFun = () => {
         setTimeout(() => {
@@ -66,15 +67,37 @@
           },
         });
       };
-      const editSelectDevice = (v) => {
+      const editSelectDevice = () => {
+        setTimeout(() => {
+          updateSchema({
+            field: 'deviceId',
+            componentProps: {
+              options: props.newFilterMapFather,
+            },
+          });
+        }, 100);
+      };
+      editSelectDevice();
+      //新增清空场景触发器选择
+      const clearSelectScene = () => {
+        updateSchema({
+          field: 'sceneLinkageId',
+          componentProps: {
+            options: [],
+          },
+        });
+      };
+      const editSelectScene = (v) => {
         updateSchema({
-          field: 'deviceId',
+          field: 'sceneLinkageId',
           componentProps: {
             options: v,
           },
         });
       };
       return {
+        clearSelectScene,
+        editSelectScene,
         clearSelectDevice,
         editSelectDevice,
         getFieldsValueFunc,
--- a/src/views/ruleengine/scenelinkage/useDrawer.vue
View file @5d13b23
+++ b/src/views/ruleengine/scenelinkage/useDrawer.vue
View file @5d13b23
@@ -17,16 +17,14 @@
         >
           <span style="display: none">{{ item + index }}</span>
           <span style="position: relative; top: 3.2vh; left: 0.3vw">触发器{{ index + 1 }}</span>
-          <div v-if="isUpdate == true">
+          <div>
             <AddTriggerForm
-              :editTriggerFather="item"
+              :editTriggerFather="isUpdate == false ? null : item"
+              :newFilterMapFather="isUpdate == false ? null : newFilterMap"
               :deviceInfo="getDeviceInfo"
               ref="refTriggerChild"
             />
           </div>
-          <div v-if="isUpdate == false">
-            <AddTriggerForm :deviceInfo="getDeviceInfo" ref="refTriggerChild" />
-          </div>
           <div style="height: 3vh"></div>
         </template>
         <div
@@ -45,6 +43,7 @@
           </div>
           <div style="display: flex; width: 4vw; height: 4vh">
             <Button
+              v-if="addTriggerPushData.length != 0 || editTriggerPushData.length != 0"
               type="default"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               class="mt-5"
@@ -83,6 +82,7 @@
           </div>
           <div style="display: flex; width: 4vw; height: 4vh">
             <Button
+              v-if="addConditionPushData.length != 0"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               type="default"
               class="mt-5"
@@ -121,6 +121,7 @@
           </div>
           <div style="display: flex; width: 4vw; height: 4vh">
             <Button
+              v-if="addActionPushData.length > 0"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               type="default"
               class="mt-5"
@@ -140,7 +141,11 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema, getData } from './config';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { screenLinkPageAddApi, screenLinkPageUpdateApi } from '/@/api/ruleengine/ruleengineApi';
+  import {
+    screenLinkPageAddApi,
+    screenLinkPageUpdateApi,
+    screenLinkPageByDeptIdGetDevice,
+  } from '/@/api/ruleengine/ruleengineApi';
   import { useMessage } from '/@/hooks/web/useMessage';
   import AddTriggerForm from './addForm/trigger.vue';
   import AddConditiForm from './addForm/condition.vue';
@@ -216,7 +221,7 @@
       const getDeviceInfo = ref(null);
       const getDeviceInfo1 = ref(null);
       const getDeviceInfo2 = ref(null);
-      const editReveiveData = ref<[]>([]);
+      const newFilterMap = ref<[]>([]);
       const [registerForm, { resetFields, setFieldsValue, validateFields }] = useForm({
         labelWidth: 120,
@@ -228,26 +233,39 @@
         await resetFields();
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
-
         if (!unref(isUpdate)) {
           try {
             proxy.$refs.refTriggerChild.clearSelectDevice();
+            proxy.$refs.refTriggerChild.clearSelectScene();
             proxy.$refs.refConditionChild.clearSelectDevice();
             proxy.$refs.refActionChild.clearSelectDevice();
           } catch (e) {
             return e;
           }
-        }
-        if (unref(isUpdate)) {
-          //编辑
+        } else {
+          newFilterMap.value = [];
           clearAllArrayFunc();
+          editTriggerPushData.value = [];
+          lastEditRefTriggerChildDataArray.value = [];
           getId.value = data.record.id;
           getTenantId.value = data.record.tenantId;
           await setFieldsValue({
             ...data.record,
           });
-          editReveiveData.value = data.record.triggers;
-          editTriggerPushData.value = editReveiveData.value;
+          editTriggerPushData.value = data.record.triggers;
+          const options = await screenLinkPageByDeptIdGetDevice({
+            organizationId: data.record.organizationId,
+          });
+          data.record.triggers.forEach((f1) => {
+            options.items.forEach((f2) => {
+              if (f2.id == f1.deviceId) {
+                newFilterMap.value.push({
+                  value: f2.id,
+                  label: f2.name,
+                });
+              }
+            });
+          });
         }
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增场景联动' : '编辑场景联动'));
@@ -259,7 +277,7 @@
         lastRefTriggerChildDataArray.value.length = 0;
         lastRefConditionChildDataArray.value.length = 0;
         lastRefActionChildDataArray.value.length = 0;
-        // lastEditRefTriggerChildDataArray.value.length = 0;
+        lastEditRefTriggerChildDataArray.value.length = 0;
       };
       const resetActionsAllArrayFunc = () => {
         try {
@@ -444,6 +462,7 @@
       };
       return {
+        newFilterMap,
         editTriggerPushData,
         isUpdate,
         clearActionsAllDevice,