Merge branch 'ft-dev' into 'main'

fix：修改设备配置告警通知和联系人为多选和场景联动没有触发器按钮问题

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

@@ -8,7 +8,7 @@
     @cancel="handleCancel"
     @cancel="handleCancel"
   >
   >
     <div class="step-form-form">
     <div class="step-form-form">
-      <a-steps :current="current" @change="handleChange">
+      <a-steps :current="current">
         <a-step title="设备配置" />
         <a-step title="设备配置" />
         <a-step title="传输配置" />
         <a-step title="传输配置" />
         <a-step title="告警配置" />
         <a-step title="告警配置" />
@@ -79,7 +79,6 @@
       const DeviceProfileStep3Ref = ref(null);
       const DeviceProfileStep3Ref = ref(null);
       const DeviceProfileStep4Ref = ref(null);
       const DeviceProfileStep4Ref = ref(null);
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
-      // const getStepData = ref(null);
       const { proxy } = getCurrentInstance();
       const { proxy } = getCurrentInstance();
       const postDeviceConfogData: any = ref({});
       const postDeviceConfogData: any = ref({});
       const getStepOneData: any = ref({});
       const getStepOneData: any = ref({});
@@ -91,10 +90,8 @@
       const postEditId = ref('');
       const postEditId = ref('');
       const current = ref(0);
       const current = ref(0);
       const isUpdate = ref(true);
       const isUpdate = ref(true);
+
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备配置' : '编辑设备配置'));
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备配置' : '编辑设备配置'));
-      const handleChange = (v) => {
-        console.log(v);
-      };
       const [register, { closeModal }] = useModalInner(async (data) => {
       const [register, { closeModal }] = useModalInner(async (data) => {
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
         if (!unref(isUpdate)) {
         if (!unref(isUpdate)) {
@@ -277,6 +274,8 @@
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           alarmProfileData.value.alarmProfile =
           alarmProfileData.value.alarmProfile =
             await proxy.$refs.DeviceProfileStep4Ref.getAllFields();
             await proxy.$refs.DeviceProfileStep4Ref.getAllFields();
+          alarmProfileData.value.alarmProfile.alarmContactId.shift();
+          alarmProfileData.value.alarmProfile.messageMode.shift();
           Object.assign(
           Object.assign(
             postDeviceConfogData.value,
             postDeviceConfogData.value,
             getStepOneData.value,
             getStepOneData.value,
@@ -288,8 +287,7 @@
           createMessage.success('新增设备配置成功');
           createMessage.success('新增设备配置成功');
           closeModal();
           closeModal();
           emit('success');
           emit('success');
-        }
-        if (unref(isUpdate)) {
+        } else {
           postDeviceConfogData.value.id = postEditId.value;
           postDeviceConfogData.value.id = postEditId.value;
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           alarmProfileData.value.alarmProfile =
           alarmProfileData.value.alarmProfile =
@@ -311,13 +309,11 @@
         closeModal();
         closeModal();
       };
       };
       return {
       return {
-        handleChange,
         DeviceProfileStep2Ref,
         DeviceProfileStep2Ref,
         DeviceProfileStep3Ref,
         DeviceProfileStep3Ref,
         DeviceProfileStep4Ref,
         DeviceProfileStep4Ref,
         DeviceProfileStep1Ref,
         DeviceProfileStep1Ref,
         editEchoData,
         editEchoData,
-        // getStepData,
         handleStep3Next,
         handleStep3Next,
         handleSubmit,
         handleSubmit,
         handleCancel,
         handleCancel,

@@ -8,6 +8,8 @@ export const alertContactsSchemas: FormSchema[] = [
     label: '告警通知联系人',
     label: '告警通知联系人',
     component: 'ApiSelect',
     component: 'ApiSelect',
     componentProps: {
     componentProps: {
+      mode: 'multiple',
+
       api: alarmContactGetPage,
       api: alarmContactGetPage,
       labelField: 'username',
       labelField: 'username',
       valueField: 'id',
       valueField: 'id',
@@ -20,6 +22,7 @@ export const alertContactsSchemas: FormSchema[] = [
     required: true,
     required: true,
     component: 'ApiSelect',
     component: 'ApiSelect',
     componentProps: {
     componentProps: {
+      mode: 'multiple',
       api: findDictItemByCode,
       api: findDictItemByCode,
       params: {
       params: {
         dictCode: 'message_type',
         dictCode: 'message_type',

@@ -223,7 +223,7 @@
       function handleSuccess() {
       function handleSuccess() {
         reload();
         reload();
       }
       }
-      return {
+      return { 
         deviceDetailRef,
         deviceDetailRef,
         setRowClassName,
         setRowClassName,
         registerModalDetail,
         registerModalDetail,

@@ -207,7 +207,7 @@
 
 
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, ref, unref, getCurrentInstance, watch } from 'vue';
   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 { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import {
   import {

 <template>
 <template>
   <div class="step-4">
   <div class="step-4">
-    <!-- <span>请选择告警通知联系人：</span> -->
-    <!-- <Tag v-for="(item, index) in 15" closable :key="index"> 冯涛+{{ item }}</Tag> -->
     <BasicForm :showSubmitButton="false" @register="register" />
     <BasicForm :showSubmitButton="false" @register="register" />
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, ref } from 'vue';
   import { defineComponent, ref } from 'vue';
-  // import { Tag } from 'ant-design-vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { alertContactsSchemas } from '../cpns/config';
   import { alertContactsSchemas } from '../cpns/config';
 
 

@@ -23,7 +23,7 @@
 
 
   export default defineComponent({
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
-    props: ['deviceInfo', 'editTriggerFather'],
+    props: ['deviceInfo', 'editTriggerFather', 'newFilterMapFather'],
     setup(props) {
     setup(props) {
       const fieldValue: any = ref({});
       const fieldValue: any = ref({});
       const [registerTrigger, { setFieldsValue, getFieldsValue, updateSchema }] = useForm({
       const [registerTrigger, { setFieldsValue, getFieldsValue, updateSchema }] = useForm({
@@ -50,6 +50,7 @@
           });
           });
         }
         }
       );
       );
+
       //回显数据
       //回显数据
       const setFieldsFormValueFun = () => {
       const setFieldsFormValueFun = () => {
         setTimeout(() => {
         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({
         updateSchema({
-          field: 'deviceId',
+          field: 'sceneLinkageId',
           componentProps: {
           componentProps: {
             options: v,
             options: v,
           },
           },
         });
         });
       };
       };
       return {
       return {
+        clearSelectScene,
+        editSelectScene,
         clearSelectDevice,
         clearSelectDevice,
         editSelectDevice,
         editSelectDevice,
         getFieldsValueFunc,
         getFieldsValueFunc,

@@ -17,16 +17,14 @@
         >
         >
           <span style="display: none">{{ item + index }}</span>
           <span style="display: none">{{ item + index }}</span>
           <span style="position: relative; top: 3.2vh; left: 0.3vw">触发器{{ index + 1 }}</span>
           <span style="position: relative; top: 3.2vh; left: 0.3vw">触发器{{ index + 1 }}</span>
-          <div v-if="isUpdate == true">
+          <div>
             <AddTriggerForm
             <AddTriggerForm
-              :editTriggerFather="item"
+              :editTriggerFather="isUpdate == false ? null : item"
+              :newFilterMapFather="isUpdate == false ? null : newFilterMap"
               :deviceInfo="getDeviceInfo"
               :deviceInfo="getDeviceInfo"
               ref="refTriggerChild"
               ref="refTriggerChild"
             />
             />
           </div>
           </div>
-          <div v-if="isUpdate == false">
-            <AddTriggerForm :deviceInfo="getDeviceInfo" ref="refTriggerChild" />
-          </div>
           <div style="height: 3vh"></div>
           <div style="height: 3vh"></div>
         </template>
         </template>
         <div
         <div
@@ -45,6 +43,7 @@
           </div>
           </div>
           <div style="display: flex; width: 4vw; height: 4vh">
           <div style="display: flex; width: 4vw; height: 4vh">
             <Button
             <Button
+              v-if="addTriggerPushData.length != 0 || editTriggerPushData.length != 0"
               type="default"
               type="default"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               class="mt-5"
               class="mt-5"
@@ -83,6 +82,7 @@
           </div>
           </div>
           <div style="display: flex; width: 4vw; height: 4vh">
           <div style="display: flex; width: 4vw; height: 4vh">
             <Button
             <Button
+              v-if="addConditionPushData.length != 0"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               type="default"
               type="default"
               class="mt-5"
               class="mt-5"
@@ -121,6 +121,7 @@
           </div>
           </div>
           <div style="display: flex; width: 4vw; height: 4vh">
           <div style="display: flex; width: 4vw; height: 4vh">
             <Button
             <Button
+              v-if="addActionPushData.length > 0"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               type="default"
               type="default"
               class="mt-5"
               class="mt-5"
@@ -140,7 +141,11 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema, getData } from './config';
   import { formSchema, getData } from './config';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   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 { useMessage } from '/@/hooks/web/useMessage';
   import AddTriggerForm from './addForm/trigger.vue';
   import AddTriggerForm from './addForm/trigger.vue';
   import AddConditiForm from './addForm/condition.vue';
   import AddConditiForm from './addForm/condition.vue';
@@ -216,7 +221,7 @@
       const getDeviceInfo = ref(null);
       const getDeviceInfo = ref(null);
       const getDeviceInfo1 = ref(null);
       const getDeviceInfo1 = ref(null);
       const getDeviceInfo2 = ref(null);
       const getDeviceInfo2 = ref(null);
-      const editReveiveData = ref<[]>([]);
+      const newFilterMap = ref<[]>([]);
 
 
       const [registerForm, { resetFields, setFieldsValue, validateFields }] = useForm({
       const [registerForm, { resetFields, setFieldsValue, validateFields }] = useForm({
         labelWidth: 120,
         labelWidth: 120,
@@ -228,26 +233,39 @@
         await resetFields();
         await resetFields();
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
-
         if (!unref(isUpdate)) {
         if (!unref(isUpdate)) {
           try {
           try {
             proxy.$refs.refTriggerChild.clearSelectDevice();
             proxy.$refs.refTriggerChild.clearSelectDevice();
+            proxy.$refs.refTriggerChild.clearSelectScene();
             proxy.$refs.refConditionChild.clearSelectDevice();
             proxy.$refs.refConditionChild.clearSelectDevice();
             proxy.$refs.refActionChild.clearSelectDevice();
             proxy.$refs.refActionChild.clearSelectDevice();
           } catch (e) {
           } catch (e) {
             return e;
             return e;
           }
           }
-        }
-        if (unref(isUpdate)) {
-          //编辑
+        } else {
+          newFilterMap.value = [];
           clearAllArrayFunc();
           clearAllArrayFunc();
+          editTriggerPushData.value = [];
+          lastEditRefTriggerChildDataArray.value = [];
           getId.value = data.record.id;
           getId.value = data.record.id;
           getTenantId.value = data.record.tenantId;
           getTenantId.value = data.record.tenantId;
           await setFieldsValue({
           await setFieldsValue({
             ...data.record,
             ...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) ? '新增场景联动' : '编辑场景联动'));
       const getTitle = computed(() => (!unref(isUpdate) ? '新增场景联动' : '编辑场景联动'));
@@ -259,7 +277,7 @@
         lastRefTriggerChildDataArray.value.length = 0;
         lastRefTriggerChildDataArray.value.length = 0;
         lastRefConditionChildDataArray.value.length = 0;
         lastRefConditionChildDataArray.value.length = 0;
         lastRefActionChildDataArray.value.length = 0;
         lastRefActionChildDataArray.value.length = 0;
-        // lastEditRefTriggerChildDataArray.value.length = 0;
+        lastEditRefTriggerChildDataArray.value.length = 0;
       };
       };
       const resetActionsAllArrayFunc = () => {
       const resetActionsAllArrayFunc = () => {
         try {
         try {
@@ -444,6 +462,7 @@
       };
       };
 
 
       return {
       return {
+        newFilterMap,
         editTriggerPushData,
         editTriggerPushData,
         isUpdate,
         isUpdate,
         clearActionsAllDevice,
         clearActionsAllDevice,