fix:修复场景联动新增触发器无设备问题

@@ -3,17 +3,17 @@ import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getCustomerList } from '/@/api/device/deviceManager';
-import moment from 'moment';
+import dayjs from 'moment';
 export const columns: BasicColumn[] = [
   {
     title: '设备名称',
     dataIndex: 'name',
-    width: 160,
+    width: 120,
   },
   {
     title: '设备标签',
     dataIndex: 'label',
-    width: 160,
+    width: 100,
   },
   {
     title: '设备配置',
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
   {
     title: '描述',
     dataIndex: 'description',
-    width: 160,
+    width: 180,
   },
 ];
 // 实时数据表格
@@ -100,7 +100,7 @@ export const alarmSearchSchemas: FormSchema[] = [
     component: 'DatePicker',
     componentProps: {
       valueFormat: 'x',
-      showTime: { defaultValue: moment('23:59:59', 'HH:mm:ss') },
+      showTime: { defaultValue: dayjs('23:59:59', 'HH:mm:ss') },
     },
     colProps: { span: 6 },
   },
@@ -216,22 +216,16 @@ export const alarmSchemasForm: FormSchema[] = [
 // 子设备
 export const childDeviceSchemas: FormSchema[] = [
   {
-    field: 'deviceState',
-    label: '设备状态',
-    colProps: { span: 6 },
+    field: 'icon',
+    label: '设备配置',
     component: 'Select',
+    colProps: { span: 6 },
     componentProps: {
-      size: 'small',
       maxLength: 255,
-      options: [
-        { label: '待激活', value: 'INACTIVE' },
-        { label: '在线', value: 'ONLINE' },
-        { label: '离线', value: 'OFFLINE' },
-      ],
     },
   },
   {
-    field: 'name',
+    field: 'icon',
     label: '设备名称',
     component: 'Input',
     colProps: { span: 6 },
@@ -244,30 +238,32 @@ export const childDeviceSchemas: FormSchema[] = [
 export const childDeviceColumns: BasicColumn[] = [
   {
     title: '名称',
-    dataIndex: 'tbDeviceName',
+    dataIndex: 'name',
     width: 120,
   },
   {
-    title: '标签',
+    title: '设备配置',
     dataIndex: 'label',
+    width: 100,
+  },
+  {
+    title: '标签',
+    dataIndex: 'aaa',
     width: 160,
   },
   {
     title: '状态',
-    dataIndex: 'deviceState',
-    slots: { customRender: 'deviceState' },
+    dataIndex: 'bbb',
     width: 160,
   },
   {
     title: '最后连接时间',
-    dataIndex: 'lastOnlineTime',
-    format: (text) => formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss'),
+    dataIndex: 'ccc',
     width: 160,
   },
   {
-    title: '更新时间',
-    dataIndex: 'createdTime',
-    format: (text) => formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss'),
+    title: '创建时间',
+    dataIndex: 'ddd',
     width: 160,
   },
 ];

@@ -7,7 +7,7 @@
     centered
     @ok="dispatchCustomer"
     @cancel="resetFields"
-    :minHeight="100"
+    :minHeight="150"
     okText="分配"
   >
     <BasicForm @register="registerForm" />

@@ -17,8 +17,8 @@
       /></TabPane>
       <TabPane key="3" tab="告警"><Alarm :id="deviceDetail.id" /></TabPane>
       <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'GATEWAY'"
-        ><ChildDevice :fromId="deviceDetail?.tbDeviceId" />
-      </TabPane>
+        ><ChildDevice
+      /></TabPane>
     </Tabs>
   </BasicDrawer>
 </template>
@@ -61,7 +61,6 @@
           deviceDetailRef.value.initMap(longitude, latitude, address);
         }
       });
-
       const closeDrawer = () => {
         activeKey.value = '1';
       };

@@ -10,9 +10,9 @@
     centered
   >
     <div class="step-form-form">
-      <Steps :current="current" v-if="!isUpdate">
-        <Step title="填写设备信息" />
-        <Step title="添加设备凭证" />
+      <Steps :current="current">
+        <Step title="填写设备信息" v-if="!isUpdate" />
+        <Step title="添加设备凭证" v-if="!isUpdate" />
       </Steps>
     </div>
     <div class="mt-5">

@@ -6,7 +6,6 @@
     @cancel="handleCancel"
     @ok="handleOk"
     centered
-    :canFullscreen="false"
   >
     <BasicForm @register="registerForm" />
   </BasicModal>

 <template>
-  <BasicTable @register="registerTable">
-    <template #deviceState="{ record }">
-      <Tag
-        :color="
-          record.deviceState == DeviceState.INACTIVE
-            ? 'warning'
-            : record.deviceState == DeviceState.ONLINE
-            ? 'success'
-            : 'error'
-        "
-        class="ml-2"
-      >
-        {{
-          record.deviceState == DeviceState.INACTIVE
-            ? '待激活'
-            : record.deviceState == DeviceState.ONLINE
-            ? '在线'
-            : '离线'
-        }}
-      </Tag>
-    </template>
-  </BasicTable>
+  <BasicTable @register="registerTable" />
 </template>
 <script lang="ts">
-  import { defineComponent, onMounted } from 'vue';
-  import { Tag } from 'ant-design-vue';
-  import { DeviceState } from '/@/api/device/model/deviceModel';
+  import { defineComponent } from 'vue';
   import { BasicTable, useTable } from '/@/components/Table';
   import { childDeviceColumns, childDeviceSchemas } from '../../config/detail.config';
-  import { getChildDevicePage } from '/@/api/device/deviceManager.ts';
+
   export default defineComponent({
     name: 'DeviceManagement',
     components: {
       BasicTable,
-      Tag,
-    },
-    props: {
-      fromId: {
-        type: String,
-        required: true,
-      },
     },
-    setup(props) {
-      console.log(123);
-      onMounted(() => {
-        console.log(props.fromId);
-      });
+    setup(_) {
       const [registerTable] = useTable({
-        api: getChildDevicePage,
         columns: childDeviceColumns,
         formConfig: {
           labelWidth: 120,
           schemas: childDeviceSchemas,
         },
-        beforeFetch: (data) => {
-          console.log(props.fromId);
-          Reflect.set(data, 'fromId', props.fromId);
-        },
         useSearchForm: true,
         showTableSetting: true,
         bordered: true,
@@ -65,7 +26,6 @@
 
       return {
         registerTable,
-        DeviceState,
       };
     },
   });

@@ -23,7 +23,7 @@
     </div>
     <div v-if="deviceDetail?.deviceInfo?.address" class="mt-4">
       <p>设备位置</p>
-      <div ref="wrapRef" style="height: 550px; width: 100%"></div>
+      <div ref="wrapRef" style="height: 400px; width: 100%"></div>
     </div>
   </div>
 </template>
@@ -38,8 +38,6 @@
   import { useModal } from '/@/components/Modal';
   import ManageDeviceTokenModal from '../modal/ManageDeviceTokenModal.vue';
   import { getDeviceToken } from '/@/api/device/deviceManager';
-  import wz from '/@/assets/images/wz.png';
-
   export default defineComponent({
     components: {
       Image,
@@ -64,7 +62,7 @@
         const BMap = (window as any).BMap;
         if (!wrapEl) return;
         const map = new BMap.Map(wrapEl);
-        let myIcon = new BMap.Icon(wz, new BMap.Size(20, 30));
+        let myIcon = new BMap.Icon('/src/assets/images/wz.png', new BMap.Size(20, 30));
 
         const point = new BMap.Point(Number(longitude), Number(latitude));
         var content = `我在 ${address}`;

@@ -207,7 +207,7 @@
       }
 
       function handleDelete(record: Recordable) {
-        const ids = [record.id];
+        let ids = [record.id];
         deleteDevice(ids).then(() => {
           createMessage.success('删除设备成功');
           handleSuccess();

+{
+  "id": "",
+  "name": "6",
+  "transportType": "DEFAULT",
+  "profileData": {
+    "alarms": [
+      {
+        "id": "05f99082-3941-467d-999a-7ab5eb7bac46",
+        "alarmType": "6",
+        "propagate": true,
+        "propagateRelationTypes": ["6"],
+        "createRules": {
+          "MAJOR": {
+            "alarmDetails": "CO2过高",
+            "schedule": {
+              "type": "ANY_TIME",
+              "timezone": "Asia/Shanghai (UTC+08:00)"
+            },
+            "condition": [
+              {
+                "key": {
+                  "type": "TIME_SERIES",
+                  "key": "100"
+                },
+                "valueType": "NUMERIC",
+                "value": "100",
+                "predicate": {
+                  "type": "NUMERIC",
+                  "operation": "NOT_EQUAL",
+                  "value": {
+                    "defaultValue": "100"
+                  }
+                }
+              }
+            ]
+          },
+          "MINOR": {
+            "alarmDetails": "CO过高",
+            "schedule": {
+              "type": "ANY_TIME",
+              "timezone": "Asia/Shanghai (UTC+08:00)"
+            },
+            "condition": [
+              {
+                "key": {
+                  "type": "TIME_SERIES",
+                  "key": "2000"
+                },
+                "valueType": "NUMERIC",
+                "value": "2000",
+                "predicate": {
+                  "type": "NUMERIC",
+                  "operation": "EQUAL",
+                  "value": {
+                    "defaultValue": "2000"
+                  }
+                }
+              }
+            ]
+          }
+        },
+        "clearRule": {
+          "schedule": {
+            "type": "ANY_TIME",
+            "timezone": "Asia/Shanghai (UTC+08:00)"
+          },
+          "condition": [
+            {
+              "key": {
+                "type": "TIME_SERIES",
+                "key": "123"
+              },
+              "valueType": "NUMERIC",
+              "value": "123",
+              "predicate": {
+                "type": "NUMERIC",
+                "operation": "GREATER_OR_EQUAL",
+                "value": {
+                  "defaultValue": "123"
+                }
+              }
+            },
+            {
+              "key": {
+                "type": "TIME_SERIES",
+                "key": "456"
+              },
+              "valueType": "NUMERIC",
+              "value": "456",
+              "predicate": {
+                "type": "NUMERIC",
+                "operation": "LESS",
+                "value": {
+                  "defaultValue": "456"
+                }
+              }
+            }
+          ],
+          "alarmDetails": "CO3过低"
+        }
+      }
+    ]
+  },
+  "alarmProfile": {
+    "alarmContactId": "224a312c-4f52-41ef-9dce-2aac69ec2e85,8aff39c6-af9c-416a-b110-601183e39da0",
+    "messageMode": "EMAIL_MESSAGE"
+  }
+}

+{
+  "id": "5445f670-8946-11ec-ac19-e398562c8b61",
+  "name": "一氧化碳检测",
+  "enabled": false,
+  "description": "针对一氧化碳有害气体检测",
+  "tenantId": "de10f9e0-8892-11ec-ac19-e398562c8b61",
+  "profileData": {
+    "configuration": {
+      "type": "DEFAULT"
+    },
+    "transportConfiguration": {
+      "type": "DEFAULT"
+    },
+    "provisionConfiguration": {
+      "type": "DISABLED",
+      "provisionDeviceSecret": null
+    },
+    "alarms": [
+      {
+        "id": "5d11af7e-71ce-44ef-b34b-6b1a2425f25c",
+        "alarmType": "气体浓度告警",
+        "createRules": {
+          "MAJOR": {
+            "condition": {
+              "condition": [
+                {
+                  "key": {
+                    "type": "TIME_SERIES",
+                    "key": "CO"
+                  },
+                  "valueType": "NUMERIC",
+                  "value": null,
+                  "predicate": {
+                    "type": "NUMERIC",
+                    "operation": "GREATER",
+                    "value": {
+                      "defaultValue": 100,
+                      "userValue": null,
+                      "dynamicValue": null
+                    }
+                  }
+                }
+              ],
+              "spec": {
+                "type": "SIMPLE"
+              }
+            },
+            "schedule": {
+              "type": "ANY_TIME"
+            },
+            "alarmDetails": "告警",
+            "dashboardId": null
+          },
+          "MINOR": {
+            "condition": {
+              "condition": [
+                {
+                  "key": {
+                    "type": "TIME_SERIES",
+                    "key": "CO"
+                  },
+                  "valueType": "NUMERIC",
+                  "value": null,
+                  "predicate": {
+                    "type": "NUMERIC",
+                    "operation": "GREATER",
+                    "value": {
+                      "defaultValue": 100,
+                      "userValue": null,
+                      "dynamicValue": null
+                    }
+                  }
+                }
+              ],
+              "spec": {
+                "type": "SIMPLE"
+              }
+            },
+            "schedule": {
+              "type": "ANY_TIME"
+            },
+            "alarmDetails": "告警",
+            "dashboardId": null
+          }
+        },
+        "clearRule": {
+          "condition": {
+            "condition": [
+              {
+                "key": {
+                  "type": "TIME_SERIES",
+                  "key": "CO"
+                },
+                "valueType": "NUMERIC",
+                "value": null,
+                "predicate": {
+                  "type": "NUMERIC",
+                  "operation": "LESS_OR_EQUAL",
+                  "value": {
+                    "defaultValue": 100,
+                    "userValue": null,
+                    "dynamicValue": null
+                  }
+                }
+              }
+            ],
+            "spec": {
+              "type": "SIMPLE"
+            }
+          },
+          "schedule": {
+            "type": "ANY_TIME"
+          },
+          "alarmDetails": "清除告警",
+          "dashboardId": null
+        },
+        "propagate": true,
+        "propagateRelationTypes": ["CO"]
+      }
+    ]
+  },
+  "defaultRuleChainId": "de8bf640-8892-11ec-ac19-e398562c8b61",
+  "alarmProfile": {
+    "id": "e822cccb-7f00-487e-9ece-790f4d145947",
+    "creator": "b75f1c80-0f94-4a06-84ef-253962bbfe9e",
+    "createTime": "2022-02-09 09:19:29",
+    "enabled": false,
+    "tenantId": "de10f9e0-8892-11ec-ac19-e398562c8b61",
+    "alarmContactId": "8aff39c6-af9c-416a-b110-601183e39da0",
+    "deviceProfileId": "5445f670-8946-11ec-ac19-e398562c8b61",
+    "messageMode": "PHONE_MESSAGE"
+  },
+  "defaultQueueName": "Main"
+}

@@ -8,7 +8,7 @@
     @cancel="handleCancel"
   >
     <div class="step-form-form">
-      <a-steps :current="current">
+      <a-steps :current="current" @change="handleChange">
         <a-step title="设备配置" />
         <a-step title="传输配置" />
         <a-step title="告警配置" />
@@ -79,6 +79,7 @@
       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({});
@@ -90,8 +91,10 @@
       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)) {
@@ -287,7 +290,8 @@
           createMessage.success('新增设备配置成功');
           closeModal();
           emit('success');
-        } else {
+        }
+        if (unref(isUpdate)) {
           postDeviceConfogData.value.id = postEditId.value;
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           alarmProfileData.value.alarmProfile =
@@ -309,11 +313,13 @@
         closeModal();
       };
       return {
+        handleChange,
         DeviceProfileStep2Ref,
         DeviceProfileStep3Ref,
         DeviceProfileStep4Ref,
         DeviceProfileStep1Ref,
         editEchoData,
+        // getStepData,
         handleStep3Next,
         handleSubmit,
         handleCancel,

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

@@ -207,7 +207,7 @@
 
 <script lang="ts">
   import { defineComponent, ref, unref, getCurrentInstance, watch } from 'vue';
-  import type { IProfileData } from './index.t';
+  import type { IProfileData } from '../types/index';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form';
   import {

 <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';
 

@@ -26,7 +26,6 @@ interface IAlarms {
   id: string;
   alarmType: string;
   createRules: ICreateRule;
-  // clearRule?: IClearRule[];
   propagate: boolean;
   propagateRelationTypes: string[];
 }
@@ -38,3 +37,12 @@ export interface IProfileData {
   alarms?: IAlarms[];
   clearRule?: IClearRule[];
 }
+
+export interface IAddAlarms {
+  id: string;
+  alarmType: string;
+  createRules: [];
+  clearRule: {};
+  propagate: boolean;
+  propagateRelationTypes: string[];
+}

+interface IConfiguration {
+  type?: string;
+}
+interface ITansportConfiguration {
+  type?: string;
+}
+interface provisionConfigurationD {
+  provisionDeviceSecret?: string;
+}
+type ICreateRule = {};
+type IClearRule = {
+  id: string;
+  alarmDetails: string;
+  dashboardId: {
+    id: string;
+    entityType: string;
+  };
+  propagate: string;
+  propagateRelationTypes: string[];
+  schedule: {
+    type: string;
+  };
+  condition: object;
+};
+interface IAlarms {
+  id: string;
+  alarmType: string;
+  createRules: ICreateRule;
+  // clearRule?: IClearRule[];
+  propagate: boolean;
+  propagateRelationTypes: string[];
+}
+
+export interface IProfileData {
+  configuration?: IConfiguration;
+  transportConfiguration?: ITansportConfiguration;
+  provisionConfiguration?: provisionConfigurationD;
+  alarms?: IAlarms[];
+  clearRule?: IClearRule[];
+}

@@ -21,19 +21,23 @@
 
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
-    props: ['deviceInfo1'],
+    props: ['deviceInfo1', 'editconditionFather', 'newConditionMapFather'],
 
     setup(props) {
       const fieldValue: any = ref({});
-      const [registerCondition, { getFieldsValue, updateSchema }] = useForm({
-        labelWidth: 100,
-        schemas: useConditionDrawerSchema,
-        actionColOptions: { span: 24 },
-      });
+      const [registerCondition, { setFieldsValue, getFieldsValue, updateSchema, resetFields }] =
+        useForm({
+          labelWidth: 100,
+          schemas: useConditionDrawerSchema,
+          actionColOptions: { span: 24 },
+        });
       const getFieldsValueFunc = () => {
         fieldValue.value = getFieldsValue();
         return fieldValue.value;
       };
+      const resetFieldsValueFunc = () => {
+        resetFields();
+      };
       watch(
         () => props.deviceInfo1,
         async (newV) => {
@@ -49,6 +53,29 @@
           });
         }
       );
+
+      //回显数据
+      const setFieldsFormValueFun = () => {
+        if (props.editconditionFather !== 1) {
+          setTimeout(() => {
+            setFieldsValue(props.editconditionFather);
+          }, 100);
+        }
+      };
+      setFieldsFormValueFun();
+      const editSelectDevice = () => {
+        if (props.newConditionMapFather !== 1) {
+          setTimeout(() => {
+            updateSchema({
+              field: 'deviceId',
+              componentProps: {
+                options: props.newConditionMapFather,
+              },
+            });
+          }, 100);
+        }
+      };
+      editSelectDevice();
       //新增清空设备选择
       const clearSelectDevice = () => {
         updateSchema({
@@ -58,15 +85,16 @@
           },
         });
       };
-      const editSelectDevice = (v) => {
-        updateSchema({
-          field: 'deviceId',
-          componentProps: {
-            options: v,
-          },
-        });
-      };
+      // const editSelectDevice = (v) => {
+      //   updateSchema({
+      //     field: 'deviceId',
+      //     componentProps: {
+      //       options: v,
+      //     },
+      //   });
+      // };
       return {
+        resetFieldsValueFunc,
         clearSelectDevice,
         editSelectDevice,
         getFieldsValueFunc,

@@ -21,15 +21,16 @@
 
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
-    props: ['deviceInfo2'],
+    props: ['deviceInfo2', 'editActionFather', 'newActionMapFather'],
 
     setup(props) {
       const fieldValue: any = ref({});
-      const [registerAction, { getFieldsValue, resetFields, updateSchema }] = useForm({
-        labelWidth: 100,
-        schemas: useActionDrawerSchema,
-        actionColOptions: { span: 24 },
-      });
+      const [registerAction, { setFieldsValue, getFieldsValue, resetFields, updateSchema }] =
+        useForm({
+          labelWidth: 100,
+          schemas: useActionDrawerSchema,
+          actionColOptions: { span: 24 },
+        });
       const getFieldsValueFunc = () => {
         fieldValue.value = getFieldsValue();
         return fieldValue.value;
@@ -52,6 +53,29 @@
           });
         }
       );
+
+      //回显数据
+      const setFieldsFormValueFun = () => {
+        if (props.editActionFather !== 1) {
+          setTimeout(() => {
+            setFieldsValue(props.editActionFather);
+          }, 100);
+        }
+      };
+      setFieldsFormValueFun();
+      const editSelectDevice = () => {
+        if (props.newActionMapFather !== 1) {
+          setTimeout(() => {
+            updateSchema({
+              field: 'deviceId',
+              componentProps: {
+                options: props.newActionMapFather,
+              },
+            });
+          }, 100);
+        }
+      };
+      editSelectDevice();
       //新增清空设备选择
       const clearSelectDevice = () => {
         updateSchema({
@@ -61,14 +85,14 @@
           },
         });
       };
-      const editSelectDevice = (v) => {
-        updateSchema({
-          field: 'deviceId',
-          componentProps: {
-            options: v,
-          },
-        });
-      };
+      // const editSelectDevice = (v) => {
+      //   updateSchema({
+      //     field: 'deviceId',
+      //     componentProps: {
+      //       options: v,
+      //     },
+      //   });
+      // };
       return {
         clearSelectDevice,
         editSelectDevice,

@@ -26,11 +26,12 @@
     props: ['deviceInfo', 'editTriggerFather', 'newFilterMapFather'],
     setup(props) {
       const fieldValue: any = ref({});
-      const [registerTrigger, { setFieldsValue, getFieldsValue, updateSchema }] = useForm({
-        labelWidth: 100,
-        schemas: useTriggerDrawerSchema,
-        actionColOptions: { span: 24 },
-      });
+      const [registerTrigger, { resetFields, setFieldsValue, getFieldsValue, updateSchema }] =
+        useForm({
+          labelWidth: 100,
+          schemas: useTriggerDrawerSchema,
+          actionColOptions: { span: 24 },
+        });
       const getFieldsValueFunc = () => {
         fieldValue.value = getFieldsValue();
         return fieldValue.value;
@@ -42,21 +43,34 @@
           options.items.forEach((v) => {
             return (v.value = v.id), (v.label = v.name);
           });
+          updateFieldDeviceId(options.items);
+        }
+      );
+      const updateFieldDeviceId = (v) => {
+        setTimeout(() => {
           updateSchema({
             field: 'deviceId',
             componentProps: {
-              options: options.items,
+              options: v,
             },
           });
-        }
-      );
+        }, 10);
+      };
+      const resetFieldsValueFunc = () => {
+        setTimeout(() => {
+          resetFields();
+        }, 100);
+      };
 
       //回显数据
       const setFieldsFormValueFun = () => {
-        setTimeout(() => {
-          setFieldsValue(props.editTriggerFather);
-        }, 100);
+        if (props.editTriggerFather != 1) {
+          setTimeout(() => {
+            setFieldsValue(props.editTriggerFather);
+          }, 100);
+        }
       };
+
       setFieldsFormValueFun();
       //新增清空设备选择
       const clearSelectDevice = () => {
@@ -68,14 +82,16 @@
         });
       };
       const editSelectDevice = () => {
-        setTimeout(() => {
-          updateSchema({
-            field: 'deviceId',
-            componentProps: {
-              options: props.newFilterMapFather,
-            },
-          });
-        }, 100);
+        if (props.newFilterMapFather != 1) {
+          setTimeout(() => {
+            updateSchema({
+              field: 'deviceId',
+              componentProps: {
+                options: props.newFilterMapFather,
+              },
+            });
+          }, 100);
+        }
       };
       editSelectDevice();
       //新增清空场景触发器选择
@@ -96,6 +112,8 @@
         });
       };
       return {
+        updateFieldDeviceId,
+        resetFieldsValueFunc,
         clearSelectScene,
         editSelectScene,
         clearSelectDevice,

@@ -90,6 +90,10 @@
       function handleAdd() {
         try {
           proxy.$refs.sceneLinkAgeDrawerRef.clearAllArrayFunc();
+          setTimeout(() => {
+            proxy.$refs.sceneLinkAgeDrawerRef.defaultAddTrigger();
+          }, 10);
+          proxy.$refs.sceneLinkAgeDrawerRef.defaultAddCondition();
           proxy.$refs.sceneLinkAgeDrawerRef.defaultAddAction();
           proxy.$refs.sceneLinkAgeDrawerRef.resetActionsAllArrayFunc();
           proxy.$refs.sceneLinkAgeDrawerRef.clearActionsAllDevice();

@@ -16,11 +16,11 @@
           :key="index"
         >
           <span style="display: none">{{ item + index }}</span>
-          <span style="position: relative; top: 3.2vh; left: 0.3vw">触发器{{ index + 1 }}</span>
-          <div>
+          <span style="position: relative; top: 3.2vh; left: 0.3vw">触发器 {{ index + 1 }}</span>
+          <div style="display: block">
             <AddTriggerForm
-              :editTriggerFather="isUpdate == false ? null : item"
-              :newFilterMapFather="isUpdate == false ? null : newFilterMap"
+              :editTriggerFather="isUpdate == false ? 1 : item"
+              :newFilterMapFather="isUpdate == false ? 1 : newFilterMap"
               :deviceInfo="getDeviceInfo"
               ref="refTriggerChild"
             />
@@ -57,12 +57,20 @@
       <div style="height: 5vh"></div>
       <!-- 执行条件 -->
       <div>
-        <template v-for="(item, index) in addConditionPushData" :key="index">
+        <template
+          v-for="(item, index) in isUpdate == false ? addConditionPushData : editConditionPushData"
+          :key="index"
+        >
           <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>
-            <AddConditiForm :deviceInfo1="getDeviceInfo1" ref="refConditionChild" />
+            <AddConditiForm
+              :editConditionFather="isUpdate == false ? 1 : item"
+              :newConditionMapFather="isUpdate == false ? 1 : newConditionFilterMap"
+              :deviceInfo1="getDeviceInfo1"
+              ref="refConditionChild"
+            />
           </div>
           <div style="height: 3vh"></div>
         </template>
@@ -82,7 +90,7 @@
           </div>
           <div style="display: flex; width: 4vw; height: 4vh">
             <Button
-              v-if="addConditionPushData.length != 0"
+              v-if="addConditionPushData.length != 0 || addConditionPushData.length != 0"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               type="default"
               class="mt-5"
@@ -96,12 +104,20 @@
       <!-- 执行动作 -->
       <div style="height: 5vh"></div>
       <div>
-        <template v-for="(item, index) in addActionPushData" :key="index">
+        <template
+          v-for="(item, index) in isUpdate == false ? addActionPushData : editActionPushData"
+          :key="index"
+        >
           <span style="display: none">{{ item + index }}</span>
-          <span style="position: relative; top: 4.2vh; left: 0.65vw">执行动作{{ index + 1 }}</span>
+          <span style="position: relative; top: 4.2vh; left: 0.65vw">执行动作 {{ index + 1 }}</span>
 
           <div>
-            <AddActionForm :deviceInfo2="getDeviceInfo2" ref="refActionChild" />
+            <AddActionForm
+              :editActionFather="isUpdate == false ? 1 : item"
+              :newActionMapFather="isUpdate == false ? 1 : newActionFilterMap"
+              :deviceInfo2="getDeviceInfo2"
+              ref="refActionChild"
+            />
           </div>
           <div style="height: 3vh"></div>
         </template>
@@ -121,7 +137,7 @@
           </div>
           <div style="display: flex; width: 4vw; height: 4vh">
             <Button
-              v-if="addActionPushData.length > 0"
+              v-if="addActionPushData.length > 0 || addActionPushData.length > 0"
               style="border-radius: 10px; background-color: rgba(237, 111, 111, 1)"
               type="default"
               class="mt-5"
@@ -168,6 +184,8 @@
       const { proxy } = getCurrentInstance();
       const lastRefTriggerChildDataArray = ref<[]>([]);
       const lastEditRefTriggerChildDataArray = ref<[]>([]);
+      const lastEditRefConditionChildDataArray = ref<[]>([]);
+      const lastEditRefActionChildDataArray = ref<[]>([]);
       const lastRefConditionChildDataArray = ref<[]>([]);
       const lastRefActionChildDataArray = ref<[]>([]);
       const lastRefTriggerChildData: any = ref({});
@@ -207,6 +225,8 @@
       const addActionPushData = ref<[]>([]);
       //edit data
       const editTriggerPushData = ref<[]>([]);
+      const editConditionPushData = ref<[]>([]);
+      const editActionPushData = ref<[]>([]);
       const getChildData = ref(null);
       const refTriggerChild = ref(null);
       const refConditionChild = ref(null);
@@ -222,6 +242,8 @@
       const getDeviceInfo1 = ref(null);
       const getDeviceInfo2 = ref(null);
       const newFilterMap = ref<[]>([]);
+      const newConditionFilterMap = ref<[]>([]);
+      const newActionFilterMap = ref<[]>([]);
 
       const [registerForm, { resetFields, setFieldsValue, validateFields }] = useForm({
         labelWidth: 120,
@@ -234,18 +256,26 @@
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         if (!unref(isUpdate)) {
+          editTriggerPushData.value = [];
+          editTriggerPushData.value.length = 0;
           try {
-            proxy.$refs.refTriggerChild.clearSelectDevice();
-            proxy.$refs.refTriggerChild.clearSelectScene();
-            proxy.$refs.refConditionChild.clearSelectDevice();
-            proxy.$refs.refActionChild.clearSelectDevice();
+            setTimeout(() => {
+              // proxy.$refs.refTriggerChild.resetFieldsValueFunc();
+              proxy.$refs.refConditionChild.resetFieldsValueFunc();
+              proxy.$refs.refActionChild.resetFieldsValueFunc();
+            }, 50);
           } catch (e) {
             return e;
           }
         } else {
           newFilterMap.value = [];
+          newConditionFilterMap.value = [];
+          newActionFilterMap.value = [];
           clearAllArrayFunc();
           editTriggerPushData.value = [];
+          editTriggerPushData.value.length = 0;
+          editConditionPushData.value = [];
+          editActionPushData.value = [];
           lastEditRefTriggerChildDataArray.value = [];
           getId.value = data.record.id;
           getTenantId.value = data.record.tenantId;
@@ -253,19 +283,52 @@
             ...data.record,
           });
           editTriggerPushData.value = data.record.triggers;
+          editTriggerPushData.value.forEach((f) => {
+            if (f?.id.length == 18) {
+              editTriggerPushData.value.pop();
+              if (editTriggerPushData.value.length) {
+                editTriggerPushData.value.length = editTriggerPushData.value.length;
+              }
+            }
+          });
+          editConditionPushData.value = data.record.doConditions;
+          editActionPushData.value = data.record.doActions;
           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,
-                });
-              }
+          try {
+            data.record.triggers.forEach((f1) => {
+              options.items?.forEach((f2) => {
+                if (f2.id == f1.deviceId) {
+                  newFilterMap.value.push({
+                    value: f2.id,
+                    label: f2.name,
+                  });
+                }
+              });
             });
-          });
+
+            data.record.doConditions.forEach((f1) => {
+              options.items?.forEach((f2) => {
+                if (f2.id == f1.deviceId) {
+                  newConditionFilterMap.value.push({
+                    value: f2.id,
+                    label: f2.name,
+                  });
+                }
+              });
+            });
+            data.record.doActions.forEach((f1) => {
+              options.items?.forEach((f2) => {
+                if (f2.id == f1.deviceId) {
+                  newActionFilterMap.value.push({
+                    value: f2.id,
+                    label: f2.name,
+                  });
+                }
+              });
+            });
+          } catch (e) {}
         }
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增场景联动' : '编辑场景联动'));
@@ -353,6 +416,8 @@
           refConditionChildDataFunc();
           refActionChildDataFunc();
           lastEditRefTriggerChildDataArray.value.push(refTriggerChildData.value as never);
+          lastEditRefConditionChildDataArray.value.push(refConditionChildData.value as never);
+          lastEditRefActionChildDataArray.value.push(refActionChildData.value as never);
           lastRefConditionChildDataArray.value.push(refConditionChildData.value as never);
           lastRefActionChildDataArray.value.push(refActionChildData.value as never);
           const triggersObj = {
@@ -365,6 +430,7 @@
             doActions: lastRefActionChildDataArray.value,
           };
           Object.assign(getAllFormData, triggersObj, conditionsObj, actionsObj);
+          console.log(getAllFormData);
         }
       };
 
@@ -381,7 +447,6 @@
         } else {
           getDefaultValue();
           getValuesFormData = await validateFields();
-          if (!getValuesFormData) return;
           Object.assign(getAllFormData, getValuesFormData);
           getAllFormData.id = getId.value;
           getAllFormData.tenantId = getTenantId.value;
@@ -391,6 +456,13 @@
           emit('success');
         }
       };
+      const defaultAddTrigger = () => {
+        if (unref(addTriggerPushData).length == 0) {
+          setTimeout(() => {
+            addTrigger();
+          }, 10);
+        }
+      };
 
       //新增触发器
       const addTrigger = () => {
@@ -426,6 +498,21 @@
 
       //新增执行条件
       const addCondition = () => {
+        // if (!unref(isUpdate)) {
+        //   console.log('add');
+        //   unref(addConditionPushData).push(addConditionData as never);
+        //   refConditionChildDataFunc();
+        //   lastRefConditionChildData.value = refConditionChildData.value;
+        //   lastRefConditionChildDataArray.value.push(lastRefConditionChildData.value as never);
+        // } else {
+        //   console.log('edit');
+
+        //   unref(editConditionPushData).push(addConditionData as never);
+        //   console.log(unref(editConditionPushData));
+        //   refConditionChildDataFunc();
+        //   lastRefConditionChildData.value = refConditionChildData.value;
+        //   lastEditRefConditionChildDataArray.value.push(lastRefConditionChildData.value as never);
+        // }
         unref(addConditionPushData).push(addConditionData as never);
         refConditionChildDataFunc();
         lastRefConditionChildData.value = refConditionChildData.value;
@@ -446,7 +533,24 @@
           addAction();
         }
       };
+
+      const defaultAddCondition = () => {
+        if (unref(addConditionPushData).length == 0) {
+          addCondition();
+        }
+      };
       const addAction = () => {
+        // if (!unref(isUpdate)) {
+        //   unref(addActionPushData).push(addActionData as never);
+        //   refActionChildDataFunc();
+        //   lastRefActionChildData.value = refActionChildData.value;
+        //   lastRefActionChildDataArray.value.push(lastRefActionChildData.value as never);
+        // } else {
+        //   unref(editActionPushData).push(addActionData as never);
+        //   refActionChildDataFunc();
+        //   lastRefActionChildData.value = refActionChildData.value;
+        //   lastEditRefActionChildDataArray.value.push(lastRefActionChildData.value as never);
+        // }
         unref(addActionPushData).push(addActionData as never);
         refActionChildDataFunc();
         lastRefActionChildData.value = refActionChildData.value;
@@ -462,8 +566,14 @@
       };
 
       return {
+        defaultAddTrigger,
+        defaultAddCondition,
         newFilterMap,
+        newConditionFilterMap,
+        newActionFilterMap,
         editTriggerPushData,
+        editConditionPushData,
+        editActionPushData,
         isUpdate,
         clearActionsAllDevice,
         getDeviceInfo,