Merge branch 'ft-dev' into 'main'

refractor:重构设备配置，fix:待修复设备配置编辑bug

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

+export const deteleObject = (obj) => {
+  let uniques = [];
+  const stringify = {};
+  for (let i = 0; i < obj.length; i++) {
+    const keys = Object.keys(obj[i]);
+    keys.sort(function (a, b) {
+      return Number(a) - Number(b);
+    });
+    let str = '';
+    for (let j = 0; j < keys.length; j++) {
+      str += JSON.stringify(keys[j]);
+      str += JSON.stringify(obj[i][keys[j]]);
+    }
+    if (!stringify.hasOwnProperty(str)) {
+      uniques.push(obj[i] as never);
+      stringify[str] = true;
+    }
+  }
+  uniques = uniques;
+  return uniques;
+};

@@ -53,7 +53,15 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, getCurrentInstance, reactive } from 'vue';
+  import {
+    defineComponent,
+    nextTick,
+    ref,
+    computed,
+    unref,
+    getCurrentInstance,
+    reactive,
+  } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import DeviceProfileStep1 from '/@/views/device/profiles/step/DeviceProfileStep1.vue';
   import DeviceProfileStep2 from '/@/views/device/profiles/step/DeviceProfileStep2.vue';
@@ -93,8 +101,8 @@
       const DeviceProfileStep4Ref = ref(null);
       const { createMessage } = useMessage();
       const postDeviceConfogData: any = ref({});
-      const getStepOneData: any = ref({});
-      const getStepTwoData: any = ref({});
+      let getStepOneData: any = reactive({});
+      let getStepTwoData: any = reactive({});
       const getStepThreeData = ref([]);
       const editData: any = ref({});
       let getStepFourData: any = reactive({});
@@ -104,7 +112,11 @@
           messageMode: '',
         },
       });
-      let isGetStepThreeData = reactive({});
+      let isGetStepThreeData: any = reactive({
+        profileData: {
+          alarms: [],
+        },
+      });
       const postEditId = ref('');
       const current = ref(0);
       const isUpdate = ref(0);
@@ -115,6 +127,7 @@
       const isShowRule = ref(true);
       const isEditAndChange = ref(true);
       const isEchoEditStatus = ref(false);
+      const isNextStatus = ref(false);
 
       const getTitle = computed(() =>
         isUpdate.value == 1 ? '新增设备配置' : isUpdate.value == 2 ? '编辑设备配置' : '设备配置详情'
@@ -123,56 +136,39 @@
       const [register, { closeModal }] = useModalInner(async (data) => {
         isUpdate.value = data.isUpdate;
         if (isUpdate.value == 1) {
-          try {
-            proxy.$refs.DeviceProfileStep1Ref?.customResetStepOneFunc();
-            proxy.$refs.DeviceProfileStep1Ref?.resetIconFunc();
-            proxy.$refs.DeviceProfileStep2Ref?.customClearStepTwoValueFunc();
-            proxy.$refs.DeviceProfileStep3Ref?.clearStep3DataFunc();
-            proxy.$refs.DeviceProfileStep4Ref?.clearAlaramContactAndNoticeMethodFunc();
-          } catch {}
+          handleCancel();
           isShowRule.value = true;
           isShowOkBtnFalse.value = true;
           current.value = 0;
           isStatus.value = !data.isUpdate;
           isEchoEditStatus.value = false;
         } else if (isUpdate.value == 2) {
+          handleCancel();
           isShowRule.value = true;
           isShowOkBtnFalse.value = true;
+          isEchoEditStatus.value = true;
           current.value = 0;
           postEditId.value = data.record.id;
           editData.value = await deviceConfigGetDetail(postEditId.value);
-          // proxy.$refs.DeviceProfileStep3Ref.isAddRuleStatusFunc(true);
-          // isStatus.value = data.isUpdate;
-          //回显第一步数据
           proxy.$refs.DeviceProfileStep1Ref.setStepOneFieldsValueFunc({
             name: editData.value.name,
             defaultRuleChainId: editData.value.defaultRuleChainId,
             defaultQueueName: editData.value.defaultQueueName,
             description: editData.value.description,
           });
-          // proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
-          // proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
-          emit('success');
         } else if (isUpdate.value == 3) {
+          handleCancel();
           isShowRule.value = false;
           isShowOkBtnFalse.value = false;
           current.value = 0;
-          // postEditId.value = data.record.id;
-          // getBackendData = await deviceConfigGetDetail(postEditId.value);
-          // editData.value = getBackendData;
-          // proxy.$refs.DeviceProfileStep3Ref.isAddRuleStatusFunc(false);
-          // isStatus.value = data.isUpdate;
-          // //清空第一步数据
-          // proxy.$refs.DeviceProfileStep1Ref.customResetStepOneFunc();
-          // //回显第一步数据
-          // proxy.$refs.DeviceProfileStep1Ref.setStepOneFieldsValueFunc({
-          //   name: editData.value.name,
-          //   defaultRuleChainId: editData.value.defaultRuleChainId,
-          //   defaultQueueName: editData.value.defaultQueueName,
-          //   description: editData.value.description,
-          // });
-          // proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
-          // proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
+          postEditId.value = data.record.id;
+          editData.value = await deviceConfigGetDetail(postEditId.value);
+          proxy.$refs.DeviceProfileStep1Ref.setStepOneFieldsValueFunc({
+            name: editData.value.name,
+            defaultRuleChainId: editData.value.defaultRuleChainId,
+            defaultQueueName: editData.value.defaultQueueName,
+            description: editData.value.description,
+          });
         }
       });
       function handleStepPrev() {
@@ -180,11 +176,15 @@
       }
       //第一步
       function handleStepNext1(v, v1) {
+        isNextStatus.value = true;
+        if (isNextStatus.value) {
+          getStepOneData = {
+            ...v,
+            ...{ icon: v1 },
+          };
+        }
         current.value++;
-        getStepOneData.value = v;
-        getStepOneData.value.icon = v1;
-        if (isUpdate.value == 1) {
-        } else if (isUpdate.value == 2) {
+        if (isUpdate.value == 2) {
           proxy.$refs.DeviceProfileStep2Ref?.setStepTwoFieldsValueFunc({
             transportType: editData.value?.profileData.transportConfiguration.type,
           });
@@ -196,97 +196,93 @@
       }
       //第二步
       function handleStep2Next(v) {
+        isNextStatus.value = true;
+        if ((isNextStatus.value = true)) {
+          getStepTwoData = {
+            ...v,
+          };
+        }
         current.value++;
-        getStepTwoData.value = v;
-        if (isUpdate.value == 1) {
-        } else if (isUpdate.value == 2) {
+        if (isUpdate.value == 2) {
           try {
             isEchoEditStatus.value = true;
             proxy.$refs.DeviceProfileStep3Ref?.echoStep3DataFunc(
               editData.value.profileData.alarms,
               isEchoEditStatus.value
             );
-            // proxy.$refs.DeviceProfileStep3Ref.setAlaramTypeFormFunc({
-            //   alarmType: editData.value?.profileData.alarms[0].alarmType,
-            // });
-            // proxy.$refs.DeviceProfileStep3Ref.setTransmitAlarmFormFunc({
-            //   propagate: editData.value?.profileData.alarms[0].propagate,
-            //   propagateRelationTypes:
-            //     editData.value?.profileData.alarms[0].propagateRelationTypes[0],
-            // });
-            // //回显报警详细信息
-            // proxy.$refs.DeviceProfileStep3Ref.setRegisterFormChangeDetailFunc({
-            //   isEditStatus: true,
-            //   stepThreeData: editData.value?.profileData.alarms[0].createRules,
-            //   stepThreeClearData: editData.value?.profileData.alarms[0].clearRule,
-            // });
-            // proxy.$refs.DeviceProfileStep3Ref.setCreateRegisterFormChangeDetailFunc(
-            //   editData.value?.profileData.alarms[0].createRules
-            // );
-            // proxy.$refs.DeviceProfileStep3Ref.setRegisterFormClearChangeDetailFunc({
-            //   alarmDetails: editData.value?.profileData.alarms[0].clearRule.alarmDetails,
-            // });
-            // proxy.$refs.DeviceProfileStep3Ref.setRegisterFormCreateAlarmFunc({
-            //   default: editData.value?.profileData.alarms[0].createRules,
-            // });
-            // //回显创建报警规则和清除报警规则
           } catch {}
         } else if (isUpdate.value == 3) {
-          // try {
-          //   proxy.$refs.DeviceProfileStep3Ref.setAlaramTypeFormFunc({
-          //     alarmType: editData.value?.profileData.alarms[0].alarmType,
-          //   });
-          //   proxy.$refs.DeviceProfileStep3Ref.setTransmitAlarmFormFunc({
-          //     propagate: editData.value?.profileData.alarms[0].propagate,
-          //     propagateRelationTypes:
-          //       editData.value?.profileData.alarms[0].propagateRelationTypes[0],
-          //   });
-          //   //回显报警详细信息
-          //   proxy.$refs.DeviceProfileStep3Ref.setRegisterFormChangeDetailFunc({
-          //     isEditStatus: true,
-          //     stepThreeData: editData.value?.profileData.alarms[0].createRules,
-          //     stepThreeClearData: editData.value?.profileData.alarms[0].clearRule,
-          //   });
-          //   proxy.$refs.DeviceProfileStep3Ref.setCreateRegisterFormChangeDetailFunc(
-          //     editData.value?.profileData.alarms[0].createRules
-          //   );
-          //   proxy.$refs.DeviceProfileStep3Ref.setRegisterFormClearChangeDetailFunc({
-          //     alarmDetails: editData.value?.profileData.alarms[0].clearRule.alarmDetails,
-          //   });
-          //   //回显创建报警规则和清除报警规则
-          // } catch {}
+          try {
+            isEchoEditStatus.value = true;
+            proxy.$refs.DeviceProfileStep3Ref?.echoStep3DataFunc(
+              editData.value.profileData.alarms,
+              isEchoEditStatus.value
+            );
+          } catch {}
         }
       }
       //第三步
       function handleStep3Next(v, v1) {
         try {
+          isNextStatus.value = true;
           isEditAndChange.value = v1;
           current.value++;
           getStepThreeData.value = v;
           proxy.$refs.DeviceProfileStep4Ref?.step3LinkStep4DefalutClose();
-          if (isUpdate.value == 1) {
-          } else if (isUpdate.value == 2) {
-            proxy.$refs.DeviceProfileStep4Ref?.setAlaramContactAndNoticeMethodFunc({
-              alarmContactId: editData.value?.alarmProfile.alarmContactId.split(','),
-              messageMode: editData.value?.alarmProfile.messageMode.split(','),
+          if (isUpdate.value == 2) {
+            if (
+              editData.value?.alarmProfile.messageMode !== null ||
+              editData.value?.alarmProfile.alarmContactId !== null
+            ) {
+              proxy.$refs.DeviceProfileStep4Ref?.addStep4();
+            } else {
+              proxy.$refs.DeviceProfileStep4Ref?.closeStep4();
+            }
+            nextTick(() => {
+              proxy.$refs.DeviceProfileStep4Ref?.setAlaramContactAndNoticeMethodFunc({
+                alarmContactId: editData.value?.alarmProfile.alarmContactId.split(','),
+                messageMode: editData.value?.alarmProfile.messageMode.split(','),
+              });
             });
           } else if (isUpdate.value == 3) {
-            proxy.$refs.DeviceProfileStep4Ref?.setAlaramContactAndNoticeMethodFunc({
-              alarmContactId: editData.value?.alarmProfile.alarmContactId.split(','),
-              messageMode: editData.value?.alarmProfile.messageMode.split(','),
+            if (
+              editData.value?.alarmProfile.messageMode !== null ||
+              editData.value?.alarmProfile.alarmContactId !== null
+            ) {
+              proxy.$refs.DeviceProfileStep4Ref?.addStep4();
+            } else {
+              proxy.$refs.DeviceProfileStep4Ref?.closeStep4();
+            }
+            nextTick(() => {
+              proxy.$refs.DeviceProfileStep4Ref?.setAlaramContactAndNoticeMethodFunc({
+                alarmContactId: editData.value?.alarmProfile.alarmContactId.split(','),
+                messageMode: editData.value?.alarmProfile.messageMode.split(','),
+              });
             });
           }
         } catch {}
       }
       const handleSubmit = async () => {
-        const step1Val = await proxy.$refs.DeviceProfileStep1Ref?.getStep1Func();
-        if (isUpdate.value == 1) {
-          isGetStepThreeData = {
-            ...{
-              profileData:
-                getStepThreeData.value.length == 0 ? { alarms: null } : getStepThreeData.value,
-            },
-          };
+        let getPic = null;
+        let getStep2Obj = proxy.$refs.DeviceProfileStep2Ref?.getStep2DataFunc();
+        Object.assign(getStepTwoData, getStep2Obj);
+        try {
+          //没有点击下一步
+          if (!isNextStatus.value) {
+            const getStep1Obj = await proxy.$refs.DeviceProfileStep1Ref?.getStep1Func();
+            getPic = getStep1Obj.icon;
+            getStepOneData = {
+              ...getStep1Obj.key,
+              ...{ image: getPic },
+            };
+            Object.assign(getStepOneData, getStep1Obj.key);
+          }
+          let step3Val = await proxy.$refs.DeviceProfileStep3Ref?.getStep3AllDataFunc();
+          if (step3Val.length === 0) {
+            isGetStepThreeData.profileData.alarms = null;
+          } else {
+            isGetStepThreeData.profileData.alarms = step3Val;
+          }
           try {
             getStepFourData = await proxy.$refs.DeviceProfileStep4Ref?.getAllFields();
             const getJoinAlarmContactIdData = getStepFourData.alarmContactId.join(',');
@@ -296,51 +292,51 @@
             alarmProfileData.alarmProfile.alarmContactId = getAlarmContactId.value;
             alarmProfileData.alarmProfile.messageMode = getMessageMode.value;
           } catch {}
-          Object.assign(
-            postDeviceConfogData.value,
-            step1Val,
-            getStepTwoData.value,
-            isGetStepThreeData,
-            alarmProfileData.alarmProfile.alarmContactId == '' ? null : alarmProfileData
-          );
-          await deviceConfigAddOrEdit(postDeviceConfogData.value);
-          createMessage.success('新增成功');
-          closeModal();
-          emit('success');
-        } else if (isUpdate.value == 2) {
-          // isGetStepThreeData.profileData.alarms =
-          //   isEditAndChange.value == true
-          //     ? editData.value.profileData.alarms
-          //     : getStepThreeData.value;
-          // postDeviceConfogData.value.id = postEditId.value;
-          // getStepFourData = await proxy.$refs.DeviceProfileStep4Ref.getAllFields();
-          // const getJoinAlarmContactIdData = getStepFourData.alarmContactId.join(',');
-          // const getJoinMessageModeData = getStepFourData.messageMode.join(',');
-          // getAlarmContactId.value = getJoinAlarmContactIdData;
-          // getMessageMode.value = getJoinMessageModeData;
-          // alarmProfileData.alarmProfile.alarmContactId = getAlarmContactId.value;
-          // alarmProfileData.alarmProfile.messageMode = getMessageMode.value;
-          // Object.assign(
-          //   postDeviceConfogData.value,
-          //   getStepOneData.value,
-          //   getStepTwoData.value,
-          //   isGetStepThreeData,
-          //   alarmProfileData
-          // );
-          // await deviceConfigAddOrEdit(postDeviceConfogData.value);
-          // createMessage.success('编辑成功');
-          // closeModal();
-          // emit('success');
-        }
+          if (isUpdate.value == 1) {
+            Object.assign(
+              postDeviceConfogData.value,
+              getStepOneData,
+              getStepTwoData,
+              isGetStepThreeData,
+              alarmProfileData.alarmProfile.alarmContactId == '' ? null : alarmProfileData
+            );
+            await deviceConfigAddOrEdit(postDeviceConfogData.value);
+            createMessage.success('新增成功');
+            closeModal();
+            emit('success');
+          } else if (isUpdate.value == 2) {
+            const id = {
+              id: postEditId,
+            };
+            Object.assign(
+              postDeviceConfogData.value,
+              getStepOneData,
+              getStepTwoData,
+              isGetStepThreeData,
+              id,
+              alarmProfileData.alarmProfile.alarmContactId == '' ? null : alarmProfileData
+            );
+            await deviceConfigAddOrEdit(postDeviceConfogData.value);
+            createMessage.success('编辑成功');
+            closeModal();
+            emit('success');
+          }
+        } catch {}
       };
       const handleCancel = () => {
-        closeModal();
         try {
-          proxy.$refs.DeviceProfileStep1Ref?.customResetStepOneFunc();
-          proxy.$refs.DeviceProfileStep1Ref?.resetIconFunc();
-          proxy.$refs.DeviceProfileStep2Ref?.customClearStepTwoValueFunc();
-          proxy.$refs.DeviceProfileStep3Ref?.clearStep3DataFunc();
-          proxy.$refs.DeviceProfileStep4Ref?.clearAlaramContactAndNoticeMethodFunc();
+          nextTick(() => {
+            proxy.$refs.DeviceProfileStep1Ref?.customResetStepOneFunc();
+            proxy.$refs.DeviceProfileStep1Ref?.resetIconFunc();
+            proxy.$refs.DeviceProfileStep2Ref?.customClearStepTwoValueFunc();
+            proxy.$refs.DeviceProfileStep3Ref?.clearStep3DataFunc();
+            proxy.$refs.DeviceProfileStep4Ref?.clearAlaramContactAndNoticeMethodFunc();
+            getStepOneData = {};
+            getStepTwoData = {};
+            isGetStepThreeData.profileData.alarms.length = 0;
+            alarmProfileData.alarmProfile.alarmContactId = '';
+            alarmProfileData.alarmProfile.messageMode = '';
+          });
         } catch {}
       };
       function handleRedo() {

@@ -201,6 +201,7 @@
         await deviceConfigDelete(selectedRowKeys);
         createMessage.success('删除成功');
         handleSuccess();
+        selectedRowKeys.length = 0;
       }
 
       function handleDelete(record: Recordable) {

@@ -15,7 +15,7 @@
             >
               <img
                 v-if="peresonalPic"
-                :src="peresonalPic"
+                :src="peresonalPic ? peresonalPic : echoPic"
                 alt="avatar"
                 style="width: 6.25rem; height: 6.25rem"
               />
@@ -54,6 +54,7 @@
     emits: ['next', 'resetFunc', 'register'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
+      const echoPic = ref('');
       const [register, { validate, setFieldsValue, resetFields }] = useForm({
         labelWidth: 100,
         schemas: step1Schemas,
@@ -69,6 +70,9 @@
       //回显数据
       const setStepOneFieldsValueFunc = (v) => {
         setFieldsValue(v);
+        if (v.image !== null) {
+          echoPic.value = v.image;
+        }
       };
       const peresonalPic = ref();
 
@@ -115,7 +119,11 @@
       };
       const getStep1Func = async () => {
         const valueStep1 = await validate();
-        return valueStep1;
+        const pic = peresonalPic.value;
+        return {
+          key: valueStep1,
+          icon: pic,
+        };
       };
       return {
         editIconFunc,
@@ -128,6 +136,7 @@
         beforeUploadqrcodePic,
         customUploadqrcodePic,
         getStep1Func,
+        echoPic,
       };
     },
   });

@@ -41,7 +41,7 @@
     },
     emits: ['next', 'prev', 'register'],
     setup(_, { emit }) {
-      const [register, { validate, setFieldsValue, resetFields }] = useForm({
+      const [register, { getFieldsValue, validate, setFieldsValue, resetFields }] = useForm({
         labelWidth: 80,
         schemas: step2Schemas,
         actionColOptions: {
@@ -66,12 +66,18 @@
         } finally {
         }
       }
+
+      const getStep2DataFunc = () => {
+        const val = getFieldsValue();
+        return val;
+      };
       return {
         customResetFunc,
         customSubmitFunc,
         register,
         setStepTwoFieldsValueFunc,
         customClearStepTwoValueFunc,
+        getStep2DataFunc,
       };
     },
   });

 <template>
   <div>
     <div>
-      <div v-if="alarmsData.length === 0" style="text-align: center">
+      <div
+        v-if="!getIsEchoEditStatus ? alarmsData.length == 0 : echoEditData.length == 0"
+        style="text-align: center"
+      >
         <p style="font-size: large">未配置报警规则</p>
       </div>
       <div>
         <template
           v-for="(item, index) in !getIsEchoEditStatus ? alarmsData : echoEditData"
           :key="index"
+          :ref="item"
         >
           <span style="display: none">{{ item }}</span>
           <span style="display: none">{{ index }}</span>
           <div class="cursor-pointer" style="position: relative; top: 3.5vh; right: -41.6vw">
             <img
               style="cursor: pointer"
-              @click="removeAlarmRule(index, item)"
+              @click="removeAlarmRule(item, index)"
               alt="移除"
               src="../../../../assets/images/delete.png"
             />
@@ -44,7 +48,11 @@
     <div style="margin-left: 14.5vw; margin-top: 2vh">
       <a-button class="mr-5" @click="prevStepFunc">上一步</a-button>
       <a-button @click="nextStepFunc">下一步</a-button>
-      <a-button style="margin-left: 20px" type="primary" @click="clickAddAlaramRuleFunc"
+      <a-button
+        v-if="btnClose"
+        style="margin-left: 20px"
+        type="primary"
+        @click="clickAddAlaramRuleFunc"
         >添加报警规则</a-button
       >
     </div>
@@ -53,40 +61,65 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, ref, getCurrentInstance, reactive } from 'vue';
+  import { defineComponent, ref, getCurrentInstance, reactive, watch } from 'vue';
   import CommonCpns from './common/index.vue';
+  import { deteleObject } from '/@/hooks/web/useFilter';
 
   export default defineComponent({
     components: {
       CommonCpns,
     },
+    props: ['isShowAddRule'],
     emits: ['next', 'prev'],
-    setup(_, { emit }) {
+    setup(props, { emit }) {
       const { proxy } = getCurrentInstance() as any;
       const commonCpnsRef = ref(null);
       const alarmsData: any = ref([]);
       let profileData: any = reactive({});
       const echoEditData: any = ref([]);
       const getIsEchoEditStatus = ref(false);
+      const btnClose = ref(true);
+      let getO = reactive({});
       const prevStepFunc = () => {
         emit('prev');
       };
       const nextStepFunc = async () => {
         profileData = await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc();
         alarmsData.value.push(profileData);
-        alarmsData.value.shift();
         emit('next', {
           alarms: alarmsData.value,
         });
       };
-      const clickAddAlaramRuleFunc = async () => {
+      const getStep3AllDataFunc = async () => {
         profileData = await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc();
         alarmsData.value.push(profileData);
+        console.log(await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc());
+        if (getIsEchoEditStatus.value) {
+          for (let i = 0; i < echoEditData.value.length; i++) {
+            getO = await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc();
+            alarmsData.value.push(getO);
+          }
+        }
+        console.log(alarmsData.value);
+        alarmsData.value = alarmsData.value.filter((i) => i);
+        alarmsData.value = deteleObject(alarmsData.value);
+        console.log(alarmsData.value);
+        return alarmsData.value;
       };
-      const removeAlarmRule = (i, e) => {
-        console.log(e);
-        let delI = i;
-        alarmsData.value.splice(delI, 1);
+      const clickAddAlaramRuleFunc = async () => {
+        try {
+          profileData = await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc();
+          alarmsData.value.push(profileData);
+          if (getIsEchoEditStatus.value) {
+            echoEditData.value.push(profileData);
+            // proxy.$refs.commonCpnsRef?.clearStep3CpnDataFunc();
+          }
+        } catch {}
+      };
+      const removeAlarmRule = (e, i) => {
+        const key = alarmsData.value.indexOf(e);
+        console.log(i);
+        alarmsData.value.splice(key, 1);
       };
       /**
        * 清空数据
@@ -94,8 +127,11 @@
       const clearStep3DataFunc = () => {
         try {
           alarmsData.value.length = 0;
-          profileData = {};
+          echoEditData.value.length = 0;
+          // profileData = {};
           proxy.$refs.commonCpnsRef?.clearStep3CpnDataFunc();
+          getIsEchoEditStatus.value = false;
+          getO = {};
         } catch {}
       };
       /**
@@ -106,10 +142,18 @@
           getIsEchoEditStatus.value = s;
           if (getIsEchoEditStatus.value === true) {
             echoEditData.value = e;
+            if (echoEditData.value == null) {
+              echoEditData.value = [];
+            }
           }
         } catch {}
       };
-
+      watch(
+        () => props.isShowAddRule,
+        (v) => {
+          btnClose.value = v;
+        }
+      );
       return {
         clickAddAlaramRuleFunc,
         prevStepFunc,
@@ -121,6 +165,8 @@
         echoStep3DataFunc,
         echoEditData,
         getIsEchoEditStatus,
+        getStep3AllDataFunc,
+        btnClose,
       };
     },
   });

@@ -15,17 +15,17 @@
         margin-top: -1.2vh;
       "
     >
-      <div style="width: 5vw; height: 4vh; margin-top: -3.5vh">
+      <div style="width: 5vw; height: 4vh; margin-top: -3.6vh">
         <Button type="primary" style="border-radius: 2px" class="mt-5" @click="prevStep4"
           >上一步</Button
         >
       </div>
-      <div style="width: 5vw; height: 4vh; margin-top: -3.5vh">
+      <div style="width: 5vw; height: 4vh; margin-top: -3.6vh">
         <Button type="default" style="border-radius: 2px" class="mt-5" @click="addStep4">
           打开告警通知</Button
         >
       </div>
-      <div style="width: 5vw; height: 4vh; margin-top: -3.5vh; margin-left: 2.2vw">
+      <div style="width: 5vw; height: 4vh; margin-top: -3.6vh; margin-left: 2.2vw">
         <Button type="default" style="border-radius: 2px" class="mt-5" @click="closeStep4">
           关闭</Button
         >
@@ -34,7 +34,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent, ref, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { alertContactsSchemas } from './data';
   import { Button } from '/@/components/Button';
@@ -58,7 +58,11 @@
         setFieldsValue(v);
       };
       const clearAlaramContactAndNoticeMethodFunc = () => {
-        resetFields();
+        try {
+          nextTick(() => {
+            // resetFields();
+          });
+        } catch {}
       };
       const getAllFields = async (getV) => {
         const values = await validate();

 export const formatAlarmRuleConditionsData = (f) => {
-  return f.predicate.operation == 'EQUAL'
-    ? f.key.key + '等于' + f.predicate.value.defaultValue
-    : f.predicate.operation == 'STARTS_WITH'
-    ? f.key.key + '开始于' + f.predicate.value.defaultValue
-    : f.predicate.operation == 'ENDS_WITH'
-    ? f.key.key + '结束于' + f.predicate.value.defaultValue
-    : f.predicate.operation == 'NOT_CONTAINS'
-    ? f.key.key + '不包含' + f.predicate.value.defaultValue
-    : f.predicate.operation == 'NOT_EQUAL'
-    ? f.key.key + '不等于' + f.predicate.value.defaultValue
-    : f.predicate.operation == 'GREATER'
-    ? f.key.key + '大于' + f.predicate.value.defaultValue
-    : f.predicate.operation == 'LESS'
-    ? f.key.key + '小于' + f.predicate.value.defaultValue
-    : f.predicate.operation == 'GREATER_OR_EQUAL'
-    ? f.key.key + '大于或等于' + f.predicate.value.defaultValue
-    : f.key.key + '小于或等于' + f.predicate.value.defaultValue;
+  return f?.predicate.operation == 'EQUAL'
+    ? f?.key.key + '等于' + f?.predicate.value.defaultValue
+    : f?.predicate.operation == 'STARTS_WITH'
+    ? f?.key.key + '开始于' + f?.predicate.value.defaultValue
+    : f?.predicate.operation == 'ENDS_WITH'
+    ? f?.key.key + '结束于' + f?.predicate.value.defaultValue
+    : f?.predicate.operation == 'NOT_CONTAINS'
+    ? f?.key.key + '不包含' + f?.predicate.value.defaultValue
+    : f?.predicate.operation == 'NOT_EQUAL'
+    ? f?.key.key + '不等于' + f?.predicate.value.defaultValue
+    : f?.predicate.operation == 'GREATER'
+    ? f?.key.key + '大于' + f?.predicate.value.defaultValue
+    : f?.predicate.operation == 'LESS'
+    ? f?.key.key + '小于' + f?.predicate.value.defaultValue
+    : f?.predicate.operation == 'GREATER_OR_EQUAL'
+    ? f?.key.key + '大于或等于' + f?.predicate.value.defaultValue
+    : f?.key.key + '小于或等于' + f?.predicate.value.defaultValue;
 };
 
 export const formatEnableRuleData = (f) => {
-  return f.type == 'ANY_TIME' ? '始终启用' : f.type == 'SPECIFIC_TIME' ? '定时启用' : '自定义启用';
+  return f?.type == 'ANY_TIME'
+    ? '始终启用'
+    : f?.type == 'SPECIFIC_TIME'
+    ? '定时启用'
+    : '自定义启用';
+};
+
+export const formatAlarmRuleConditionsData1 = (v) => {
+  let openEditRuleConditObj: any = {};
+  for (const i in v) {
+    if (i == 'CRITICAL') {
+      openEditRuleConditObj = v[i];
+    } else if (i == 'MAJOR') {
+      openEditRuleConditObj = v[i];
+    } else if (i == 'MINOR') {
+      openEditRuleConditObj = v[i];
+    } else if (i == 'WARNING') {
+      openEditRuleConditObj = v[i];
+    } else if (i == 'INDETERMINATE') {
+      openEditRuleConditObj = v[i];
+    }
+  }
+  return openEditRuleConditObj;
 };

@@ -22,11 +22,19 @@
     <!-- 创建报警规则 -->
     <div style="margin-top: -6vh">
       <p style="margin-left: 10px; font-size: medium">创建报警规则</p>
-      <p v-if="createAlarmRuleData.length === 0" style="text-align: center; font-size: large"
+      <p
+        v-if="createAlarmRuleData.length === 0 && createEditAlarmRuleData.length == 0"
+        style="text-align: center; font-size: large"
         >请添加创建报警规则</p
       >
       <div v-if="createAlarmRuleData.length > 0">
-        <template v-for="(item, index) in createAlarmRuleData" :key="index">
+        <template
+          v-for="(item, index) in !isStep3FatherAddOrEditStatus
+            ? createAlarmRuleData
+            : createEditAlarmRuleData"
+          :key="index"
+          :ref="item"
+        >
           <span style="display: none">{{ item }}</span>
           <span style="display: none">{{ index }}</span>
           <div class="cursor-pointer" style="position: relative; top: 15.5vh; right: -40.8vw">
@@ -39,8 +47,14 @@
           </div>
           <div style="width: 38vw; height: 30vh; border: 1px solid grey; border-radius: 4px">
             <div style="margin-top: 1vh">
-              <AlarmSeverityCpn ref="AlarmSeverityRef" />
-              <DetailTemplateCpn ref="DetailTemplateRef" />
+              <AlarmSeverityCpn
+                ref="AlarmSeverityRef"
+                :AlarmSeverityCpnData="!isStep3FatherAddOrEditStatus ? 1 : item"
+              />
+              <DetailTemplateCpn
+                ref="DetailTemplateRef"
+                :DetailTemplateCpnData="!isStep3FatherAddOrEditStatus ? 1 : item"
+              />
               <AlarmRuleConditionsCpn
                 ref="AlarmRuleConditionsRef"
                 @register="registerAlarmRuleConditionsModal"
@@ -61,21 +75,19 @@
                 /></a-button>
                 <div>
                   <div>
-                    <template v-for="(item1, index1) in formatAlarmRuleConditions" :key="index1">
+                    <template
+                      v-for="(item1, index1) in !isStep3FatherAddOrEditStatus
+                        ? formatAlarmRuleConditions
+                        : []"
+                      :key="index1"
+                    >
                       <p v-if="index1 == index">
                         报警规则条件：{{ formatAlarmRuleConditionsFunc(item1) }}
                       </p>
                     </template>
                   </div>
-                  <div>
-                    <template
-                      v-for="(item11, index11) in formatEditAlarmRuleConditions"
-                      :key="index11"
-                    >
-                      <p v-if="index11 == index">
-                        报警规则条件：{{ formatAlarmRuleConditionsData(item11) }}
-                      </p>
-                    </template>
+                  <div v-if="isStep3FatherAddOrEditStatus">
+                    <p> 报警规则条件：{{ formatAlarmRuleConditionsDataFunc(item) }} </p>
                   </div>
                 </div>
               </div>
@@ -85,18 +97,21 @@
                   ><PlusCircleOutlined
                 /></a-button>
                 <div>
-                  <p v-if="formatEnableRule.length == 0 && formatEditEnableRule.length == 0"
-                    >始终启用</p
+                  <p v-if="formatEnableRule.length == 0 && !isStep3FatherAddOrEditStatus"
+                    >启用规则：始终启用</p
                   >
                   <div>
-                    <template v-for="(item2, index2) in formatEnableRule" :key="index2">
+                    <template
+                      v-for="(item2, index2) in !isStep3FatherAddOrEditStatus
+                        ? formatEnableRule
+                        : []"
+                      :key="index2"
+                    >
                       <p v-if="index2 == index"> 启用规则：{{ formatEnableRuleFunc(item2) }} </p>
                     </template>
                   </div>
-                  <div>
-                    <template v-for="(item22, index22) in formatEditEnableRule" :key="index22">
-                      <p v-if="index22 == index"> 启用规则：{{ formatEnableRuleData(item22) }} </p>
-                    </template>
+                  <div v-if="isStep3FatherAddOrEditStatus">
+                    <p> 启用规则：{{ formatEnableRuleFuncData(item) }} </p>
                   </div>
                 </div>
               </div>
@@ -176,7 +191,9 @@
                 ><PlusCircleOutlined
               /></a-button>
               <div>
-                <p v-if="formatEnableRule.length == 0">始终启用</p>
+                <p v-if="formatEnableRule.length == 0 && !isStep3FatherAddOrEditStatus"
+                  >启用规则：始终启用</p
+                >
                 <div>
                   <template v-for="(item4, index4) in formatClearEnableRule" :key="index4">
                     <span style="display: none">{{ index4 }}</span>
@@ -184,9 +201,14 @@
                   </template>
                 </div>
                 <div>
-                  <template v-for="(item44, index44) in formatEditClearEnableRule" :key="index44">
+                  <template
+                    v-for="(item44, index44) in isStep3FatherAddOrEditStatus
+                      ? formatEditClearEnableRule
+                      : []"
+                    :key="index44"
+                  >
                     <span style="display: none">{{ index44 }}</span>
-                    <p> 启用规则：{{ formatClearEnableRuleFunc(item44) }} </p>
+                    <p> 启用规则：{{ formatEnableRuleData(item44) }} </p>
                   </template>
                 </div>
               </div>
@@ -207,7 +229,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, nextTick, getCurrentInstance, reactive } from 'vue';
+  import { defineComponent, ref, nextTick, getCurrentInstance, reactive, watch } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { step3Schemas, step3HighSetting, formChangeDetailSchema } from '../data';
   import { Checkbox } from 'ant-design-vue';
@@ -218,7 +240,11 @@
   import EnableRuleCpn from '../cpns/enablerule/index.vue';
   import { useModal } from '/@/components/Modal';
   import { generateUUID } from '/@/hooks/web/useGenerateUUID';
-  import { formatAlarmRuleConditionsData, formatEnableRuleData } from '../common/format-data/index';
+  import {
+    formatAlarmRuleConditionsData,
+    formatEnableRuleData,
+    formatAlarmRuleConditionsData1,
+  } from '../common/format-data/index';
 
   export default defineComponent({
     components: {
@@ -234,14 +260,13 @@
     setup(props) {
       const { proxy } = getCurrentInstance() as any;
       const createAlarmRuleData: any = ref([1]);
+      const createEditAlarmRuleData: any = ref([]);
       const AlarmRuleConditionsRef = ref(null);
       const EnableRuleRef = ref(null);
       const formatAlarmRuleConditions: any = ref([]);
-      const formatEditAlarmRuleConditions: any = ref([]);
       const formatClearAlarmRuleConditions: any = ref([]);
       const formatEditClearAlarmRuleConditions: any = ref([]);
       const formatEnableRule: any = ref([]);
-      const formatEditEnableRule: any = ref([]);
       const formatClearEnableRule: any = ref([]);
       const formatEditClearEnableRule: any = ref([]);
       let alaramsObj: any = reactive({
@@ -314,6 +339,10 @@
       const clickAddCreateRuleFunc = () => {
         createAlarmRuleData.value.push(1);
         getAddCreateRuleFunc();
+        if (isStep3FatherAddOrEditStatus.value) {
+          createEditAlarmRuleData.value.push(1);
+          getAddCreateRuleFunc();
+        }
       };
       /**
        * 获取创建报警规则数据
@@ -340,6 +369,9 @@
           ...{ schedule: Object.keys(kongEnable).length == 0 ? null : kongEnable },
         };
       };
+      /**
+       * 获取清除报警规则数据
+       */
       const clickAddClearRuleFunc = () => {
         isClearStatus.value = true;
         const val6 = getRegisterFormClearChangeDetailFunc();
@@ -377,21 +409,25 @@
       const clickAddAlarmRuleConditionsFunc = () => {
         nextTick(() => {
           openModalAlarmRuleConditions(true);
+          proxy.$refs.AlarmRuleConditionsRef?.resetDataFunc();
         });
       };
       const clickAddEnableRuleFunc = () => {
         nextTick(() => {
           openModalEnableRule(true);
+          proxy.$refs.DetailTemplateRef?.resetDataFunc();
         });
       };
       const clickClearAlarmRuleConditionsFunc = () => {
         nextTick(() => {
           openModalClearAlarmRuleConditions(true);
+          proxy.$refs.AlarmRuleConditionsRef?.resetDataFunc();
         });
       };
       const clickClearEnableRuleFunc = () => {
         nextTick(() => {
           openModalClearEnableRule(true);
+          proxy.$refs.DetailTemplateRef?.resetDataFunc();
         });
       };
       const getAlarmRuleConditionsValFunc = (e) => {
@@ -441,8 +477,9 @@
         }
         getAddCreateRuleFunc();
         clickAddClearRuleFunc();
-        if (alaramsObj.clearRule.condition == null) {
+        if (alaramsObj.clearRule.condition == null || alaramsObj.clearRule.schedule == null) {
           isClearStatus.value = false;
+          alaramsObj.clearRule = null;
         }
         return alaramsObj;
       };
@@ -463,24 +500,46 @@
           formatEnableRule.value.length = 0;
           formatClearEnableRule.value.length = 0;
           tempDetailTemplateData.value.length = 0;
+          formatEditClearEnableRule.value.length = 0;
+          formatEditClearAlarmRuleConditions.value.length = 0;
+          createEditAlarmRuleData.value.length = 0;
+          alaramsObj.alarmType = null;
+          alaramsObj.propagate = null;
+          alaramsObj.propagateRelationTypes = null;
+          alaramsObj.clearRule = {};
+          alaramsObj.createRules = {};
+          alaramsObj.id = '';
         } catch {}
       };
       /**
        * 回显第三步数据
        */
+      watch(
+        () => props.step3FatherEmitCpnData,
+        (v) => {
+          console.log(v);
+        }
+      );
       const echoStep3DataCpnFunc = () => {
         try {
           if (props.step3FatherEmitCpnData !== 1) {
-            console.log(props.step3FatherEmitCpnData);
+            if (props.step3FatherEmitCpnData == undefined) return;
             isStep3FatherAddOrEditStatus.value = props.step3FatherEmitCpnStatus;
+            for (let i in props.step3FatherEmitCpnData?.createRules) {
+              createEditAlarmRuleData.value.push({
+                [i]: props.step3FatherEmitCpnData?.createRules[i],
+              });
+            }
             nextTick(() => {
               setAlarmTypeValFunc({
                 alarmType: props.step3FatherEmitCpnData?.alarmType,
               });
-              setDeliverAlertsValFunc({
-                propagate: props.step3FatherEmitCpnData?.propagate,
-                propagateRelationTypes: props.step3FatherEmitCpnData?.propagateRelationTypes[0],
-              });
+              try {
+                setDeliverAlertsValFunc({
+                  propagate: props.step3FatherEmitCpnData?.propagate,
+                  propagateRelationTypes: props.step3FatherEmitCpnData?.propagateRelationTypes[0],
+                });
+              } catch {}
               if (props.step3FatherEmitCpnData?.clearRule?.alarmDetails !== '') {
                 isClearStatus.value = true;
                 nextTick(() => {
@@ -489,34 +548,34 @@
                   });
                 });
               }
-              /**
-               * 回显第三步创建条件和清除条件
-               */
-              if (isStep3FatherAddOrEditStatus.value == true) {
-                let openEditRuleConditObj: any = {};
-                for (let i in props.step3FatherEmitCpnData?.createRules) {
-                  if (i == 'CRITICAL') {
-                    openEditRuleConditObj = props.step3FatherEmitCpnData?.createRules[i];
-                  } else if (i == 'MAJOR') {
-                    openEditRuleConditObj = props.step3FatherEmitCpnData?.createRules[i];
-                  } else if (i == 'MINOR') {
-                    openEditRuleConditObj = props.step3FatherEmitCpnData?.createRules[i];
-                  } else if (i == 'WARNING') {
-                    openEditRuleConditObj = props.step3FatherEmitCpnData?.createRules[i];
-                  } else if (i == 'INDETERMINATE') {
-                    openEditRuleConditObj = props.step3FatherEmitCpnData?.createRules[i];
-                  }
-                }
-                formatEditAlarmRuleConditions.value = openEditRuleConditObj?.condition?.condition;
-                formatEditEnableRule.value.push(openEditRuleConditObj?.schedule);
-              }
               formatEditClearAlarmRuleConditions.value =
                 props.step3FatherEmitCpnData?.clearRule?.condition?.condition;
+              formatEditClearEnableRule.value.push(
+                props.step3FatherEmitCpnData?.clearRule?.schedule
+              );
+              if (props.step3FatherEmitCpnData?.clearRule == null) {
+                nextTick(() => {
+                  return (isClearStatus.value = false);
+                });
+              } else {
+                nextTick(() => {
+                  return (isClearStatus.value = true);
+                });
+              }
             });
           }
         } catch {}
       };
       echoStep3DataCpnFunc();
+      const formatAlarmRuleConditionsDataFunc = (v) => {
+        let formatMap = formatAlarmRuleConditionsData1(v)?.condition?.condition.map((f: any) =>
+          formatAlarmRuleConditionsData(f)
+        );
+        return formatMap;
+      };
+      const formatEnableRuleFuncData = (v) => {
+        return formatEnableRuleData(formatAlarmRuleConditionsData1(v)?.schedule);
+      };
       return {
         registerForm,
         registerFormHighSetting,
@@ -554,13 +613,14 @@
         registerFormChangeClearDetail,
         clearStep3CpnDataFunc,
         echoStep3DataCpnFunc,
-        formatEditAlarmRuleConditions,
         isStep3FatherAddOrEditStatus,
         formatAlarmRuleConditionsData,
         formatEditClearAlarmRuleConditions,
-        formatEditEnableRule,
         formatEnableRuleData,
         formatEditClearEnableRule,
+        createEditAlarmRuleData,
+        formatAlarmRuleConditionsDataFunc,
+        formatEnableRuleFuncData,
       };
     },
   });

@@ -13,7 +13,7 @@
     components: {
       BasicForm,
     },
-    props: ['alarmSeverityInfo'],
+    props: ['AlarmSeverityCpnData'],
     emits: ['success', 'register', 'getAllFields'],
     setup(props) {
       const fieldValue: any = ref({});
@@ -26,12 +26,10 @@
       const resetFieldsFunc = () => {
         resetFields();
       };
-
       const getFieldsValueFunc = () => {
         fieldValue.value = getFieldsValue();
         return fieldValue.value;
       };
-
       const item = [
         {
           value: 'CRITICAL',
@@ -69,23 +67,28 @@
           },
         });
       };
-
-      // const setFieldsValueFunc = () => {
-      //   if (props.alarmSeverityInfo != 1) {
-      //     let newArr = Object.keys(props.alarmSeverityInfo);
-      //     setTimeout(() => {
-      //       newArr.forEach((f) => {
-      //         setFieldsValue({ default: f });
-      //       });
-      //     }, 10);
-      //   }
+      // const setFieldsValueFunc = (v) => {
+      //   setFieldsValue({
+      //     default: v,
+      //   });
       // };
-      // setFieldsValueFunc();
+      const setFieldsValueFunc = () => {
+        if (props.AlarmSeverityCpnData != 1) {
+          let newArr = Object.keys(props.AlarmSeverityCpnData);
+          setTimeout(() => {
+            newArr.forEach((f) => {
+              setFieldsValue({ default: f });
+            });
+          }, 10);
+        }
+      };
+      setFieldsValueFunc();
       return {
         resetFieldsFunc,
         updateSchemaSelectDisableFunc,
         getFieldsValueFunc,
         registerForm,
+        setFieldsValueFunc,
       };
     },
   });

@@ -13,7 +13,7 @@
     components: {
       BasicForm,
     },
-    props: ['detailTemplateInfo'],
+    props: ['DetailTemplateCpnData'],
     emits: ['success', 'register', 'getAllFields'],
     setup(props) {
       const fieldValue: any = ref({});
@@ -21,17 +21,29 @@
         labelWidth: 120,
         schemas: formSchema,
       });
-
       const getFieldsValueFunc = () => {
         fieldValue.value = getFieldsValue();
         return fieldValue.value;
       };
       const setFieldsValueFunc = () => {
-        if (props.detailTemplateInfo != 1) {
-          resetFields();
+        if (props.DetailTemplateCpnData != 1) {
+          let openEditRuleConditObj: any = {};
+          for (let i in props.DetailTemplateCpnData) {
+            if (i == 'CRITICAL') {
+              openEditRuleConditObj = props.DetailTemplateCpnData[i];
+            } else if (i == 'MAJOR') {
+              openEditRuleConditObj = props.DetailTemplateCpnData[i];
+            } else if (i == 'MINOR') {
+              openEditRuleConditObj = props.DetailTemplateCpnData[i];
+            } else if (i == 'WARNING') {
+              openEditRuleConditObj = props.DetailTemplateCpnData[i];
+            } else if (i == 'INDETERMINATE') {
+              openEditRuleConditObj = props.DetailTemplateCpnData[i];
+            }
+          }
           setTimeout(() => {
             setFieldsValue({
-              alarmDetails: props.detailTemplateInfo,
+              alarmDetails: openEditRuleConditObj?.alarmDetails,
             });
           }, 10);
         }
@@ -45,6 +57,7 @@
         resetFieldsFunc,
         getFieldsValueFunc,
         registerForm,
+        setFieldsValueFunc,
       };
     },
   });