Merge branch 'ft-dev' into 'main'

feat:新增设备配置设为默认配置，新增表格两个字段，type和default，fix:修改设备配置第三步页面调整

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

@@ -11,7 +11,8 @@ VITE_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://192.168.10.108:8080/api"]]
 
 # 线上
-VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
+# VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
+VITE_PROXY = [["/api","http://47.99.141.212:8080/api"]]
 
 # 实时数据的ws地址
 VITE_WEB_SOCKET = ws://101.133.234.90:8080/api/ws/plugins/telemetry?token=

@@ -16,6 +16,7 @@ enum EDeviceConfigApi {
   ALARM_CONTACT_GET_PAGE = '/alarmContact',
   DEVICE_CONFIG_EXPORT = '/deviceProfile/export',
   DEVICE_CONFIG_IMPORT = '/deviceProfile/import',
+  SET_DEVICE_ISDEFAULT = '/deviceProfile',
 }
 
 /**
@@ -97,3 +98,19 @@ export const deviceConfigImport = (params: IDeviceConfigAddOrEditModel) => {
     params,
   });
 };
+
+/**
+ *
+ * 设置该设备配置为默认
+ */
+export const setDeviceProfileIsDefaultApi = (id: string, v, params?: {}) => {
+  return defHttp.post(
+    {
+      url: EDeviceConfigApi.SET_DEVICE_ISDEFAULT + '/' + id + '/' + v,
+      params,
+    },
+    {
+      joinPrefix: false,
+    }
+  );
+};

@@ -46,20 +46,6 @@ export async function deleteTenantProfileApi(ids: string) {
   );
 }
 
-// export async function deleteTenantProfileApi(ids: string[]) {
-//   await defHttp.delete(
-//     {
-//       url: Api.deleteTenantProfile,
-//       data: {
-//         ids: ids,
-//       },
-//     },
-//     {
-//       joinPrefix: false,
-//     }
-//   );
-// }
-
 export const getTableTenantProfileApi = (params?: QueryTenantProfilesParam) => {
   return defHttp.get({
     url: Api.getTenantProfile,

@@ -18,17 +18,20 @@
         </a-steps>
       </div>
       <div class="mt-5">
+        <!-- 设备配置 -->
         <div v-show="current === 0">
           <DeviceProfileStep1 ref="DeviceProfileStep1Ref" @next="handleStepNext1"
         /></div>
-
+        <!-- 设备配置 -->
+        <!-- 传输配置 -->
         <div v-show="current === 1">
           <DeviceProfileStep2
             ref="DeviceProfileStep2Ref"
             @prev="handleStepPrev"
             @next="handleStep2Next"
         /></div>
-
+        <!-- 传输配置 -->
+        <!-- 告警配置 -->
         <div v-show="current === 2">
           <DeviceProfileStep3
             ref="DeviceProfileStep3Ref"
@@ -39,9 +42,12 @@
             :isAddOrEdit="isStatus"
             :isShowAddRule="isShowRule"
         /></div>
+        <!-- 告警配置 -->
+        <!-- 告警通知 -->
         <div v-show="current === 3">
           <DeviceProfileStep4 ref="DeviceProfileStep4Ref" @prev="handleStepPrev" />
         </div>
+        <!-- 告警通知 -->
       </div>
     </BasicModal>
   </div>
@@ -113,7 +119,6 @@
       const isShowOkBtnFalse = ref(true);
       const isShowRule = ref(true);
       const isEditAndChange = ref(true);
-
       const getTitle = computed(() =>
         isUpdate.value == 1 ? '新增设备配置' : isUpdate.value == 2 ? '编辑设备配置' : '设备配置详情'
       );
@@ -127,18 +132,19 @@
           current.value = 0;
           isStatus.value = !data.isUpdate;
           //清空第一步数据
-          proxy.$refs.DeviceProfileStep1Ref.resetIconFunc();
-          proxy.$refs.DeviceProfileStep1Ref.customResetStepOneFunc();
-          proxy.$refs.DeviceProfileStep3Ref.clearAllRegisterFormFunc();
+          proxy.$refs.DeviceProfileStep1Ref?.resetIconFunc();
+          proxy.$refs.DeviceProfileStep1Ref?.customResetStepOneFunc();
+          proxy.$refs.DeviceProfileStep3Ref?.clearProfileDataFunc1();
+          proxy.$refs.DeviceProfileStep3Ref?.deleteClearCondition();
           //报警详细信息
-          proxy.$refs.DeviceProfileStep3Ref.setRegisterFormChangeDetailFunc({
+          proxy.$refs.DeviceProfileStep3Ref?.setRegisterFormChangeDetailFunc({
             isEditStatus: false,
             stepThreeData: {},
           });
         } else if (isUpdate.value == 2) {
           isGetStepThreeData.profileData.alarms.length = 0;
           try {
-            proxy.$refs.DeviceProfileStep3Ref.clearEditAllRegisterFormFunc();
+            proxy.$refs.DeviceProfileStep3Ref?.clearEditAllRegisterFormFunc();
           } catch (e) {
             return e;
           }
@@ -161,7 +167,6 @@
           });
           proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
           proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
-          // emit('success');
         } else if (isUpdate.value == 3) {
           postEditId.value = data.record.id;
           getBackendData = await deviceConfigGetDetail(postEditId.value);
@@ -182,36 +187,32 @@
           });
           proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
           proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
-          // emit('success');
         }
       });
       function handleStepPrev() {
         current.value--;
       }
+      //第一步
       function handleStepNext1(v, v1) {
         current.value++;
         getStepOneData.value = v;
         getStepOneData.value.icon = v1;
         if (isUpdate.value == 1) {
         } else if (isUpdate.value == 2) {
-          return proxy.$refs.DeviceProfileStep2Ref.setStepTwoFieldsValueFunc({
+          proxy.$refs.DeviceProfileStep2Ref?.setStepTwoFieldsValueFunc({
             transportType: editData.value?.profileData.transportConfiguration.type,
           });
         } else if (isUpdate.value == 3) {
-          return proxy.$refs.DeviceProfileStep2Ref.setStepTwoFieldsValueFunc({
+          proxy.$refs.DeviceProfileStep2Ref?.setStepTwoFieldsValueFunc({
             transportType: editData.value?.profileData.transportConfiguration.type,
           });
         }
       }
+      //第二步
       function handleStep2Next(v) {
         current.value++;
         getStepTwoData.value = v;
         if (isUpdate.value == 1) {
-          try {
-            proxy.$refs.DeviceProfileStep3Ref.initAddAlarmRuleFunc();
-            proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormCreateAlarmFunc();
-            proxy.$refs.DeviceProfileStep3Ref.resetAlarmSeverityRefFunc();
-          } catch {}
         } else if (isUpdate.value == 2) {
           try {
             proxy.$refs.DeviceProfileStep3Ref.setAlaramTypeFormFunc({
@@ -265,6 +266,7 @@
           } catch {}
         }
       }
+      //第三步
       function handleStep3Next(v, v1) {
         isEditAndChange.value = v1;
         current.value++;
@@ -285,7 +287,6 @@
       function handleRedo() {
         current.value = 0;
       }
-
       const handleSubmit = async () => {
         if (isUpdate.value == 1) {
           isGetStepThreeData.profileData.alarms = getStepThreeData.value;
@@ -333,18 +334,19 @@
           emit('success');
         }
       };
-
       const handleCancel = () => {
         closeModal();
         try {
-          proxy.$refs.DeviceProfileStep4Ref.clearAlaramContactAndNoticeMethodFunc();
-          proxy.$refs.DeviceProfileStep3Ref.clearDetailTemplateFunc();
-          proxy.$refs.DeviceProfileStep3Ref.clearEditAllRegisterFormFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetAlarmSeverityRefFunc();
-          emit('success');
-        } catch (e) {
-          return e;
-        }
+          proxy.$refs.DeviceProfileStep1Ref?.customResetStepOneFunc();
+          proxy.$refs.DeviceProfileStep2Ref?.customClearStepTwoValueFunc();
+          proxy.$refs.DeviceProfileStep3Ref?.resetAlarmSeverityRefFunc();
+          proxy.$refs.DeviceProfileStep3Ref?.resetRegisterFormCreateAlarmFunc();
+          proxy.$refs.DeviceProfileStep3Ref?.clearDetailTemplateFunc();
+          proxy.$refs.DeviceProfileStep3Ref?.clearEditAllRegisterFormFunc();
+          proxy.$refs.DeviceProfileStep3Ref?.clearAllRegisterFormFunc();
+          proxy.$refs.DeviceProfileStep4Ref?.clearAlaramContactAndNoticeMethodFunc();
+          proxy.$refs.DeviceProfileStep3Ref?.clearProfileDataFunc1();
+        } catch {}
       };
       return {
         isShowRule,

@@ -6,24 +6,29 @@ import { numberRule } from '/@/utils/rules';
 
 export const columns: BasicColumn[] = [
   {
-    title: '配置名称',
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 150,
+  },
+  {
+    title: '名称',
     dataIndex: 'name',
-    width: 200,
+    width: 150,
   },
   {
-    title: '传输协议',
-    dataIndex: 'transportType',
-    width: 200,
+    title: '配置类型',
+    dataIndex: 'type',
+    width: 100,
   },
   {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 180,
+    title: '传输方式',
+    dataIndex: 'transportType',
+    width: 100,
   },
   {
     title: '描述',
     dataIndex: 'description',
-    width: 180,
+    width: 150,
   },
 ];
 

@@ -9,7 +9,7 @@
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增设备配置 </a-button>
         <ImpExcel @success="loadDataSuccess" dateFormat="YYYY-MM-DD">
-          <a-button @click="handleImport"> 导入设备配置 </a-button>
+          <a-button disabled @click="handleImport"> 导入设备配置 </a-button>
         </ImpExcel>
         <a-button danger color="error" @click="handleTableDel" :disabled="disabled">
           批量删除
@@ -19,6 +19,11 @@
         <TableAction
           :actions="[
             {
+              label: '设置为默认',
+              icon: 'ant-design:profile-outlined',
+              onClick: handleSetDefault.bind(null, record),
+            },
+            {
               label: '详情',
               icon: 'ant-design:eye-outlined',
               onClick: handleDetailView.bind(null, record),
@@ -41,6 +46,9 @@
                 title: '是否确认删除',
                 confirm: handleDelete.bind(null, record),
               },
+              ifShow: () => {
+                return record.default === false;
+              },
             },
           ]"
         />
@@ -55,7 +63,11 @@
   import { BasicTable, useTable, TableAction, BasicColumn } from '/@/components/Table';
   import { columns, searchFormSchema } from './device.profile.data';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { deviceConfigGetQuery, deviceConfigDelete } from '/@/api/device/deviceConfigApi';
+  import {
+    deviceConfigGetQuery,
+    deviceConfigDelete,
+    setDeviceProfileIsDefaultApi,
+  } from '/@/api/device/deviceConfigApi';
   import { useModal } from '/@/components/Modal';
   import DeviceProfileModal from '/@/views/device/profiles/DeviceProfileModal.vue';
   import { ImpExcel, ExcelData } from '/@/components/Excel';
@@ -220,7 +232,32 @@
       function handleSuccess() {
         reload();
       }
+      const handleSetDefault = async (record: Recordable) => {
+        let id = record.id;
+        const obj = {
+          headers: {
+            normalizedNames: {},
+            lazyUpdate: null,
+          },
+          params: {
+            updates: null,
+            cloneFrom: null,
+            encoder: {},
+            map: null,
+            interceptorConfig: {
+              ignoreLoading: false,
+              ignoreErrors: false,
+              resendRequest: false,
+            },
+          },
+        };
+        const data = await setDeviceProfileIsDefaultApi(id, 'default', obj);
+        if (!data) return createMessage.error('设置该设备配置为默认失败');
+        createMessage.success('设置该设备配置为默认成功');
+        reload();
+      };
       return {
+        handleSetDefault,
         disabled,
         deviceDetailRef,
         // setRowClassName,

 <template>
   <div class="step2">
-    <BasicForm @register="register" />
+    <BasicForm :showResetButton="false" :showSubmitButton="false" @register="register" />
+    <div
+      style="
+        display: flex;
+        width: 11vw;
+        height: 4vh;
+        flex-direction: row;
+        justify-content: space-between;
+        margin-left: 8vw;
+        margin-top: -4vh;
+      "
+    >
+      <div style="display: flex; width: 4vw; height: 4vh">
+        <Button type="default" style="border-radius: 2px" class="mt-5" @click="customResetFunc"
+          >上一步</Button
+        >
+      </div>
+      <div style="display: flex; width: 4vw; height: 4vh">
+        <Button type="default" class="mt-5" @click="customSubmitFunc"> 下一步</Button>
+      </div>
+    </div>
   </div>
 </template>
 <script lang="ts">
@@ -8,6 +28,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { step2Schemas } from './data';
   import { Alert, Divider, Descriptions } from 'ant-design-vue';
+  import { Button } from '/@/components/Button';
 
   export default defineComponent({
     components: {
@@ -16,6 +37,7 @@
       [Divider.name]: Divider,
       [Descriptions.name]: Descriptions,
       [Descriptions.Item.name]: Descriptions.Item,
+      Button,
     },
     emits: ['next', 'prev', 'register'],
     setup(_, { emit }) {
@@ -25,14 +47,6 @@
         actionColOptions: {
           span: 14,
         },
-        resetButtonOptions: {
-          text: '上一步',
-        },
-        submitButtonOptions: {
-          text: '下一步',
-        },
-        resetFunc: customResetFunc,
-        submitFunc: customSubmitFunc,
       });
       const setStepTwoFieldsValueFunc = (v) => {
         setFieldsValue(v);
@@ -52,7 +66,13 @@
         } finally {
         }
       }
-      return { register, setStepTwoFieldsValueFunc, customClearStepTwoValueFunc };
+      return {
+        customResetFunc,
+        customSubmitFunc,
+        register,
+        setStepTwoFieldsValueFunc,
+        customClearStepTwoValueFunc,
+      };
     },
   });
 </script>

@@ -181,7 +181,7 @@
                 v-if="isAddRuleStatus"
                 style="border-radius: 10px"
                 class="mt-5"
-                @click="addCreateRole(index)"
+                @click="addCreateRule(index)"
                 ><PlusCircleOutlined />添加创建条件</a-button
               >
             </div>
@@ -189,8 +189,8 @@
           <!-- 创建报警规则 -->
           <div style="height: 20px"></div>
           <!-- 清除报警规则 -->
-          <div>
-            <p style="margin-left: 10px; font-size: medium">清除报警规则</p>
+          <div v-if="clearRuleStatus || getStepThreeEditStatus">
+            <p style="margin-left: 10px; font-size: medium; position: relative">清除报警规则</p>
             <template
               v-for="(childClearItem, clearIndexItem) in item.clearRule"
               :key="childClearItem.id"
@@ -294,6 +294,29 @@
                 </div>
               </div>
             </template>
+            <!-- 移除按钮 -->
+            <div
+              class="remove-type"
+              style="display: inline-block; position: relative; top: -21.2vh; left: 41.4vw"
+            >
+              <img
+                v-if="isAddRuleStatus"
+                style="cursor: pointer"
+                @click="deleteClearCondition"
+                alt="移除"
+                src="../../../../assets/images/close.png"
+              />
+            </div>
+            <!-- 移除按钮 -->
+          </div>
+          <div>
+            <a-button
+              v-if="isAddRuleStatus"
+              style="border-radius: 10px; margin-top: -2vh"
+              class="mt-5"
+              @click="addClearRuleStatus"
+              ><PlusCircleOutlined />清除报警规则</a-button
+            >
           </div>
           <!-- 清除报警规则 -->
         </CollapseContainer>
@@ -470,8 +493,9 @@
       const createAlarmArray = ref<[]>([]);
       const isLostFocuxStatus = ref(true);
       const editIndex = ref(-1);
-      const allAlarmsData = ref<[]>([]);
-      let allAlarmsSingleObj = reactive({});
+      // const allAlarmsData = ref<[]>([]);
+      // let allAlarmsSingleObj = reactive({});
+      const clearRuleStatus = ref(false);
 
       setTimeout(() => {
         getIsShowAddRule = props.isShowAddRule;
@@ -483,6 +507,9 @@
       const clearProfileDataFunc = () => {
         profileData.value.splice(0, 1);
       };
+      const clearProfileDataFunc1 = () => {
+        profileData.value.length = 0;
+      };
       //删除告警配置
       const deleteAlarmRule = (index: number) => {
         profileData.value.splice(index, 1);
@@ -552,33 +579,45 @@
       const clearEditAllRegisterFormFunc = () => {
         getFilterStepThreeEditArr.value.length = 0;
         getFilterStepThreeEditArr.value = [];
-        try {
-          proxy.$refs.alarmSeverityRef.resetFieldsFunc();
-        } catch {}
       };
 
       //重置表单数据
       const clearAllRegisterFormFunc = () => {
         try {
           setTimeout(() => {
+            //报警类型
             clearAlaramTypeValueFunc();
+            //传递报警
             clearTransmitAlarmFunc();
-            resetRegisterFormClearChangeDetailFunc();
+            //报警严重程度
+            addChangeSeverity.value = {};
+            proxy.$refs.alarmSeverityRef?.resetFieldsFunc();
+            //报警详情模板
+            proxy.$refs.detailTemplateRef?.resetFieldsFunc();
+            //清除报警详情模板
+            resetRegisterFormClearChangeDetail();
+            //重置报警规则条件
+            fliterTempRuleConditionTempArr.value = [];
+            fliterTempRuleConditionTempArr.value.length = 0;
+            //重置报警启用规则
+            fliterTempOpenRuleTempArr.value = [];
+            fliterTempOpenRuleTempArr.value.length = 0;
+            //重置清除报警规则条件
+            fliterClearTempRuleConditionTempArr.value = [];
+            fliterClearTempRuleConditionTempArr.value.length = 0;
+            //重置清除报警启用规则
+            fliterClearTempOpenRuleTempArr.value = [];
+            fliterClearTempOpenRuleTempArr.value.length = 0;
             resetAllTemplateFunc();
-          }, 5000);
+          }, 10);
         } catch {}
       };
+
       //重置报警启用规则-报警规则条件
       const resetAllTemplateFunc = () => {
-        fliterTempOpenRuleTempArr.value = [];
-        fliterTempRuleConditionTempArr.value = [];
-        fliterClearTempRuleConditionTempArr.value = [];
-        fliterClearTempOpenRuleTempArr.value = [];
         allAlarms.value = [];
         tempDetailTempArr.value = [];
         addCreateRulesObj.createRules = {};
-        profileData.value = [];
-        profileData.value.push(initProfileData);
         initClearCreateRuleFunc();
         getFilterStepThreeEditArr.value = [];
         getFilterStepThreeEditClearArr.value = [];
@@ -595,11 +634,6 @@
         });
       };
 
-      //清除修改详情模板
-      const resetRegisterFormClearChangeDetailFunc = () => {
-        resetRegisterFormClearChangeDetail();
-      };
-
       //回显报警类型和传递报警数据
       const setAlaramTypeFormFunc = (v) => {
         setAlaramTypeValueFunc(v);
@@ -735,13 +769,6 @@
           return e;
         }
       };
-      const clearDetailTemplateFunc = () => {
-        try {
-          proxy.$refs.detailTemplateRef.resetFieldsFunc();
-        } catch (e) {
-          return e;
-        }
-      };
       const getRegisterClearFormChangeDetailFunc = () => {
         changeGetClearDetailValue.value = getRegisterFormClearChangeDetail();
       };
@@ -768,10 +795,12 @@
       //传递报警数据
       const validateRegisterFormHighSettingFunc = () => {
         const val = getTransmitAlarmFunc();
-        propagateAndpropagateRelationTypes.propagate = val.propagate;
-        propagateAndpropagateRelationTypes.propagateRelationTypes.push(
-          val.propagateRelationTypes as never
-        );
+        try {
+          propagateAndpropagateRelationTypes.propagate = val.propagate;
+          propagateAndpropagateRelationTypes.propagateRelationTypes.push(
+            val.propagateRelationTypes as never
+          );
+        } catch {}
       };
       //报警类型数据
       const validateRegisterFormFunc = () => {
@@ -782,33 +811,34 @@
       const addAlarmRule = () => {
         profileData.value.push(initProfileData);
         addAlarmRuleFunc();
+        clearAllRegisterFormFunc();
       };
       //添加报警规则方法
       const addAlarmRuleFunc = () => {
-        validateRegisterFormFunc();
-        validateRegisterFormHighSettingFunc();
-        addCreateRuleFunc();
-        tempDetailTempArr.value.push(changeGetDetailValue.value as never);
-        tempDetailTempArr.value.forEach((f1) => {
-          kongDetail.value = f1;
-        });
-        addChangeSeverity.value = proxy.$refs.alarmSeverityRef.getFieldsValueFunc();
-        emptyCreateRoleFunc();
-        getOpenRuleAndRuleCondition();
-        tempOpenRuleTempArr.value.forEach((f2) => {
-          kongOpenRuleObj.schedule = f2;
-        });
-        tempRuleConditionTempArr.value.forEach((f3) => {
-          kongRuleConditionObj.condition = f3;
-        });
-        createRulesObj.value[addChangeSeverity.value?.default] = {
-          ...kongDetail.value,
-          ...addNewOpenRule,
-          ...addNewRuleTem,
-          ...kongOpenRuleObj,
-          ...kongRuleConditionObj,
-        };
-        console.log(createRulesObj);
+        // validateRegisterFormFunc();
+        // validateRegisterFormHighSettingFunc();
+        // addCreateRuleFunc();
+        // tempDetailTempArr.value.push(changeGetDetailValue.value as never);
+        // tempDetailTempArr.value.forEach((f1) => {
+        //   kongDetail.value = f1;
+        // });
+        // addChangeSeverity.value = proxy.$refs.alarmSeverityRef.getFieldsValueFunc();
+        // emptyCreateRoleFunc();
+        // getOpenRuleAndRuleCondition();
+        // tempOpenRuleTempArr.value.forEach((f2) => {
+        //   kongOpenRuleObj.schedule = f2;
+        // });
+        // tempRuleConditionTempArr.value.forEach((f3) => {
+        //   kongRuleConditionObj.condition = f3;
+        // });
+        // createRulesObj.value[addChangeSeverity.value?.default] = {
+        //   ...kongDetail.value,
+        //   ...addNewOpenRule,
+        //   ...addNewRuleTem,
+        //   ...kongOpenRuleObj,
+        //   ...kongRuleConditionObj,
+        // };
+        // console.log(createRulesObj);
         // const sigleAlarmTypeGetVal = [];
         // let sigleAlarmTypeGetObj = {};
         // sigleAlarmTypeGetVal.push(alarmTypeGet.value as never);
@@ -823,11 +853,11 @@
       };
 
       //初始化添加一个报警规则
-      const initAddAlarmRuleFunc = () => {
-        if (profileData.value.length === 0) {
-          profileData.value.push(initProfileData);
-        }
-      };
+      // const initAddAlarmRuleFunc = () => {
+      //   if (profileData.value.length === 0) {
+      //     profileData.value.push(initProfileData);
+      //   }
+      // };
       // 添加创建条件方法
       const addCreateRuleFunc = async () => {
         try {
@@ -876,11 +906,12 @@
       };
 
       // 添加创建条件
-      const addCreateRole = async (index: number) => {
+      const addCreateRule = async (index: number) => {
         profileData.value[index]?.alarms.push(initCreateRules);
         addCreateRuleFunc();
-        proxy.$refs.alarmSeverityRef.updateSchemaSelectDisableFunc();
+        proxy.$refs.alarmSeverityRef?.updateSchemaSelectDisableFunc();
       };
+
       // 删除创建条件
       const deleteCondition = (index: number, createIndex: number) => {
         profileData.value[index].alarms.splice(createIndex, 1);
@@ -888,6 +919,13 @@
           getFilterStepThreeEditArr.value.pop();
         }
       };
+
+      const addClearRuleStatus = () => {
+        clearRuleStatus.value = true;
+      };
+      const deleteClearCondition = () => {
+        clearRuleStatus.value = false;
+      };
       //报警规则
       //启用规则
       const getAllFieldsEnabFunc = (v) => {
@@ -1018,13 +1056,11 @@
         getStepThreeEditStatus.value = false;
         setTimeout(() => {
           openModal3(true);
-          if (true) {
-            try {
-              setTimeout(() => {
-                proxy.$refs.getChildData3.resetDataFunc();
-              }, 100);
-            } catch {}
-          }
+          try {
+            setTimeout(() => {
+              proxy.$refs.getChildData3.resetDataFunc();
+            }, 100);
+          } catch {}
         }, 10);
       };
       const handleOpenClearDetailTemplate = () => {
@@ -1074,6 +1110,10 @@
       };
 
       return {
+        deleteClearCondition,
+        clearRuleStatus,
+        addClearRuleStatus,
+        clearProfileDataFunc1,
         clearEditAllRegisterFormFunc,
         returnChildItem,
         editIndex,
@@ -1100,7 +1140,7 @@
         tempOpenRuleTempArr,
         kongOpenRuleObj,
         allAlarms,
-        initAddAlarmRuleFunc,
+        // initAddAlarmRuleFunc,
         getChildData5,
         getChildData6,
         refAlarmDetailTemplate,
@@ -1139,7 +1179,7 @@
         addAlarmRule,
         registerForm,
         registerFormHighSetting,
-        addCreateRole,
+        addCreateRule,
         deleteCondition,
         setCreateRegisterFormChangeDetailFunc,
         detailDetailModelArray,
@@ -1147,7 +1187,6 @@
         handleClickHidenEdit,
         alarmSeverityRef,
         detailTemplateRef,
-        clearDetailTemplateFunc,
       };
     },
   });

@@ -101,6 +101,7 @@ export const formSchema: FormSchema[] = [
     label: '条件类型',
     colProps: { span: 13 },
     component: 'Select',
+    defaultValue: 'SIMPLE',
     componentProps: {
       placeholder: '请选择报警日程表',
       options: [

@@ -175,7 +175,8 @@ export const formSchema: FormSchema[] = [
     field: 'value1',
     label: '默认值',
     colProps: { span: 13 },
-    component: 'Input',
+    component: 'InputNumber',
+    defaultValue: 0,
     componentProps: {
       maxLength: 16,
       placeholder: '请输入值(数字)',
@@ -266,7 +267,8 @@ export const formSchema: FormSchema[] = [
     field: 'value1',
     label: '值',
     colProps: { span: 13 },
-    component: 'Input',
+    component: 'InputNumber',
+    defaultValue: 0,
     componentProps: {
       placeholder: '请输入值(数字)',
     },
@@ -317,7 +319,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isBoolean(Reflect.get(values, 'type1')),
   },
   {
-    field: '',
+    field: 'no',
     label: '默认值',
     colProps: { span: 13 },
     component: 'Checkbox',

 import { FormSchema } from '/@/components/Form';
+import { ref } from 'vue';
+
+const isWhereType = ref('');
 
 export const formSchema: FormSchema[] = [
   {
     field: 'default',
+    component: 'Select',
     label: '报警严重程度：',
+    defaultValue: 'CRITICAL',
     colProps: {
       span: 17,
     },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择报警严重程度',
-      options: [
-        {
-          value: 'CRITICAL',
-          label: '危险',
-          disabled: false,
-        },
-        {
-          value: 'MAJOR',
-          label: '重要',
-          disabled: false,
-        },
-        {
-          value: 'MINOR',
-          label: '次要',
-          disabled: false,
-        },
-        {
-          value: 'WARNING',
-          label: '警告',
-          disabled: false,
-        },
-        {
-          value: 'INDETERMINATE',
-          label: '不确定',
-          disabled: false,
+    componentProps() {
+      return {
+        placeholder: '请选择严重程度',
+        options: [
+          {
+            value: 'CRITICAL',
+            label: '危险',
+          },
+          {
+            value: 'MAJOR',
+            label: '重要',
+          },
+          {
+            value: 'MINOR',
+            label: '次要',
+          },
+          {
+            value: 'WARNING',
+            label: '警告',
+          },
+          {
+            value: 'INDETERMINATE',
+            label: '不确定',
+          },
+        ],
+        onChange: (v) => {
+          isWhereType.value = v ? v : 'INDETERMINATE';
         },
-      ],
+      };
     },
   },
 ];

@@ -31,38 +31,34 @@
         fieldValue.value = getFieldsValue();
         return fieldValue.value;
       };
+
       const item = [
         {
           value: 'CRITICAL',
           label: '危险',
-          disabled: false,
         },
         {
           value: 'MAJOR',
           label: '重要',
-          disabled: false,
         },
         {
           value: 'MINOR',
           label: '次要',
-          disabled: false,
         },
         {
           value: 'WARNING',
           label: '警告',
-          disabled: false,
         },
         {
           value: 'INDETERMINATE',
           label: '不确定',
-          disabled: false,
         },
       ];
       const updateSchemaSelectDisableFunc = () => {
         updateSchema({
           field: 'default',
           componentProps: ({ formModel }) => {
-            item.forEach((f) => {
+            item.forEach((f: any) => {
               if (f.value == formModel.default) {
                 f.disabled = true;
               }

@@ -74,14 +74,7 @@ export const step2Schemas: FormSchema[] = [
     label: '传输方式',
     defaultValue: 'DEFAULT',
     componentProps: {
-      options: [
-        { label: 'DEFAULT', value: 'DEFAULT' },
-        { label: 'MQTT', value: 'MQTT' },
-        { label: 'TCP', value: 'TCP' },
-        { label: 'CoAP', value: 'CoAP' },
-        { label: 'LWM2M', value: 'LWM2M' },
-        { label: 'SNMP', value: 'SNMP' },
-      ],
+      options: [{ label: '默认', value: 'DEFAULT' }],
     },
   },
 ];

@@ -38,6 +38,7 @@
       };
       const updateFieldDeviceId = (v) => {
         const option = v;
+        console.log(option);
         setTimeout(() => {
           updateSchema({
             field: 'entityId',
@@ -98,6 +99,19 @@
           });
         }, 10);
       };
+      const updateOperatorAndValue = () => {
+        updateSchema([
+          {
+            field: 'operation',
+            ifShow: false,
+          },
+          {
+            field: 'value',
+            ifShow: false,
+          },
+        ]);
+      };
+
       const resetFieldsValueFunc = () => {
         resetFields();
       };
@@ -130,7 +144,7 @@
                 },
               ]);
             }
-          }, 10);
+          }, 1);
         }
       };
 
@@ -183,6 +197,7 @@
         });
       };
       return {
+        updateOperatorAndValue,
         clearSelectAttribute,
         updateFieldType2Func,
         updateFieldDeviceId,

@@ -34,7 +34,12 @@ export enum AttrAndWenDuEnum {
   IS_SHIDU = 'NUMERIC',
   IS_CONDITION_WENDU = 'NUMERIC2',
   IS_CONDITION_SHIDU = 'NUMERIC1',
+  IS_TYPE2 = 'type2',
 }
+export const isType2 = (type: string) => {
+  return type === AttrAndWenDuEnum.IS_TYPE2;
+};
+
 export const isConditionShiDu = (type: string) => {
   return type === AttrAndWenDuEnum.IS_CONDITION_SHIDU;
 };
@@ -80,6 +85,11 @@ export const isHand = (type: string) => {
 
 export const columns: BasicColumn[] = [
   {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+  {
     title: '场景联动名称',
     dataIndex: 'name',
     width: 200,
@@ -139,11 +149,6 @@ export const columns: BasicColumn[] = [
     dataIndex: 'description',
     width: 200,
   },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 180,
-  },
 ];
 
 export const getData = ref(null);
@@ -294,10 +299,7 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     component: 'Select',
     componentProps: {
       placeholder: '属性触发',
-      options: [
-        { label: '属性触发', value: 'TIME_SERIES' },
-        // { label: '上下线触发', value: 'ATTRIBUTE' },
-      ],
+      options: [{ label: '属性触发', value: 'TIME_SERIES' }],
     },
     ifShow: ({ values }) =>
       !isTime(Reflect.get(values, 'triggerType')) &&
@@ -305,25 +307,6 @@ export const useTriggerDrawerSchema: FormSchema[] = [
       !isHand(Reflect.get(values, 'triggerType')),
     colProps: { span: 12 },
   },
-  // {
-  //   field: 'key1',
-  //   label: '',
-  //   component: 'Select',
-  //   componentProps: {
-  //     placeholder: '请选择上下线',
-  //     options: [
-  //       { label: '上下线', value: '1' },
-  //       { label: '上线', value: '2' },
-  //       { label: '下线', value: '3' },
-  //     ],
-  //   },
-  //   colProps: { span: 12 },
-  //   ifShow: ({ values }) =>
-  //     isUpAndDown(Reflect.get(values, 'type1')) &&
-  //     !isTime(Reflect.get(values, 'triggerType')) &&
-  //     !isScene(Reflect.get(values, 'triggerType')) &&
-  //     !isHand(Reflect.get(values, 'triggerType')),
-  // },
   {
     field: 'type2',
     label: '',
@@ -340,7 +323,7 @@ export const useTriggerDrawerSchema: FormSchema[] = [
       !isTime(Reflect.get(values, 'triggerType')) &&
       !isScene(Reflect.get(values, 'triggerType')) &&
       !isHand(Reflect.get(values, 'triggerType')) &&
-      !isUpAndDown(Reflect.get(values, 'type1')),
+      isUpAndDown(Reflect.get(values, 'type1')),
     colProps: { span: 12 },
   },
   {
@@ -357,23 +340,23 @@ export const useTriggerDrawerSchema: FormSchema[] = [
         { label: '>=', value: 'GREATER_OR_EQUAL' },
       ],
     },
-    ifShow: false,
+    ifShow: ({ values }) => isType2(Reflect.get(values, 'type2')),
     colProps: { span: 12 },
   },
   {
     field: 'value',
     component: 'Input',
     label: '',
+    defaultValue: 0,
     componentProps: {
       maxLength: 16,
       placeholder: '请输入比较值',
     },
-    ifShow: false,
+    ifShow: ({ values }) => isType2(Reflect.get(values, 'type2')),
     colProps: {
       span: 12,
     },
   },
-
   {
     field: 'sceneLinkageId',
     label: '',
@@ -390,19 +373,6 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     },
     ifShow: ({ values }) => isScene(Reflect.get(values, 'triggerType')),
   },
-
-  // {
-  //   field: 'no3',
-  //   label: '',
-  //   component: 'ApiSelect',
-  //   colProps: {
-  //     span: 12,
-  //   },
-  //   componentProps: {
-  //     placeholder: '暂不实现',
-  //   },
-  //   ifShow: ({ values }) => isHand(Reflect.get(values, 'triggerType')),
-  // },
 ];
 
 export const useConditionDrawerSchema: FormSchema[] = [
@@ -536,12 +506,11 @@ export const useActionDrawerSchema: FormSchema[] = [
   {
     field: 'doContext',
     component: 'InputTextArea',
-    defaultValue:
-      '{"method": "setDOValue","params": {"devID": "492S211218028819","data": {"DO1": 1,"DO2": 1,"DO3": 1,"DO4": 1}}}',
     label: '',
     componentProps: {
       maxLength: 255,
-      placeholder: '请输入下发指定',
+      placeholder:
+        '请输入下发指定(JSON格式：{"method": "setDOValue","params": {"devID": "492S211218028819","data": {"DO1": 1}})',
     },
     ifShow: ({ values }) =>
       !isScene(Reflect.get(values, 'outTarget')) && !isMsg(Reflect.get(values, 'outTarget')),

@@ -374,17 +374,15 @@
               });
             });
 
-            options.items.forEach((v) => {
-              return (v.value = v.tbDeviceId), (v.label = v.name);
+            optionsItemArray.value = options.items.map((v) => {
+              return {
+                value: v.tbDeviceId,
+                label: v.name,
+              };
             });
-            optionsItemArray.value = options.items;
-            try {
-              proxy.$refs.refTriggerChild.updateFieldDeviceId(optionsItemArray.value);
-              proxy.$refs.refConditionChild.updateFieldDeviceId(optionsItemArray.value);
-              proxy.$refs.refActionChild.updateFieldDeviceId(optionsItemArray.value);
-            } catch (e) {
-              return e;
-            }
+            proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
+            proxy.$refs.refConditionChild?.updateFieldDeviceId(optionsItemArray.value);
+            proxy.$refs.refActionChild?.updateFieldDeviceId(optionsItemArray.value);
           } catch (e) {
             return e;
           }
@@ -392,6 +390,7 @@
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增场景联动' : '编辑场景联动'));
       const handleClose = () => {
+        editTriggerPushData.value.length = 0;
         pushEditArray.value.length = 0;
         pushEditConditionArray.value.length = 0;
         pushEditActionArray.value.length = 0;
@@ -403,6 +402,13 @@
         filterArrayTrigger.length = 0;
         filterArrayCondition.value.length = 0;
         filterArrayAction.value.length = 0;
+        proxy.$refs.refTriggerChild?.resetFieldsValueFunc();
+        proxy.$refs.refTriggerChild?.clearSelectDevice();
+        proxy.$refs.refTriggerChild?.clearSelectAttribute();
+        proxy.$refs.refConditionChild?.resetFieldsValueFunc();
+        proxy.$refs.refConditionChild?.clearSelectDevice();
+        proxy.$refs.refActionChild?.resetFieldsValueFunc();
+        proxy.$refs.refActionChild?.clearSelectDevice();
       };
 
       const clearAllArrayFunc = () => {
@@ -430,23 +436,24 @@
       };
       watch(getData, async (newV: string) => {
         const options = await screenLinkPageByDeptIdGetDevice({ organizationId: newV });
-        options.items.forEach((v) => {
-          return (v.value = v.tbDeviceId), (v.label = v.name);
+        optionsItemArray.value = options.items.map((v) => {
+          return {
+            value: v.tbDeviceId,
+            label: v.name,
+          };
         });
-        optionsItemArray.value = options.items;
+        // optionsItemArray.value = options.items;
         updateDeviceIdFunc(optionsItemArray.value);
-        try {
-          proxy.$refs.refActionChild.updateFieldDeviceId(optionsItemArray.value);
-        } catch (e) {
-          return e;
-        }
+        proxy.$refs.refActionChild?.updateFieldDeviceId(optionsItemArray.value);
+        proxy.$refs.refConditionChild?.updateFieldDeviceId(optionsItemArray.value);
+        proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
       });
 
       const updateDeviceIdFunc = (v) => {
         try {
-          proxy.$refs.refTriggerChild.updateFieldDeviceId(v);
-          proxy.$refs.refConditionChild.updateFieldDeviceId(v);
-          proxy.$refs.refActionChild.updateFieldDeviceId(v);
+          proxy.$refs.refTriggerChild?.updateFieldDeviceId(v);
+          proxy.$refs.refConditionChild?.updateFieldDeviceId(v);
+          proxy.$refs.refActionChild?.updateFieldDeviceId(v);
         } catch (e) {
           return e;
         }
@@ -503,7 +510,7 @@
                       // type: m.type2 == null ? 'NUMERIC' : m.type2,
                       type: 'NUMERIC',
                       value: {
-                        defaultValue: Number(m.value) == null ? 0 : Number(m.value),
+                        defaultValue: Number(m.value),
                       },
                       operation: m.operation == null ? 'EQUAL' : m.operation,
                     },
@@ -654,7 +661,7 @@
                       // type: m.type2 == null ? 'NUMERIC' : m.type2,
                       type: 'NUMERIC',
                       value: {
-                        defaultValue: Number(m.value) == null ? 0 : Number(m.value),
+                        defaultValue: Number(m.value),
                       },
                       operation: m.operation == null ? 'EQUAL' : m.operation,
                     },
@@ -668,8 +675,8 @@
           });
           try {
             setTimeout(() => {
-              proxy.$refs.refTriggerChild.updateFieldDeviceId(optionsItemArray.value);
-            }, 50);
+              proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
+            }, 10);
           } catch (e) {
             return e;
           }

@@ -66,7 +66,7 @@
       let selectedRowKeys: Array<string> = [];
       const [registerDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();
-      const [registerTable, { reload, getSelectRowKeys }] = useTable({
+      const [registerTable, { reload, getSelectRows }] = useTable({
         title: '租户配置列表',
         clickToRowSelect: false,
         api: getTableTenantProfileApi,