Merge branch 'ft-dev' into 'main'

feat:设备配置新增清除报警，wip：设备配置键名筛选器待修改预览

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

@@ -19,13 +19,13 @@
       <DeviceProfileStep1
         ref="DeviceProfileStep1Ref"
         @next="handleStepNext1"
-        v-if="current === 0"
+        v-show="current === 0"
       />
       <DeviceProfileStep2
         ref="DeviceProfileStep2Ref"
         @prev="handleStepPrev"
         @next="handleStep2Next"
-        v-if="current === 1"
+        v-show="current === 1"
       />
       <DeviceProfileStep3
         ref="DeviceProfileStep3Ref"
@@ -34,7 +34,11 @@
         @redo="handleRedo"
         v-if="current === 2"
       />
-      <DeviceProfileStep4 ref="DeviceProfileStep4Ref" @prev="handleStepPrev" v-if="current === 3" />
+      <DeviceProfileStep4
+        ref="DeviceProfileStep4Ref"
+        @prev="handleStepPrev"
+        v-show="current === 3"
+      />
     </div>
   </BasicModal>
 </template>
@@ -87,20 +91,20 @@
         isUpdate.value = !!data?.isUpdate;
         if (!unref(isUpdate)) {
           current.value = 0;
-          // switch (current.value) {
-          //   case 0:
-          //     proxy.$refs.DeviceProfileStep1Ref.customResetFunc();
-          //     break;
-          //   case 1:
-          //     proxy.$refs.DeviceProfileStep2Ref.customResetAndFunc();
-          //     break;
-          //   case 2:
-          //   // proxy.$refs.DeviceProfileStep3Ref.customResetFunc();
-          //   // break;
-          //   case 3:
-          //     proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
-          //     break;
-          // }
+          switch (current.value) {
+            case 0:
+              proxy.$refs.DeviceProfileStep1Ref.customResetFunc();
+              break;
+            case 1:
+              proxy.$refs.DeviceProfileStep2Ref.customResetAndFunc();
+              break;
+            case 2:
+            // proxy.$refs.DeviceProfileStep3Ref.customResetFunc();
+            // break;
+            case 3:
+              proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
+              break;
+          }
         }
         if (unref(isUpdate)) {
           current.value = 0;

@@ -8,7 +8,7 @@
       @register="register"
       :title="getTitle"
     >
-      <Tabs v-model:activeKey="activeKey">
+      <Tabs @change="handleChange" v-model:activeKey="activeKey">
         <TabPane key="1" tab="详情">
           <BasicForm
             :showSubmitButton="false"
@@ -94,26 +94,6 @@
       const isUpdate = ref(true);
       const descInfo: any = ref(null);
       const dataInfo: any = ref('');
-      watch(
-        () => activeKey.value,
-        (v) => {
-          dataInfo.value = v;
-          // switch (dataInfo.value) {
-          //   case '1':
-          //     console.log(1);
-          //     break;
-          //   case '2':
-          //     console.log(2);
-          //     break;
-          //   case '3':
-          //     console.log(3);
-          //     break;
-          //   case '4':
-          //     console.log(4);
-          //     break;
-          // }
-        }
-      );
       const [registerDetail, { setFieldsValue: setRegisterDetail }] = useForm({
         schemas: step1Schemas,
         actionColOptions: {
@@ -182,24 +162,92 @@
         descInfo.value = await deviceConfigGetDetail(data.record.id);
         try {
           await setRegisterDetail({ ...descInfo.value });
-          await setRegisterTrans({ ...descInfo.value });
-          await setRegisterStep3Schemas({ ...descInfo.value });
-          await setRegisterStep3HighSetting({ ...descInfo.value });
-          await setRegisterStep3CreateAlarm({ ...descInfo.value });
-          await setRegisterStep3RuleAlarm({ ...descInfo.value });
-          await setRegisterContact({ ...descInfo.value });
-          await setRegisterStep3Condition({ ...descInfo.value });
-          await setRegisterStep3Enable({ ...descInfo.value });
-          await setRegisterStep3TemplateDetail({ ...descInfo.value });
+          // await setRegisterTrans({
+          //   transportType: descInfo.value.profileData.transportConfiguration.type,
+          // });
+          // await setRegisterStep3Schemas({
+          //   alarmType: descInfo.value.profileData.alarms[0].alarmType,
+          // });
+          // await setRegisterStep3HighSetting({
+          //   propagate: descInfo.value.profileData.alarms[0].propagate,
+          //   propagateRelationTypes: descInfo.value.profileData.alarms[0].propagateRelationTypes[0],
+          // });
+          // await setRegisterStep3CreateAlarm({ ...descInfo.value });
+          // await setRegisterStep3RuleAlarm({ ...descInfo.value });
+          // await setRegisterContact({ ...descInfo.value });
+          // await setRegisterStep3Condition({ ...descInfo.value });
+          // await setRegisterStep3Enable({ ...descInfo.value });
+          // await setRegisterStep3TemplateDetail({ ...descInfo.value });
         } catch (e) {
           return e;
         }
       });
+      const handleChange = (v) => {
+        switch (v) {
+          case '1':
+            setRegisterDetail({ ...descInfo.value });
+            break;
+          case '2':
+            setRegisterTrans({
+              transportType: descInfo.value.profileData.transportConfiguration.type,
+            });
+            break;
+          case '3':
+            setRegisterStep3Schemas({
+              alarmType: descInfo.value.profileData.alarms[0].alarmType,
+            });
+            setRegisterStep3HighSetting({
+              propagate: descInfo.value.profileData.alarms[0].propagate,
+              propagateRelationTypes:
+                descInfo.value.profileData.alarms[0].propagateRelationTypes[0],
+            });
+            const getKey = Object.keys(descInfo.value.profileData.alarms[0].createRules);
+            console.log(descInfo.value.profileData.alarms[0].createRules[getKey[0]]);
+            // console.log(descInfo.value.profileData.alarms[0].createRules.MAJOR);
+            // console.log(descInfo.value.profileData.alarms[0].createRules['MAJOR']);
+            setRegisterStep3CreateAlarm({
+              MAJOR: descInfo.value.profileData.alarms[0].createRules[getKey[0]] + '',
+            });
+            setRegisterStep3RuleAlarm({
+              type: descInfo.value.profileData.alarms[0].createRules[getKey[0]].condition.condition
+                .key.type,
+              key: descInfo.value.profileData.alarms[0].createRules[getKey[0]].condition.condition
+                .key.key,
+              valueType:
+                descInfo.value.profileData.alarms[0].createRules[getKey[0]].condition.condition
+                  .valueType,
+            });
+            setRegisterStep3Condition({
+              conditionType:
+                descInfo.value.profileData.alarms[0].createRules[getKey[0]].condition.spec.type,
+            });
+            setRegisterStep3Enable({
+              schedule: descInfo.value.profileData.alarms[0].createRules[getKey[0]].schedule,
+            });
+            setRegisterStep3TemplateDetail({
+              alarmDetails: descInfo.value.profileData.alarms[0].createRules,
+            });
+            break;
+          case '4':
+            setRegisterContact({
+              alarmContactId: descInfo.value.alarmProfile.alarmContactId,
+              messageMode: descInfo.value.alarmProfile.messageMode,
+            });
+            break;
+        }
+      };
+      watch(
+        () => activeKey.value,
+        (v) => {
+          dataInfo.value = v;
+        }
+      );
       const getTitle = computed(() => {
         return '设备配置详情';
       });
 
       return {
+        handleChange,
         registerStep3TemplateDetail,
         registerStep3Enable,
         registerStep3Condition,

@@ -45,7 +45,7 @@
       const customResetFunc = async () => {
         await resetFields();
       };
-      return { register, customResetFunc, resetFieldsFunc };
+      return { register, resetFieldsFunc, customResetFunc };
     },
   });
 </script>

@@ -70,30 +70,33 @@
         >
         <div style="height: 20px"></div>
         <p>清除报警规则</p>
-        <template v-for="(childItem, createIndex) in item.alarms" :key="childItem.id">
+        <template v-for="(childItem, createIndex) in item.clearAlarms" :key="childItem.id">
           <div class="aic mb-4" style="border: 1px solid #bfbfbf">
             <div class="w-3/4">
               <div style="margin-left: 5px">
                 <p style="color: #f5594e" class="mt-4 ml-4"
                   >请添加报警规则条件
                   <PlusOutlined
-                    @click="handleOpenAlaramRuleConditions"
+                    @click="handleOpenClearAlaramRuleConditions"
                     class="cursor-pointer ml-4"
                     style="font-size: 20px"
-                /></p>
+                  />{{ ruleClearTemplateData }}</p
+                >
                 <p class="mt-4 ml-4"
                   >启用规则：始终启用
                   <EditOutlined
-                    @click="handleOpenEnableRule"
+                    @click="handleOpenClearEnableRule"
                     class="cursor-pointer ml-4"
                     style="font-size: 20px"
-                /></p>
+                  />{{ enableClearTemplateData }}</p
+                >
                 <p class="mt-4 ml-4"
                   >详情模板：<EditOutlined
-                    @click="handleOpenDetailTemplate"
+                    @click="handleOpenClearDetailTemplate"
                     class="cursor-pointer ml-4"
                     style="font-size: 20px"
-                /></p>
+                  />{{ detailClearTemplateData }}</p
+                >
                 <div style="margin-left: 16px">
                   <BasicForm @register="dashboardForm" />
                 </div>
@@ -104,13 +107,13 @@
                 <MinusCircleOutlined
                   style="font-size: 25px; color: #305680"
                   class="cursor-pointer"
-                  @click="deleteCondition(index, createIndex)"
+                  @click="deleteClearCondition(index, createIndex)"
                 />
               </Tooltip>
             </div>
           </div>
         </template>
-        <a-button class="mt-5" @click="addCreateRole(index)"
+        <a-button class="mt-5" @click="addClearRole(index)"
           ><PlusCircleOutlined />添加清除条件</a-button
         >
       </CollapseContainer>
@@ -141,6 +144,28 @@
     @getAllFieldsRule="getAllFieldsRuleFunc"
     @register="registerModal3"
   />
+
+  <!-- 清除条件的 -->
+  <!-- 详情模板 -->
+  <DetailTemplate
+    v-if="isRuleAlarmRuleConditions == 4"
+    @getAllFields="getAllClearFieldsFunc"
+    @register="registerModal4"
+  />
+  <!-- 启用规则 -->
+  <EnableRule
+    v-if="isRuleAlarmRuleConditions == 5"
+    ref="getChildData2"
+    @getAllFieldsEnab="getAllClearFieldsEnabFunc"
+    @register="registerModal5"
+  />
+  <!-- 报警规则条件 -->
+  <AlarmRuleConditions
+    v-if="isRuleAlarmRuleConditions == 6"
+    ref="getChildData3"
+    @getAllFieldsRule="getAllClearFieldsRuleFunc"
+    @register="registerModal6"
+  />
 </template>
 
 <script lang="ts">
@@ -202,6 +227,9 @@
       const ruleTemplateData: any = ref(null);
       const enableTemplateData: any = ref(null);
       const detailTemplateData: any = ref(null);
+      const ruleClearTemplateData: any = ref(null);
+      const enableClearTemplateData: any = ref(null);
+      const detailClearTemplateData: any = ref(null);
       //告警列表
       let profileData = ref<alarmListItem[]>([]);
       const log = (e) => {
@@ -232,6 +260,15 @@
               propagateRelationTypes: [''],
             },
           ],
+          clearAlarms: [
+            {
+              id: Date.now() + Math.random(),
+              alarmType: '',
+              clearRules: {},
+              propagate: true,
+              propagateRelationTypes: [''],
+            },
+          ],
         });
       };
       //Mobile dashboard:
@@ -248,7 +285,6 @@
         showResetButton: false,
         showSubmitButton: false,
       });
-
       // 高级设置
       const [registerFormHighSetting, { validate: validateRegisterFormHighSetting }] = useForm({
         labelWidth: 120,
@@ -259,7 +295,6 @@
           span: 24,
         },
       });
-
       // 添加创建条件表单
       const [registerFormCreateAlarm, { validate: validateRegisterFormCreateAlarm }] = useForm({
         labelWidth: 120,
@@ -270,7 +305,6 @@
           span: 24,
         },
       });
-
       // 添加‘创建条件’
       const addCreateRole = (index: number) => {
         unref(profileData)[index].alarms.push({
@@ -286,6 +320,21 @@
       const deleteCondition = (index: number, createIndex: number) => {
         profileData.value[index].alarms.splice(createIndex, 1);
       };
+      // 添加‘清除条件’
+      const addClearRole = (index: number) => {
+        unref(profileData)[index].clearAlarms.push({
+          id: Date.now() + Math.random(),
+          alarmVisible: false,
+          addKeyFilterVisible: false,
+          detailVisible: false,
+          detail: '',
+          filterList: [],
+        });
+      };
+      // 删除‘清除条件’
+      const deleteClearCondition = (index: number, createIndex: number) => {
+        profileData.value[index].clearAlarms.splice(createIndex, 1);
+      };
       watch(isWhereType, (nV) => {
         isWhereTypeValue.value = nV;
       });
@@ -368,6 +417,125 @@
         ruleTemplateData.value = `
          键名:${v.key}...操作:${findRuleByValue?.label}...值:${v.value1}
          `;
+
+        ruleLastObj.value = v1;
+        const predicate = {
+          operation: ruleObj.value.operation,
+          value: {
+            defaultValue: Number(ruleObj.value.value1),
+          },
+          type: ruleObj.value.type1,
+        };
+        const spec1 = {
+          type: ruleLastObj.value.conditionType,
+          // unit: ruleLastObj.value.unit,
+          // predicate: {
+          //   defaultValue: Number(ruleLastObj.value.defaultValue),
+          //   dynamicValue: {
+          //     sourceType: ruleLastObj.value.sourceType,
+          //     sourceAttribute: ruleLastObj.value.sourceAttribute,
+          //     inherit: ruleLastObj.value.inherit,
+          //   },
+          // },
+        };
+        const getCondition = {
+          condition: [
+            {
+              key: {
+                type: ruleObj.value?.type,
+                key: ruleObj.value?.key,
+              },
+              valueType: ruleObj.value.type1,
+              predicate,
+            },
+          ],
+          spec: spec1,
+        };
+        const getValueConditon = {
+          condition: getCondition,
+        };
+        Object.assign(additionalObj.value, getValueConditon);
+      };
+      //清除条件
+      //详情模板
+      const getAllClearFieldsFunc = (v) => {
+        detailObj.value = v;
+        detailClearTemplateData.value = `
+         报警详细信息:${v.alarmDetails}
+         `;
+      };
+      //启用规则
+      const getAllClearFieldsEnabFunc = (v) => {
+        enableObj.value = v;
+        const findDay = [
+          {
+            label: '星期一',
+            value: '1',
+          },
+          {
+            label: '星期二',
+            value: '2',
+          },
+          {
+            label: '星期三',
+            value: '3',
+          },
+          {
+            label: '星期四',
+            value: '4',
+          },
+          {
+            label: '星期五',
+            value: '5',
+          },
+          {
+            label: '星期六',
+            value: '6',
+          },
+          {
+            label: '星期七',
+            value: '7',
+          },
+        ];
+        const findDayByValue = findDay.map((f, i) => {
+          try {
+            if (f.value == v.daysOfWeek[i]) {
+              return f.label;
+            }
+          } catch (e) {
+            console.log(e);
+          }
+        });
+        enableClearTemplateData.value = `
+         开始时间:${v.startsOn}结束时间:${v.endsOn}天数:${findDayByValue}
+         `;
+      };
+      //规则条件
+      const getAllClearFieldsRuleFunc = (v, v1) => {
+        ruleObj.value = v;
+        const findDay = [
+          { label: '等于', value: 'EQUAL' },
+          { label: '不等于', value: 'NOT_EQUAL' },
+          { label: '开始于', value: 'STARTS_WITH' },
+          { label: '结束于', value: 'ENDS_WITH' },
+          { label: '包含', value: 'CONTAINS' },
+          { label: '不包含', value: 'NOT_CONTAINS' },
+          { label: '等于', value: 'EQUAL' },
+          { label: '不等于', value: 'NOT_EQUAL' },
+          { label: '大于', value: 'GREATER' },
+          { label: '小于', value: 'LESS' },
+          { label: '大于或等于', value: 'GREATER_OR_EQUAL' },
+          { label: '小于或等于', value: 'LESS_OR_EQUAL' },
+        ];
+        const findRuleByValue = findDay.find((f) => {
+          if (f.value == v.operation) {
+            return f.label;
+          }
+        });
+        ruleClearTemplateData.value = `
+         键名:${v.key}...操作:${findRuleByValue?.label}...值:${v.value1}
+         `;
+
         ruleLastObj.value = v1;
         const predicate = {
           operation: ruleObj.value.operation,
@@ -425,6 +593,11 @@
             getAdditionalProp,
             additionalObj.value
           );
+          const getScheduleAndClearAlarmDetails = Object.assign(
+            {},
+            getAdditionalProp,
+            additionalObj.value
+          );
           const getIsWhereTypeValue: any = isWhereTypeValue.value;
           const getAdditionalPropObj = {
             [getIsWhereTypeValue]: getScheduleAndAlarmDetails,
@@ -432,23 +605,25 @@
           const getCreateRulesAllObj = {
             createRules: getAdditionalPropObj,
           };
+          const getClearRulesAllObj = {
+            clearRule: getScheduleAndClearAlarmDetails,
+          };
           const valueRegisterForm = await validateRegisterForm();
           const valueRegisterFormAndId = {
             alarmType: Object.values(valueRegisterForm)[0],
           };
-
           const valueRegisterFormHighSetting = await validateRegisterFormHighSetting();
           // const valueRegisterFormCreateAlarm = await validateRegisterFormCreateAlarm();
           const getValueRegisterFormHighSetting = {
             propagate: valueRegisterFormHighSetting?.propagate,
             propagateRelationTypes: [valueRegisterFormHighSetting?.propagateRelationTypes],
           };
-
           Object.assign(
             emptyObj.value,
             valueRegisterFormAndId,
             getValueRegisterFormHighSetting,
-            getCreateRulesAllObj
+            getCreateRulesAllObj,
+            getClearRulesAllObj
           );
           alarmss.value.push(emptyObj.value);
           const getAlarms = {
@@ -458,35 +633,70 @@
           emit('next', getAllFormData.value);
         } catch (error) {}
       };
-
       const [registerModal1, { openModal: openModal1 }] = useModal();
       const [registerModal2, { openModal: openModal2 }] = useModal();
       const [registerModal3, { openModal: openModal3 }] = useModal();
-
+      const [registerModal4, { openModal: openModal4 }] = useModal();
+      const [registerModal5, { openModal: openModal5 }] = useModal();
+      const [registerModal6, { openModal: openModal6 }] = useModal();
       const handleOpenDetailTemplate = () => {
         isRuleAlarmRuleConditions.value = 1;
         setTimeout(() => {
           openModal1(true);
+          proxy.$refs.getChildData1.resetDataFunc();
         }, 50);
       };
       const handleOpenEnableRule = () => {
         isRuleAlarmRuleConditions.value = 2;
         setTimeout(() => {
           openModal2(true);
+          proxy.$refs.getChildData2.resetDataFunc();
         }, 50);
       };
       const handleOpenAlaramRuleConditions = () => {
         isRuleAlarmRuleConditions.value = 3;
         setTimeout(() => {
           openModal3(true);
+          proxy.$refs.getChildData3.resetDataFunc();
+        }, 50);
+      };
+      const handleOpenClearDetailTemplate = () => {
+        isRuleAlarmRuleConditions.value = 4;
+        setTimeout(() => {
+          openModal4(true);
+          proxy.$refs.getChildData1.resetDataFunc();
+        }, 50);
+      };
+      const handleOpenClearEnableRule = () => {
+        isRuleAlarmRuleConditions.value = 5;
+        setTimeout(() => {
+          openModal5(true);
+          proxy.$refs.getChildData2.resetDataFunc();
+        }, 50);
+      };
+      const handleOpenClearAlaramRuleConditions = () => {
+        isRuleAlarmRuleConditions.value = 6;
+        setTimeout(() => {
+          openModal6(true);
+          proxy.$refs.getChildData3.resetDataFunc();
         }, 50);
       };
-
       return {
+        ruleClearTemplateData,
+        enableClearTemplateData,
+        detailClearTemplateData,
+        handleOpenClearDetailTemplate,
+        handleOpenClearEnableRule,
+        handleOpenClearAlaramRuleConditions,
+        addClearRole,
+        deleteClearCondition,
         detailTemplateData,
         enableTemplateData,
         ruleTemplateData,
         dashboardForm,
+        getAllClearFieldsRuleFunc,
+        getAllClearFieldsEnabFunc,
+        getAllClearFieldsFunc,
         getAllFieldsRuleFunc,
         getAllFieldsEnabFunc,
         getAllFieldsFunc,
@@ -497,6 +707,9 @@
         registerModal1,
         registerModal2,
         registerModal3,
+        registerModal4,
+        registerModal5,
+        registerModal6,
         handleOpenEnableRule,
         handleOpenAlaramRuleConditions,
         handleOpenDetailTemplate,

@@ -60,16 +60,16 @@ export const formSchema: FormSchema[] = [
     field: 'key',
     label: '键名',
     colProps: { span: 24 },
-    component: 'Select',
+    component: 'Input',
     componentProps: {
-      placeholder: '请选择键名',
-      options: [
-        { label: 'active', value: 'active' },
-        { label: 'inactivityAlarmTime', value: 'inactivityAlarmTime' },
-        { label: 'lastActivityTime', value: 'lastActivityTime' },
-        { label: 'lastConnectTime', value: 'lastConnectTime' },
-        { label: 'lastDisconnectTime', value: 'lastDisconnectTime' },
-      ],
+      placeholder: '请输入键名',
+      // options: [
+      //   { label: 'active', value: 'active' },
+      //   { label: 'inactivityAlarmTime', value: 'inactivityAlarmTime' },
+      //   { label: 'lastActivityTime', value: 'lastActivityTime' },
+      //   { label: 'lastConnectTime', value: 'lastConnectTime' },
+      //   { label: 'lastDisconnectTime', value: 'lastDisconnectTime' },
+      // ],
     },
     ifShow: ({ values }) => isShiDu(Reflect.get(values, 'type')),
   },
@@ -77,14 +77,14 @@ export const formSchema: FormSchema[] = [
     field: 'key',
     label: '键名',
     colProps: { span: 24 },
-    component: 'Select',
+    component: 'Input',
     componentProps: {
-      placeholder: '请选择键名',
-      options: [
-        { label: 'CO2', value: 'CO2' },
-        { label: 'temp', value: 'temp' },
-        { label: 'wet', value: 'wet' },
-      ],
+      placeholder: '请输入键名',
+      // options: [
+      //   { label: 'CO2', value: 'CO2' },
+      //   { label: 'temp', value: 'temp' },
+      //   { label: 'wet', value: 'wet' },
+      // ],
     },
     ifShow: ({ values }) => isWenDu(Reflect.get(values, 'type')),
   },

@@ -30,12 +30,15 @@
       });
       const [register, { closeModal }] = useModalInner(async (data) => {
         isUpdate.value = !!data?.isUpdate;
+        if (!unref(isUpdate)) {
+          console.log('新增键名筛选器');
+          resetFields();
+        }
         if (unref(isUpdate)) {
-          await setFieldsValue({
+          console.log('编辑键名筛选器');
+          setFieldsValue({
             ...data.record,
           });
-        } else {
-          await resetFields();
         }
       });
 

@@ -72,7 +72,7 @@
       const receiveData: any = ref(null);
       const lastValues: any = ref(null);
       const isUpdate = ref(true);
-      const [registerForm, { getFieldsValue }] = useForm({
+      const [registerForm, { getFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
       });
@@ -105,6 +105,13 @@
         emit('getAllFieldsRule', receiveData.value, lastValues.value);
         closeModal();
       };
+      const resetDataFunc = () => {
+        getTableApiData.value = [];
+        getTableApiData.value.length = 0;
+        detailData.value = [];
+        detailData.value.length = 0;
+        resetFields();
+      };
       const handleAddKey = () => {
         openModal(true, {
           isUpdate: false,
@@ -133,6 +140,7 @@
         detailData.value.push(receiveData.value);
       };
       return {
+        resetDataFunc,
         columnsView,
         DescDetailSchema,
         detailData,

@@ -25,7 +25,7 @@
     setup(_, { emit }) {
       // const getValueData: any = ref({});
       const isUpdate = ref(true);
-      const [registerForm, { getFieldsValue }] = useForm({
+      const [registerForm, { getFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
       });
@@ -33,6 +33,9 @@
       const [register, { closeModal }] = useModalInner((data) => {
         isUpdate.value = !!data?.isUpdate;
       });
+      const resetDataFunc = () => {
+        resetFields();
+      };
       const handleSubmit = () => {
         const values = getFieldsValue();
         emit('getAllFields', values);
@@ -47,6 +50,7 @@
       //   return getV;
       // }
       return {
+        resetDataFunc,
         // getAllFields,
         registerForm,
         handleSubmit,

@@ -25,7 +25,7 @@
     setup(_, { emit }) {
       // const getValueData: any = ref({});
       const isUpdate = ref(true);
-      const [registerForm, { getFieldsValue }] = useForm({
+      const [registerForm, { getFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
       });
@@ -33,6 +33,9 @@
       const [register, { closeModal }] = useModalInner((data) => {
         isUpdate.value = !!data?.isUpdate;
       });
+      const resetDataFunc = () => {
+        resetFields();
+      };
       const handleSubmit = () => {
         const values = getFieldsValue();
         emit('getAllFieldsEnab', values);
@@ -47,6 +50,7 @@
       //   return getV;
       // }
       return {
+        resetDataFunc,
         // getAllFieldsEnab,
         registerForm,
         handleSubmit,

@@ -73,6 +73,7 @@ export const step2Schemas: FormSchema[] = [
     field: 'transportType',
     component: 'Select',
     label: '传输方式',
+    defaultValue: 'CoAP',
     componentProps: {
       options: [
         { label: 'MQTT', value: 'MQTT' },
@@ -125,7 +126,7 @@ export const isWhereType = ref(null);
 
 export const step3CreateAlarm: FormSchema[] = [
   {
-    field: '',
+    field: 'MAJOR',
     component: 'Select',
     label: '严重程度',
     colProps: {

@@ -26,6 +26,13 @@ interface IAddAlarms {
   propagate: true;
   propagateRelationTypes: string[];
 }
+interface IAddClearAlarms {
+  id: number;
+  alarmType: string;
+  clearRules: object;
+  propagate: true;
+  propagateRelationTypes: string[];
+}
 
 export interface alarmListItem {
   configuration?: object;
@@ -33,6 +40,7 @@ export interface alarmListItem {
   provisionConfiguration?: provisionConfigurationD;
   // id?: number;
   alarms?: IAddAlarms[];
+  clearAlarms?: IAddClearAlarms[];
   // alarmType?: string;
   // messageMode?: string;
   // createRule?: createRule[];