fix：设备配置编辑第三步的数据回显问题解决，待修改设备配置编辑如果什么都没编辑点击提交报400问题

@@ -154,6 +154,9 @@
           });
           proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
           proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
+          setTimeout(() => {
+            emit('success');
+          }, 10);
         } else if (isUpdate.value == 3) {
           postEditId.value = data.record.id;
           getBackendData = await deviceConfigGetDetail(postEditId.value);
@@ -174,6 +177,9 @@
           });
           proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
           proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
+          setTimeout(() => {
+            emit('success');
+          }, 10);
         }
       });
       function handleStepPrev() {
@@ -184,9 +190,6 @@
         getStepOneData.value = v;
         getStepOneData.value.icon = v1;
         if (isUpdate.value == 1) {
-          // return setTimeout(() => {
-          //   proxy.$refs.DeviceProfileStep2Ref.customClearStepTwoValueFunc();
-          // }, 10);
         } else if (isUpdate.value == 2) {
           return proxy.$refs.DeviceProfileStep2Ref.setStepTwoFieldsValueFunc({
             transportType: editData.value?.profileData.transportConfiguration.type,
@@ -200,7 +203,6 @@
       function handleStep2Next(v) {
         current.value++;
         getStepTwoData.value = v;
-
         if (isUpdate.value == 1) {
           proxy.$refs.DeviceProfileStep3Ref.initAddAlarmRuleFunc();
           proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormCreateAlarmFunc();
@@ -224,6 +226,9 @@
           proxy.$refs.DeviceProfileStep3Ref.setRegisterFormClearChangeDetailFunc({
             alarmDetails: editData.value?.profileData.alarms[0].clearRule.alarmDetails,
           });
+          proxy.$refs.DeviceProfileStep3Ref.setRegisterFormCreateAlarmFunc({
+            default: editData.value?.profileData.alarms[0].createRules,
+          });
           //回显创建报警规则和清除报警规则
         } else if (isUpdate.value == 3) {
           proxy.$refs.DeviceProfileStep3Ref.setAlaramTypeFormFunc({
@@ -252,13 +257,6 @@
         current.value++;
         getStepThreeData.value = v;
         if (isUpdate.value == 1) {
-          // try {
-          //   setTimeout(() => {
-          //     proxy.$refs.DeviceProfileStep4Ref.clearAlaramContactAndNoticeMethodFunc();
-          //   }, 500);
-          // } catch (e) {
-          //   return e;
-          // }
         } else if (isUpdate.value == 2) {
           proxy.$refs.DeviceProfileStep4Ref.setAlaramContactAndNoticeMethodFunc({
             alarmContactId: editData.value?.alarmProfile.alarmContactId.split(','),

@@ -7,6 +7,7 @@ export const alertContactsSchemas: FormSchema[] = [
     field: 'alarmContactId',
     label: '告警通知联系人',
     component: 'ApiSelect',
+    required: true,
     componentProps: {
       mode: 'multiple',
       api: alarmContactGetPage,

@@ -161,7 +161,7 @@
           openModal(true, {
             isUpdate: 1,
           });
-        }, 100);
+        }, 10);
       }
 
       function handleEdit(record: Recordable) {
@@ -169,16 +169,18 @@
           openModal(true, {
             record,
             isUpdate: 2,
+            isLostFocuxStatus: true,
           });
-        }, 100);
+        }, 10);
       }
       async function handleDetailView(record: Recordable) {
         setTimeout(() => {
           openModal(true, {
             record,
             isUpdate: 3,
+            isLostFocuxStatus: true,
           });
-        }, 100);
+        }, 10);
       }
       const useSelectionChange = () => {
         selectedRowKeys = getSelectRowKeys();

@@ -68,17 +68,19 @@
                   <div class="w-3/4" style="margin-left: 40px">
                     <!-- 报警严重程度 -->
                     <div style="margin-left: 10px; margin-top: 20px"
-                      ><BasicForm @register="registerFormCreateAlarm" />
-                      <div
-                        v-for="(i8, index8) in getStepThreeEditStatus ? createAlarmArray : []"
-                        :key="index8"
-                        style="position: relative"
-                      >
-                        <p
-                          style="position: absolute; top: -6vh; left: 6.5vw"
-                          v-if="index8 == createIndex"
-                          >{{ formatAlarmFunc(i8) }}</p
+                      ><BasicForm v-if="childItem" @register="registerFormCreateAlarm" />
+                      <div>
+                        <div
+                          v-for="(i8, index8) in getStepThreeEditStatus ? createAlarmArray : []"
+                          :key="index8"
+                          style="position: relative"
                         >
+                          <p
+                            style="position: absolute; top: -10.2vh; left: 6.5vw; z-index: 1"
+                            v-if="index8 == createIndex"
+                            >{{ formatAlarmFunc(i8) }}</p
+                          >
+                        </div>
                       </div>
                     </div>
                     <!-- 报警严重程度 -->
@@ -92,7 +94,6 @@
                           @click="handleOpenAlaramRuleConditions"
                           >添加</Button
                         >
-
                         <template
                           v-for="(v2, index2) in getStepThreeEditStatus
                             ? getFilterStepThreeEditArr
@@ -106,6 +107,14 @@
                             >报警规则条件：{{ openRuleConditionComp(v2) }}</p
                           >
                         </template>
+                        <template
+                          v-for="(vi, indexi) in isEditDataAndValue ? getEditDataAndValue : []"
+                          :key="indexi"
+                        >
+                          <p v-if="indexi == createIndex && isEditDataAndValue"
+                            >报警规则条件：{{ isEditDataAndValueFunc(vi) }}</p
+                          >
+                        </template>
                       </div>
                       <div style="white-space: wrap; margin-top: 25px" class="mt-4 ml-4"
                         >报警启用规则：
@@ -143,13 +152,14 @@
                             <BasicForm @register="registerFormChangeDetail" />
                           </div>
                           <div
+                            style="position: relative"
                             v-for="(i7, index7) in getStepThreeEditStatus
                               ? detailDetailModelArray
                               : []"
                             :key="index7"
                           >
                             <p
-                              style="margin-top: 1.5vh; margin-left: 5.6vw"
+                              style="position: absolute; top: -2.3vh; left: 5.68vw"
                               v-if="index7 == createIndex"
                               >{{ i7 }}</p
                             >
@@ -164,7 +174,7 @@
                     </div>
                     <div
                       class="remove-type"
-                      style="display: inline-block; position: relative; top: -257px; left: 757px"
+                      style="display: inline-block; position: relative; top: -33vh; left: 39.4vw"
                     >
                       <img
                         v-if="isAddRuleStatus"
@@ -216,7 +226,7 @@
                 />
               </div>
               <div class="aic mb-1" style="border: 1px solid #bfbfbf">
-                <div class="w-3/4" style="margin-left: 40px">
+                <div class="w-3/4 aic-class" style="margin-left: 40px">
                   <div style="margin-left: 5px">
                     <div style="color: #f5594e" class="mt-4 ml-4"
                       >报警规则条件：
@@ -327,6 +337,7 @@
     step3CreateAlarm,
     dashboardFormScheme,
     isWhereType,
+    isLostFocux,
     formChangeDetailSchema,
   } from './data';
   import { PlusCircleOutlined } from '@ant-design/icons-vue';
@@ -335,8 +346,8 @@
   import EnableRule from './cpns/enablerule/index.vue';
   import AlarmRuleConditions from './cpns/alarmruleconditions/index.vue';
   import { Button } from '/@/components/Button';
-
   export const isWhereTypeValueDisabled = ref(false);
+
   export default defineComponent({
     components: {
       BasicForm,
@@ -466,20 +477,20 @@
       let fliterClearTempRuleConditionTempArr = ref<[]>([]);
       let fliterClearTempOpenRuleTempArr = ref<[]>([]);
       const getStepThreeEditStatus: any = ref(false);
+      const isEditDataAndValue = ref(false);
       const getStepThreeEditArr = ref<[]>([]);
       const getFilterStepThreeEditArr = ref<[]>([]);
       const getFilterStepThreeEditClearArr = ref<[]>([]);
       const getFilterStepThreeClearDetailEditArr = ref<[]>([]);
       let getIsShowAddRule = true;
-
       const detailDetailModelArray = ref<[]>([]);
       const createAlarmArray = ref<[]>([]);
+      const isLostFocuxStatus = ref(true);
+      const getEditDataAndValue = ref<[]>([]);
 
-      // getIsShowAddRule.value = props.isShowAddRule;
-      // console.log(getIsShowAddRule.value);
       setTimeout(() => {
         getIsShowAddRule = props.isShowAddRule;
-      }, 100);
+      }, 10);
 
       const log = (e) => {
         console.log(e);
@@ -550,11 +561,7 @@
       //详情模板
       const [
         registerFormChangeDetail,
-        {
-          getFieldsValue: getRegisterFormChangeDetail,
-          resetFields: resetRegisterFormChangeDetail,
-          // setFieldsValue: setCreateRegisterFormChangeDetail,
-        },
+        { getFieldsValue: getRegisterFormChangeDetail, resetFields: resetRegisterFormChangeDetail },
       ] = useForm({
         labelWidth: 120,
         schemas: formChangeDetailSchema,
@@ -611,7 +618,7 @@
           resetRegisterFormClearChangeDetailFunc();
           resetAllTemplateFunc();
           resetRegisterFormCreateAlarmFunc();
-        }, 100);
+        }, 10);
       };
       //重置报警启用规则-报警规则条件
       const resetAllTemplateFunc = () => {
@@ -656,55 +663,33 @@
       const setTransmitAlarmFormFunc = (v) => {
         setTransmitAlarmFunc(v);
       };
-      const setRegisterFormCreateAlarmFunc = (v) => {
-        setRegisterFormCreateAlarm(v);
+      const setRegisterFormCreateAlarmFunc = async () => {
+        setRegisterFormCreateAlarm({
+          default: '',
+        });
       };
-
-      const optionsAlaram = [
-        {
-          value: 'CRITICAL',
-          label: '危险',
-        },
-        {
-          value: 'MAJOR',
-          label: '重要',
-        },
-        {
-          value: 'MINOR',
-          label: '次要',
-        },
-        {
-          value: 'WARNING',
-          label: '警告',
-        },
-        {
-          value: 'INDETERMINATE',
-          label: '不确定',
-        },
-      ];
       const openRuleComp = (v1) => {
-        let newOpenRuleComp = null;
-        optionsAlaram.forEach((f) => {
-          if (
-            f.value === v1?.MAJOR ||
-            v1?.MINOR ||
-            v1?.INDETERMINATE ||
-            v1?.CRITICAL ||
-            v1?.WARNING
-          ) {
-            newOpenRuleComp =
-              v1?.MAJOR ||
-              v1?.MINOR ||
-              v1?.INDETERMINATE ||
-              v1?.CRITICAL ||
-              v1?.WARNING?.schedule?.type;
+        let openSchemObj = {};
+        for (let i in v1) {
+          if (i == 'CRITICAL') {
+            openSchemObj = v1[i];
+          } else if (i == 'MAJOR') {
+            openSchemObj = v1[i];
+          } else if (i == 'MINOR') {
+            openSchemObj = v1[i];
+          } else if (i == 'WARNING') {
+            openSchemObj = v1[i];
+          } else if (i == 'INDETERMINATE') {
+            openSchemObj = v1[i];
           }
-        });
-        return newOpenRuleComp?.schedule?.type == 'ANY_TIME'
-          ? '始终启用'
-          : newOpenRuleComp?.schedule?.type == 'SPECIFIC_TIME'
-          ? '定时启用'
-          : '自定义启用';
+        }
+        let formatSchemeMap =
+          openSchemObj?.schedule.type == 'ANY_TIME'
+            ? '始终启用'
+            : openSchemObj?.schedule.type == 'SPECIFIC_TIME'
+            ? '定时启用'
+            : '自定义启用';
+        return formatSchemeMap;
       };
       //清除报警规则
       const openClearRuleConditionComp = (v4) => {
@@ -781,6 +766,7 @@
           getFilterStepThreeEditArr.value = [];
           getFilterStepThreeEditClearArr.value = [];
           getStepThreeEditStatus.value = v.isEditStatus;
+          isEditDataAndValue.value = v.isEditStatus;
           getStepThreeEditArr.value = v.stepThreeData;
           if (getFilterStepThreeEditClearArr.value.length == 0) {
             getFilterStepThreeEditClearArr.value.push(v.stepThreeClearData as never);
@@ -916,7 +902,9 @@
           isWhereTypeValueDisabled.value = true;
         }
       });
-
+      watch(isLostFocux, (nV) => {
+        isLostFocuxStatus.value = nV;
+      });
       //报警规则
       //启用规则
       const getAllFieldsEnabFunc = (v) => {
@@ -930,6 +918,34 @@
         fliterTempRuleConditionTempArr.value.push({
           condition: addNewRuleTem.condition.condition,
         });
+        if (isEditDataAndValue.value == true) {
+          getEditDataAndValue.value.push({
+            condition: addNewRuleTem.condition.condition,
+          });
+        }
+      };
+      //格式化编辑
+      const isEditDataAndValueFunc = (v) => {
+        let formatMap = v.condition.map((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 formatMap;
       };
       //格式化新增
       const formatAddRuleFunc = (v) => {
@@ -996,7 +1012,7 @@
       function generateUUID() {
         let d = new Date().getTime();
         if (window.performance && typeof window.performance.now === 'function') {
-          d += performance.now(); //use high-precision timer if available
+          d += performance.now();
         }
         let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
           let r = (d + Math.random() * 16) % 16 | 0;
@@ -1043,20 +1059,17 @@
           openModal1(true);
           setTimeout(() => {
             proxy.$refs.getChildData1.resetDataFunc();
-          }, 1000);
-        }, 50);
+          }, 10);
+        }, 10);
       };
       const handleOpenEnableRule = () => {
-        // if (getStepThreeEditStatus.value == true) {
-        //   getStepThreeEditStatus.value = !getStepThreeEditStatus.value;
-        // }
         isRuleAlarmRuleConditions.value = 2;
         setTimeout(() => {
           openModal2(true);
           setTimeout(() => {
             proxy.$refs.getChildData2.resetDataFunc();
-          }, 1000);
-        }, 50);
+          }, 10);
+        }, 10);
       };
       const handleOpenAlaramRuleConditions = () => {
         isRuleAlarmRuleConditions.value = 3;
@@ -1065,11 +1078,11 @@
           try {
             setTimeout(() => {
               proxy.$refs.getChildData3.resetDataFunc();
-            }, 1000);
+            }, 10);
           } catch (e) {
             return e;
           }
-        }, 500);
+        }, 10);
       };
       const handleOpenClearDetailTemplate = () => {
         isRuleAlarmRuleConditions.value = 4;
@@ -1078,29 +1091,23 @@
           try {
             setTimeout(() => {
               proxy.$refs.getChildData1.resetDataFunc();
-            }, 1000);
+            }, 10);
           } catch (e) {
             return e;
           }
-        }, 500);
+        }, 10);
       };
       const handleOpenClearEnableRule = () => {
         isRuleAlarmRuleConditions.value = 5;
         setTimeout(() => {
           openModal5(true);
-          setTimeout(() => {
-            // proxy.$refs.getChildData2.resetDataFunc();
-          }, 1000);
-        }, 50);
+        }, 10);
       };
       const handleOpenClearAlaramRuleConditions = () => {
         isRuleAlarmRuleConditions.value = 6;
         setTimeout(() => {
           openModal6(true);
-          setTimeout(() => {
-            // proxy.$refs.getChildData3.resetDataFunc();
-          }, 1000);
-        }, 50);
+        }, 10);
       };
 
       return {
@@ -1182,6 +1189,10 @@
         deleteCondition,
         setCreateRegisterFormChangeDetailFunc,
         detailDetailModelArray,
+        isLostFocuxStatus,
+        isEditDataAndValue,
+        getEditDataAndValue,
+        isEditDataAndValueFunc,
       };
     },
   });
@@ -1203,9 +1214,15 @@
     align-items: center;
     border-radius: 10px;
     margin-top: 15px;
+    .aic-class {
+      position: relative;
+    }
   }
 
   :deep(.vben-collapse-container__header) {
     border: none;
   }
+  :deep .ant-select-selection-placeholder {
+    display: none;
+  }
 </style>

@@ -8,36 +8,37 @@
       @ok="handleSubmit"
     >
       <CollapseContainer title="键名筛选器" class="border mb-8">
-        <BasicTable
-          :showIndexColumn="false"
-          :resizeHeightOffset="200"
-          :dataSource="getTableApiData"
-          @register="registerTable"
-        >
-          <template #toolbar>
-            <a-button type="primary" @click="handleAddKey">新增键名筛选器</a-button>
-          </template>
-          <template #action="{ record }">
-            <TableAction
-              :actions="[
-                {
-                  label: '编辑',
-                  icon: 'clarity:note-edit-line',
-                  onClick: handleEdit.bind(null, record),
-                },
-                {
-                  label: '删除',
-                  icon: 'ant-design:delete-outlined',
-                  color: 'error',
-                  popConfirm: {
-                    title: '是否确认删除',
-                    confirm: handleDelete.bind(null, record),
+        <div class="table-style">
+          <BasicTable
+            :showIndexColumn="false"
+            :dataSource="getTableApiData"
+            @register="registerTable"
+          >
+            <template #toolbar>
+              <a-button type="primary" @click="handleAddKey">新增键名筛选器</a-button>
+            </template>
+            <template #action="{ record }">
+              <TableAction
+                :actions="[
+                  {
+                    label: '编辑',
+                    icon: 'clarity:note-edit-line',
+                    onClick: handleEdit.bind(null, record),
                   },
-                },
-              ]"
-            />
-          </template>
-        </BasicTable>
+                  {
+                    label: '删除',
+                    icon: 'ant-design:delete-outlined',
+                    color: 'error',
+                    popConfirm: {
+                      title: '是否确认删除',
+                      confirm: handleDelete.bind(null, record),
+                    },
+                  },
+                ]"
+              />
+            </template>
+          </BasicTable>
+        </div>
       </CollapseContainer>
       <CollapseContainer title="筛选器预览" class="border mb-8">
         <!-- <p v-for="(item, index) in detailData" :key="index">{{ item }}</p> -->
@@ -138,7 +139,6 @@
         title: '键名筛选器',
         columns: keyColumns,
         bordered: true,
-        // api: useWaitFunc,
         showIndexColumn: false,
         pagination: false,
         autoCreateKey: true,
@@ -195,13 +195,8 @@
         getTableApiData.value.push(receiveData.value);
         detailData.value.push(receiveData.value);
         setFunc(getTableApiData.value);
-        // setFunc1(detailData.value);
         reload();
       };
-      // const useWaitFunc = async (v) => {
-      //   // detailData.value.push(v);
-      //   return getTableApiData.value.push(v), detailData.value.push(v);
-      // };
       return {
         schema,
         detailData,
@@ -223,9 +218,9 @@
   });
 </script>
 <style lang="less" scoped>
-  :deep.ant-table-body {
+  :deep .ant-table-body {
     overflow-y: auto !important;
-    min-height: 173px !important;
-    height: 100px !important;
+    min-height: 90px !important;
+    height: 0px !important;
   }
 </style>

@@ -48,21 +48,6 @@ export const step1Schemas: FormSchema[] = [
     field: 'defaultQueueName',
     label: '处理队列',
     component: 'ApiSelect',
-    // componentProps: {
-    //   api: async () => {
-    //     const data = await findDictItemByCode({ dictCode: 'queen_execute_sequence' });
-    //     const returnData = data.map((m) => {
-    //       return {
-    //         getLabelField: m.itemText,
-    //         getValueField: m.itemValue,
-    //       };
-    //     });
-    //     return returnData;
-    //   },
-    //   labelField: 'getLabelField',
-    //   valueField: 'getValueField',
-    //   immediate: true,
-    // },
     componentProps: {
       api: findDictItemByCode,
       params: {
@@ -163,19 +148,18 @@ export const step3HighSetting: FormSchema[] = [
 ];
 
 export const isWhereType = ref(null);
+export const isLostFocux = ref(true);
 
 export const step3CreateAlarm: FormSchema[] = [
   {
     field: 'default',
     component: 'Select',
-    required: true,
     label: '报警严重程度：',
     colProps: {
       span: 17,
     },
     componentProps() {
       return {
-        placeholder: '请选择严重程度',
         options: [
           {
             value: 'CRITICAL',
@@ -201,6 +185,9 @@ export const step3CreateAlarm: FormSchema[] = [
         onChange: (v) => {
           isWhereType.value = v ? v : 'INDETERMINATE';
         },
+        onFocus: () => {
+          isLostFocux.value = false;
+        },
       };
     },
   },
@@ -266,11 +253,11 @@ export const formChangeDetailSchema: FormSchema[] = [
     field: 'alarmDetails',
     label: '',
     colProps: { span: 13 },
-    required: true,
     component: 'Input',
+    defaultValue: '',
     componentProps: {
+      placeholder: '.',
       maxLength: 255,
-      placeholder: '请输入报警详细信息',
     },
   },
 ];